[oe] [meta-multimedia][PATCHv2 2/4] vlc: update to 2.2.2

[Rafaël Carré]

Drop rdp.c patch obsoleted by upstream changes

Signed-off-by: Rafaël Carré <funman at videolan.org>
---
 .../vlc/vlc/0009-fix-rdp-module.patch                 | 19 -------------------
 meta-multimedia/recipes-multimedia/vlc/vlc_2.2.1.bb   | 18 ------------------
 meta-multimedia/recipes-multimedia/vlc/vlc_2.2.2.bb   | 17 +++++++++++++++++
 3 files changed, 17 insertions(+), 37 deletions(-)
 delete mode 100644 meta-multimedia/recipes-multimedia/vlc/vlc/0009-fix-rdp-module.patch
 delete mode 100644 meta-multimedia/recipes-multimedia/vlc/vlc_2.2.1.bb
 create mode 100644 meta-multimedia/recipes-multimedia/vlc/vlc_2.2.2.bb

diff --git a/meta-multimedia/recipes-multimedia/vlc/vlc/0009-fix-rdp-module.patch b/meta-multimedia/recipes-multimedia/vlc/vlc/0009-fix-rdp-module.patch
deleted file mode 100644
index 8e554a9..0000000
--- a/meta-multimedia/recipes-multimedia/vlc/vlc/0009-fix-rdp-module.patch
+++ /dev/null
@@ -1,19 +0,0 @@
---- a/modules/access/rdp.c	2015-10-22 19:42:24.447445250 +0000
-+++ b/modules/access/rdp.c	2015-10-22 19:42:46.570445248 +0000
-@@ -428,8 +428,6 @@
-     if ( p_sys->f_fps <= 0 ) p_sys->f_fps = 1.0;
-     p_sys->i_frame_interval = 1000000 / p_sys->f_fps;
- 
--    freerdp_channels_global_init();
--
-     p_sys->p_instance = freerdp_new();
-     if ( !p_sys->p_instance )
-     {
-@@ -504,7 +502,6 @@
- 
-     freerdp_disconnect( p_sys->p_instance );
-     freerdp_free( p_sys->p_instance );
--    freerdp_channels_global_uninit();
- 
-     if ( p_sys->p_block )
-         block_Release( p_sys->p_block );
diff --git a/meta-multimedia/recipes-multimedia/vlc/vlc_2.2.1.bb b/meta-multimedia/recipes-multimedia/vlc/vlc_2.2.1.bb
deleted file mode 100644
index fa9d11a..0000000
--- a/meta-multimedia/recipes-multimedia/vlc/vlc_2.2.1.bb
+++ /dev/null
@@ -1,18 +0,0 @@
-require ${BPN}.inc
-
-# work around build failure
-EXTRA_OECONF += " --enable-libxml2=no"
-
-SRC_URI += "file://0001-enable-subdir-objects.patch \
-            file://0002-glibc-does-not-provide-strlcpy.patch \
-            file://0003-use-am-path-libgcrypt.patch \
-            file://0004-modules-gui-qt4-out-of-tree-build.patch \
-            file://0005-libpostproc-header-check.patch \
-            file://0006-make-opencv-configurable.patch \
-            file://0007-use-vorbisidec.patch \
-            file://0008-fix-luaL-checkint.patch \
-            file://0009-fix-rdp-module.patch \
-"
-
-SRC_URI[md5sum] = "42273945758b521c408fabc7fd6d9946"
-SRC_URI[sha256sum] = "543d9d7e378ec0fa1ee2e7f7f5acf8c456c7d0ecc32037171523197ef3cf1fcb"
diff --git a/meta-multimedia/recipes-multimedia/vlc/vlc_2.2.2.bb b/meta-multimedia/recipes-multimedia/vlc/vlc_2.2.2.bb
new file mode 100644
index 0000000..5b15839
--- /dev/null
+++ b/meta-multimedia/recipes-multimedia/vlc/vlc_2.2.2.bb
@@ -0,0 +1,17 @@
+require ${BPN}.inc
+
+# work around build failure
+EXTRA_OECONF += " --enable-libxml2=no"
+
+SRC_URI += "file://0001-enable-subdir-objects.patch \
+            file://0002-glibc-does-not-provide-strlcpy.patch \
+            file://0003-use-am-path-libgcrypt.patch \
+            file://0004-modules-gui-qt4-out-of-tree-build.patch \
+            file://0005-libpostproc-header-check.patch \
+            file://0006-make-opencv-configurable.patch \
+            file://0007-use-vorbisidec.patch \
+            file://0008-fix-luaL-checkint.patch \
+"
+
+SRC_URI[md5sum] = "f98d60f0f59ef72b6e3407f2ff09bda6"
+SRC_URI[sha256sum] = "9ad23128be16f9b40ed772961272cb0748ed8e4aa1bc79c129e589feebea5fb5"
-- 
2.5.0