diff options
author | Peter Kjellerstedt <peter.kjellerstedt@axis.com> | 2017-02-27 14:02:50 +0100 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2017-03-01 11:17:45 +0000 |
commit | 254bfb107134702d8d1e0bfbdd1b011212e8c291 (patch) | |
tree | 188ddf3ea786bc1b913904330e4f95125bd6def4 /meta/recipes-multimedia/gstreamer | |
parent | dec5650bc292aa3c4a0a04ace72d2cf762e9620b (diff) | |
download | poky-254bfb107134702d8d1e0bfbdd1b011212e8c291.tar.gz |
recipes: Make use of the new bb.utils.filter() function
(From OE-Core rev: 0a1427bf9aeeda6bee2cc0af8da4ea5fd90aef6f)
Signed-off-by: Peter Kjellerstedt <peter.kjellerstedt@axis.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-multimedia/gstreamer')
4 files changed, 5 insertions, 8 deletions
diff --git a/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad.inc b/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad.inc index 3cb7ab1ae1..992373b69e 100644 --- a/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad.inc +++ b/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad.inc | |||
@@ -20,7 +20,7 @@ PACKAGECONFIG ??= " \ | |||
20 | ${GSTREAMER_ORC} \ | 20 | ${GSTREAMER_ORC} \ |
21 | ${PACKAGECONFIG_GL} \ | 21 | ${PACKAGECONFIG_GL} \ |
22 | ${@bb.utils.contains('DISTRO_FEATURES', 'bluetooth', 'bluez', '', d)} \ | 22 | ${@bb.utils.contains('DISTRO_FEATURES', 'bluetooth', 'bluez', '', d)} \ |
23 | ${@bb.utils.contains('DISTRO_FEATURES', 'directfb', 'directfb', '', d)} \ | 23 | ${@bb.utils.filter('DISTRO_FEATURES', 'directfb', d)} \ |
24 | ${@bb.utils.contains('DISTRO_FEATURES', 'wayland', 'wayland egl', '', d)} \ | 24 | ${@bb.utils.contains('DISTRO_FEATURES', 'wayland', 'wayland egl', '', d)} \ |
25 | bz2 curl dash dtls hls neon rsvg sbc smoothstreaming sndfile uvch264 webp \ | 25 | bz2 curl dash dtls hls neon rsvg sbc smoothstreaming sndfile uvch264 webp \ |
26 | " | 26 | " |
diff --git a/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base.inc b/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base.inc index 1c5620017a..08130c1da4 100644 --- a/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base.inc +++ b/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base.inc | |||
@@ -17,8 +17,7 @@ PACKAGES_DYNAMIC =+ "^libgst.*" | |||
17 | 17 | ||
18 | PACKAGECONFIG ??= " \ | 18 | PACKAGECONFIG ??= " \ |
19 | ${GSTREAMER_ORC} \ | 19 | ${GSTREAMER_ORC} \ |
20 | ${@bb.utils.contains('DISTRO_FEATURES', 'alsa', 'alsa', '', d)} \ | 20 | ${@bb.utils.filter('DISTRO_FEATURES', 'alsa x11', d)} \ |
21 | ${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'x11', '', d)} \ | ||
22 | gio-unix-2.0 ogg pango theora vorbis \ | 21 | gio-unix-2.0 ogg pango theora vorbis \ |
23 | " | 22 | " |
24 | 23 | ||
diff --git a/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-good.inc b/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-good.inc index f1e30aba55..14c3d61848 100644 --- a/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-good.inc +++ b/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-good.inc | |||
@@ -8,8 +8,7 @@ inherit gettext | |||
8 | 8 | ||
9 | PACKAGECONFIG ??= " \ | 9 | PACKAGECONFIG ??= " \ |
10 | ${GSTREAMER_ORC} \ | 10 | ${GSTREAMER_ORC} \ |
11 | ${@bb.utils.contains('DISTRO_FEATURES', 'pulseaudio', 'pulseaudio', '', d)} \ | 11 | ${@bb.utils.filter('DISTRO_FEATURES', 'pulseaudio x11', d)} \ |
12 | ${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'x11', '', d)} \ | ||
13 | cairo flac gdk-pixbuf gudev jpeg libpng soup speex taglib v4l2 \ | 12 | cairo flac gdk-pixbuf gudev jpeg libpng soup speex taglib v4l2 \ |
14 | " | 13 | " |
15 | 14 | ||
diff --git a/meta/recipes-multimedia/gstreamer/gstreamer1.0-vaapi.inc b/meta/recipes-multimedia/gstreamer/gstreamer1.0-vaapi.inc index c73ecf8efe..ef0734ba93 100644 --- a/meta/recipes-multimedia/gstreamer/gstreamer1.0-vaapi.inc +++ b/meta/recipes-multimedia/gstreamer/gstreamer1.0-vaapi.inc | |||
@@ -23,9 +23,8 @@ REQUIRED_DISTRO_FEATURES ?= "opengl" | |||
23 | PACKAGES =+ "${PN}-tests" | 23 | PACKAGES =+ "${PN}-tests" |
24 | 24 | ||
25 | PACKAGECONFIG ??= "drm \ | 25 | PACKAGECONFIG ??= "drm \ |
26 | ${@bb.utils.contains("DISTRO_FEATURES", "opengl x11", "glx", "", d)} \ | 26 | ${@bb.utils.contains('DISTRO_FEATURES', 'opengl x11', 'glx', '', d)} \ |
27 | ${@bb.utils.contains("DISTRO_FEATURES", "wayland", "wayland", "", d)} \ | 27 | ${@bb.utils.filter('DISTRO_FEATURES', 'wayland x11', d)}" |
28 | ${@bb.utils.contains("DISTRO_FEATURES", "x11", "x11", "", d)}" | ||
29 | 28 | ||
30 | PACKAGECONFIG[drm] = "--enable-drm,--disable-drm,udev libdrm" | 29 | PACKAGECONFIG[drm] = "--enable-drm,--disable-drm,udev libdrm" |
31 | PACKAGECONFIG[glx] = "--enable-glx,--disable-glx,virtual/mesa" | 30 | PACKAGECONFIG[glx] = "--enable-glx,--disable-glx,virtual/mesa" |