From 11ccc856a355971697c33135fea3170c3360155c Mon Sep 17 00:00:00 2001
From: Stephan Raue <stephan@openelec.tv>
Date: Mon, 25 Jul 2011 06:13:21 +0200
Subject: [PATCH] bluez: update to bluez-53e6e76

Signed-off-by: Stephan Raue <stephan@openelec.tv>
---
 packages/network/bluez/build   |  4 +--
 packages/network/bluez/install | 45 ++++++++++++++++++----------------
 packages/network/bluez/meta    |  5 ++--
 3 files changed, 28 insertions(+), 26 deletions(-)

diff --git a/packages/network/bluez/build b/packages/network/bluez/build
index d2a540f563..e3d083fe81 100755
--- a/packages/network/bluez/build
+++ b/packages/network/bluez/build
@@ -55,7 +55,6 @@ cd $PKG_BUILD
             --disable-audio \
             --enable-service \
             --disable-pnat \
-            --disable-attrib \
             --disable-gstreamer \
             --enable-alsa \
             --disable-tracer \
@@ -66,8 +65,7 @@ cd $PKG_BUILD
             --disable-pand \
             --disable-dund \
             --disable-cups \
-            --enable-udevrules \
-            --enable-configfiles \
+            --enable-wiimote \
             --disable-maemo6 \
             --disable-dbusoob \
             --disable-hal \
diff --git a/packages/network/bluez/install b/packages/network/bluez/install
index 58b61d1dcf..86933d8537 100755
--- a/packages/network/bluez/install
+++ b/packages/network/bluez/install
@@ -35,32 +35,13 @@ mkdir -p $INSTALL/etc/dbus-1/system.d
 mkdir -p $INSTALL/lib/udev
   cp $PKG_BUILD/scripts/bluetooth_serial $INSTALL/lib/udev
   chmod +x $INSTALL/lib/udev/bluetooth_serial
+  cp $PKG_BUILD/tools/hid2hci $INSTALL/lib/udev
 
 mkdir -p $INSTALL/lib/udev/rules.d
   cp $PKG_BUILD/scripts/97-bluetooth.rules $INSTALL/lib/udev/rules.d
   cp $PKG_BUILD/scripts/97-bluetooth-hid2hci.rules $INSTALL/lib/udev/rules.d
   cp $PKG_BUILD/scripts/97-bluetooth-serial.rules $INSTALL/lib/udev/rules.d
 
-if [ "$DEVTOOLS" = "yes" ]; then
-  mkdir -p $INSTALL/usr/bin
-    cp $PKG_BUILD/tools/.libs/ciptool $INSTALL/usr/bin
-    cp $PKG_BUILD/tools/.libs/hcitool $INSTALL/usr/bin
-    cp $PKG_BUILD/tools/.libs/l2ping $INSTALL/usr/bin
-    cp $PKG_BUILD/tools/.libs/rfcomm $INSTALL/usr/bin
-    cp $PKG_BUILD/tools/.libs/sdptool $INSTALL/usr/bin
-    cp $PKG_BUILD/tools/dfutool $INSTALL/usr/bin
-    cp $PKG_BUILD/compat/.libs/hidd  $INSTALL/usr/bin
-    cp $PKG_BUILD/test/.libs/l2test $INSTALL/usr/bin
-    cp $PKG_BUILD/test/.libs/rctest $INSTALL/usr/bin
-
-mkdir -p $INSTALL/usr/sbin
-  cp $PKG_BUILD/tools/.libs/bccmd $INSTALL/usr/sbin # TODO
-  cp $PKG_BUILD/tools/.libs/hciattach $INSTALL/usr/sbin
-  cp $PKG_BUILD/tools/.libs/hciconfig $INSTALL/usr/sbin
-  cp $PKG_BUILD/tools/hid2hci $INSTALL/usr/sbin
-  cp $PKG_BUILD/test/.libs/hciemu $INSTALL/usr/sbin
-fi
-
 mkdir -p $INSTALL/usr/lib
   cp $PKG_BUILD/lib/.libs/libbluetooth.so* $INSTALL/usr/lib
 
@@ -68,8 +49,30 @@ 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
+#  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
 
+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/.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
+    cp $PKG_BUILD/tools/.libs/rfcomm $INSTALL/usr/bin
+    cp $PKG_BUILD/tools/.libs/sdptool $INSTALL/usr/bin
+
+mkdir -p $INSTALL/usr/sbin
+  cp $PKG_BUILD/tools/.libs/bccmd $INSTALL/usr/sbin # TODO
+  cp $PKG_BUILD/tools/.libs/hciattach $INSTALL/usr/sbin
+  cp $PKG_BUILD/tools/.libs/hciconfig $INSTALL/usr/sbin
+  cp $PKG_BUILD/test/.libs/hciemu $INSTALL/usr/sbin
+fi
+
diff --git a/packages/network/bluez/meta b/packages/network/bluez/meta
index 646c78b1b5..001a7dea7c 100644
--- a/packages/network/bluez/meta
+++ b/packages/network/bluez/meta
@@ -19,12 +19,13 @@
 ################################################################################
 
 PKG_NAME="bluez"
-PKG_VERSION="4.95"
+PKG_VERSION="53e6e76"
 PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="GPL"
 PKG_SITE="http://www.bluez.org/"
-PKG_URL="http://www.kernel.org/pub/linux/bluetooth/$PKG_NAME-$PKG_VERSION.tar.bz2"
+#PKG_URL="http://www.kernel.org/pub/linux/bluetooth/$PKG_NAME-$PKG_VERSION.tar.bz2"
+PKG_URL="$OPENELEC_SRC/$PKG_NAME-$PKG_VERSION.tar.xz"
 PKG_DEPENDS="alsa-lib libusb-compat dbus glib"
 PKG_BUILD_DEPENDS="toolchain alsa-lib libusb-compat dbus glib"
 PKG_PRIORITY="optional"