rework bluetooth apps, move to misc,disable broken ones, after bluez5 update

9 files changed, 26 insertions, 16 deletions

diff --git a/package/bluez-firmware/Makefile b/package/bluez-firmware/Makefile
index a04cec163..45e1eff73 100644
--- a/package/bluez-firmware/Makefile
+++ b/package/bluez-firmware/Makefile
@@ -8,7 +8,7 @@ PKG_VERSION:=		1.2
 PKG_RELEASE:=		1
 PKG_MD5SUM:=		1cc3cefad872e937e05de5a0a2b390dd
 PKG_DESCR:=		Bluez firmware for BCM2033
-PKG_SECTION:=		bluetooth
+PKG_SECTION:=		misc
 PKG_DEPENDS:=		kmod-bt bluez
 PKG_URL:=		http://www.bluez.org/
 PKG_SITES:=		http://bluez.sourceforge.net/download/
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/
diff --git a/package/miax/Makefile b/package/miax/Makefile
index 581909511..bd7c9de30 100644
--- a/package/miax/Makefile
+++ b/package/miax/Makefile
@@ -8,11 +8,11 @@ PKG_VERSION:=		1.4
 PKG_RELEASE:=		1
 PKG_MD5SUM:=		44f0d2ef46ee2697d890b7b96846adc7
 PKG_DESCR:=		A console iax (asterisk) client
-PKG_SECTION:=		bluetooth
-PKG_DEPENDS:=		kmod-bt bluez libpthread
-PKG_BUILDDEP:=		bluez
+PKG_SECTION:=		misc
+PKG_DEPENDS:=		libpthread
 PKG_URL:=		http://sourceforge.net/projects/miax
 PKG_SITES:=		http://mesh.dl.sourceforge.net/sourceforge/miax/
+PKG_CFLINE_MIAX:=	depends on ADK_BROKEN
 
 PKG_ARCH_DEPENDS:=	!avr32
 
diff --git a/package/miax/patches/01-cross.patch b/package/miax/patches/01-cross.patch
index f47c1101d..04ec04d78 100644
--- a/package/miax/patches/01-cross.patch
+++ b/package/miax/patches/01-cross.patch
@@ -1,6 +1,6 @@
 diff -ruN miax-1.4-old/Makefile miax-1.4-new/Makefile
---- miax-1.4-old/Makefile	2005-04-27 18:56:13.000000000 +0200
-+++ miax-1.4-new/Makefile	2005-11-30 01:07:21.000000000 +0100
+--- miax.orig/Makefile	2005-04-27 18:56:13.000000000 +0200
++++ miax/Makefile	2013-12-22 09:48:41.000000000 +0100
 @@ -1,4 +1,5 @@
 -CFLAGS= -Iiax/ -Igsm/inc -DIAXC_IAX2 -DLIBIAX -g -DPOSIXSLEEP -DLINUX -O2 
 +OFLAGS= -02 -g
@@ -8,7 +8,7 @@ diff -ruN miax-1.4-old/Makefile miax-1.4-new/Makefile
  SYSLIBS=-lpthread -lm -lbluetooth
  
  
-@@ -32,11 +33,10 @@
+@@ -32,11 +33,10 @@ OBJS=\
  	miax.o
  
  all: $(OBJS)
diff --git a/package/obexftp/Makefile b/package/obexftp/Makefile
index e70519cc6..828d73871 100644
--- a/package/obexftp/Makefile
+++ b/package/obexftp/Makefile
@@ -7,9 +7,9 @@ PKG_NAME:=		obexftp
 PKG_VERSION:=		0.23
 PKG_RELEASE:=		4
 PKG_MD5SUM:=		f20762061b68bc921e80be4aebc349eb
-PKG_DESCR:=		bluetooth ftp application
-PKG_SECTION:=		bluetooth
-PKG_DEPENDS:=		openobex libobexftp libbluetooth
+PKG_DESCR:=		OBEX ftp application
+PKG_SECTION:=		misc
+PKG_DEPENDS:=		openobex libobexftp
 PKG_BUILDDEP:=		openobex libiconv-tiny
 PKG_URL:=		http://dev.zuckschwerdt.org/openobex/wiki/ObexFtp
 PKG_SITES:=		${MASTER_SITE_SOURCEFORGE:=openobex/}
@@ -39,7 +39,7 @@ endif
 
 CONFIGURE_ENV+=		OPENOBEX_CFLAGS="-I${STAGING_TARGET_DIR}/usr/include" \
 			OPENOBEX_LIBS="-L${STAGING_TARGET_DIR}/usr/lib \
-			    -lopenobex -lbluetooth -liconv"
+			    -lopenobex -liconv"
 CONFIGURE_ARGS+=	--disable-perl \
 			--disable-ruby \
 			--disable-tcl \
diff --git a/package/obexftp/patches/patch-obexftp_client_c b/package/obexftp/patches/patch-obexftp_client_c
new file mode 100644
index 000000000..f4c90143b
--- /dev/null
+++ b/package/obexftp/patches/patch-obexftp_client_c
@@ -0,0 +1,11 @@
+--- obexftp-0.23.orig/obexftp/client.c	2009-02-17 19:27:48.000000000 +0100
++++ obexftp-0.23/obexftp/client.c	2013-12-22 09:35:39.000000000 +0100
+@@ -51,8 +51,6 @@
+ 
+ #ifdef HAVE_BLUETOOTH
+ #include "bt_kit.h"
+-#else
+-#define ESOCKTNOSUPPORT	WSAESOCKTNOSUPPORT
+ #endif /* HAVE_BLUETOOTH */
+ 
+ #include <openobex/obex.h>
diff --git a/package/openobex/Makefile b/package/openobex/Makefile
index e4e95e93f..d0091fe5c 100644
--- a/package/openobex/Makefile
+++ b/package/openobex/Makefile
@@ -8,8 +8,7 @@ PKG_VERSION:=		1.5
 PKG_RELEASE:=		2
 PKG_MD5SUM:=		0d83dc86445a46a1b9750107ba7ab65c
 PKG_DESCR:=		implementation of the Object Exchange (OBEX) protocol
-PKG_SECTION:=		bluetooth
-PKG_BUILDDEP:=		bluez
+PKG_SECTION:=		misc
 PKG_URL:=		http://dev.zuckschwerdt.org/openobex/wiki/WikiStart
 PKG_SITES:=		${MASTER_SITE_KERNEL:=bluetooth/}
 PKG_OPTS:=		dev
diff --git a/package/section.lst b/package/section.lst
index b4aa58f3b..795840988 100644
--- a/package/section.lst
+++ b/package/section.lst
@@ -1,5 +1,4 @@
 base	Base System
-bluetooth	Bluetooth
 browser	Browser / Editor / Pager
 editor	Browser / Editor / Pager
 pager	Browser / Editor / Pager
diff --git a/package/ussp-push/Makefile b/package/ussp-push/Makefile
index 85cde1233..a0302f016 100644
--- a/package/ussp-push/Makefile
+++ b/package/ussp-push/Makefile
@@ -8,10 +8,11 @@ PKG_VERSION:=		0.11
 PKG_RELEASE:=		1
 PKG_MD5SUM:=		5c44983ee27809867041feff6bb4423a
 PKG_DESCR:=		OBEX push command
-PKG_SECTION:=		bluetooth
+PKG_SECTION:=		misc
 PKG_DEPENDS:=		openobex
 PKG_BUILDDEP:=		openobex
 PKG_SITES:=		http://xmailserver.org/
+PKG_CFLINE_USSP_PUSH:=	depends on ADK_BROKEN
 
 PKG_ARCH_DEPENDS:=	!avr32