pulseaudio: properly enable/disable bluez support based on package selection

PATCH New Calin Crisan 2 participants 2 messages Jul 18, 2017 – Jul 20, 2017

Share & tools

Calin Crisan

author

2017-07-18 08:55 UTC #0 lore raw

PATCH 1/1 pulseaudio: properly enable/disable bluez support based on package selection

Instead of letting the configure script automatically detect the presence of bluez package files, the script is now explicitly instructed to enable or disable bluez (both 4.x and 5.x) support based on the selection of the following packages: bluez_utils, bluez5_utils and sbc.

Signed-off-by Calin Crisan <ccrisan@gmail dot com>

---
 package/pulseaudio/pulseaudio.mk | 16 ++++++++++++++--
 1 file changed, 14 insertions(+), 2 deletions(-)

package/pulseaudio/pulseaudio.mk +14 -2

index 2f2cfbbed..c627c4b5b 100644
@@ -31,8 +31,6 @@ PULSEAUDIO_DEPENDENCIES = \
 	$(if $(BR2_PACKAGE_LIBGLIB2),libglib2) \
 	$(if $(BR2_PACKAGE_AVAHI_DAEMON),avahi) \
 	$(if $(BR2_PACKAGE_DBUS),dbus) \
-	$(if $(BR2_PACKAGE_BLUEZ_UTILS),bluez_utils) \
-	$(if $(BR2_PACKAGE_BLUEZ5_UTILS),bluez5_utils) \
 	$(if $(BR2_PACKAGE_OPENSSL),openssl) \
 	$(if $(BR2_PACKAGE_FFTW),fftw) \
 	$(if $(BR2_PACKAGE_SYSTEMD),systemd)

@@ -81,6 +79,20 @@ else
 PULSEAUDIO_CONF_OPTS += --without-soxr
 endif
 
+ifeq ($(BR2_PACKAGE_BLUEZ_UTILS)$(BR2_PACKAGE_SBC),yy)
+PULSEAUDIO_CONF_OPTS += --enable-bluez4
+PULSEAUDIO_DEPENDENCIES += bluez_utils sbc
+else
+PULSEAUDIO_CONF_OPTS += --disable-bluez4
+endif
+
+ifeq ($(BR2_PACKAGE_BLUEZ5_UTILS)$(BR2_PACKAGE_SBC),yy)
+PULSEAUDIO_CONF_OPTS += --enable-bluez5
+PULSEAUDIO_DEPENDENCIES += bluez5_utils sbc
+else
+PULSEAUDIO_CONF_OPTS += --disable-bluez5
+endif
+
 ifeq ($(BR2_PACKAGE_HAS_UDEV),y)
 PULSEAUDIO_CONF_OPTS += --enable-udev
 PULSEAUDIO_DEPENDENCIES += udev

Signature · 1 line

2.13.3

Thomas Petazzoni

Applied

2017-07-20 21:07 UTC #1 lore raw

PATCH 1/1 pulseaudio: properly enable/disable bluez support based on package selection

Hello,

Quoted 9 lines · Calin Crisan

Instead of letting the configure script automatically detect the presence of bluez package files, the script is now explicitly instructed to enable or disable bluez (both 4.x and 5.x) support based on the selection of the following packages: bluez_utils, bluez5_utils and sbc.
Signed-off-by Calin Crisan <ccrisan@gmail dot com>
---
 package/pulseaudio/pulseaudio.mk | 16 ++++++++++++++--
 1 file changed, 14 insertions(+), 2 deletions(-)

Applied to master, thanks.

Thomas

Signature · 3 lines

Thomas Petazzoni, CTO, Free Electrons
Embedded Linux, Kernel and Android engineering
http://free-electrons.com