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/mpg123 | |
| parent | 09ae3b65d73860e4a2bd78fb7746d1a91bad56b0 (diff) | |
| download | meta-openembedded-contrib-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/mpg123')
| -rw-r--r-- | meta-multimedia/recipes-multimedia/mpg123/mpg123_1.22.4.bb | 18 |
1 files changed, 9 insertions, 9 deletions
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 d11a312c00..e6a912b359 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 # The options should be mutually exclusive for configuration script. # If both alsa and pulseaudio are specified (as in the default distro features) # pulseaudio takes precedence. -PACKAGECONFIG_ALSA = "${@base_contains('DISTRO_FEATURES', 'alsa', 'alsa', '', d)}" -PACKAGECONFIG ??= "${@base_contains('DISTRO_FEATURES', 'pulseaudio', 'pulseaudio', '${PACKAGECONFIG_ALSA}', d)}" +PACKAGECONFIG_ALSA = "${@bb.utils.contains('DISTRO_FEATURES', 'alsa', 'alsa', '', d)}" +PACKAGECONFIG ??= "${@bb.utils.contains('DISTRO_FEATURES', 'pulseaudio', 'pulseaudio', '${PACKAGECONFIG_ALSA}', d)}" PACKAGECONFIG[alsa] = "--with-default-audio=alsa,,alsa-lib" PACKAGECONFIG[esd] = ",,esound" @@ -35,13 +35,13 @@ PACKAGECONFIG[sdl] = ",,libsdl" # Following are possible sound output modules: # alsa arts coreaudio dummy esd jack nas openal os2 oss portaudio pulse sdl sndio sun tinyalsa win32 win32_wasapi -AUDIOMODS += "${@base_contains('PACKAGECONFIG', 'alsa', 'alsa', '', d)}" -AUDIOMODS += "${@base_contains('PACKAGECONFIG', 'esd', 'esd', '', d)}" -AUDIOMODS += "${@base_contains('PACKAGECONFIG', 'jack', 'jack', '', d)}" -AUDIOMODS += "${@base_contains('PACKAGECONFIG', 'openal', 'openal', '', d)}" -AUDIOMODS += "${@base_contains('PACKAGECONFIG', 'portaudio', 'portaudio', '', d)}" -AUDIOMODS += "${@base_contains('PACKAGECONFIG', 'pulseaudio', 'pulse', '', d)}" -AUDIOMODS += "${@base_contains('PACKAGECONFIG', 'sdl', 'sdl', '', d)}" +AUDIOMODS += "${@bb.utils.contains('PACKAGECONFIG', 'alsa', 'alsa', '', d)}" +AUDIOMODS += "${@bb.utils.contains('PACKAGECONFIG', 'esd', 'esd', '', d)}" +AUDIOMODS += "${@bb.utils.contains('PACKAGECONFIG', 'jack', 'jack', '', d)}" +AUDIOMODS += "${@bb.utils.contains('PACKAGECONFIG', 'openal', 'openal', '', d)}" +AUDIOMODS += "${@bb.utils.contains('PACKAGECONFIG', 'portaudio', 'portaudio', '', d)}" +AUDIOMODS += "${@bb.utils.contains('PACKAGECONFIG', 'pulseaudio', 'pulse', '', d)}" +AUDIOMODS += "${@bb.utils.contains('PACKAGECONFIG', 'sdl', 'sdl', '', d)}" EXTRA_OECONF = " \ --enable-shared \ |