[Lunar-commits] <moonbase-other> pulseaudio: Making a few adjustments to prevent conflicts between bluez-4 and bluez-5.

[Dennis Veatch]

commit e5c639fa20eb40489512c5f6116139fb4c867bf3
Author: Dennis Veatch <dennisveatch at bellsouth.net>
Date: Mon, 10 Nov 2014 06:13:52 -0500
URL: https://github.com/lunar-linux/moonbase-other/commit/e5c639fa20eb40489512c5f6116139fb4c867bf3

pulseaudio: Making a few adjustments to prevent conflicts between bluez-4 and bluez-5.

Restore the %BLUEZ alias and provide some logic in the BUILD to enable/disable appropriately.

Bluez-5 still lacks HSP and HFP profile support so I was to hasty suggesting we send
bluez-4 to /dev/null.
---
  audio/pulseaudio/BUILD   | +10/-0    
  audio/pulseaudio/DEPENDS | +5/-2     
  2 files changed, 15 insertions(+), 2 deletions(-)

--- a/audio/pulseaudio/BUILD
+++ b/audio/pulseaudio/BUILD
@@ -1,4 +1,14 @@
 
+# Obviously if bluez4 we want to disable bluez-5. However since bluez-5 provides a
+# compatibility layer for bluez4 we want both enabled if bluez-5 is installed.
+  if in_depends $MODULE bluez ; then
+    OPTS+=" --enable-bluez4 --disable-bluez5"
+     else
+    if in_depends $MODULE bluez-5 ; then
+      OPTS+=" --enable-bluez5 --enable-bluez4"
+    fi
+  fi &&
+
   if module_installed systemd ; then
      OPTS+=" --with-udev-rules-dir=/usr/lib/udev/rules.d"
   fi &&
--- a/audio/pulseaudio/DEPENDS
+++ b/audio/pulseaudio/DEPENDS
@@ -20,8 +20,6 @@ optional_depends "GConf"         "--enable-gconf"       "--disable-gconf"      "
 optional_depends "gtk+-3"        "--enable-gtk3"        "--disable-gtk3"       "optional Gtk+ 3 support"
 optional_depends "libsamplerate" "--enable-samplerate"  "--disable-samplerate" "optional libsamplerate support"
 optional_depends "openssl"       "--enable-openssl"     "--disable-openssl"    "for OpenSSL support"
-optional_depends "bluez"         "--enable-bluez4"      "--disable-bluez4"     "optional BlueZ 4 support"
-optional_depends "bluez-5"       "--enable-bluez5"      "--disable-bluez5"     "optional BlueZ 5 support"
 optional_depends "orc"           "--enable-orc"         "--disable-orc"        "for orc support"
 optional_depends "esound"        "--enable-esound"      "--disable-esound"     "for esound support"
 
@@ -29,3 +27,8 @@ optional_depends "alsa-oss"      "--enable-oss-output --enable-oss-wrapper"   \
                                  "--disable-oss-output --disable-oss-wrapper" \
                                  "optional OSS output support"
 
+optional_depends "webrtc-audio-processing" "--enable-webrtc-aec" \
+                 "--disable-webrtc-aec" "For WebRTC echo cancellation support"
+
+# We take care of which bluez to enable in the BUILD
+optional_depends "%BLUEZ"        ""      ""     "optional BlueZ support"