diff options
Diffstat (limited to 'package')
-rw-r--r-- | package/bluez/Makefile | 5 | ||||
-rw-r--r-- | package/bluez/patches/patch-tools_csr_usb_c | 10 | ||||
-rw-r--r-- | package/bluez/patches/patch-tools_hciattach_bcm43xx_c | 32 |
3 files changed, 3 insertions, 44 deletions
diff --git a/package/bluez/Makefile b/package/bluez/Makefile index bf12c5187..4741808b9 100644 --- a/package/bluez/Makefile +++ b/package/bluez/Makefile @@ -4,9 +4,9 @@ include $(ADK_TOPDIR)/rules.mk PKG_NAME:= bluez -PKG_VERSION:= 5.43 +PKG_VERSION:= 5.66 PKG_RELEASE:= 1 -PKG_HASH:= 16c9c05d2a1da644ce3570d975ada3643d2e60c007a955bac09c0a0efeb58d15 +PKG_HASH:= 39fea64b590c9492984a0c27a89fc203e1cdc74866086efb8f4698677ab2b574 PKG_DESCR:= bluetooth applications PKG_SECTION:= net/wifi PKG_DEPENDS:= glib dbus libreadline libudev @@ -36,6 +36,7 @@ CONFIGURE_ARGS+= --enable-tools \ --enable-udev \ --with-udevdir=/usr/bin \ --disable-test \ + --disable-manpages \ --disable-systemd \ --disable-obex \ --disable-cups diff --git a/package/bluez/patches/patch-tools_csr_usb_c b/package/bluez/patches/patch-tools_csr_usb_c deleted file mode 100644 index 509061b56..000000000 --- a/package/bluez/patches/patch-tools_csr_usb_c +++ /dev/null @@ -1,10 +0,0 @@ ---- 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 <errno.h> - #include <ctype.h> - #include <fcntl.h> -+#include <limits.h> - #include <unistd.h> - #include <stdlib.h> - #include <string.h> diff --git a/package/bluez/patches/patch-tools_hciattach_bcm43xx_c b/package/bluez/patches/patch-tools_hciattach_bcm43xx_c deleted file mode 100644 index 0b8799193..000000000 --- a/package/bluez/patches/patch-tools_hciattach_bcm43xx_c +++ /dev/null @@ -1,32 +0,0 @@ ---- bluez-5.40.orig/tools/hciattach_bcm43xx.c 2015-03-11 11:01:57.000000000 +0100 -+++ bluez-5.40/tools/hciattach_bcm43xx.c 2016-06-18 23:25:59.991459117 +0200 -@@ -43,7 +43,7 @@ - #include "hciattach.h" - - #ifndef FIRMWARE_DIR --#define FIRMWARE_DIR "/etc/firmware" -+#define FIRMWARE_DIR "/lib/firmware" - #endif - - #define FW_EXT ".hcd" -@@ -366,11 +366,8 @@ int bcm43xx_init(int fd, int def_speed, - return -1; - - if (bcm43xx_locate_patch(FIRMWARE_DIR, chip_name, fw_path)) { -- fprintf(stderr, "Patch not found, continue anyway\n"); -+ fprintf(stderr, "Patch not found for %s, continue anyway\n", chip_name); - } else { -- if (bcm43xx_set_speed(fd, ti, speed)) -- return -1; -- - if (bcm43xx_load_firmware(fd, fw_path)) - return -1; - -@@ -380,6 +377,7 @@ int bcm43xx_init(int fd, int def_speed, - return -1; - } - -+ sleep(1); - if (bcm43xx_reset(fd)) - return -1; - } |