From ca463b87887d8151b83d222dc35d461991c1dd63 Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Sat, 21 Dec 2013 21:37:59 +0100 Subject: another musl fix round --- package/bluez/Makefile | 39 ++++++---------------- package/bluez/patches/patch-Makefile_am | 10 ++++++ package/bluez/patches/patch-Makefile_in | 11 ++++++ package/bluez/patches/patch-plugins_wiimote_c | 10 ++++++ .../bluez/patches/patch-profiles_network_bnep_c | 10 ++++++ package/bluez/patches/patch-tools_bccmd_c | 8 ++--- package/bluez/patches/patch-tools_csr_usb_c | 10 ++++++ package/bluez/patches/patch-tools_hciattach_c | 8 ++--- package/bluez/patches/patch-tools_hciconfig_c | 10 ++++++ package/bluez/patches/patch-unit_test-sdp_c | 15 +++++++++ 10 files changed, 94 insertions(+), 37 deletions(-) create mode 100644 package/bluez/patches/patch-Makefile_am create mode 100644 package/bluez/patches/patch-Makefile_in create mode 100644 package/bluez/patches/patch-plugins_wiimote_c create mode 100644 package/bluez/patches/patch-profiles_network_bnep_c create mode 100644 package/bluez/patches/patch-tools_csr_usb_c create mode 100644 package/bluez/patches/patch-tools_hciconfig_c create mode 100644 package/bluez/patches/patch-unit_test-sdp_c (limited to 'package/bluez') 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 diff --git a/package/bluez/patches/patch-Makefile_am b/package/bluez/patches/patch-Makefile_am new file mode 100644 index 000000000..ab4c015af --- /dev/null +++ b/package/bluez/patches/patch-Makefile_am @@ -0,0 +1,10 @@ +--- 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 new file mode 100644 index 000000000..d1abdecec --- /dev/null +++ b/package/bluez/patches/patch-Makefile_in @@ -0,0 +1,11 @@ +--- 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 new file mode 100644 index 000000000..30ba5e647 --- /dev/null +++ b/package/bluez/patches/patch-plugins_wiimote_c @@ -0,0 +1,10 @@ +--- 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 +@@ -28,6 +28,7 @@ + #include + + #include ++#include + #include + + #include "plugin.h" diff --git a/package/bluez/patches/patch-profiles_network_bnep_c b/package/bluez/patches/patch-profiles_network_bnep_c new file mode 100644 index 000000000..5423f4e45 --- /dev/null +++ b/package/bluez/patches/patch-profiles_network_bnep_c @@ -0,0 +1,10 @@ +--- bluez-5.12.orig/profiles/network/bnep.c 2013-12-10 07:59:06.000000000 +0100 ++++ bluez-5.12/profiles/network/bnep.c 2013-12-21 19:31:52.000000000 +0100 +@@ -32,6 +32,7 @@ + #include + #include + #include ++#include + #include + #include + #include diff --git a/package/bluez/patches/patch-tools_bccmd_c b/package/bluez/patches/patch-tools_bccmd_c index 8278a834c..d9ac8ac35 100644 --- a/package/bluez/patches/patch-tools_bccmd_c +++ b/package/bluez/patches/patch-tools_bccmd_c @@ -1,6 +1,6 @@ ---- bluez-4.92.orig/tools/bccmd.c 2010-11-30 15:50:48.000000000 +0100 -+++ bluez-4.92/tools/bccmd.c 2011-05-17 18:19:30.856601139 +0200 -@@ -1183,6 +1183,7 @@ int main(int argc, char *argv[]) +--- bluez-5.12.orig/tools/bccmd.c 2013-09-16 10:36:07.000000000 +0200 ++++ bluez-5.12/tools/bccmd.c 2013-12-21 19:19:21.000000000 +0100 +@@ -1159,6 +1159,7 @@ int main(int argc, char *argv[]) case 115200: bcsp_rate = B115200; break; case 230400: bcsp_rate = B230400; break; case 460800: bcsp_rate = B460800; break; @@ -8,7 +8,7 @@ case 500000: bcsp_rate = B500000; break; case 576000: bcsp_rate = B576000; break; case 921600: bcsp_rate = B921600; break; -@@ -1202,6 +1203,7 @@ int main(int argc, char *argv[]) +@@ -1178,6 +1179,7 @@ int main(int argc, char *argv[]) #ifdef B4000000 case 4000000: bcsp_rate = B4000000; break; #endif diff --git a/package/bluez/patches/patch-tools_csr_usb_c b/package/bluez/patches/patch-tools_csr_usb_c new file mode 100644 index 000000000..509061b56 --- /dev/null +++ b/package/bluez/patches/patch-tools_csr_usb_c @@ -0,0 +1,10 @@ +--- bluez-5.12.orig/tools/csr_usb.c 2013-09-16 10:36:07.000000000 +0200 ++++ bluez-5.12/tools/csr_usb.c 2013-12-21 19:22:48.000000000 +0100 +@@ -29,6 +29,7 @@ + #include + #include + #include ++#include + #include + #include + #include diff --git a/package/bluez/patches/patch-tools_hciattach_c b/package/bluez/patches/patch-tools_hciattach_c index 45c8e2e7f..1021bb9f1 100644 --- a/package/bluez/patches/patch-tools_hciattach_c +++ b/package/bluez/patches/patch-tools_hciattach_c @@ -1,6 +1,6 @@ ---- bluez-4.92.orig/tools/hciattach.c 2010-11-30 15:50:48.000000000 +0100 -+++ bluez-4.92/tools/hciattach.c 2011-05-17 18:18:20.776610031 +0200 -@@ -107,6 +107,7 @@ static int uart_speed(int s) +--- 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) return B230400; case 460800: return B460800; @@ -8,7 +8,7 @@ case 500000: return B500000; case 576000: -@@ -137,6 +138,7 @@ static int uart_speed(int s) +@@ -135,6 +136,7 @@ static int uart_speed(int s) case 4000000: return B4000000; #endif diff --git a/package/bluez/patches/patch-tools_hciconfig_c b/package/bluez/patches/patch-tools_hciconfig_c new file mode 100644 index 000000000..6e137449c --- /dev/null +++ b/package/bluez/patches/patch-tools_hciconfig_c @@ -0,0 +1,10 @@ +--- bluez-5.12.orig/tools/hciconfig.c 2013-10-15 15:41:07.000000000 +0200 ++++ bluez-5.12/tools/hciconfig.c 2013-12-21 19:26:45.000000000 +0100 +@@ -30,6 +30,7 @@ + #include + #include + #include ++#include + #include + #include + #include diff --git a/package/bluez/patches/patch-unit_test-sdp_c b/package/bluez/patches/patch-unit_test-sdp_c new file mode 100644 index 000000000..355300b79 --- /dev/null +++ b/package/bluez/patches/patch-unit_test-sdp_c @@ -0,0 +1,15 @@ +--- 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); -- cgit v1.2.3 From 38e17878401ef8bec46bc3eba1733e9c3d4293bc Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Sun, 22 Dec 2013 09:57:45 +0100 Subject: rework bluetooth apps, move to misc,disable broken ones, after bluez5 update --- package/bluez-firmware/Makefile | 2 +- package/bluez/Makefile | 2 +- package/miax/Makefile | 6 +++--- package/miax/patches/01-cross.patch | 6 +++--- package/obexftp/Makefile | 8 ++++---- package/obexftp/patches/patch-obexftp_client_c | 11 +++++++++++ package/openobex/Makefile | 3 +-- package/section.lst | 1 - package/ussp-push/Makefile | 3 ++- 9 files changed, 26 insertions(+), 16 deletions(-) create mode 100644 package/obexftp/patches/patch-obexftp_client_c (limited to 'package/bluez') 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 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 -- cgit v1.2.3