CaROS/meta-openembedded
3
1
Fork 0
mirror of git://git.openembedded.org/meta-openembedded synced 2026-01-01 13:58:06 +00:00
Code Issues Packages Projects Releases Wiki Activity

vlc: fix freerdp module build

Browse Source 
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>
This commit is contained in:
Manuel Bachmann 2015-10-22 22:09:39 +02:00 committed by Martin Jansa
parent ba8b86175e
commit 9dbf3c5b02
3 changed files with 22 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
meta-multimedia/recipes-multimedia/vlc/vlc.inc
View File

@ -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

19
meta-multimedia/recipes-multimedia/vlc/vlc/0009-fix-rdp-module.patch Normal file
View File

@ -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 );

3
meta-multimedia/recipes-multimedia/vlc/vlc_2.2.1.bb
View File

@ -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"