vlc: fix freerdp module build

Since we are building "freerdp" again, build can now fail
due to reliance on removed APIs. For instance :
http://errors.yoctoproject.org/Errors/Details/20603/

Fix this by conditionally building the module, and if we
build it, patching the code until the fix gets merged
upstream.

Signed-off-by: Manuel Bachmann <manuel.bachmann@iot.bzh>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>

3 files changed, 22 insertions, 1 deletions

diff --git a/meta-multimedia/recipes-multimedia/vlc/vlc.inc b/meta-multimedia/recipes-multimedia/vlc/vlc.inc
index 41b5df92d..ee90ac804 100644
--- a/meta-multimedia/recipes-multimedia/vlc/vlc.inc
+++ b/meta-multimedia/recipes-multimedia/vlc/vlc.inc
@@ -57,6 +57,7 @@ PACKAGECONFIG[speex] = "--enable-speex,--disable-speex,speex"
 PACKAGECONFIG[gstreamer] = "--enable-gst-decode,--disable-gst-decode,gstreamer1.0 gstreamer1.0-plugins-base"
 PACKAGECONFIG[vpx] = "--enable-vpx,--disable-vpx, libvpx"
 PACKAGECONFIG[qt4] = "--enable-qt,--disable-qt, qt4-x11-free"
+PACKAGECONFIG[freerdp] = "--enable-freerdp,--disable-freerdp, freerdp"
 
 do_configure_prepend() {
     cp ${STAGING_DATADIR}/libtool/config.* ${S}/autotools/ || true
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
new file mode 100644
index 000000000..8e554a980
--- /dev/null
+++ b/meta-multimedia/recipes-multimedia/vlc/vlc/0009-fix-rdp-module.patch
@@ -0,0 +1,19 @@
+--- 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
index ba8ca4b5a..fa9d11a11 100644
--- a/meta-multimedia/recipes-multimedia/vlc/vlc_2.2.1.bb
+++ b/meta-multimedia/recipes-multimedia/vlc/vlc_2.2.1.bb
@@ -9,8 +9,9 @@ SRC_URI += "file://0001-enable-subdir-objects.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://0007-use-vorbisidec.patch \
             file://0008-fix-luaL-checkint.patch \
+            file://0009-fix-rdp-module.patch \
 "
 
 SRC_URI[md5sum] = "42273945758b521c408fabc7fd6d9946"