[oe-commits] Paul Eggleton : pulseaudio: make bluetooth support conditional upon DISTRO_FEATURES
git at git.openembedded.org
git at git.openembedded.org
Mon Oct 17 12:46:27 UTC 2011
Module: openembedded-core.git
Branch: master
Commit: f53d70bdeed989e031e06b8851a9706ff7ab9855
URL: http://git.openembedded.org/?p=openembedded-core.git&a=commit;h=f53d70bdeed989e031e06b8851a9706ff7ab9855
Author: Paul Eggleton <paul.eggleton at linux.intel.com>
Date: Fri Oct 14 13:43:35 2011 +0100
pulseaudio: make bluetooth support conditional upon DISTRO_FEATURES
If "bluetooth" is in DISTRO_FEATURES then enable bluetooth and depend on
bluez4, otherwise disable it.
Signed-off-by: Paul Eggleton <paul.eggleton at linux.intel.com>
---
meta/recipes-multimedia/pulseaudio/pulseaudio.inc | 5 +++--
.../pulseaudio/pulseaudio_0.9.22.bb | 2 +-
.../pulseaudio/pulseaudio_0.9.23.bb | 2 +-
3 files changed, 5 insertions(+), 4 deletions(-)
diff --git a/meta/recipes-multimedia/pulseaudio/pulseaudio.inc b/meta/recipes-multimedia/pulseaudio/pulseaudio.inc
index 2a8e74d..bb32467 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 \
file://src/pulsecore/vector.h;beginline=1;endline=21;md5=1b561f0a2ca47b1fa49862a6ccaacff1"
DEPENDS = "libatomics-ops liboil avahi libsamplerate0 libsndfile1 libtool virtual/libx11"
# optional
-DEPENDS += "bluez4 udev alsa-lib glib-2.0 dbus consolekit"
+DEPENDS += "udev alsa-lib glib-2.0 dbus consolekit \
+ ${@base_contains('DISTRO_FEATURES', 'bluetooth', 'bluez4', '', d)}"
SRC_URI = "http://0pointer.de/lennart/projects/pulseaudio/pulseaudio-${PV}.tar.gz \
file://gcc4-compile-fix.patch \
@@ -19,7 +20,7 @@ inherit autotools pkgconfig
EXTRA_OECONF = "\
--disable-lynx \
- --enable-bluez \
+ ${@base_contains('DISTRO_FEATURES', 'bluetooth', '--enable-bluez', '--disable-bluez', d)} \
--disable-polkit \
--with-x \
--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 da2e988..3067365 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 @@
require pulseaudio.inc
-PR = "r6"
+PR = "r7"
DEPENDS += "gdbm speex"
diff --git a/meta/recipes-multimedia/pulseaudio/pulseaudio_0.9.23.bb b/meta/recipes-multimedia/pulseaudio/pulseaudio_0.9.23.bb
index 1edd913..33f5e15 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 @@
require pulseaudio.inc
-PR = "r4"
+PR = "r5"
DEPENDS += "gdbm speex"
More information about the Openembedded-commits
mailing list