[PATCH 0/2] A couple of bluetooth improvements

[PATCH 0/2] A couple of bluetooth improvements

[Paul Eggleton]

The following changes since commit 362512b83775ad7020e5870a594f0e7ca9ef83ba:

  bitbake.conf Exclude MACHINE from MACHINEOVERRIDE variable dependencies (2011-10-14 13:51:14 +0100)

are available in the git repository at:
  git://git.openembedded.org/openembedded-core-contrib paule/bluetooth
  http://cgit.openembedded.org/cgit.cgi/openembedded-core-contrib/log/?h=paule/bluetooth

Paul Eggleton (2):
  pulseaudio: make bluetooth support conditional upon DISTRO_FEATURES
  bluez4: disable hidd, pand & dund

 meta/recipes-connectivity/bluez/bluez4.inc         |    6 +++---
 meta/recipes-connectivity/bluez/bluez4_4.96.bb     |    2 +-
 meta/recipes-multimedia/pulseaudio/pulseaudio.inc  |    5 +++--
 .../pulseaudio/pulseaudio_0.9.22.bb                |    2 +-
 .../pulseaudio/pulseaudio_0.9.23.bb                |    2 +-
 5 files changed, 9 insertions(+), 8 deletions(-)

-- 
1.7.4.1

[PATCH 1/2] pulseaudio: make bluetooth support conditional upon DISTRO_FEATURES

[Paul Eggleton]

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>
---
 meta/recipes-multimedia/pulseaudio/pulseaudio.inc  |    5 +++--
 .../pulseaudio/pulseaudio_0.9.22.bb                |    2 +-
 .../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 2a8e74d..bb32467 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 da2e988..3067365 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 1edd913..33f5e15 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"
 
-- 
1.7.4.1

[PATCH 2/2] bluez4: disable hidd, pand & dund

[Paul Eggleton]

These daemons have been deprecated for some time, as their functionality
is now provided within the main bluetoothd daemon.

Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
---
 meta/recipes-connectivity/bluez/bluez4.inc     |    6 +++---
 meta/recipes-connectivity/bluez/bluez4_4.96.bb |    2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/meta/recipes-connectivity/bluez/bluez4.inc b/meta/recipes-connectivity/bluez/bluez4.inc
index 5dacd92..fc515f6 100644
--- a/meta/recipes-connectivity/bluez/bluez4.inc
+++ b/meta/recipes-connectivity/bluez/bluez4.inc
@@ -27,9 +27,9 @@ EXTRA_OECONF = "\
   --enable-bccmd \
   --enable-hid2hci \
   --enable-dfutool \
-  --enable-hidd \
-  --enable-pand \
-  --enable-dund \
+  --disable-hidd \
+  --disable-pand \
+  --disable-dund \
   --disable-cups \
   --enable-test \
   --enable-datafiles \
diff --git a/meta/recipes-connectivity/bluez/bluez4_4.96.bb b/meta/recipes-connectivity/bluez/bluez4_4.96.bb
index 420a525..52268cf 100644
--- a/meta/recipes-connectivity/bluez/bluez4_4.96.bb
+++ b/meta/recipes-connectivity/bluez/bluez4_4.96.bb
@@ -1,6 +1,6 @@
 require bluez4.inc
 
-PR = "r2"
+PR = "r3"
 
 SRC_URI += "file://bluetooth.conf"
 
-- 
1.7.4.1

Re: [PATCH 1/2] pulseaudio: make bluetooth support conditional upon DISTRO_FEATURES

[Koen Kooi]

Op 14 okt. 2011, om 16:07 heeft Paul Eggleton het volgende geschreven:

> 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>
> ---
> meta/recipes-multimedia/pulseaudio/pulseaudio.inc  |    5 +++--
> .../pulseaudio/pulseaudio_0.9.22.bb                |    2 +-
> .../pulseaudio/pulseaudio_0.9.23.bb                |    2 +-

Slightly off-topic, PA has had a 1.0 release recently, any volunteers for adding it?

Re: [PATCH 0/2] A couple of bluetooth improvements

[Saul Wold]

On 10/14/2011 07:07 AM, Paul Eggleton wrote:
> The following changes since commit 362512b83775ad7020e5870a594f0e7ca9ef83ba:
>
>    bitbake.conf Exclude MACHINE from MACHINEOVERRIDE variable dependencies (2011-10-14 13:51:14 +0100)
>
> are available in the git repository at:
>    git://git.openembedded.org/openembedded-core-contrib paule/bluetooth
>    http://cgit.openembedded.org/cgit.cgi/openembedded-core-contrib/log/?h=paule/bluetooth
>
> Paul Eggleton (2):
>    pulseaudio: make bluetooth support conditional upon DISTRO_FEATURES
>    bluez4: disable hidd, pand&  dund
>
>   meta/recipes-connectivity/bluez/bluez4.inc         |    6 +++---
>   meta/recipes-connectivity/bluez/bluez4_4.96.bb     |    2 +-
>   meta/recipes-multimedia/pulseaudio/pulseaudio.inc  |    5 +++--
>   .../pulseaudio/pulseaudio_0.9.22.bb                |    2 +-
>   .../pulseaudio/pulseaudio_0.9.23.bb                |    2 +-
>   5 files changed, 9 insertions(+), 8 deletions(-)
>
Merged into OE-Core

Thanks
	Sau!