diff options
| author | Kai Kang <kai.kang@windriver.com> | 2018-05-16 16:09:38 +0800 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2018-05-22 13:13:33 +0100 |
| commit | 46a8d4e8479c1f3eb136ef5c91a91ed431fa025a (patch) | |
| tree | d46b73a36d07c6d963e12b0024f8e45bccaef363 | |
| parent | dfe68bd9642d65c7157dbfea62795ba3a848d530 (diff) | |
| download | poky-46a8d4e8479c1f3eb136ef5c91a91ed431fa025a.tar.gz | |
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 <kai.kang@windriver.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
| -rw-r--r-- | meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-good_1.14.0.bb | 3 |
1 files changed, 2 insertions, 1 deletions
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 | |||
| 27 | PACKAGECONFIG ??= " \ | 27 | PACKAGECONFIG ??= " \ |
| 28 | ${GSTREAMER_ORC} \ | 28 | ${GSTREAMER_ORC} \ |
| 29 | ${@bb.utils.filter('DISTRO_FEATURES', 'pulseaudio x11', d)} \ | 29 | ${@bb.utils.filter('DISTRO_FEATURES', 'pulseaudio x11', d)} \ |
| 30 | cairo flac gdk-pixbuf gudev jpeg libpng soup speex taglib v4l2 bz2 zlib gtk mpg123 lame \ | 30 | ${@bb.utils.contains_any('DISTRO_FEATURES', d.getVar('GTK3DISTROFEATURES'), 'gtk', '', d)} \ |
| 31 | cairo flac gdk-pixbuf gudev jpeg libpng soup speex taglib v4l2 bz2 zlib mpg123 lame \ | ||
| 31 | " | 32 | " |
| 32 | 33 | ||
| 33 | X11DEPENDS = "virtual/libx11 libsm libxrender libxfixes libxdamage" | 34 | X11DEPENDS = "virtual/libx11 libsm libxrender libxfixes libxdamage" |