From ca463b87887d8151b83d222dc35d461991c1dd63 Mon Sep 17 00:00:00 2001
From: Waldemar Brodkorb <wbx@openadk.org>
Date: Sat, 21 Dec 2013 21:37:59 +0100
Subject: another musl fix round

---
 package/bluez/Makefile | 39 ++++++++++-----------------------------
 1 file changed, 10 insertions(+), 29 deletions(-)

(limited to 'package/bluez/Makefile')

diff --git a/package/bluez/Makefile b/package/bluez/Makefile
index d8a0b540f..ae89d6852 100644
--- a/package/bluez/Makefile
+++ b/package/bluez/Makefile
@@ -4,47 +4,34 @@
 include ${TOPDIR}/rules.mk
 
 PKG_NAME:=		bluez
-PKG_VERSION:=		4.101
-PKG_RELEASE:=		2
-PKG_MD5SUM:=		fb42cb7038c380eb0e2fa208987c96ad
+PKG_VERSION:=		5.12
+PKG_RELEASE:=		1
+PKG_MD5SUM:=		981b34c2ae7e2ed2e25a167d8a902a25
 PKG_DESCR:=		bluetooth applications
 PKG_SECTION:=		bluetooth
-PKG_DEPENDS:=		kmod-bt libbluetooth
+PKG_DEPENDS:=		kmod-bt glib dbus libreadline
+PKG_BUILDDEP:=		autotool glib dbus readline
 PKG_URL:=		http://www.bluez.org/
 PKG_SITES:=		http://mirror.anl.gov/pub/linux/bluetooth/
-PKG_LIBNAME:=		libbluetooth
 PKG_OPTS:=		dev
 
-PKG_SUBPKGS:=		BLUEZ LIBBLUETOOTH
-PKGSC_LIBBLUETOOTH:=	libs
-PKGSD_LIBBLUETOOTH:=	bluetooth libraries
-PKGSS_LIBBLUETOOTH:=	glib libusb dbus libusb-compat
-PKGSB_LIBBLUETOOTH:=	glib libusb dbus libusb-compat
-
 PKG_ARCH_DEPENDS:=	!avr32
 
-ifeq ($(ADK_STATIC),y)
-PKG_OPTS+=              libmix
-endif
-
 include ${TOPDIR}/mk/package.mk
 
 $(eval $(call PKG_template,BLUEZ,bluez,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
-$(eval $(call PKG_template,LIBBLUETOOTH,libbluetooth,${PKG_VERSION}-${PKG_RELEASE},${PKGSS_LIBBLUETOOTH},${PKGSD_LIBBLUETOOTH},${PKGSC_LIBBLUETOOTH},${PKG_OPTS}))
 
+AUTOTOOL_STYLE:=	autoreconf
 ifeq ($(ADK_STATIC),y)
 XAKE_FLAGS+=		CCLD="$(TARGET_CC) -all-static -pthread"
 endif
 TARGET_CFLAGS:=         $(filter-out -flto,$(TARGET_CFLAGS))
+TARGET_LDFLAGS+=	-lncurses
 CONFIGURE_ENV+=		ac_cv_prog_cc_pie=no
 CONFIGURE_ARGS+=	--enable-tools \
-			--enable-alsa \
-			--enable-usb \
-			--enable-bccmd \
-			--enable-hidd \
-			--enable-pand \
-			--enable-dund \
-			--enable-netlink \
+			--disable-udev \
+			--disable-systemd \
+			--disable-obex \
 			--disable-pie \
 			--disable-cups
 
@@ -52,16 +39,10 @@ bluez-install:
 	${INSTALL_DIR} $(IDIR_BLUEZ)/etc/dbus-1/system.d
 	${INSTALL_DIR} ${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
 	${INSTALL_DIR} ${IDIR_BLUEZ}/etc/bluetooth
 	$(INSTALL_DATA) ./files/main.conf \
 		${IDIR_BLUEZ}/etc/bluetooth
 	$(INSTALL_DATA) ./files/bluetooth.conf \
 		$(IDIR_BLUEZ)/etc/dbus-1/system.d
 
-libbluetooth-install:
-	${INSTALL_DIR} ${IDIR_LIBBLUETOOTH}/usr/lib
-	${CP} ${WRKINST}/usr/lib/libbluetooth.so* ${IDIR_LIBBLUETOOTH}/usr/lib
-
 include ${TOPDIR}/mk/pkg-bottom.mk
-- 
cgit v1.2.3


From 38e17878401ef8bec46bc3eba1733e9c3d4293bc Mon Sep 17 00:00:00 2001
From: Waldemar Brodkorb <wbx@openadk.org>
Date: Sun, 22 Dec 2013 09:57:45 +0100
Subject: rework bluetooth apps, move to misc,disable broken ones, after bluez5
 update

---
 package/bluez/Makefile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'package/bluez/Makefile')

diff --git a/package/bluez/Makefile b/package/bluez/Makefile
index ae89d6852..e86eac36a 100644
--- a/package/bluez/Makefile
+++ b/package/bluez/Makefile
@@ -8,7 +8,7 @@ PKG_VERSION:=		5.12
 PKG_RELEASE:=		1
 PKG_MD5SUM:=		981b34c2ae7e2ed2e25a167d8a902a25
 PKG_DESCR:=		bluetooth applications
-PKG_SECTION:=		bluetooth
+PKG_SECTION:=		misc	
 PKG_DEPENDS:=		kmod-bt glib dbus libreadline
 PKG_BUILDDEP:=		autotool glib dbus readline
 PKG_URL:=		http://www.bluez.org/
-- 
cgit v1.2.3