bluez: update to 5.80

use new option -s for obexd - 002ee180b1
2025-07-24 11:16:51 +00:00 · 2024-11-20 13:05:48 +00:00 · 2024-11-20 13:05:48 +00:00 · f977ae878d
commit f977ae878d
parent 09edfa29f1
7 changed files with 18 additions and 43 deletions
--- a/packages/network/bluez/package.mk
+++ b/packages/network/bluez/package.mk
@ -3,8 +3,8 @@
 # Copyright (C) 2019-present Team LibreELEC (https://libreelec.tv)

 PKG_NAME="bluez"
-PKG_VERSION="5.79"
-PKG_SHA256="4164a5303a9f71c70f48c03ff60be34231b568d93a9ad5e79928d34e6aa0ea8a"
+PKG_VERSION="5.80"
+PKG_SHA256="a4d0bca3299691f06d5bd9773b854638204a51a5026c42b0ad7f1c6cf16b459a"
 PKG_LICENSE="GPL"
 PKG_SITE="http://www.bluez.org/"
 PKG_URL="https://www.kernel.org/pub/linux/bluetooth/${PKG_NAME}-${PKG_VERSION}.tar.xz"
--- a/packages/network/bluez/patches/bluez-01_add-obexd-policy.patch
+++ b/packages/network/bluez/patches/bluez-01_add-obexd-policy.patch
@ -2,7 +2,7 @@ diff --git a/src/bluetooth.conf b/src/bluetooth.conf
 index 8a1e258..31b7542 100644
 --- a/src/bluetooth.conf
 +++ b/src/bluetooth.conf
-@@ -20,10 +20,24 @@
+@@ -21,10 +21,24 @@
     <allow send_interface="org.freedesktop.DBus.ObjectManager"/>
     <allow send_interface="org.freedesktop.DBus.Properties"/>
     <allow send_interface="org.mpris.MediaPlayer2.Player"/>
--- a/packages/network/bluez/patches/bluez-02_obexd-use-system-bus.patch
+++ b/packages/network/bluez/patches/bluez-02_obexd-use-system-bus.patch
@ -1,25 +0,0 @@
-From 20dfa1079c088236bcd63f1a986956b488177ebf Mon Sep 17 00:00:00 2001
-From: Stefan Saraev <stefan@saraev.ca>
-Date: Tue, 6 Aug 2013 11:18:09 +0300
-Subject: [PATCH] obexd: use system bus
-
---
- obexd/src/manager.c |    2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
-
-diff --git a/obexd/src/manager.c b/obexd/src/manager.c
-index dbfbef8..9a29f8c 100644
--- a/obexd/src/manager.c
-+++ b/obexd/src/manager.c
-@@ -569,7 +569,7 @@ gboolean manager_init(void)
- 
- 	dbus_error_init(&err);
- 
-	connection = g_dbus_setup_bus(DBUS_BUS_SESSION, OBEXD_SERVICE, &err);
-+	connection = g_dbus_setup_bus(DBUS_BUS_SYSTEM, OBEXD_SERVICE, &err);
- 	if (connection == NULL) {
- 		if (dbus_error_is_set(&err) == TRUE) {
- 			fprintf(stderr, "%s\n", err.message);
-- 
-1.7.2.5
-
--- a/packages/network/bluez/patches/bluez-11_sixaxis-fix-PID-navigation-controller.patch
+++ b/packages/network/bluez/patches/bluez-11_sixaxis-fix-PID-navigation-controller.patch
@ -17,7 +17,7 @@ diff --git a/plugins/sixaxis.c b/plugins/sixaxis.c
 index 939fed7..f6baea7 100644
 --- a/plugins/sixaxis.c
 +++ b/plugins/sixaxis.c
-@@ -364,7 +364,13 @@ static bool setup_device(int fd, const char *sysfs_path,
+@@ -354,7 +354,13 @@ static bool setup_device(int fd, const char *sysfs_path,
 	info("sixaxis: setting up new device");
 
 	btd_device_device_set_name(device, cp->name);
@ -36,7 +36,7 @@ diff --git a/profiles/input/sixaxis.h b/profiles/input/sixaxis.h
 index 8e6f3cc..321a918 100644
 --- a/profiles/input/sixaxis.h
 +++ b/profiles/input/sixaxis.h
-@@ -38,6 +38,7 @@ struct cable_pairing {
+@@ -25,6 +25,7 @@ struct cable_pairing {
 	uint16_t vid;
 	uint16_t pid;
 	uint16_t version;
@ -44,7 +44,7 @@ index 8e6f3cc..321a918 100644
 	CablePairingType type;
 };
 
-@@ -59,6 +60,7 @@ get_pairing(uint16_t vid, uint16_t pid)
+@@ -54,6 +55,7 @@ get_pairing(uint16_t vid, uint16_t pid)
 			.vid = 0x054c,
 			.pid = 0x042f,
 			.version = 0x0000,
--- a/packages/network/bluez/patches/bluez-12-fix-obexd-after-5_73.patch
+++ b/packages/network/bluez/patches/bluez-12-fix-obexd-after-5_73.patch
@ -7,9 +7,9 @@ index b7e9f2d33..9a9e9a0a0 100644
 -if OBEX
 -
 if SYSTEMD
- systemduserunitdir = $(SYSTEMD_USERUNITDIR)
- systemduserunit_DATA = obexd/src/obex.service
-@@ -41,6 +39,8 @@ obexd_builtin_sources += obexd/plugins/opp.c
+ systemduserunit_DATA += obexd/src/obex.service
+ 
+@@ -40,6 +38,8 @@ obexd_builtin_sources += obexd/plugins/opp.c
 obexd_builtin_modules += ftp
 obexd_builtin_sources += obexd/plugins/ftp.c obexd/plugins/ftp.h
 
@ -18,7 +18,7 @@ index b7e9f2d33..9a9e9a0a0 100644
 obexd_builtin_modules += irmc
 obexd_builtin_sources += obexd/plugins/irmc.c
 
-@@ -57,6 +57,8 @@ obexd_builtin_sources += obexd/plugins/mas.c obexd/src/map_ap.h \
+@@ -56,6 +56,8 @@ obexd_builtin_sources += obexd/plugins/mas.c obexd/src/map_ap.h \
 				obexd/plugins/messages.h \
 				obexd/plugins/messages-dummy.c
 
@ -27,7 +27,7 @@ index b7e9f2d33..9a9e9a0a0 100644
 obexd_builtin_modules += mns
 obexd_builtin_sources += obexd/client/mns.c obexd/src/map_ap.h \
 				obexd/client/map-event.h
-@@ -103,11 +105,6 @@ obexd_src_obexd_CPPFLAGS = $(AM_CPPFLAGS) $(GLIB_CFLAGS) $(DBUS_CFLAGS) \
+@@ -104,11 +106,6 @@ obexd_src_obexd_CPPFLAGS = $(AM_CPPFLAGS) $(GLIB_CFLAGS) $(DBUS_CFLAGS) \
 				-D_FILE_OFFSET_BITS=64 \
 				-I$(builddir)/obexd/src
 
--- a/packages/network/bluez/patches/bluez-21-hciattach-add-QCA9377-Tuffello-support.patch
+++ b/packages/network/bluez/patches/bluez-21-hciattach-add-QCA9377-Tuffello-support.patch
@ -33,7 +33,7 @@ diff --git a/Makefile.tools b/Makefile.tools
 index b7b422506..e0e995089 100644
 --- a/Makefile.tools
 +++ b/Makefile.tools
-@@ -304,6 +304,7 @@ tools_hciattach_SOURCES = tools/hciattach.c tools/hciattach.h \
+@@ -417,6 +417,7 @@ tools_hciattach_SOURCES = tools/hciattach.c tools/hciattach.h \
 						tools/hciattach_ti.c \
 						tools/hciattach_tialt.c \
 						tools/hciattach_ath3k.c \
@ -45,7 +45,7 @@ diff --git a/android/Android.mk b/android/Android.mk
 index 76a826b47..01599c04b 100644
 --- a/android/Android.mk
 +++ b/android/Android.mk
-@@ -696,6 +696,7 @@ LOCAL_SRC_FILES := \
+@@ -697,6 +697,7 @@ LOCAL_SRC_FILES := \
 	bluez/tools/hciattach_ti.c \
 	bluez/tools/hciattach_tialt.c \
 	bluez/tools/hciattach_ath3k.c \
@ -57,7 +57,7 @@ diff --git a/tools/hciattach.c b/tools/hciattach.c
 index fad176c9b..02a65c692 100644
 --- a/tools/hciattach.c
 +++ b/tools/hciattach.c
-@@ -263,6 +263,11 @@ static int ath3k_pm(int fd, struct uart_t *u, struct termios *ti)
+@@ -252,6 +252,11 @@ static int ath3k_pm(int fd, struct uart_t *u, struct termios *ti)
 	return ath3k_post(fd, u->pm);
 }
 
@ -69,7 +69,7 @@ index fad176c9b..02a65c692 100644
 static int qualcomm(int fd, struct uart_t *u, struct termios *ti)
 {
 	return qualcomm_init(fd, u->speed, ti, u->bdaddr);
-@@ -1093,6 +1098,10 @@ struct uart_t uart[] = {
+@@ -1082,6 +1087,10 @@ struct uart_t uart[] = {
 	{ "ath3k",    0x0000, 0x0000, HCI_UART_ATH3K, 115200, 115200,
 			FLOW_CTL, DISABLE_PM, NULL, ath3k_ps, ath3k_pm  },
 
@ -80,7 +80,7 @@ index fad176c9b..02a65c692 100644
 	/* QUALCOMM BTS */
 	{ "qualcomm",   0x0000, 0x0000, HCI_UART_H4,   115200, 115200,
 			FLOW_CTL, DISABLE_PM, NULL, qualcomm, NULL },
-@@ -1145,6 +1154,9 @@ static int init_uart(char *dev, struct uart_t *u, int send_break, int raw)
+@@ -1134,6 +1143,9 @@ static int init_uart(char *dev, struct uart_t *u, int send_break, int raw)
 	if (u->flags & AMP_DEV)
 		flags |= 1 << HCI_UART_CREATE_AMP;
 
@ -94,7 +94,7 @@ diff --git a/tools/hciattach.h b/tools/hciattach.h
 index 249aab49e..85c801ccf 100644
 --- a/tools/hciattach.h
 +++ b/tools/hciattach.h
-@@ -65,6 +65,7 @@ int bgb2xx_init(int dd, bdaddr_t *bdaddr);
+@@ -56,6 +56,7 @@ int bgb2xx_init(int dd, bdaddr_t *bdaddr);
 int ath3k_init(int fd, int speed, int init_speed, char *bdaddr,
 						struct termios *ti);
 int ath3k_post(int fd, int pm);
--- a/packages/network/bluez/system.d/obex.service
+++ b/packages/network/bluez/system.d/obex.service
@ -10,7 +10,7 @@ ConditionPathExists=/storage/.cache/services/bluez.conf
 EnvironmentFile=/storage/.cache/services/obexd.conf
 EnvironmentFile=-/run/libreelec/debug/obexd.conf
 ExecStartPre=/bin/sh -c 'mkdir -p $OBEXD_ROOT'
-ExecStart=/usr/lib/bluetooth/obexd -r $OBEXD_ROOT $OBEXD_DEBUG
+ExecStart=/usr/lib/bluetooth/obexd -s -r $OBEXD_ROOT $OBEXD_DEBUG
 TimeoutStopSec=1s

 [Install]