From 8aa5a3ab2f0b369a77ce64fa59aa392f7d73ad1f Mon Sep 17 00:00:00 2001 From: Hauke Mehrtens Date: Mon, 3 Aug 2015 22:35:56 +0200 Subject: [PATCH] bluez: update to version 5.33 Signed-off-by: Hauke Mehrtens --- utils/bluez/Makefile | 4 ++-- utils/bluez/patches/201-readline.patch | 20 ++++++++------------ 2 files changed, 10 insertions(+), 14 deletions(-) diff --git a/utils/bluez/Makefile b/utils/bluez/Makefile index ce1497582..e7b504832 100644 --- a/utils/bluez/Makefile +++ b/utils/bluez/Makefile @@ -8,12 +8,12 @@ include $(TOPDIR)/rules.mk PKG_NAME:=bluez -PKG_VERSION:=5.31 +PKG_VERSION:=5.33 PKG_RELEASE:=1 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz PKG_SOURCE_URL:=@KERNEL/linux/bluetooth/ -PKG_MD5SUM:=cb1db487b65dd4d57a2dd6b8f063c393 +PKG_MD5SUM:=78782dc33d9a8b6344c4cc1af70c8a98 PKG_LICENSE:=GPL-2.0+ PKG_LICENSE_FILES:=COPYING diff --git a/utils/bluez/patches/201-readline.patch b/utils/bluez/patches/201-readline.patch index dba14b456..3d6ffaec3 100644 --- a/utils/bluez/patches/201-readline.patch +++ b/utils/bluez/patches/201-readline.patch @@ -1,6 +1,6 @@ --- a/Makefile.in +++ b/Makefile.in -@@ -2394,7 +2394,7 @@ unit_tests = $(am__append_32) unit/test- +@@ -2405,7 +2405,7 @@ unit_tests = $(am__append_32) unit/test- @CLIENT_TRUE@ monitor/uuid.h monitor/uuid.c @CLIENT_TRUE@client_bluetoothctl_LDADD = gdbus/libgdbus-internal.la @GLIB_LIBS@ @DBUS_LIBS@ \ @@ -9,16 +9,7 @@ @MONITOR_TRUE@monitor_btmon_SOURCES = monitor/main.c monitor/bt.h \ @MONITOR_TRUE@ monitor/display.h monitor/display.c \ -@@ -2594,7 +2594,7 @@ unit_tests = $(am__append_32) unit/test- - @EXPERIMENTAL_TRUE@tools_hcieventmask_LDADD = lib/libbluetooth-internal.la - @EXPERIMENTAL_TRUE@tools_btmgmt_SOURCES = tools/btmgmt.c src/uuid-helper.c client/display.c - @EXPERIMENTAL_TRUE@tools_btmgmt_LDADD = lib/libbluetooth-internal.la src/libshared-mainloop.la \ --@EXPERIMENTAL_TRUE@ -lreadline -+@EXPERIMENTAL_TRUE@ -lreadline -lncurses - - @EXPERIMENTAL_TRUE@tools_btinfo_SOURCES = tools/btinfo.c monitor/bt.h - @EXPERIMENTAL_TRUE@tools_btinfo_LDADD = src/libshared-mainloop.la -@@ -2642,13 +2642,13 @@ unit_tests = $(am__append_32) unit/test- +@@ -2651,13 +2651,13 @@ unit_tests = $(am__append_32) unit/test- @READLINE_TRUE@ client/display.h @READLINE_TRUE@attrib_gatttool_LDADD = lib/libbluetooth-internal.la \ @@ -34,7 +25,7 @@ @READLINE_TRUE@tools_obex_server_tool_SOURCES = $(gobex_sources) $(btio_sources) \ @READLINE_TRUE@ tools/obex-server-tool.c -@@ -2658,13 +2658,13 @@ unit_tests = $(am__append_32) unit/test- +@@ -2667,17 +2667,17 @@ unit_tests = $(am__append_32) unit/test- @READLINE_TRUE@ client/display.h client/display.c @READLINE_TRUE@tools_bluetooth_player_LDADD = gdbus/libgdbus-internal.la \ @@ -48,5 +39,10 @@ -@READLINE_TRUE@ @GLIB_LIBS@ @DBUS_LIBS@ -lreadline +@READLINE_TRUE@ @GLIB_LIBS@ @DBUS_LIBS@ -lreadline -lncurses + @READLINE_TRUE@tools_btmgmt_SOURCES = tools/btmgmt.c src/uuid-helper.c client/display.c + @READLINE_TRUE@tools_btmgmt_LDADD = lib/libbluetooth-internal.la src/libshared-mainloop.la \ +-@READLINE_TRUE@ -lreadline ++@READLINE_TRUE@ -lreadline -lncurses + @EXPERIMENTAL_TRUE@tools_gatt_service_SOURCES = tools/gatt-service.c @EXPERIMENTAL_TRUE@tools_gatt_service_LDADD = @GLIB_LIBS@ @DBUS_LIBS@ gdbus/libgdbus-internal.la