Revert "bluez: remove audio and alsa support"

This reverts commit 14a82dffa2bd0a846e8fcc464ff074fe098010f1.

packages/network/bluez/build

@@ -22,6 +22,12 @@
 
 . config/options
 
+if [ "$ALSA_SUPPORT" = "yes" ]; then
+  BLUEZ_ALSA="--enable-audio --enable-alsa"
+else
+  BLUEZ_ALSA="--disable-audio --disable-alsa"
+fi
+
 if [ "$DEBUG" = "yes" ]; then
   DEBUG_CONFIG="--enable-debug"
 else
@@ -56,8 +62,7 @@ cd $PKG_BUILD
             --enable-health \
             --disable-pnat \
             --disable-gstreamer \
-            --disable-audio \
-            --disable-alsa \
+            $BLUEZ_ALSA \
             --enable-usb \
             --enable-datafiles \
             --enable-pcmcia \

packages/network/bluez/install

@@ -30,6 +30,10 @@ mkdir -p $INSTALL/etc/bluetooth
   cp $PKG_BUILD/tools/rfcomm.conf $INSTALL/etc/bluetooth
   cp $PKG_BUILD/input/input.conf $INSTALL/etc/bluetooth
 
+  if [ "$ALSA_SUPPORT" = yes ]; then
+    cp $PKG_BUILD/audio/audio.conf $INSTALL/etc/bluetooth
+  fi
+
 mkdir -p $INSTALL/etc/dbus-1/system.d
   cp $PKG_BUILD/src/bluetooth.conf $INSTALL/etc/dbus-1/system.d
 
@@ -43,9 +47,19 @@ mkdir -p $INSTALL/lib/udev/rules.d
 # todo:        cp $PKG_BUILD/scripts/97-bluetooth-hid2hci.rules $INSTALL/lib/udev/rules.d
 # not needed:  cp $PKG_BUILD/scripts/97-bluetooth-serial.rules $INSTALL/lib/udev/rules.d
 
+if [ "$ALSA_SUPPORT" = yes ]; then
+  mkdir -p $INSTALL/usr/lib/alsa
+    cp $PKG_BUILD/audio/.libs/*.so $INSTALL/usr/lib/alsa
+fi
+
+mkdir -p $INSTALL/usr/lib/bluetooth/plugins
+
 mkdir -p $INSTALL/usr/sbin
   cp $PKG_BUILD/src/bluetoothd $INSTALL/usr/sbin
 
+mkdir -p $INSTALL/usr/share/alsa
+  cp $PKG_BUILD/audio/bluetooth.conf $INSTALL/usr/share/alsa
+
 if [ "$DEVTOOLS" = "yes" ]; then
   mkdir -p $INSTALL/usr/bin
     cp $PKG_BUILD/tools/ciptool $INSTALL/usr/bin

packages/network/bluez/meta

@@ -34,3 +34,8 @@ PKG_LONGDESC="Bluetooth Tools and System Daemons for Linux."
 PKG_IS_ADDON="no"
 
 PKG_AUTORECONF="yes"
+
+if [ "$ALSA_SUPPORT" = yes ]; then
+  PKG_DEPENDS="$PKG_DEPENDS alsa-lib"
+  PKG_BUILD_DEPENDS="$PKG_BUILD_DEPENDS alsa-lib"
+fi