[oe-commits] [meta-openembedded] 12/20: vlc: blacklist, not compatible with currently used ffmpeg 3

[git at git.openembedded.org]

martin_jansa pushed a commit to branch master-next
in repository meta-openembedded.

commit e08c3e850ae80b6f6776a25ab48a32eada503de5
Author: Martin Jansa <Martin.Jansa at gmail.com>
AuthorDate: Wed Mar 2 17:15:40 2016 +0100

    vlc: blacklist, not compatible with currently used ffmpeg 3
    
    * also fix missing $ which was causing couple QA errors:
    vlc-2.2.1: vlc: invalid PACKAGECONFIG: {@bb.utils.contains('DISTRO_FEATURES', [invalid-packageconfig]
    vlc-2.2.1: vlc: invalid PACKAGECONFIG: 'x11', [invalid-packageconfig]
    vlc-2.2.1: vlc: invalid PACKAGECONFIG: 'x11 [invalid-packageconfig]
    vlc-2.2.1: vlc: invalid PACKAGECONFIG: sdl', [invalid-packageconfig]
    vlc-2.2.1: vlc: invalid PACKAGECONFIG: '', [invalid-packageconfig]
    vlc-2.2.1: vlc: invalid PACKAGECONFIG: d)} [invalid-packageconfig]
    
    Signed-off-by: Martin Jansa <Martin.Jansa at gmail.com>
---
 meta-multimedia/recipes-multimedia/vlc/vlc.inc | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/meta-multimedia/recipes-multimedia/vlc/vlc.inc b/meta-multimedia/recipes-multimedia/vlc/vlc.inc
index 3267dad..825f291 100644
--- a/meta-multimedia/recipes-multimedia/vlc/vlc.inc
+++ b/meta-multimedia/recipes-multimedia/vlc/vlc.inc
@@ -38,7 +38,7 @@ EXTRA_OECONF = "\
     ac_cv_path_UIC=${STAGING_BINDIR_NATIVE}/uic4 \
 "
 
-PACKAGECONFIG ?= " live555 dc1394 dv1394 notify fontconfig freetype dvdread {@bb.utils.contains('DISTRO_FEATURES', 'x11', 'x11 sdl', '', d)}"
+PACKAGECONFIG ?= " live555 dc1394 dv1394 notify fontconfig freetype dvdread ${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'x11 sdl', '', d)}"
 PACKAGECONFIG[mad] = "--enable-mad,--disable-mad,libmad"
 PACKAGECONFIG[sdl] = "--enable-sdl,--disable-sdl,virtual/libsdl libsdl-image "
 PACKAGECONFIG[a52] = "--enable-a52,--disable-a52,liba52"
@@ -104,3 +104,6 @@ FILES_${PN}-dbg += "\
 FILES_${PN}-staticdev += "\
     ${libdir}/vlc/plugins/*/*.a \
 "
+
+# http://errors.yoctoproject.org/Errors/Details/40690/
+PNBLACKLIST[vlc] ?= "Not compatible with currently used ffmpeg 3"

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.