| Submitter | Jonas Danielsson |
|---|---|
| Date | April 19, 2012, 8:31 a.m. |
| Message ID | <20120419083122.GB22585@jkd-desktop> |
| Download | mbox | patch |
| Permalink | /patch/26153/ |
| State | Accepted |
| Commit | 36e434ecd05754d8c99d416f706da4a1b11b729e |
| Headers | show |
Comments
On 04/19/2012 01:31 AM, Jonas Danielsson wrote: > > Do not enable alsa in bluez4 unless it's included in DISTRO_FEATURES. > > Signed-off-by: Jonas Danielsson<jonas.danielsson@lundinova.se> > --- > meta/recipes-connectivity/bluez/bluez4.inc | 6 ++++-- > meta/recipes-connectivity/bluez/bluez4_4.99.bb | 3 ++- > 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 \ > file://COPYING.LIB;md5=fb504b67c50331fc78734fed90fb0e09 \ > file://src/main.c;beginline=1;endline=24;md5=9bc54b93cd7e17bf03f52513f39f926e \ > file://sbc/sbc.c;beginline=1;endline=25;md5=1a40781ed30d50d8639323a184aeb191" > -DEPENDS = "udev alsa-lib libusb dbus-glib glib-2.0 libcheck" > +DEPENDS = "udev libusb dbus-glib glib-2.0 libcheck" > RDEPENDS_${PN}-dev = "bluez-hcidump" > > +PACKAGECONFIG ??= "${@base_contains('DISTRO_FEATURES', 'alsa', 'alsa', '', d)}" > +PACKAGECONFIG[alsa] = "--enable-alsa,--disable-alsa,alsa-lib" > + > ASNEEDED = "" > > SRC_URI = "\ > @@ -21,7 +24,6 @@ inherit autotools > > EXTRA_OECONF = "\ > --disable-gstreamer \ > - --enable-alsa \ > --enable-usb \ > --enable-tools \ > --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 @@ > require bluez4.inc > > -PR = "r1" > +PR = "r2" > > SRC_URI += "file://bluetooth.conf \ > file://sbc_mmx.patch \ > @@ -19,6 +19,7 @@ do_install_append() { > > RDEPENDS_${PN}-dev = "bluez-hcidump" > > +ALLOW_EMPTY_libasound-module-bluez = "1" > PACKAGES =+ "libasound-module-bluez" > > FILES_libasound-module-bluez = "${libdir}/alsa-lib/lib*.so ${datadir}/alsa" Merged into OE-Core Thanks Sau!
Patch
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 \ file://COPYING.LIB;md5=fb504b67c50331fc78734fed90fb0e09 \ file://src/main.c;beginline=1;endline=24;md5=9bc54b93cd7e17bf03f52513f39f926e \ file://sbc/sbc.c;beginline=1;endline=25;md5=1a40781ed30d50d8639323a184aeb191" -DEPENDS = "udev alsa-lib libusb dbus-glib glib-2.0 libcheck" +DEPENDS = "udev libusb dbus-glib glib-2.0 libcheck" RDEPENDS_${PN}-dev = "bluez-hcidump" +PACKAGECONFIG ??= "${@base_contains('DISTRO_FEATURES', 'alsa', 'alsa', '', d)}" +PACKAGECONFIG[alsa] = "--enable-alsa,--disable-alsa,alsa-lib" + ASNEEDED = "" SRC_URI = "\ @@ -21,7 +24,6 @@ inherit autotools EXTRA_OECONF = "\ --disable-gstreamer \ - --enable-alsa \ --enable-usb \ --enable-tools \ --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 @@ require bluez4.inc -PR = "r1" +PR = "r2" SRC_URI += "file://bluetooth.conf \ file://sbc_mmx.patch \ @@ -19,6 +19,7 @@ do_install_append() { RDEPENDS_${PN}-dev = "bluez-hcidump" +ALLOW_EMPTY_libasound-module-bluez = "1" PACKAGES =+ "libasound-module-bluez" FILES_libasound-module-bluez = "${libdir}/alsa-lib/lib*.so ${datadir}/alsa"
Do not enable alsa in bluez4 unless it's included in DISTRO_FEATURES. Signed-off-by: Jonas Danielsson <jonas.danielsson@lundinova.se> --- meta/recipes-connectivity/bluez/bluez4.inc | 6 ++++-- meta/recipes-connectivity/bluez/bluez4_4.99.bb | 3 ++- 2 files changed, 6 insertions(+), 3 deletions(-)