bluez: version bump 4.96 -> 5.30

Signed-off-by: Juergen Borleis <jbe@pengutronix.de>
[mol: 5.28 -> 5.30]
Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>

1 files changed, 45 insertions, 61 deletions

diff --git a/rules/bluez.make b/rules/bluez.make
index b46bece3d..35530ebd2 100644
--- a/rules/bluez.make
+++ b/rules/bluez.make
@@ -16,8 +16,8 @@ PACKAGES-$(PTXCONF_BLUEZ) += bluez
 #
 # Paths and names
 #
-BLUEZ_VERSION	:= 4.96
-BLUEZ_MD5	:= 1d363ed751f89133f953182e843b2a19 296111afac49e3f9035085ac14daf518
+BLUEZ_VERSION	:= 5.30
+BLUEZ_MD5	:= a7b99d40cd78c7497abdfd7f024fd07b
 BLUEZ		:= bluez-$(BLUEZ_VERSION)
 BLUEZ_SUFFIX	:= tar.gz
 BLUEZ_URL	:= $(call ptx/mirror, KERNEL, bluetooth/$(BLUEZ).$(BLUEZ_SUFFIX))
@@ -28,9 +28,6 @@ ifdef PTXCONF_BLUEZ_INSTALL_TESTSCRIPTS
 BLUEZ_DEVPKG	:= NO
 endif
 
-# the tools don't depend on the generated headers
-BLUEZ_MAKE_PAR	:= NO
-
 # ----------------------------------------------------------------------------
 # Prepare
 # ----------------------------------------------------------------------------
@@ -41,41 +38,29 @@ BLUEZ_MAKE_PAR	:= NO
 BLUEZ_CONF_TOOL	:= autoconf
 BLUEZ_CONF_OPT	:= $(CROSS_AUTOCONF_USR) \
 	--enable-optimization \
-	--disable-fortify \
+	--disable-debug \
 	--disable-pie \
-	--enable-network \
-	--disable-sap \
-	--disable-proximity \
-	--enable-serial \
-	--enable-input \
-	--enable-audio \
-	--enable-service \
-	--disable-health \
-	--disable-pnat \
-	--disable-gatt-example \
-	--$(call ptx/endis, PTXCONF_BLUEZ_GSTREAMER)-gstreamer \
-	--$(call ptx/endis, PTXCONF_BLUEZ_ALSA)-alsa \
-	--$(call ptx/endis, PTXCONF_BLUEZ_USB)-usb \
-	--disable-tracer \
+	--enable-threads \
+	--enable-library \
+	--$(call ptx/endis, PTXCONF_BLUEZ_INSTALL_TESTSCRIPTS)-test \
 	--enable-tools \
-	--enable-bccmd \
-	--disable-pcmcia \
-	--disable-hid2hci \
-	--disable-dfutool \
-	--disable-hidd \
-	--disable-pand \
-	--disable-dund \
+	--enable-monitor \
+	--enable-udev \
 	--disable-cups \
-	--enable-test \
+	--disable-obex \
+	--enable-client \
+	--enable-systemd \
 	--enable-datafiles \
-	--enable-debug \
-	--disable-maemo6 \
-	--disable-dbusoob \
-	--disable-wiimote \
-	--disable-hal \
-	--disable-thermometer \
-	--disable-capng \
-	--with-systemdunitdir=/lib/systemd/system
+	--disable-manpages \
+	--disable-experimental \
+	--disable-sixaxis \
+	--disable-android \
+	--with-dbusconfdir=/etc \
+	--with-dbussystembusdir=/usr/share/dbus-1/system-services \
+	--with-dbussessionbusdir=/usr/share/dbus-1/services \
+	--with-udevdir=/lib/udev \
+	--with-systemdsystemunitdir=/lib/systemd/system \
+	--with-systemduserunitdir=/usr/lib/systemd/user
 
 # ----------------------------------------------------------------------------
 # Target-Install
@@ -88,43 +73,40 @@ $(STATEDIR)/bluez.targetinstall:
 	@$(call install_fixup, bluez,PRIORITY,optional)
 	@$(call install_fixup, bluez,SECTION,base)
 	@$(call install_fixup, bluez,AUTHOR,"Uwe Kleine-Koenig <u.kleine-koenig@pengutronix.de>")
-	@$(call install_fixup, bluez,DESCRIPTION,missing)
+	@$(call install_fixup, bluez,DESCRIPTION, "Bluetooth protocol stack")
 
 	@$(call install_lib, bluez, 0, 0, 0644, libbluetooth)
 
-ifdef PTXCONF_BLUEZ_ALSA
-	@$(foreach alsamod, ctl_bluetooth pcm_bluetooth, \
-		$(call install_lib, bluez, 0, 0, 0644, \
-			alsa-lib/libasound_module_$(alsamod));)
-endif
-
-ifdef PTXCONF_BLUEZ_GSTREAMER
-	@$(call install_lib, bluez, 0, 0, 0644, gstreamer-0.10/libgstbluetooth)
-endif
+	@$(call install_copy, bluez, 0, 0, 0755, -, /usr/libexec/bluetooth/bluetoothd)
+	@$(call install_copy, bluez, 0, 0, 0755, -, /usr/libexec/bluetooth/obexd)
+	@$(call install_lib, bluez, 0, 0, 0644, libbluetooth)
 
 ifdef PTXCONF_BLUEZ_UTILS
-	@$(foreach binprogram, ciptool l2ping hcitool rctest rfcomm sdptool, \
+	@$(foreach binprogram, bccmd bluemoon bluetoothctl btmon ciptool \
+			hciattach hciconfig hcidump hcitool hex2hcd l2ping \
+			l2test mpris-proxy rctest rfcomm sdptool, \
 		$(call install_copy, bluez, 0, 0, 0755, -, \
 			/usr/bin/$(binprogram));)
-
-	@$(foreach sbinprogram, bccmd hciattach hciconfig, \
-		$(call install_copy, bluez, 0, 0, 0755, -, \
-			/usr/sbin/$(sbinprogram));)
 endif
 
 ifdef PTXCONF_BLUEZ_INSTALL_TESTSCRIPTS
-	@$(foreach testprog, simple-agent simple-service test-telephony \
-			test-adapter test-audio test-device test-discovery \
-			test-input test-manager test-network test-serial \
-			test-service test-telephony test-textfile \
-			monitor-bluetooth, \
-		$(call install_copy, bluez, 0, 0, 0755, \
-			$(BLUEZ_DIR)/test/$(testprog), \
-			/usr/share/doc/bluez/examples/$(testprog));)
+	@$(foreach testdata, service-ftp.xml service-did.xml service-spp.xml \
+			service-record.dtd service-opp.xml, \
+		$(call install_copy, bluez, 0, 0, 0644, -, \
+			/usr/lib/bluez/test/$(testdata));)
+
+	@$(foreach testprog, bluezutils.py list-devices opp-client \
+			simple-endpoint test-alert test-discovery \
+			test-heartrate test-nap test-proximity dbusdef.py \
+			map-client pbap-client simple-player test-cyclingspeed \
+			test-health test-hfp test-network test-sap-server \
+			ftp-client monitor-bluetooth sap_client.py simple-agent \
+			test-adapter test-device test-health-sink test-manager \
+			test-profile test-thermometer, \
+		$(call install_copy, bluez, 0, 0, 0755, -, \
+			/usr/lib/bluez/test/$(testprog));)
 endif
 
-	@$(call install_copy, bluez, 0, 0, 0755, -, /usr/sbin/bluetoothd)
-
 	@$(call install_copy, bluez, 0, 0, 0644, -, \
 		/etc/dbus-1/system.d/bluetooth.conf)
 	@$(call install_tree, bluez, 0, 0, -, /lib/udev/rules.d/)
@@ -134,6 +116,8 @@ ifdef PTXCONF_BLUEZ_SYSTEMD_UNIT
 		/lib/systemd/system/bluetooth.service)
 	@$(call install_link, bluez, ../bluetooth.service, \
 		/lib/systemd/system/multi-user.target.wants/bluetooth.service)
+	@$(call install_copy, bluez, 0, 0, 0644, -, \
+		/usr/lib/systemd/user/obex.service)
 endif
 
 	@$(call install_finish, bluez)