From fb52be187f6d5c09ae0b4906b5a4206893b450d3 Mon Sep 17 00:00:00 2001
From: Stephan Raue <stephan@openelec.tv>
Date: Mon, 25 Jul 2011 21:35:08 +0200
Subject: [PATCH] bluez: cleanup, enable networking, audio, health, pnat
 support

Signed-off-by: Stephan Raue <stephan@openelec.tv>
---
 packages/network/bluez/build   | 12 +++++++-----
 packages/network/bluez/install |  3 +--
 2 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/packages/network/bluez/build b/packages/network/bluez/build
index e3d083fe81..a6f966af76 100755
--- a/packages/network/bluez/build
+++ b/packages/network/bluez/build
@@ -47,21 +47,23 @@ cd $PKG_BUILD
             --enable-optimization \
             --enable-fortify \
             --disable-pie \
-            --disable-network \
+            --enable-network \
             --disable-sap \
             --disable-serial \
-            --enable-usb \
             --enable-input \
-            --disable-audio \
+            --enable-audio \
             --enable-service \
-            --disable-pnat \
+            --enable-health \
+            --enable-pnat \
             --disable-gstreamer \
             --enable-alsa \
+            --enable-usb \
             --disable-tracer \
+            --enable-datafiles \
             --enable-pcmcia \
             --enable-hid2hci \
             --enable-dfutool \
-            --enable-hidd \
+            --disable-hidd \
             --disable-pand \
             --disable-dund \
             --disable-cups \
diff --git a/packages/network/bluez/install b/packages/network/bluez/install
index 86933d8537..54efddd911 100755
--- a/packages/network/bluez/install
+++ b/packages/network/bluez/install
@@ -27,6 +27,7 @@ PKG_DIR=`find $PACKAGES -type d -name $1`
 mkdir -p $INSTALL/etc/bluetooth
   cp $PKG_BUILD/src/main.conf $INSTALL/etc/bluetooth
   cp $PKG_BUILD/tools/rfcomm.conf $INSTALL/etc/bluetooth
+  cp $PKG_BUILD/audio/audio.conf $INSTALL/etc/bluetooth
   cp $PKG_BUILD/input/input.conf $INSTALL/etc/bluetooth
 
 mkdir -p $INSTALL/etc/dbus-1/system.d
@@ -49,7 +50,6 @@ mkdir -p $INSTALL/usr/lib/alsa-lib
   cp $PKG_BUILD/audio/.libs/*.so $INSTALL/usr/lib/alsa-lib
 
 mkdir -p $INSTALL/usr/lib/bluetooth/plugins
-#  cp $PKG_BUILD/plugins/.libs/*.so $INSTALL/usr/lib/bluetooth/plugins
 
 mkdir -p $INSTALL/usr/sbin
   cp $PKG_BUILD/src/.libs/bluetoothd $INSTALL/usr/sbin
@@ -62,7 +62,6 @@ if [ "$DEVTOOLS" = "yes" ]; then
     cp $PKG_BUILD/tools/.libs/ciptool $INSTALL/usr/bin
     cp $PKG_BUILD/tools/dfutool $INSTALL/usr/bin
     cp $PKG_BUILD/tools/.libs/hcitool $INSTALL/usr/bin
-    cp $PKG_BUILD/compat/.libs/hidd  $INSTALL/usr/bin
     cp $PKG_BUILD/tools/.libs/l2ping $INSTALL/usr/bin
     cp $PKG_BUILD/test/.libs/l2test $INSTALL/usr/bin
     cp $PKG_BUILD/test/.libs/rctest $INSTALL/usr/bin