summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEren Türkay <eren@hambedded.org>2013-08-23 14:18:03 +0000
committerMartin Jansa <Martin.Jansa@gmail.com>2013-09-03 19:12:40 +0200
commit06673b1e9d8ff4f5f11f01c763e4a6f841836cf4 (patch)
tree1545d30e455b9696325a13d4bb9a1eed32a10855
parent824047d132133331e4727a1ff2cffc598bf9b286 (diff)
downloadmeta-openembedded-06673b1e9d8ff4f5f11f01c763e4a6f841836cf4.tar.gz
mpg123: add PACKAGECONFIG for pulseaudio and alsa
The default DISTRO_FEATURES include alsa and pulseaudio at the same time. Hence, both of the options are enabled in mpg123 configuration without adding related dependencies, which causes build error. Make the options mutually exclusive through PACKAGECONFIG. If both alsa and pulseaudio are specified, pulseaudio takes precedence. Signed-off-by: Eren Türkay <eren@hambedded.org> Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
-rw-r--r--meta-multimedia/recipes-multimedia/mpg123/mpg123_1.15.3.bb10
1 files changed, 8 insertions, 2 deletions
diff --git a/meta-multimedia/recipes-multimedia/mpg123/mpg123_1.15.3.bb b/meta-multimedia/recipes-multimedia/mpg123/mpg123_1.15.3.bb
index 595235cd2..007542733 100644
--- a/meta-multimedia/recipes-multimedia/mpg123/mpg123_1.15.3.bb
+++ b/meta-multimedia/recipes-multimedia/mpg123/mpg123_1.15.3.bb
@@ -6,6 +6,14 @@ HOMEPAGE = "http://mpg123.de/"
6BUGTRACKER = "http://sourceforge.net/p/mpg123/bugs/" 6BUGTRACKER = "http://sourceforge.net/p/mpg123/bugs/"
7SECTION = "multimedia" 7SECTION = "multimedia"
8 8
9# The options should be mutually exclusive for configuration script.
10# If both alsa and pulseaudio are specified (as in the default distro features)
11# pulseaudio takes precedence.
12PACKAGECONFIG_ALSA = "${@base_contains('DISTRO_FEATURES', 'alsa', 'alsa', '', d)}"
13PACKAGECONFIG ??= "${@base_contains('DISTRO_FEATURES', 'pulseaudio', 'pulseaudio', '${PACKAGECONFIG_ALSA}', d)}"
14PACKAGECONFIG[pulseaudio] = "--with-default-audio=pulse,,pulseaudio"
15PACKAGECONFIG[alsa] = "--with-default-audio=alsa,,alsa-lib"
16
9LICENSE = "LGPLv2.1" 17LICENSE = "LGPLv2.1"
10LICENSE_FLAGS = "commercial" 18LICENSE_FLAGS = "commercial"
11LIC_FILES_CHKSUM = "file://COPYING;md5=a7aa23a2b646eca38ad4eeb7a853761c" 19LIC_FILES_CHKSUM = "file://COPYING;md5=a7aa23a2b646eca38ad4eeb7a853761c"
@@ -23,7 +31,5 @@ EXTRA_OECONF = " \
23 --enable-shared \ 31 --enable-shared \
24 ${@bb.utils.contains('TUNE_FEATURES', 'neon', '--with-cpu=neon', '', d)} \ 32 ${@bb.utils.contains('TUNE_FEATURES', 'neon', '--with-cpu=neon', '', d)} \
25 ${@bb.utils.contains('TUNE_FEATURES', 'altivec', '--with-cpu=altivec', '', d)} \ 33 ${@bb.utils.contains('TUNE_FEATURES', 'altivec', '--with-cpu=altivec', '', d)} \
26 ${@bb.utils.contains('DISTRO_FEATURES', 'alsa', '--with-default-audio=alsa', '', d)} \
27 ${@bb.utils.contains('DISTRO_FEATURES', 'pulseaudio', '--with-default-audio=pulse', '', d)} \
28" 34"
29 35