[oe-commits] [openembedded-core] 22/24: gstreamer1.0-plugins-good: enable PACKAGECONFIG gtk conditionally

[git at git.openembedded.org]

This is an automated email from the git hooks/post-receive script.

rpurdie pushed a commit to branch master
in repository openembedded-core.

commit a36c1e514d43854b22da75a2ec4c8069a6eaab27
Author: Kai Kang <kai.kang at windriver.com>
AuthorDate: Wed May 16 16:09:38 2018 +0800

    gstreamer1.0-plugins-good: enable PACKAGECONFIG gtk conditionally
    
    PACKAGECONFIG 'gtk' is enabled by default for gstreamer1.0-plugins-good
    and it makes gstreamer1.0-plugins-good depends on package gtk+3 which
    requires any distro feature in ${GTK3DISTROFEATURES}. When none distro
    feature is enabled from ${GTK3DISTROFEATURES}, it causes error:
    
    | ERROR: Nothing PROVIDES 'gtk+3' (but .../meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-good_1.14.0.bb
    | DEPENDS on or otherwise requires it)
    | gtk+3 was skipped: one of '['x11', 'wayland']' needs to be in DISTRO_FEATURES
    
    So enable PACKAGECONFIG gtk conditionally for gstreamer1.0-plugins-good.
    
    Signed-off-by: Kai Kang <kai.kang at windriver.com>
    Signed-off-by: Ross Burton <ross.burton at intel.com>
---
 meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-good_1.14.0.bb | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-good_1.14.0.bb b/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-good_1.14.0.bb
index a420039..b269fce 100644
--- a/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-good_1.14.0.bb
+++ b/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-good_1.14.0.bb
@@ -27,7 +27,8 @@ inherit gettext
 PACKAGECONFIG ??= " \
     ${GSTREAMER_ORC} \
     ${@bb.utils.filter('DISTRO_FEATURES', 'pulseaudio x11', d)} \
-    cairo flac gdk-pixbuf gudev jpeg libpng soup speex taglib v4l2 bz2 zlib gtk mpg123 lame \
+    ${@bb.utils.contains_any('DISTRO_FEATURES', d.getVar('GTK3DISTROFEATURES'), 'gtk', '', d)} \
+    cairo flac gdk-pixbuf gudev jpeg libpng soup speex taglib v4l2 bz2 zlib mpg123 lame \
 "
 
 X11DEPENDS = "virtual/libx11 libsm libxrender libxfixes libxdamage"

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