diff options
| author |   Paul Eggleton <paul.eggleton@linux.intel.com> | 2011-10-14 13:43:35 +0100 |
|---|---|---|
| committer |   Richard Purdie <richard.purdie@linuxfoundation.org> | 2011-10-17 13:32:23 +0100 |
| commit | f53d70bdeed989e031e06b8851a9706ff7ab9855 (patch) | |
| tree | 5f35f62e05bc62b86e97ef519cdf56f658e957a6 /meta/recipes-multimedia | |
| parent | 2adc9a3f1f1db284f7d91193ad77b3524e0e0d2c (diff) | |
| download | openembedded-core-contrib-f53d70bdeed989e031e06b8851a9706ff7ab9855.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.
Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
Diffstat (limited to 'meta/recipes-multimedia')
| -rw-r--r-- | meta/recipes-multimedia/pulseaudio/pulseaudio.inc | 5 | ||||
| -rw-r--r-- | meta/recipes-multimedia/pulseaudio/pulseaudio_0.9.22.bb | 2 | ||||
| -rw-r--r-- | meta/recipes-multimedia/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 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 \ 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 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 @@ 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 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 @@ require pulseaudio.inc -PR = "r4" +PR = "r5" DEPENDS += "gdbm speex" |