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 | |
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')
9 files changed, 11 insertions, 21 deletions
diff --git a/meta/recipes-multimedia/alsa/alsa-plugins_1.1.1.bb b/meta/recipes-multimedia/alsa/alsa-plugins_1.1.1.bb index c95ea54160..3928fb1cb9 100644 --- a/meta/recipes-multimedia/alsa/alsa-plugins_1.1.1.bb +++ b/meta/recipes-multimedia/alsa/alsa-plugins_1.1.1.bb | |||
@@ -31,7 +31,7 @@ inherit autotools pkgconfig | |||
31 | PACKAGECONFIG ??= "\ | 31 | PACKAGECONFIG ??= "\ |
32 | samplerate \ | 32 | samplerate \ |
33 | speexdsp \ | 33 | speexdsp \ |
34 | ${@bb.utils.contains('DISTRO_FEATURES', 'pulseaudio', 'pulseaudio', '', d)} \ | 34 | ${@bb.utils.filter('DISTRO_FEATURES', 'pulseaudio', d)} \ |
35 | " | 35 | " |
36 | PACKAGECONFIG[avcodec] = "--enable-avcodec,--disable-avcodec,libav" | 36 | PACKAGECONFIG[avcodec] = "--enable-avcodec,--disable-avcodec,libav" |
37 | PACKAGECONFIG[jack] = "--enable-jack,--disable-jack,jack" | 37 | PACKAGECONFIG[jack] = "--enable-jack,--disable-jack,jack" |
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" |
diff --git a/meta/recipes-multimedia/libsndfile/libsndfile1_1.0.27.bb b/meta/recipes-multimedia/libsndfile/libsndfile1_1.0.27.bb index ec41719439..7a095b6a11 100644 --- a/meta/recipes-multimedia/libsndfile/libsndfile1_1.0.27.bb +++ b/meta/recipes-multimedia/libsndfile/libsndfile1_1.0.27.bb | |||
@@ -14,7 +14,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=e77fe93202736b47c07035910f47974a" | |||
14 | 14 | ||
15 | S = "${WORKDIR}/libsndfile-${PV}" | 15 | S = "${WORKDIR}/libsndfile-${PV}" |
16 | 16 | ||
17 | PACKAGECONFIG ??= "${@bb.utils.contains('DISTRO_FEATURES', 'alsa', 'alsa', '', d)}" | 17 | PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'alsa', d)}" |
18 | PACKAGECONFIG[alsa] = "--enable-alsa,--disable-alsa,alsa-lib" | 18 | PACKAGECONFIG[alsa] = "--enable-alsa,--disable-alsa,alsa-lib" |
19 | 19 | ||
20 | inherit autotools lib_package pkgconfig | 20 | inherit autotools lib_package pkgconfig |
diff --git a/meta/recipes-multimedia/mpeg2dec/mpeg2dec_0.4.1.bb b/meta/recipes-multimedia/mpeg2dec/mpeg2dec_0.4.1.bb index 16669947f9..fe765da193 100644 --- a/meta/recipes-multimedia/mpeg2dec/mpeg2dec_0.4.1.bb +++ b/meta/recipes-multimedia/mpeg2dec/mpeg2dec_0.4.1.bb | |||
@@ -20,7 +20,7 @@ inherit autotools pkgconfig | |||
20 | 20 | ||
21 | EXTRA_OECONF = "--enable-shared --disable-sdl" | 21 | EXTRA_OECONF = "--enable-shared --disable-sdl" |
22 | 22 | ||
23 | PACKAGECONFIG ?= "${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'x11', '', d)}" | 23 | PACKAGECONFIG ?= "${@bb.utils.filter('DISTRO_FEATURES', 'x11', d)}" |
24 | PACKAGECONFIG[x11] = "--with-x,--without-x,virtual/libx11 libxext libxv" | 24 | PACKAGECONFIG[x11] = "--with-x,--without-x,virtual/libx11 libxext libxv" |
25 | 25 | ||
26 | PACKAGES = "mpeg2dec-dbg mpeg2dec mpeg2dec-doc libmpeg2 libmpeg2-dev libmpeg2convert libmpeg2convert-dev libmpeg2-staticdev libmpeg2convert-staticdev" | 26 | PACKAGES = "mpeg2dec-dbg mpeg2dec mpeg2dec-doc libmpeg2 libmpeg2-dev libmpeg2convert libmpeg2convert-dev libmpeg2-staticdev libmpeg2convert-staticdev" |
diff --git a/meta/recipes-multimedia/mpg123/mpg123_1.23.8.bb b/meta/recipes-multimedia/mpg123/mpg123_1.23.8.bb index f4c5c7cce8..e0a70380ea 100644 --- a/meta/recipes-multimedia/mpg123/mpg123_1.23.8.bb +++ b/meta/recipes-multimedia/mpg123/mpg123_1.23.8.bb | |||
@@ -20,7 +20,7 @@ inherit autotools pkgconfig | |||
20 | # The options should be mutually exclusive for configuration script. | 20 | # The options should be mutually exclusive for configuration script. |
21 | # If both alsa and pulseaudio are specified (as in the default distro features) | 21 | # If both alsa and pulseaudio are specified (as in the default distro features) |
22 | # pulseaudio takes precedence. | 22 | # pulseaudio takes precedence. |
23 | PACKAGECONFIG_ALSA = "${@bb.utils.contains('DISTRO_FEATURES', 'alsa', 'alsa', '', d)}" | 23 | PACKAGECONFIG_ALSA = "${@bb.utils.filter('DISTRO_FEATURES', 'alsa', d)}" |
24 | PACKAGECONFIG ??= "${@bb.utils.contains('DISTRO_FEATURES', 'pulseaudio', 'pulseaudio', '${PACKAGECONFIG_ALSA}', d)}" | 24 | PACKAGECONFIG ??= "${@bb.utils.contains('DISTRO_FEATURES', 'pulseaudio', 'pulseaudio', '${PACKAGECONFIG_ALSA}', d)}" |
25 | 25 | ||
26 | PACKAGECONFIG[alsa] = "--with-default-audio=alsa,,alsa-lib" | 26 | PACKAGECONFIG[alsa] = "--with-default-audio=alsa,,alsa-lib" |
@@ -33,13 +33,8 @@ PACKAGECONFIG[sdl] = ",,libsdl" | |||
33 | 33 | ||
34 | # Following are possible sound output modules: | 34 | # Following are possible sound output modules: |
35 | # alsa arts coreaudio dummy esd jack nas openal os2 oss portaudio pulse sdl sndio sun tinyalsa win32 win32_wasapi | 35 | # alsa arts coreaudio dummy esd jack nas openal os2 oss portaudio pulse sdl sndio sun tinyalsa win32 win32_wasapi |
36 | AUDIOMODS += "${@bb.utils.contains('PACKAGECONFIG', 'alsa', 'alsa', '', d)}" | 36 | AUDIOMODS += "${@bb.utils.filter('PACKAGECONFIG', 'alsa esd jack openal portaudio sdl', d)}" |
37 | AUDIOMODS += "${@bb.utils.contains('PACKAGECONFIG', 'esd', 'esd', '', d)}" | ||
38 | AUDIOMODS += "${@bb.utils.contains('PACKAGECONFIG', 'jack', 'jack', '', d)}" | ||
39 | AUDIOMODS += "${@bb.utils.contains('PACKAGECONFIG', 'openal', 'openal', '', d)}" | ||
40 | AUDIOMODS += "${@bb.utils.contains('PACKAGECONFIG', 'portaudio', 'portaudio', '', d)}" | ||
41 | AUDIOMODS += "${@bb.utils.contains('PACKAGECONFIG', 'pulseaudio', 'pulse', '', d)}" | 37 | AUDIOMODS += "${@bb.utils.contains('PACKAGECONFIG', 'pulseaudio', 'pulse', '', d)}" |
42 | AUDIOMODS += "${@bb.utils.contains('PACKAGECONFIG', 'sdl', 'sdl', '', d)}" | ||
43 | 38 | ||
44 | EXTRA_OECONF = " \ | 39 | EXTRA_OECONF = " \ |
45 | --enable-shared \ | 40 | --enable-shared \ |
diff --git a/meta/recipes-multimedia/pulseaudio/pulseaudio.inc b/meta/recipes-multimedia/pulseaudio/pulseaudio.inc index 818ff560cc..fdbf5abc16 100644 --- a/meta/recipes-multimedia/pulseaudio/pulseaudio.inc +++ b/meta/recipes-multimedia/pulseaudio/pulseaudio.inc | |||
@@ -108,10 +108,8 @@ EXTRA_OECONF += "--disable-adrian-aec" | |||
108 | 108 | ||
109 | PACKAGECONFIG ??= "${@bb.utils.contains('DISTRO_FEATURES', 'bluetooth', '${BLUEZ}', '', d)} \ | 109 | PACKAGECONFIG ??= "${@bb.utils.contains('DISTRO_FEATURES', 'bluetooth', '${BLUEZ}', '', d)} \ |
110 | ${@bb.utils.contains('DISTRO_FEATURES', 'zeroconf', 'avahi', '', d)} \ | 110 | ${@bb.utils.contains('DISTRO_FEATURES', 'zeroconf', 'avahi', '', d)} \ |
111 | ${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'x11', '', d)} \ | ||
112 | ${@bb.utils.contains('DISTRO_FEATURES', '3g', 'ofono', '', d)} \ | 111 | ${@bb.utils.contains('DISTRO_FEATURES', '3g', 'ofono', '', d)} \ |
113 | ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'systemd', '', d)} \ | 112 | ${@bb.utils.filter('DISTRO_FEATURES', 'ipv6 systemd x11', d)} \ |
114 | ${@bb.utils.contains('DISTRO_FEATURES', 'ipv6', 'ipv6', '', d)} \ | ||
115 | dbus \ | 113 | dbus \ |
116 | " | 114 | " |
117 | 115 | ||