From 63be73e9c0e04091806d05d447e4e67164935b8b Mon Sep 17 00:00:00 2001
From: Stephan Raue <stephan@openelec.tv>
Date: Fri, 2 Oct 2015 16:55:07 +0200
Subject: [PATCH] bluez: update to bluez-5.35

Signed-off-by: Stephan Raue <stephan@openelec.tv>
---
 packages/network/bluez/package.mk             |  2 +-
 .../patches/bluez-link_against_ncurses.patch  | 19 ++++++++++++-------
 2 files changed, 13 insertions(+), 8 deletions(-)

diff --git a/packages/network/bluez/package.mk b/packages/network/bluez/package.mk
index 9b2d26e9d9..7a1c162fa5 100644
--- a/packages/network/bluez/package.mk
+++ b/packages/network/bluez/package.mk
@@ -17,7 +17,7 @@
 ################################################################################
 
 PKG_NAME="bluez"
-PKG_VERSION="5.29"
+PKG_VERSION="5.35"
 PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="GPL"
diff --git a/packages/network/bluez/patches/bluez-link_against_ncurses.patch b/packages/network/bluez/patches/bluez-link_against_ncurses.patch
index bb5c84c825..9bab171e90 100644
--- a/packages/network/bluez/patches/bluez-link_against_ncurses.patch
+++ b/packages/network/bluez/patches/bluez-link_against_ncurses.patch
@@ -1,8 +1,8 @@
-diff -Naur bluez-5.25/Makefile.tools bluez-5.25.patch/Makefile.tools
---- bluez-5.25/Makefile.tools	2014-10-05 21:31:20.000000000 +0200
-+++ bluez-5.25.patch/Makefile.tools	2014-11-21 19:10:03.450218527 +0100
-@@ -7,7 +7,7 @@
- 					client/agent.h client/agent.c \
+diff -Naur bluez-5.35/Makefile.tools bluez-5.35.patch/Makefile.tools
+--- bluez-5.35/Makefile.tools	2015-09-04 03:19:36.000000000 +0200
++++ bluez-5.35.patch/Makefile.tools	2015-10-02 15:28:03.406835739 +0200
+@@ -8,7 +8,7 @@
+ 					client/gatt.h client/gatt.c \
  					monitor/uuid.h monitor/uuid.c
  client_bluetoothctl_LDADD = gdbus/libgdbus-internal.la @GLIB_LIBS@ @DBUS_LIBS@ \
 -				-lreadline
@@ -10,7 +10,7 @@ diff -Naur bluez-5.25/Makefile.tools bluez-5.25.patch/Makefile.tools
  endif
  
  if MONITOR
-@@ -288,12 +288,12 @@
+@@ -340,12 +340,12 @@
  				attrib/utils.c src/log.c client/display.c \
  				client/display.h
  attrib_gatttool_LDADD = lib/libbluetooth-internal.la \
@@ -25,7 +25,7 @@ diff -Naur bluez-5.25/Makefile.tools bluez-5.25.patch/Makefile.tools
  
  tools_obex_server_tool_SOURCES = $(gobex_sources) $(btio_sources) \
  						tools/obex-server-tool.c
-@@ -302,12 +302,12 @@
+@@ -354,16 +354,16 @@
  tools_bluetooth_player_SOURCES = tools/bluetooth-player.c \
  				client/display.h client/display.c
  tools_bluetooth_player_LDADD = gdbus/libgdbus-internal.la \
@@ -37,6 +37,11 @@ diff -Naur bluez-5.25/Makefile.tools bluez-5.25.patch/Makefile.tools
  tools_obexctl_LDADD = gdbus/libgdbus-internal.la \
 -				@GLIB_LIBS@ @DBUS_LIBS@ -lreadline
 +				@GLIB_LIBS@ @DBUS_LIBS@ -lreadline -lncurses
+ 
+ tools_btmgmt_SOURCES = tools/btmgmt.c src/uuid-helper.c client/display.c
+ tools_btmgmt_LDADD = lib/libbluetooth-internal.la src/libshared-mainloop.la \
+-				-lreadline
++				-lreadline -lncurses
  endif
  
  if EXPERIMENTAL