diff options
author | Peter A. Bigot <pab@pabigot.com> | 2015-02-16 17:06:13 +0200 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2015-02-17 13:43:38 +0000 |
commit | 0a4db94942920cff01a14cfb4cfccb4af6c160a3 (patch) | |
tree | bef89d1450a612a2389e0ac492009197f507a463 /meta/recipes-multimedia/pulseaudio | |
parent | 0c9d0e964eb1acfa87843ef801a1cce8933bedd4 (diff) | |
download | poky-0a4db94942920cff01a14cfb4cfccb4af6c160a3.tar.gz |
pulseaudio: select distro preference for bluez provider
(From OE-Core rev: 2da39b9c6ee7019a88b962ec30980221f2b966c1)
Signed-off-by: Peter A. Bigot <pab@pabigot.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-multimedia/pulseaudio')
-rw-r--r-- | meta/recipes-multimedia/pulseaudio/pulseaudio.inc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/meta/recipes-multimedia/pulseaudio/pulseaudio.inc b/meta/recipes-multimedia/pulseaudio/pulseaudio.inc index 99cad76186..b73576e38c 100644 --- a/meta/recipes-multimedia/pulseaudio/pulseaudio.inc +++ b/meta/recipes-multimedia/pulseaudio/pulseaudio.inc | |||
@@ -12,7 +12,7 @@ DEPENDS = "libatomics-ops liboil libsamplerate0 libsndfile1 libtool" | |||
12 | DEPENDS += "udev alsa-lib glib-2.0 dbus gconf" | 12 | DEPENDS += "udev alsa-lib glib-2.0 dbus gconf" |
13 | DEPENDS += "json-c gdbm speex libxml-parser-perl-native libcap" | 13 | DEPENDS += "json-c gdbm speex libxml-parser-perl-native libcap" |
14 | 14 | ||
15 | inherit autotools pkgconfig useradd gettext perlnative | 15 | inherit autotools pkgconfig useradd gettext perlnative bluetooth |
16 | 16 | ||
17 | # *.desktop rules wont be generated during configure and build will fail | 17 | # *.desktop rules wont be generated during configure and build will fail |
18 | # if using --disable-nls | 18 | # if using --disable-nls |
@@ -31,7 +31,7 @@ EXTRA_OECONF = "\ | |||
31 | ac_cv_header_valgrind_memcheck_h=no \ | 31 | ac_cv_header_valgrind_memcheck_h=no \ |
32 | " | 32 | " |
33 | 33 | ||
34 | PACKAGECONFIG ??= "${@bb.utils.contains('DISTRO_FEATURES', 'bluetooth', 'bluez4', '', d)} \ | 34 | PACKAGECONFIG ??= "${@bb.utils.contains('DISTRO_FEATURES', 'bluetooth', '${BLUEZ}', '', d)} \ |
35 | ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'systemd', '', d)} \ | 35 | ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'systemd', '', d)} \ |
36 | ${@bb.utils.contains('DISTRO_FEATURES', 'zeroconf', 'avahi', '', d)} \ | 36 | ${@bb.utils.contains('DISTRO_FEATURES', 'zeroconf', 'avahi', '', d)} \ |
37 | ${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'x11', '', d)}" | 37 | ${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'x11', '', d)}" |