update to latest upstream version

5 files changed, 16 insertions, 60 deletions

diff --git a/package/bluez/Makefile b/package/bluez/Makefile
index eb72b47f7..aae196ad6 100644
--- a/package/bluez/Makefile
+++ b/package/bluez/Makefile
@@ -4,9 +4,9 @@
 include ${TOPDIR}/rules.mk
 
 PKG_NAME:=		bluez
-PKG_VERSION:=		4.59
+PKG_VERSION:=		4.89
 PKG_RELEASE:=		1
-PKG_MD5SUM:=		1c7cee215bc84656b1edee019cee78f5
+PKG_MD5SUM:=		67fd9ad2852ce01f01b16ddd2336d1ea
 PKG_DESCR:=		bluetooth libraries and applications
 PKG_SECTION:=		bluetooth
 PKG_DEPENDS:=		kmod-bt libusb glib dbus
@@ -16,7 +16,7 @@ PKG_SITES:=		${MASTER_SITE_KERNEL:=bluetooth/}
 
 include ${TOPDIR}/mk/package.mk
 
-$(eval $(call PKG_template,BLUEZ,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
+$(eval $(call PKG_template,BLUEZ,bluez,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 
 ifeq ($(ADK_STATIC),y)
 XAKE_FLAGS+=		CCLD="$(TARGET_CC) -all-static -pthread"
@@ -33,19 +33,19 @@ CONFIGURE_ARGS+=	--enable-tools \
 			--disable-pie \
 			--disable-cups
 
-post-install:
+bluez-install:
 ifneq ($(ADK_STATIC),y)
 	${INSTALL_DIR} ${IDIR_BLUEZ}/usr/lib
-	${CP} ${WRKINST}/usr/lib/libbluetooth.so.* ${IDIR_BLUEZ}/usr/lib/
+	${CP} ${WRKINST}/usr/lib/libbluetooth.so* ${IDIR_BLUEZ}/usr/lib
 endif
 	${INSTALL_DIR} $(IDIR_BLUEZ)/etc/dbus-1/system.d
 	${INSTALL_DIR} ${IDIR_BLUEZ}/usr/bin
-	${CP} ${WRKINST}/usr/bin/* ${IDIR_BLUEZ}/usr/bin/
+	${CP} ${WRKINST}/usr/bin/* ${IDIR_BLUEZ}/usr/bin
 	${INSTALL_DIR} ${IDIR_BLUEZ}/usr/sbin
-	${CP} ${WRKINST}/usr/sbin/* ${IDIR_BLUEZ}/usr/sbin/
+	${CP} ${WRKINST}/usr/sbin/* ${IDIR_BLUEZ}/usr/sbin
 	${INSTALL_DIR} ${IDIR_BLUEZ}/etc/bluetooth
 	$(INSTALL_DATA) ./files/main.conf \
-		${IDIR_BLUEZ}/etc/bluetooth/
+		${IDIR_BLUEZ}/etc/bluetooth
 	$(INSTALL_DATA) ./files/bluetooth.conf \
 		$(IDIR_BLUEZ)/etc/dbus-1/system.d
 
diff --git a/package/bluez/patches/patch-Makefile_in b/package/bluez/patches/patch-Makefile_in
deleted file mode 100644
index 2c4cf7336..000000000
--- a/package/bluez/patches/patch-Makefile_in
+++ /dev/null
@@ -1,27 +0,0 @@
---- bluez-4.59.orig/Makefile.in	2009-12-24 17:42:48.000000000 +0100
-+++ bluez-4.59/Makefile.in	2011-01-14 19:24:13.000000000 +0100
-@@ -48,7 +48,6 @@ noinst_PROGRAMS = $(am__EXEEXT_7) $(am__
- 	$(am__EXEEXT_10) $(am__EXEEXT_11)
- @SBC_TRUE@am__append_1 = sbc/libsbc.la
- @SBC_TRUE@am__append_2 = sbc/sbcinfo sbc/sbcdec sbc/sbcenc
--@SBC_TRUE@@SNDFILE_TRUE@am__append_3 = sbc/sbctester
- @NETLINK_TRUE@am__append_4 = plugins/netlink.la
- @ECHOPLUGIN_TRUE@am__append_5 = echo
- @ECHOPLUGIN_TRUE@am__append_6 = plugins/echo.c
-@@ -318,7 +317,6 @@ sbc_libsbc_la_LINK = $(LIBTOOL) $(AM_V_l
- @DUND_TRUE@am__EXEEXT_6 = compat/dund$(EXEEXT)
- @SBC_TRUE@am__EXEEXT_7 = sbc/sbcinfo$(EXEEXT) sbc/sbcdec$(EXEEXT) \
- @SBC_TRUE@	sbc/sbcenc$(EXEEXT)
--@SBC_TRUE@@SNDFILE_TRUE@am__EXEEXT_8 = sbc/sbctester$(EXEEXT)
- @TOOLS_TRUE@am__EXEEXT_9 = tools/avinfo$(EXEEXT) tools/ppporc$(EXEEXT) \
- @TOOLS_TRUE@	tools/hcieventmask$(EXEEXT) \
- @TOOLS_TRUE@	tools/hcisecfilter$(EXEEXT)
-@@ -918,8 +916,6 @@ lib_libbluetooth_la_DEPENDENCIES = $(loc
- @SBC_TRUE@sbc_sbcdec_LDADD = sbc/libsbc.la
- @SBC_TRUE@sbc_sbcenc_SOURCES = sbc/sbcenc.c sbc/formats.h
- @SBC_TRUE@sbc_sbcenc_LDADD = sbc/libsbc.la
--@SBC_TRUE@@SNDFILE_TRUE@sbc_sbctester_LDADD = @SNDFILE_LIBS@
--@SBC_TRUE@@SNDFILE_TRUE@sbc_sbctest_CFLAGS = @SNDFILE_CFLAGS@
- @NETLINK_TRUE@plugins_netlink_la_LIBADD = @NETLINK_LIBS@
- @NETLINK_TRUE@plugins_netlink_la_LDFLAGS = -module -avoid-version -no-undefined
- @NETLINK_TRUE@plugins_netlink_la_CFLAGS = -fvisibility=hidden @DBUS_CFLAGS@ \
diff --git a/package/bluez/patches/patch-ltmain_sh b/package/bluez/patches/patch-ltmain_sh
index e323f1b54..650de61e1 100644
--- a/package/bluez/patches/patch-ltmain_sh
+++ b/package/bluez/patches/patch-ltmain_sh
@@ -1,11 +1,11 @@
---- bluez-4.59.orig/ltmain.sh	2009-12-24 17:42:43.000000000 +0100
-+++ bluez-4.59/ltmain.sh	2011-01-14 19:25:00.000000000 +0100
+--- bluez-4.89.orig/ltmain.sh	2011-02-20 15:49:33.000000000 +0100
++++ bluez-4.89/ltmain.sh	2011-03-03 22:50:01.000000000 +0100
 @@ -4765,7 +4765,7 @@ func_mode_link ()
        # -p, -pg, --coverage, -fprofile-* pass through profiling flag for GCC
        # @file GCC response files
        -64|-mips[0-9]|-r[0-9][0-9]*|-xarch=*|-xtarget=*|+DA*|+DD*|-q*|-m*| \
 -      -t[45]*|-txscale*|-p|-pg|--coverage|-fprofile-*|-F*|@*)
-+      -t[45]*|-txscale*|-p|-pg|--coverage|-fprofile-*|-F*|@*|-fstack-protector*|-flto)
++      -t[45]*|-txscale*|-p|-pg|--coverage|-fprofile-*|-F*|@*|-fstack-protector*|-flto*)
          func_quote_for_eval "$arg"
  	arg="$func_quote_for_eval_result"
          func_append compile_command " $arg"
diff --git a/package/bluez/patches/patch-scripts_bluetooth_rules b/package/bluez/patches/patch-scripts_bluetooth_rules
index 0ff2c0ef3..348da2486 100644
--- a/package/bluez/patches/patch-scripts_bluetooth_rules
+++ b/package/bluez/patches/patch-scripts_bluetooth_rules
@@ -1,7 +1,9 @@
---- bluez-4.59.orig/scripts/bluetooth.rules	Thu Dec 24 17:43:09 2009
-+++ bluez-4.59/scripts/bluetooth.rules	Tue Dec 29 01:26:46 2009
-@@ -1,3 +1,3 @@
+--- bluez-4.89.orig/scripts/bluetooth.rules	2011-02-20 15:49:58.000000000 +0100
++++ bluez-4.89/scripts/bluetooth.rules	2011-03-03 22:48:19.000000000 +0100
+@@ -1,4 +1,4 @@
  # Run helper every time a Bluetooth device appears
  # On remove actions, bluetoothd should go away by itself
 -ACTION=="add", SUBSYSTEM=="bluetooth", RUN+="/usr/local/sbin/bluetoothd --udev"
+-ACTION=="change", SUBSYSTEM=="bluetooth", RUN+="/usr/local/sbin/bluetoothd --udev"
 +ACTION=="add", SUBSYSTEM=="bluetooth", RUN+="/usr/sbin/bluetoothd --udev"
++ACTION=="change", SUBSYSTEM=="bluetooth", RUN+="/usr/sbin/bluetoothd --udev"
diff --git a/package/bluez/patches/patch-tools_hciattach_c b/package/bluez/patches/patch-tools_hciattach_c
deleted file mode 100644
index e5a84de4f..000000000
--- a/package/bluez/patches/patch-tools_hciattach_c
+++ /dev/null
@@ -1,19 +0,0 @@
-$Id: update-patches 24 2008-08-31 14:56:13Z wbx $
---- bluez-4.59.orig/tools/hciattach.c	Tue May 19 11:04:10 2009
-+++ bluez-4.59/tools/hciattach.c	Tue Dec 29 01:26:35 2009
-@@ -100,6 +100,7 @@ static int uart_speed(int s)
- 		return B57600;
- 	case 115200:
- 		return B115200;
-+#if 0
- 	case 230400:
- 		return B230400;
- 	case 460800:
-@@ -118,6 +119,7 @@ static int uart_speed(int s)
- 		return B1500000;
- 	case 2000000:
- 		return B2000000;
-+#endif
- #ifdef B2500000
- 	case 2500000:
- 		return B2500000;