From c0b9d4ecdf2be1b3110e85585a1ab2877d8b9e3a Mon Sep 17 00:00:00 2001 From: "Fiona Klute (WIWA)" Date: Tue, 10 Dec 2024 17:22:39 +0100 Subject: [PATCH] package/bluez5_utils{, -headers}: bump version to 5.79 Upstream changelog: https://git.kernel.org/pub/scm/bluetooth/bluez.git/commit/?h=5.79&id=0845b8f6ef2ac004b1c953cf4fe4ca3458cd8e36 Patch for musl compatibility taken from upstream "master". Signed-off-by: Fiona Klute (WIWA) Signed-off-by: Thomas Petazzoni (cherry picked from commit 6a4cdf2057335fc021b20488531e3293584840e7) Signed-off-by: Peter Korsgaard --- .../bluez5_utils-headers.mk | 2 +- ...0001-gdbus-define-MAX_INPUT-for-musl.patch | 33 +++++++++++++++++++ package/bluez5_utils/bluez5_utils.hash | 2 +- package/bluez5_utils/bluez5_utils.mk | 2 +- 4 files changed, 36 insertions(+), 3 deletions(-) create mode 100644 package/bluez5_utils/0001-gdbus-define-MAX_INPUT-for-musl.patch diff --git a/package/bluez5_utils-headers/bluez5_utils-headers.mk b/package/bluez5_utils-headers/bluez5_utils-headers.mk index 1fd4e0fff3..7acf62b226 100644 --- a/package/bluez5_utils-headers/bluez5_utils-headers.mk +++ b/package/bluez5_utils-headers/bluez5_utils-headers.mk @@ -5,7 +5,7 @@ ################################################################################ # Keep the version and patches in sync with bluez5_utils -BLUEZ5_UTILS_HEADERS_VERSION = 5.78 +BLUEZ5_UTILS_HEADERS_VERSION = 5.79 BLUEZ5_UTILS_HEADERS_SOURCE = bluez-$(BLUEZ5_UTILS_VERSION).tar.xz BLUEZ5_UTILS_HEADERS_SITE = $(BR2_KERNEL_MIRROR)/linux/bluetooth BLUEZ5_UTILS_HEADERS_DL_SUBDIR = bluez5_utils diff --git a/package/bluez5_utils/0001-gdbus-define-MAX_INPUT-for-musl.patch b/package/bluez5_utils/0001-gdbus-define-MAX_INPUT-for-musl.patch new file mode 100644 index 0000000000..dc823e9277 --- /dev/null +++ b/package/bluez5_utils/0001-gdbus-define-MAX_INPUT-for-musl.patch @@ -0,0 +1,33 @@ +From 9d69dba21f1e46b34cdd8ae27fec11d0803907ee Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Gu=C3=B0ni=20M=C3=A1r=20Gilbert?= +Date: Sat, 2 Nov 2024 16:10:18 +0000 +Subject: [PATCH] gdbus: define MAX_INPUT for musl + +This is the same solution as was done in src/shared/util.c + +Upstream: https://git.kernel.org/pub/scm/bluetooth/bluez.git/commit/?id=9d69dba21f1e46b34cdd8ae27fec11d0803907ee +Signed-off-by: Fiona Klute +--- + gdbus/object.c | 6 ++++++ + 1 file changed, 6 insertions(+) + +diff --git a/gdbus/object.c b/gdbus/object.c +index 84f116bf1..7b0476f1a 100644 +--- a/gdbus/object.c ++++ b/gdbus/object.c +@@ -20,6 +20,12 @@ + #include + + #include "gdbus.h" ++ ++/* define MAX_INPUT for musl */ ++#ifndef MAX_INPUT ++#define MAX_INPUT _POSIX_MAX_INPUT ++#endif ++ + #include "src/shared/util.h" + + #define info(fmt...) +-- +2.45.2 + diff --git a/package/bluez5_utils/bluez5_utils.hash b/package/bluez5_utils/bluez5_utils.hash index 41e39e0b5c..9b39b19c08 100644 --- a/package/bluez5_utils/bluez5_utils.hash +++ b/package/bluez5_utils/bluez5_utils.hash @@ -1,5 +1,5 @@ # From https://www.kernel.org/pub/linux/bluetooth/sha256sums.asc: -sha256 830fed1915c5d375b8de0f5e6f45fcdea0dcc5ff5ffb3d31db6ed0f00d73c5e3 bluez-5.78.tar.xz +sha256 4164a5303a9f71c70f48c03ff60be34231b568d93a9ad5e79928d34e6aa0ea8a bluez-5.79.tar.xz # Locally computed sha256 b499eddebda05a8859e32b820a64577d91f1de2b52efa2a1575a2cb4000bc259 COPYING sha256 ec60b993835e2c6b79e6d9226345f4e614e686eb57dc13b6420c15a33a8996e5 COPYING.LIB diff --git a/package/bluez5_utils/bluez5_utils.mk b/package/bluez5_utils/bluez5_utils.mk index 717c10e870..1695aeb210 100644 --- a/package/bluez5_utils/bluez5_utils.mk +++ b/package/bluez5_utils/bluez5_utils.mk @@ -5,7 +5,7 @@ ################################################################################ # Keep the version and patches in sync with bluez5_utils-headers -BLUEZ5_UTILS_VERSION = 5.78 +BLUEZ5_UTILS_VERSION = 5.79 BLUEZ5_UTILS_SOURCE = bluez-$(BLUEZ5_UTILS_VERSION).tar.xz BLUEZ5_UTILS_SITE = $(BR2_KERNEL_MIRROR)/linux/bluetooth BLUEZ5_UTILS_INSTALL_STAGING = YES