update to latest stable version

6 files changed, 20 insertions, 50 deletions

diff --git a/package/bluez/Makefile b/package/bluez/Makefile
index 579cff571..6166c1f50 100644
--- a/package/bluez/Makefile
+++ b/package/bluez/Makefile
@@ -4,32 +4,38 @@
 include ${TOPDIR}/rules.mk
 
 PKG_NAME:=		bluez
-PKG_VERSION:=		5.12
+PKG_VERSION:=		5.19
 PKG_RELEASE:=		1
-PKG_MD5SUM:=		5d37e581107b3d6f91b81194a5006407
+PKG_MD5SUM:=		2d839c0bc9f8daaa6ca32e65d7701812
 PKG_DESCR:=		bluetooth applications
 PKG_SECTION:=		net/wifi
 PKG_DEPENDS:=		glib dbus libreadline
-PKG_BUILDDEP:=		autotool glib dbus readline
+PKG_BUILDDEP:=		glib dbus readline
 PKG_URL:=		http://www.bluez.org/
 PKG_SITES:=		http://mirror.anl.gov/pub/linux/bluetooth/
-PKG_OPTS:=		dev
 
 include ${TOPDIR}/mk/package.mk
 
 $(eval $(call PKG_template,BLUEZ,bluez,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 
-AUTOTOOL_STYLE:=	autoreconf
+TARGET_LDFLAGS+=	-lncurses
+
 ifeq ($(ADK_TARGET_USE_STATIC_LIBS),y)
 XAKE_FLAGS+=		CCLD="$(TARGET_CC) -all-static -pthread"
 endif
-TARGET_LDFLAGS+=	-lncurses
+
+ifeq ($(ADK_TARGET_USE_PIE),y)
+CONFIGURE_ARGS+=	--enable-pie
+else
 CONFIGURE_ENV+=		ac_cv_prog_cc_pie=no
+CONFIGURE_ARGS+=	--disable-pie
+endif
+
 CONFIGURE_ARGS+=	--enable-tools \
 			--disable-udev \
+			--disable-test \
 			--disable-systemd \
 			--disable-obex \
-			--disable-pie \
 			--disable-cups
 
 bluez-install:
diff --git a/package/bluez/patches/patch-Makefile_am b/package/bluez/patches/patch-Makefile_am
deleted file mode 100644
index ab4c015af..000000000
--- a/package/bluez/patches/patch-Makefile_am
+++ /dev/null
@@ -1,10 +0,0 @@
---- bluez-5.12.orig/Makefile.am	2013-12-10 07:59:06.000000000 +0100
-+++ bluez-5.12/Makefile.am	2013-12-21 20:18:52.000000000 +0100
-@@ -245,6 +245,7 @@ unit_tests += unit/test-sdp
- 
- unit_test_sdp_SOURCES = unit/test-sdp.c \
- 				src/shared/util.h src/shared/util.c \
-+				src/log.h src/log.c \
- 				src/sdpd.h src/sdpd-database.c \
- 				src/sdpd-service.c src/sdpd-request.c
- unit_test_sdp_LDADD = lib/libbluetooth-internal.la @GLIB_LIBS@
diff --git a/package/bluez/patches/patch-Makefile_in b/package/bluez/patches/patch-Makefile_in
deleted file mode 100644
index d1abdecec..000000000
--- a/package/bluez/patches/patch-Makefile_in
+++ /dev/null
@@ -1,11 +0,0 @@
---- bluez-5.12.orig/Makefile.in	2013-12-10 07:59:32.000000000 +0100
-+++ bluez-5.12/Makefile.in	2013-12-21 20:02:59.000000000 +0100
-@@ -157,7 +157,7 @@ DIST_COMMON = README $(am__configure_dep
- @ANDROID_TRUE@	android/bluetoothd android/haltest
- @ANDROID_TRUE@am__append_30 = android/libhal-internal.la
- @HID2HCI_TRUE@am__append_31 = $(rules_DATA)
--TESTS = $(am__EXEEXT_8)
-+TESTS = 
- subdir = .
- ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
- am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \
diff --git a/package/bluez/patches/patch-plugins_wiimote_c b/package/bluez/patches/patch-plugins_wiimote_c
index 30ba5e647..07b9028f1 100644
--- a/package/bluez/patches/patch-plugins_wiimote_c
+++ b/package/bluez/patches/patch-plugins_wiimote_c
@@ -1,5 +1,5 @@
---- bluez-5.12.orig/plugins/wiimote.c	2013-12-10 07:59:06.000000000 +0100
-+++ bluez-5.12/plugins/wiimote.c	2013-12-21 19:29:22.000000000 +0100
+--- bluez-5.19.orig/plugins/wiimote.c	2014-02-22 02:42:18.000000000 +0100
++++ bluez-5.19/plugins/wiimote.c	2014-06-04 16:53:28.000000000 +0200
 @@ -28,6 +28,7 @@
  #include <stdbool.h>
  
@@ -7,4 +7,4 @@
 +#include <fcntl.h>
  #include <glib.h>
  
- #include "plugin.h"
+ #include "src/plugin.h"
diff --git a/package/bluez/patches/patch-tools_hciattach_c b/package/bluez/patches/patch-tools_hciattach_c
index 1021bb9f1..221766348 100644
--- a/package/bluez/patches/patch-tools_hciattach_c
+++ b/package/bluez/patches/patch-tools_hciattach_c
@@ -1,6 +1,6 @@
---- bluez-5.12.orig/tools/hciattach.c	2012-12-24 18:46:55.000000000 +0100
-+++ bluez-5.12/tools/hciattach.c	2013-12-21 19:19:21.000000000 +0100
-@@ -101,6 +101,7 @@ static int uart_speed(int s)
+--- bluez-5.19.orig/tools/hciattach.c	2014-04-12 12:13:29.000000000 +0200
++++ bluez-5.19/tools/hciattach.c	2014-06-04 16:53:28.000000000 +0200
+@@ -101,6 +101,7 @@ int uart_speed(int s)
  		return B230400;
  	case 460800:
  		return B460800;
@@ -8,7 +8,7 @@
  	case 500000:
  		return B500000;
  	case 576000:
-@@ -135,6 +136,7 @@ static int uart_speed(int s)
+@@ -135,6 +136,7 @@ int uart_speed(int s)
  	case 4000000:
  		return B4000000;
  #endif
diff --git a/package/bluez/patches/patch-unit_test-sdp_c b/package/bluez/patches/patch-unit_test-sdp_c
deleted file mode 100644
index 355300b79..000000000
--- a/package/bluez/patches/patch-unit_test-sdp_c
+++ /dev/null
@@ -1,15 +0,0 @@
---- bluez-5.12.orig/unit/test-sdp.c	2013-10-15 15:41:07.000000000 +0200
-+++ bluez-5.12/unit/test-sdp.c	2013-12-21 20:23:50.000000000 +0100
-@@ -128,12 +128,6 @@ static void sdp_debug(const char *str, v
- 	g_print("%s%s\n", prefix, str);
- }
- 
--void btd_debug(const char *format, ...);
--
--void btd_debug(const char *format, ...)
--{
--}
--
- static void context_quit(struct context *context)
- {
- 	g_main_loop_quit(context->main_loop);