summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJonas Danielsson <jonas.danielsson@lundinova.se>2012-09-17 10:30:49 (GMT)
committerRichard Purdie <richard.purdie@linuxfoundation.org>2012-09-28 15:53:14 (GMT)
commitbbe83b55cdfbfe55fa378c9c643433ca2a7604e1 (patch)
treeaa34c3e3c447cdef9ab4a36345b11e1aca350d3b
parent3c363a70aa6c73bcf4256f560dfd2d3367ae1736 (diff)
downloadpoky-bbe83b55cdfbfe55fa378c9c643433ca2a7604e1.tar.gz
bluez4: make alsa support conditional upon DISTRO_FEATURES
Do not enable alsa in bluez4 unless it's included in DISTRO_FEATURES. (From OE-Core rev: f6297d648b1464719d1e1e42e99d473b69a13e56) Signed-off-by: Jonas Danielsson <jonas.danielsson@lundinova.se> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-connectivity/bluez/bluez4.inc6
-rw-r--r--meta/recipes-connectivity/bluez/bluez4_4.99.bb3
2 files changed, 6 insertions, 3 deletions
diff --git a/meta/recipes-connectivity/bluez/bluez4.inc b/meta/recipes-connectivity/bluez/bluez4.inc
index fbbe0bf..6dc06f4 100644
--- a/meta/recipes-connectivity/bluez/bluez4.inc
+++ b/meta/recipes-connectivity/bluez/bluez4.inc
@@ -7,9 +7,12 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=12f884d2ae1ff87c09e5b7ccc2c4ca7e \
7 file://COPYING.LIB;md5=fb504b67c50331fc78734fed90fb0e09 \ 7 file://COPYING.LIB;md5=fb504b67c50331fc78734fed90fb0e09 \
8 file://src/main.c;beginline=1;endline=24;md5=9bc54b93cd7e17bf03f52513f39f926e \ 8 file://src/main.c;beginline=1;endline=24;md5=9bc54b93cd7e17bf03f52513f39f926e \
9 file://sbc/sbc.c;beginline=1;endline=25;md5=1a40781ed30d50d8639323a184aeb191" 9 file://sbc/sbc.c;beginline=1;endline=25;md5=1a40781ed30d50d8639323a184aeb191"
10DEPENDS = "udev alsa-lib libusb dbus-glib glib-2.0 libcheck" 10DEPENDS = "udev libusb dbus-glib glib-2.0 libcheck"
11RDEPENDS_${PN}-dev = "bluez-hcidump" 11RDEPENDS_${PN}-dev = "bluez-hcidump"
12 12
13PACKAGECONFIG ??= "${@base_contains('DISTRO_FEATURES', 'alsa', 'alsa', '', d)}"
14PACKAGECONFIG[alsa] = "--enable-alsa,--disable-alsa,alsa-lib"
15
13ASNEEDED = "" 16ASNEEDED = ""
14 17
15SRC_URI = "\ 18SRC_URI = "\
@@ -21,7 +24,6 @@ inherit autotools
21 24
22EXTRA_OECONF = "\ 25EXTRA_OECONF = "\
23 --disable-gstreamer \ 26 --disable-gstreamer \
24 --enable-alsa \
25 --enable-usb \ 27 --enable-usb \
26 --enable-tools \ 28 --enable-tools \
27 --enable-bccmd \ 29 --enable-bccmd \
diff --git a/meta/recipes-connectivity/bluez/bluez4_4.99.bb b/meta/recipes-connectivity/bluez/bluez4_4.99.bb
index 5033d34..32831e7 100644
--- a/meta/recipes-connectivity/bluez/bluez4_4.99.bb
+++ b/meta/recipes-connectivity/bluez/bluez4_4.99.bb
@@ -1,6 +1,6 @@
1require bluez4.inc 1require bluez4.inc
2 2
3PR = "r1" 3PR = "r2"
4 4
5SRC_URI += "file://bluetooth.conf \ 5SRC_URI += "file://bluetooth.conf \
6 file://sbc_mmx.patch \ 6 file://sbc_mmx.patch \
@@ -19,6 +19,7 @@ do_install_append() {
19 19
20RDEPENDS_${PN}-dev = "bluez-hcidump" 20RDEPENDS_${PN}-dev = "bluez-hcidump"
21 21
22ALLOW_EMPTY_libasound-module-bluez = "1"
22PACKAGES =+ "libasound-module-bluez" 23PACKAGES =+ "libasound-module-bluez"
23 24
24FILES_libasound-module-bluez = "${libdir}/alsa-lib/lib*.so ${datadir}/alsa" 25FILES_libasound-module-bluez = "${libdir}/alsa-lib/lib*.so ${datadir}/alsa"