* [PATCH] bluez4: make alsa support conditional upon DISTRO_FEATURES
@ 2012-04-18 20:30 Jonas Danielsson
2012-04-18 22:44 ` Saul Wold
0 siblings, 1 reply; 7+ messages in thread
From: Jonas Danielsson @ 2012-04-18 20:30 UTC (permalink / raw)
To: openembedded-core
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 | 7 +++++--
meta/recipes-connectivity/bluez/bluez4_4.99.bb | 11 +++++++----
2 files changed, 12 insertions(+), 6 deletions(-)
diff --git a/meta/recipes-connectivity/bluez/bluez4.inc b/meta/recipes-connectivity/bluez/bluez4.inc
index fbbe0bf..0ce7c31 100644
--- a/meta/recipes-connectivity/bluez/bluez4.inc
+++ b/meta/recipes-connectivity/bluez/bluez4.inc
@@ -7,7 +7,10 @@ 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 ${@base_contains('DISTRO_FEATURES', 'alsa', 'alsa-lib', '', d)} \
+ libusb dbus-glib glib-2.0 libcheck \
+ "
RDEPENDS_${PN}-dev = "bluez-hcidump"
ASNEEDED = ""
@@ -21,7 +24,7 @@ inherit autotools
EXTRA_OECONF = "\
--disable-gstreamer \
- --enable-alsa \
+ ${@base_contains('DISTRO_FEATURES', 'alsa', '--enable-alsa', '--disable-alsa', d)} \
--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..5f1ef45 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,13 +19,16 @@ do_install_append() {
RDEPENDS_${PN}-dev = "bluez-hcidump"
-PACKAGES =+ "libasound-module-bluez"
+PACKAGES =+ "${@base_contains('DISTRO_FEATURES', 'alsa', 'libasound-module-bluez', '', d)}"
-FILES_libasound-module-bluez = "${libdir}/alsa-lib/lib*.so ${datadir}/alsa"
+FILES_libasound-module-bluez = "\
+ ${@base_contains('DISTRO_FEATURES', 'alsa', '${libdir}/alsa-lib/lib*.so', '', d)} \
+ ${@base_contains('DISTRO_FEATURES', 'alsa', '${datadir}/alsa', '', d)} \
+"
FILES_${PN} += "${libdir}/bluetooth/plugins ${libdir}/bluetooth/plugins/*.so ${base_libdir}/udev/ ${systemd_unitdir}/"
FILES_${PN}-dev += "\
${libdir}/bluetooth/plugins/*.la \
- ${libdir}/alsa-lib/*.la \
+ ${@base_contains('DISTRO_FEATURES', 'alsa', '${libdir}/alsa-lib/*.la', '', d)} \
"
FILES_${PN}-dbg += "\
--
1.7.5.4
^ permalink raw reply related [flat|nested] 7+ messages in thread
* Re: [PATCH] bluez4: make alsa support conditional upon DISTRO_FEATURES
2012-04-18 20:30 [PATCH] bluez4: make alsa support conditional upon DISTRO_FEATURES Jonas Danielsson
@ 2012-04-18 22:44 ` Saul Wold
2012-04-19 8:08 ` Jonas Danielsson
0 siblings, 1 reply; 7+ messages in thread
From: Saul Wold @ 2012-04-18 22:44 UTC (permalink / raw)
To: Patches and discussions about the oe-core layer
On 04/18/2012 01:30 PM, 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 | 7 +++++--
> meta/recipes-connectivity/bluez/bluez4_4.99.bb | 11 +++++++----
> 2 files changed, 12 insertions(+), 6 deletions(-)
>
> diff --git a/meta/recipes-connectivity/bluez/bluez4.inc b/meta/recipes-connectivity/bluez/bluez4.inc
> index fbbe0bf..0ce7c31 100644
> --- a/meta/recipes-connectivity/bluez/bluez4.inc
> +++ b/meta/recipes-connectivity/bluez/bluez4.inc
> @@ -7,7 +7,10 @@ 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 ${@base_contains('DISTRO_FEATURES', 'alsa', 'alsa-lib', '', d)} \
> + libusb dbus-glib glib-2.0 libcheck \
> + "
> RDEPENDS_${PN}-dev = "bluez-hcidump"
>
> ASNEEDED = ""
> @@ -21,7 +24,7 @@ inherit autotools
>
> EXTRA_OECONF = "\
> --disable-gstreamer \
> - --enable-alsa \
> + ${@base_contains('DISTRO_FEATURES', 'alsa', '--enable-alsa', '--disable-alsa', d)} \
> --enable-usb \
> --enable-tools \
> --enable-bccmd \
Thanks for the contribution, there are some adjustments that I would
suggest making to more maintainable.
You should be using PACKAGECONFIG here instead of base_contains.
> diff --git a/meta/recipes-connectivity/bluez/bluez4_4.99.bb b/meta/recipes-connectivity/bluez/bluez4_4.99.bb
> index 5033d34..5f1ef45 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,13 +19,16 @@ do_install_append() {
>
> RDEPENDS_${PN}-dev = "bluez-hcidump"
>
> -PACKAGES =+ "libasound-module-bluez"
> +PACKAGES =+ "${@base_contains('DISTRO_FEATURES', 'alsa', 'libasound-module-bluez', '', d)}"
>
> -FILES_libasound-module-bluez = "${libdir}/alsa-lib/lib*.so ${datadir}/alsa"
> +FILES_libasound-module-bluez = "\
> + ${@base_contains('DISTRO_FEATURES', 'alsa', '${libdir}/alsa-lib/lib*.so', '', d)} \
> + ${@base_contains('DISTRO_FEATURES', 'alsa', '${datadir}/alsa', '', d)} \
> +"
Also, you can use ALLOW_EMPTY_libasound-module-bluez = "1" so that it
does not matter if the files are available
> FILES_${PN} += "${libdir}/bluetooth/plugins ${libdir}/bluetooth/plugins/*.so ${base_libdir}/udev/ ${systemd_unitdir}/"
> FILES_${PN}-dev += "\
> ${libdir}/bluetooth/plugins/*.la \
> - ${libdir}/alsa-lib/*.la \
> + ${@base_contains('DISTRO_FEATURES', 'alsa', '${libdir}/alsa-lib/*.la', '', d)} \
> "
>
The base_contains is not needed here, if the alsa-lib/*.la files are not
there then I don't think any warnings or errors will occur
> FILES_${PN}-dbg += "\
^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: [PATCH] bluez4: make alsa support conditional upon DISTRO_FEATURES
2012-04-18 22:44 ` Saul Wold
@ 2012-04-19 8:08 ` Jonas Danielsson
2012-04-19 8:13 ` [PATCH v2] " Jonas Danielsson
0 siblings, 1 reply; 7+ messages in thread
From: Jonas Danielsson @ 2012-04-19 8:08 UTC (permalink / raw)
To: Saul Wold; +Cc: Patches and discussions about the oe-core layer
On Wed, Apr 18, 2012 at 03:44:16PM -0700, Saul Wold wrote:
> On 04/18/2012 01:30 PM, 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 | 7 +++++--
> > meta/recipes-connectivity/bluez/bluez4_4.99.bb | 11 +++++++----
> > 2 files changed, 12 insertions(+), 6 deletions(-)
> >
> >diff --git a/meta/recipes-connectivity/bluez/bluez4.inc b/meta/recipes-connectivity/bluez/bluez4.inc
> >index fbbe0bf..0ce7c31 100644
> >--- a/meta/recipes-connectivity/bluez/bluez4.inc
> >+++ b/meta/recipes-connectivity/bluez/bluez4.inc
> >@@ -7,7 +7,10 @@ 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 ${@base_contains('DISTRO_FEATURES', 'alsa', 'alsa-lib', '', d)} \
> >+ libusb dbus-glib glib-2.0 libcheck \
> >+ "
> > RDEPENDS_${PN}-dev = "bluez-hcidump"
> >
> > ASNEEDED = ""
> >@@ -21,7 +24,7 @@ inherit autotools
> >
> > EXTRA_OECONF = "\
> > --disable-gstreamer \
> >- --enable-alsa \
> >+ ${@base_contains('DISTRO_FEATURES', 'alsa', '--enable-alsa', '--disable-alsa', d)} \
> > --enable-usb \
> > --enable-tools \
> > --enable-bccmd \
>
> Thanks for the contribution, there are some adjustments that I would
> suggest making to more maintainable.
>
Thank you for comments! A new version will follow.
Jonas
> You should be using PACKAGECONFIG here instead of base_contains.
>
>
> >diff --git a/meta/recipes-connectivity/bluez/bluez4_4.99.bb b/meta/recipes-connectivity/bluez/bluez4_4.99.bb
> >index 5033d34..5f1ef45 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,13 +19,16 @@ do_install_append() {
> >
> > RDEPENDS_${PN}-dev = "bluez-hcidump"
> >
> >-PACKAGES =+ "libasound-module-bluez"
> >+PACKAGES =+ "${@base_contains('DISTRO_FEATURES', 'alsa', 'libasound-module-bluez', '', d)}"
> >
> >-FILES_libasound-module-bluez = "${libdir}/alsa-lib/lib*.so ${datadir}/alsa"
> >+FILES_libasound-module-bluez = "\
> >+ ${@base_contains('DISTRO_FEATURES', 'alsa', '${libdir}/alsa-lib/lib*.so', '', d)} \
> >+ ${@base_contains('DISTRO_FEATURES', 'alsa', '${datadir}/alsa', '', d)} \
> >+"
>
> Also, you can use ALLOW_EMPTY_libasound-module-bluez = "1" so that
> it does not matter if the files are available
>
> > FILES_${PN} += "${libdir}/bluetooth/plugins ${libdir}/bluetooth/plugins/*.so ${base_libdir}/udev/ ${systemd_unitdir}/"
> > FILES_${PN}-dev += "\
> > ${libdir}/bluetooth/plugins/*.la \
> >- ${libdir}/alsa-lib/*.la \
> >+ ${@base_contains('DISTRO_FEATURES', 'alsa', '${libdir}/alsa-lib/*.la', '', d)} \
> > "
> >
> The base_contains is not needed here, if the alsa-lib/*.la files are
> not there then I don't think any warnings or errors will occur
>
> > FILES_${PN}-dbg += "\
>
^ permalink raw reply [flat|nested] 7+ messages in thread
* [PATCH v2] bluez4: make alsa support conditional upon DISTRO_FEATURES
2012-04-19 8:08 ` Jonas Danielsson
@ 2012-04-19 8:13 ` Jonas Danielsson
2012-04-19 8:19 ` Martin Jansa
0 siblings, 1 reply; 7+ messages in thread
From: Jonas Danielsson @ 2012-04-19 8:13 UTC (permalink / raw)
To: Saul Wold; +Cc: Patches and discussions about the oe-core layer
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 | 9 +++++++--
meta/recipes-connectivity/bluez/bluez4_4.99.bb | 3 ++-
2 files changed, 9 insertions(+), 3 deletions(-)
diff --git a/meta/recipes-connectivity/bluez/bluez4.inc b/meta/recipes-connectivity/bluez/bluez4.inc
index fbbe0bf..40e8543 100644
--- a/meta/recipes-connectivity/bluez/bluez4.inc
+++ b/meta/recipes-connectivity/bluez/bluez4.inc
@@ -7,9 +7,15 @@ 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 ${@base_contains('DISTRO_FEATURES', 'alsa', 'alsa-lib', '', d)} \
+ 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 +27,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"
--
1.7.5.4
^ permalink raw reply related [flat|nested] 7+ messages in thread
* Re: [PATCH v2] bluez4: make alsa support conditional upon DISTRO_FEATURES
2012-04-19 8:13 ` [PATCH v2] " Jonas Danielsson
@ 2012-04-19 8:19 ` Martin Jansa
2012-04-19 8:31 ` [PATCH v3] " Jonas Danielsson
0 siblings, 1 reply; 7+ messages in thread
From: Martin Jansa @ 2012-04-19 8:19 UTC (permalink / raw)
To: Patches and discussions about the oe-core layer
[-- Attachment #1: Type: text/plain, Size: 2676 bytes --]
On Thu, Apr 19, 2012 at 10:13:15AM +0200, 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 | 9 +++++++--
> meta/recipes-connectivity/bluez/bluez4_4.99.bb | 3 ++-
> 2 files changed, 9 insertions(+), 3 deletions(-)
>
> diff --git a/meta/recipes-connectivity/bluez/bluez4.inc b/meta/recipes-connectivity/bluez/bluez4.inc
> index fbbe0bf..40e8543 100644
> --- a/meta/recipes-connectivity/bluez/bluez4.inc
> +++ b/meta/recipes-connectivity/bluez/bluez4.inc
> @@ -7,9 +7,15 @@ 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 ${@base_contains('DISTRO_FEATURES', 'alsa', 'alsa-lib', '', d)} \
this ^ is not needed anymore
> + 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 +27,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"
> --
> 1.7.5.4
>
>
> _______________________________________________
> Openembedded-core mailing list
> Openembedded-core@lists.openembedded.org
> http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
--
Martin 'JaMa' Jansa jabber: Martin.Jansa@gmail.com
[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 205 bytes --]
^ permalink raw reply [flat|nested] 7+ messages in thread
* [PATCH v3] bluez4: make alsa support conditional upon DISTRO_FEATURES
2012-04-19 8:19 ` Martin Jansa
@ 2012-04-19 8:31 ` Jonas Danielsson
2012-04-27 21:18 ` Saul Wold
0 siblings, 1 reply; 7+ messages in thread
From: Jonas Danielsson @ 2012-04-19 8:31 UTC (permalink / raw)
To: Patches and discussions about the oe-core layer
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"
--
1.7.5.4
^ permalink raw reply related [flat|nested] 7+ messages in thread
* Re: [PATCH v3] bluez4: make alsa support conditional upon DISTRO_FEATURES
2012-04-19 8:31 ` [PATCH v3] " Jonas Danielsson
@ 2012-04-27 21:18 ` Saul Wold
0 siblings, 0 replies; 7+ messages in thread
From: Saul Wold @ 2012-04-27 21:18 UTC (permalink / raw)
To: Patches and discussions about the oe-core layer
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!
^ permalink raw reply [flat|nested] 7+ messages in thread
end of thread, other threads:[~2012-04-27 21:27 UTC | newest]
Thread overview: 7+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2012-04-18 20:30 [PATCH] bluez4: make alsa support conditional upon DISTRO_FEATURES Jonas Danielsson
2012-04-18 22:44 ` Saul Wold
2012-04-19 8:08 ` Jonas Danielsson
2012-04-19 8:13 ` [PATCH v2] " Jonas Danielsson
2012-04-19 8:19 ` Martin Jansa
2012-04-19 8:31 ` [PATCH v3] " Jonas Danielsson
2012-04-27 21:18 ` Saul Wold
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox