summaryrefslogtreecommitdiffstats
path: root/meta/recipes-multimedia
diff options
context:
space:
mode:
authorPaul Eggleton <paul.eggleton@linux.intel.com>2011-10-14 13:43:35 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2011-10-17 14:10:42 +0100
commit07e98778560208a5310cd41a85547476e3138274 (patch)
tree886b7b8aeba4f8d31b5d620119054b6b366e83b6 /meta/recipes-multimedia
parenta3a5e4cae0ad77970b8ae082312d57f3b217f11d (diff)
downloadpoky-07e98778560208a5310cd41a85547476e3138274.tar.gz
pulseaudio: make bluetooth support conditional upon DISTRO_FEATURES
If "bluetooth" is in DISTRO_FEATURES then enable bluetooth and depend on bluez4, otherwise disable it. (From OE-Core rev: f53d70bdeed989e031e06b8851a9706ff7ab9855) Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-multimedia')
-rw-r--r--meta/recipes-multimedia/pulseaudio/pulseaudio.inc5
-rw-r--r--meta/recipes-multimedia/pulseaudio/pulseaudio_0.9.22.bb2
-rw-r--r--meta/recipes-multimedia/pulseaudio/pulseaudio_0.9.23.bb2
3 files changed, 5 insertions, 4 deletions
diff --git a/meta/recipes-multimedia/pulseaudio/pulseaudio.inc b/meta/recipes-multimedia/pulseaudio/pulseaudio.inc
index 2a8e74dcd5..bb32467015 100644
--- a/meta/recipes-multimedia/pulseaudio/pulseaudio.inc
+++ b/meta/recipes-multimedia/pulseaudio/pulseaudio.inc
@@ -9,7 +9,8 @@ LIC_FILES_CHKSUM = "file://GPL;md5=4325afd396febcb659c36b49533135d4 \
9 file://src/pulsecore/vector.h;beginline=1;endline=21;md5=1b561f0a2ca47b1fa49862a6ccaacff1" 9 file://src/pulsecore/vector.h;beginline=1;endline=21;md5=1b561f0a2ca47b1fa49862a6ccaacff1"
10DEPENDS = "libatomics-ops liboil avahi libsamplerate0 libsndfile1 libtool virtual/libx11" 10DEPENDS = "libatomics-ops liboil avahi libsamplerate0 libsndfile1 libtool virtual/libx11"
11# optional 11# optional
12DEPENDS += "bluez4 udev alsa-lib glib-2.0 dbus consolekit" 12DEPENDS += "udev alsa-lib glib-2.0 dbus consolekit \
13 ${@base_contains('DISTRO_FEATURES', 'bluetooth', 'bluez4', '', d)}"
13 14
14SRC_URI = "http://0pointer.de/lennart/projects/pulseaudio/pulseaudio-${PV}.tar.gz \ 15SRC_URI = "http://0pointer.de/lennart/projects/pulseaudio/pulseaudio-${PV}.tar.gz \
15 file://gcc4-compile-fix.patch \ 16 file://gcc4-compile-fix.patch \
@@ -19,7 +20,7 @@ inherit autotools pkgconfig
19 20
20EXTRA_OECONF = "\ 21EXTRA_OECONF = "\
21 --disable-lynx \ 22 --disable-lynx \
22 --enable-bluez \ 23 ${@base_contains('DISTRO_FEATURES', 'bluetooth', '--enable-bluez', '--disable-bluez', d)} \
23 --disable-polkit \ 24 --disable-polkit \
24 --with-x \ 25 --with-x \
25 --without-jack \ 26 --without-jack \
diff --git a/meta/recipes-multimedia/pulseaudio/pulseaudio_0.9.22.bb b/meta/recipes-multimedia/pulseaudio/pulseaudio_0.9.22.bb
index da2e988178..3067365cc2 100644
--- a/meta/recipes-multimedia/pulseaudio/pulseaudio_0.9.22.bb
+++ b/meta/recipes-multimedia/pulseaudio/pulseaudio_0.9.22.bb
@@ -1,6 +1,6 @@
1require pulseaudio.inc 1require pulseaudio.inc
2 2
3PR = "r6" 3PR = "r7"
4 4
5DEPENDS += "gdbm speex" 5DEPENDS += "gdbm speex"
6 6
diff --git a/meta/recipes-multimedia/pulseaudio/pulseaudio_0.9.23.bb b/meta/recipes-multimedia/pulseaudio/pulseaudio_0.9.23.bb
index 1edd9138b6..33f5e152c1 100644
--- a/meta/recipes-multimedia/pulseaudio/pulseaudio_0.9.23.bb
+++ b/meta/recipes-multimedia/pulseaudio/pulseaudio_0.9.23.bb
@@ -1,6 +1,6 @@
1require pulseaudio.inc 1require pulseaudio.inc
2 2
3PR = "r4" 3PR = "r5"
4 4
5DEPENDS += "gdbm speex" 5DEPENDS += "gdbm speex"
6 6