From 46a8d4e8479c1f3eb136ef5c91a91ed431fa025a Mon Sep 17 00:00:00 2001 From: Kai Kang Date: Wed, 16 May 2018 16:09:38 +0800 Subject: 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. (From OE-Core rev: a36c1e514d43854b22da75a2ec4c8069a6eaab27) Signed-off-by: Kai Kang Signed-off-by: Ross Burton Signed-off-by: Richard Purdie --- meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-good_1.14.0.bb | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'meta') 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 a420039fa8..b269fce173 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" -- cgit v1.2.3-54-g00ecf