diff options
author | Ross Burton <ross.burton@intel.com> | 2016-04-22 20:48:53 +0100 |
---|---|---|
committer | Armin Kuster <akuster808@gmail.com> | 2016-05-02 14:03:03 -0700 |
commit | d336edb5d2d0013530ab55cfb9709dd10d529e86 (patch) | |
tree | 615837226807382ad94d632efe4f95991f59923a /meta-multimedia/recipes-multimedia | |
parent | 09ae3b65d73860e4a2bd78fb7746d1a91bad56b0 (diff) | |
download | meta-openembedded-d336edb5d2d0013530ab55cfb9709dd10d529e86.tar.gz |
meta-multimedia: use bb.utils.contains() instead of base_contains()
base_contains() is a compatibility wrapper and may warn in the future, so
replace all instances with bb.utils.contains().
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Signed-off-by: Armin Kuster <akuster808@gmail.com>
Diffstat (limited to 'meta-multimedia/recipes-multimedia')
6 files changed, 16 insertions, 16 deletions
diff --git a/meta-multimedia/recipes-multimedia/fluidsynth/fluidsynth_1.1.6.bb b/meta-multimedia/recipes-multimedia/fluidsynth/fluidsynth_1.1.6.bb index b0bc824c5..66f020134 100644 --- a/meta-multimedia/recipes-multimedia/fluidsynth/fluidsynth_1.1.6.bb +++ b/meta-multimedia/recipes-multimedia/fluidsynth/fluidsynth_1.1.6.bb | |||
@@ -12,7 +12,7 @@ SRC_URI[sha256sum] = "50853391d9ebeda9b4db787efb23f98b1e26b7296dd2bb5d0d96b5bcce | |||
12 | 12 | ||
13 | inherit autotools-brokensep pkgconfig lib_package | 13 | inherit autotools-brokensep pkgconfig lib_package |
14 | 14 | ||
15 | PACKAGECONFIG ??= "${@base_contains('DISTRO_FEATURES', 'pulseaudio', 'pulseaudio', '', d)}" | 15 | PACKAGECONFIG ??= "${@bb.utils.contains('DISTRO_FEATURES', 'pulseaudio', 'pulseaudio', '', d)}" |
16 | PACKAGECONFIG[sndfile] = "--enable-libsndfile-support,--disable-libsndfile-support,libsndfile1" | 16 | PACKAGECONFIG[sndfile] = "--enable-libsndfile-support,--disable-libsndfile-support,libsndfile1" |
17 | PACKAGECONFIG[jack] = "--enable-jack-support,--disable-jack-support,jack" | 17 | PACKAGECONFIG[jack] = "--enable-jack-support,--disable-jack-support,jack" |
18 | PACKAGECONFIG[pulseaudio] = "--enable-pulse-support,--disable-pulse-support,pulseaudio" | 18 | PACKAGECONFIG[pulseaudio] = "--enable-pulse-support,--disable-pulse-support,pulseaudio" |
diff --git a/meta-multimedia/recipes-multimedia/libao/libao_1.2.0.bb b/meta-multimedia/recipes-multimedia/libao/libao_1.2.0.bb index 3991f027c..1339df6df 100644 --- a/meta-multimedia/recipes-multimedia/libao/libao_1.2.0.bb +++ b/meta-multimedia/recipes-multimedia/libao/libao_1.2.0.bb | |||
@@ -27,7 +27,7 @@ python populate_packages_prepend () { | |||
27 | do_split_packages(d, rootdir_dbg, '^(.*)\.so$', output_pattern='${BPN}-plugin-%s-dbg', description='AO %s plugin debug data') | 27 | do_split_packages(d, rootdir_dbg, '^(.*)\.so$', output_pattern='${BPN}-plugin-%s-dbg', description='AO %s plugin debug data') |
28 | } | 28 | } |
29 | 29 | ||
30 | PACKAGECONFIG ?= "${@base_contains('DISTRO_FEATURES', 'pulseaudio', 'pulseaudio', '', d)} ${@base_contains('DISTRO_FEATURES', 'alsa', 'alsa', '', d)}" | 30 | PACKAGECONFIG ?= "${@bb.utils.contains('DISTRO_FEATURES', 'pulseaudio', 'pulseaudio', '', d)} ${@bb.utils.contains('DISTRO_FEATURES', 'alsa', 'alsa', '', d)}" |
31 | PACKAGECONFIG[esound] = "--enable-esd,--disable-esd,esound" | 31 | PACKAGECONFIG[esound] = "--enable-esd,--disable-esd,esound" |
32 | PACKAGECONFIG[alsa] = "--enable-alsa,--disable-alsa,alsa-lib" | 32 | PACKAGECONFIG[alsa] = "--enable-alsa,--disable-alsa,alsa-lib" |
33 | PACKAGECONFIG[pulseaudio] = "--enable-pulse,--disable-pulse,pulseaudio" | 33 | PACKAGECONFIG[pulseaudio] = "--enable-pulse,--disable-pulse,pulseaudio" |
diff --git a/meta-multimedia/recipes-multimedia/mpg123/mpg123_1.22.4.bb b/meta-multimedia/recipes-multimedia/mpg123/mpg123_1.22.4.bb index d11a312c0..e6a912b35 100644 --- a/meta-multimedia/recipes-multimedia/mpg123/mpg123_1.22.4.bb +++ b/meta-multimedia/recipes-multimedia/mpg123/mpg123_1.22.4.bb | |||
@@ -22,8 +22,8 @@ inherit autotools pkgconfig | |||
22 | # The options should be mutually exclusive for configuration script. | 22 | # The options should be mutually exclusive for configuration script. |
23 | # If both alsa and pulseaudio are specified (as in the default distro features) | 23 | # If both alsa and pulseaudio are specified (as in the default distro features) |
24 | # pulseaudio takes precedence. | 24 | # pulseaudio takes precedence. |
25 | PACKAGECONFIG_ALSA = "${@base_contains('DISTRO_FEATURES', 'alsa', 'alsa', '', d)}" | 25 | PACKAGECONFIG_ALSA = "${@bb.utils.contains('DISTRO_FEATURES', 'alsa', 'alsa', '', d)}" |
26 | PACKAGECONFIG ??= "${@base_contains('DISTRO_FEATURES', 'pulseaudio', 'pulseaudio', '${PACKAGECONFIG_ALSA}', d)}" | 26 | PACKAGECONFIG ??= "${@bb.utils.contains('DISTRO_FEATURES', 'pulseaudio', 'pulseaudio', '${PACKAGECONFIG_ALSA}', d)}" |
27 | 27 | ||
28 | PACKAGECONFIG[alsa] = "--with-default-audio=alsa,,alsa-lib" | 28 | PACKAGECONFIG[alsa] = "--with-default-audio=alsa,,alsa-lib" |
29 | PACKAGECONFIG[esd] = ",,esound" | 29 | PACKAGECONFIG[esd] = ",,esound" |
@@ -35,13 +35,13 @@ PACKAGECONFIG[sdl] = ",,libsdl" | |||
35 | 35 | ||
36 | # Following are possible sound output modules: | 36 | # Following are possible sound output modules: |
37 | # alsa arts coreaudio dummy esd jack nas openal os2 oss portaudio pulse sdl sndio sun tinyalsa win32 win32_wasapi | 37 | # alsa arts coreaudio dummy esd jack nas openal os2 oss portaudio pulse sdl sndio sun tinyalsa win32 win32_wasapi |
38 | AUDIOMODS += "${@base_contains('PACKAGECONFIG', 'alsa', 'alsa', '', d)}" | 38 | AUDIOMODS += "${@bb.utils.contains('PACKAGECONFIG', 'alsa', 'alsa', '', d)}" |
39 | AUDIOMODS += "${@base_contains('PACKAGECONFIG', 'esd', 'esd', '', d)}" | 39 | AUDIOMODS += "${@bb.utils.contains('PACKAGECONFIG', 'esd', 'esd', '', d)}" |
40 | AUDIOMODS += "${@base_contains('PACKAGECONFIG', 'jack', 'jack', '', d)}" | 40 | AUDIOMODS += "${@bb.utils.contains('PACKAGECONFIG', 'jack', 'jack', '', d)}" |
41 | AUDIOMODS += "${@base_contains('PACKAGECONFIG', 'openal', 'openal', '', d)}" | 41 | AUDIOMODS += "${@bb.utils.contains('PACKAGECONFIG', 'openal', 'openal', '', d)}" |
42 | AUDIOMODS += "${@base_contains('PACKAGECONFIG', 'portaudio', 'portaudio', '', d)}" | 42 | AUDIOMODS += "${@bb.utils.contains('PACKAGECONFIG', 'portaudio', 'portaudio', '', d)}" |
43 | AUDIOMODS += "${@base_contains('PACKAGECONFIG', 'pulseaudio', 'pulse', '', d)}" | 43 | AUDIOMODS += "${@bb.utils.contains('PACKAGECONFIG', 'pulseaudio', 'pulse', '', d)}" |
44 | AUDIOMODS += "${@base_contains('PACKAGECONFIG', 'sdl', 'sdl', '', d)}" | 44 | AUDIOMODS += "${@bb.utils.contains('PACKAGECONFIG', 'sdl', 'sdl', '', d)}" |
45 | 45 | ||
46 | EXTRA_OECONF = " \ | 46 | EXTRA_OECONF = " \ |
47 | --enable-shared \ | 47 | --enable-shared \ |
diff --git a/meta-multimedia/recipes-multimedia/musicpd/mpd_0.19.10.bb b/meta-multimedia/recipes-multimedia/musicpd/mpd_0.19.10.bb index 09caf47ec..7b124ca15 100644 --- a/meta-multimedia/recipes-multimedia/musicpd/mpd_0.19.10.bb +++ b/meta-multimedia/recipes-multimedia/musicpd/mpd_0.19.10.bb | |||
@@ -15,7 +15,7 @@ SRC_URI[sha256sum] = "c386eb3d22f98dc993b5ae3c272f969aa7763713483c6800040ebf1791 | |||
15 | inherit autotools useradd systemd | 15 | inherit autotools useradd systemd |
16 | 16 | ||
17 | EXTRA_OECONF = "enable_bzip2=yes" | 17 | EXTRA_OECONF = "enable_bzip2=yes" |
18 | EXTRA_OECONF += "${@base_contains('DISTRO_FEATURES', 'systemd', '--with-systemdsystemunitdir=${systemd_unitdir}/system/', '--without-systemdsystemunitdir', d)}" | 18 | EXTRA_OECONF += "${@bb.utils.contains('DISTRO_FEATURES', 'systemd', '--with-systemdsystemunitdir=${systemd_unitdir}/system/', '--without-systemdsystemunitdir', d)}" |
19 | 19 | ||
20 | PACKAGECONFIG[mad] = "--enable-mad,--disable-mad,libmad" | 20 | PACKAGECONFIG[mad] = "--enable-mad,--disable-mad,libmad" |
21 | PACKAGECONFIG[id3tag] = "--enable-id3,--disable-id3,libid3tag" | 21 | PACKAGECONFIG[id3tag] = "--enable-id3,--disable-id3,libid3tag" |
diff --git a/meta-multimedia/recipes-multimedia/openal/openal-soft_1.15.1.bb b/meta-multimedia/recipes-multimedia/openal/openal-soft_1.15.1.bb index ab038a71b..589523482 100644 --- a/meta-multimedia/recipes-multimedia/openal/openal-soft_1.15.1.bb +++ b/meta-multimedia/recipes-multimedia/openal/openal-soft_1.15.1.bb | |||
@@ -10,8 +10,8 @@ SRC_URI[md5sum] = "ea83dec3b9655a27d28e7bc7cae9cd71" | |||
10 | SRC_URI[sha256sum] = "0e29a162f0841ccb4135ce76e92e8a704589b680a85eddf76f898de5236eb056" | 10 | SRC_URI[sha256sum] = "0e29a162f0841ccb4135ce76e92e8a704589b680a85eddf76f898de5236eb056" |
11 | 11 | ||
12 | PACKAGECONFIG ?= "\ | 12 | PACKAGECONFIG ?= "\ |
13 | ${@base_contains('DISTRO_FEATURES', 'alsa', 'alsa', '', d)} \ | 13 | ${@bb.utils.contains('DISTRO_FEATURES', 'alsa', 'alsa', '', d)} \ |
14 | ${@base_contains('DISTRO_FEATURES', 'pulseaudio', 'pulseaudio', '', d)} \ | 14 | ${@bb.utils.contains('DISTRO_FEATURES', 'pulseaudio', 'pulseaudio', '', d)} \ |
15 | " | 15 | " |
16 | PACKAGECONFIG[alsa] = "-DALSA=TRUE, -DALSA=FALSE, alsa-lib" | 16 | PACKAGECONFIG[alsa] = "-DALSA=TRUE, -DALSA=FALSE, alsa-lib" |
17 | PACKAGECONFIG[pulseaudio] = "-DPULSEAUDIO=TRUE, -DPULSEAUDIO=FALSE, pulseaudio" | 17 | PACKAGECONFIG[pulseaudio] = "-DPULSEAUDIO=TRUE, -DPULSEAUDIO=FALSE, pulseaudio" |
diff --git a/meta-multimedia/recipes-multimedia/sox/sox_14.4.0.bb b/meta-multimedia/recipes-multimedia/sox/sox_14.4.0.bb index eb40a3eba..3c688bd7c 100644 --- a/meta-multimedia/recipes-multimedia/sox/sox_14.4.0.bb +++ b/meta-multimedia/recipes-multimedia/sox/sox_14.4.0.bb | |||
@@ -8,8 +8,8 @@ DEPENDS = "libpng libav libsndfile1 libvorbis" | |||
8 | 8 | ||
9 | PR = "r2" | 9 | PR = "r2" |
10 | 10 | ||
11 | PACKAGECONFIG ??= "${@base_contains('DISTRO_FEATURES', 'pulseaudio', 'pulseaudio', '', d)} \ | 11 | PACKAGECONFIG ??= "${@bb.utils.contains('DISTRO_FEATURES', 'pulseaudio', 'pulseaudio', '', d)} \ |
12 | ${@base_contains('DISTRO_FEATURES', 'alsa', 'alsa', '', d)} \ | 12 | ${@bb.utils.contains('DISTRO_FEATURES', 'alsa', 'alsa', '', d)} \ |
13 | magic \ | 13 | magic \ |
14 | " | 14 | " |
15 | PACKAGECONFIG[pulseaudio] = "--with-pulseaudio=dyn,--with-pulseaudio=no,pulseaudio," | 15 | PACKAGECONFIG[pulseaudio] = "--with-pulseaudio=dyn,--with-pulseaudio=no,pulseaudio," |