diff --git a/packages/network/bluez/package.mk b/packages/network/bluez/package.mk index fbb2412fae..b0abab837b 100644 --- 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.72" -PKG_SHA256="499d7fa345a996c1bb650f5c6749e1d929111fa6ece0be0e98687fee6124536e" +PKG_VERSION="5.73" +PKG_SHA256="257e9075ce05c70d48c5defd254e78c418416f7584b45f9dddc884ff88e3fc53" PKG_LICENSE="GPL" PKG_SITE="http://www.bluez.org/" PKG_URL="https://www.kernel.org/pub/linux/bluetooth/${PKG_NAME}-${PKG_VERSION}.tar.xz" diff --git a/packages/network/bluez/patches/bluez-12-fix-obexd-after-5_50.patch b/packages/network/bluez/patches/bluez-12-fix-obexd-after-5_50.patch deleted file mode 100644 index 24311aac02..0000000000 --- a/packages/network/bluez/patches/bluez-12-fix-obexd-after-5_50.patch +++ /dev/null @@ -1,40 +0,0 @@ -diff --git a/Makefile.obexd b/Makefile.obexd -index cd3ace4..89f1609 100644 ---- a/Makefile.obexd -+++ b/Makefile.obexd -@@ -8,8 +8,6 @@ endif - - EXTRA_DIST += obexd/src/obex.service.in obexd/src/org.bluez.obex.service - --if OBEX -- - obex_plugindir = $(libdir)/obex/plugins - - obexd_builtin_modules = -@@ -33,6 +31,8 @@ obexd_builtin_sources += obexd/plugins/opp.c - obexd_builtin_modules += ftp - obexd_builtin_sources += obexd/plugins/ftp.c obexd/plugins/ftp.h - -+if OBEX -+ - obexd_builtin_modules += irmc - obexd_builtin_sources += obexd/plugins/irmc.c - -@@ -47,6 +47,8 @@ obexd_builtin_sources += obexd/plugins/mas.c obexd/src/map_ap.h \ - obexd/plugins/messages.h \ - obexd/plugins/messages-dummy.c - -+endif -+ - obexd_builtin_modules += mns - obexd_builtin_sources += obexd/client/mns.c obexd/src/map_ap.h \ - obexd/client/map-event.h -@@ -90,8 +92,6 @@ obexd_src_obexd_CFLAGS = $(AM_CFLAGS) @GLIB_CFLAGS@ @DBUS_CFLAGS@ \ - - obexd_src_obexd_CPPFLAGS = -I$(builddir)/lib -I$(builddir)/obexd/src - --endif -- - obexd_src_obexd_SHORTNAME = obexd - - obexd_builtin_files = obexd/src/builtin.h $(obexd_builtin_nodist) diff --git 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 new file mode 100644 index 0000000000..8b2e0e52fa --- /dev/null +++ b/packages/network/bluez/patches/bluez-12-fix-obexd-after-5_73.patch @@ -0,0 +1,41 @@ +diff --git a/Makefile.obexd b/Makefile.obexd +index b7e9f2d33..9a9e9a0a0 100644 +--- a/Makefile.obexd ++++ b/Makefile.obexd +@@ -1,6 +1,4 @@ + # SPDX-License-Identifier: GPL-2.0 +-if OBEX +- + if SYSTEMD + systemduserunitdir = $(SYSTEMD_USERUNITDIR) + systemduserunit_DATA = obexd/src/obex.service +@@ -41,6 +39,8 @@ obexd_builtin_sources += obexd/plugins/opp.c + obexd_builtin_modules += ftp + obexd_builtin_sources += obexd/plugins/ftp.c obexd/plugins/ftp.h + ++if OBEX ++ + 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 \ + obexd/plugins/messages.h \ + obexd/plugins/messages-dummy.c + ++endif ++ + 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) \ + -D_FILE_OFFSET_BITS=64 \ + -I$(builddir)/obexd/src + +-else +-obexd-add-service-symlink: +-obexd-remove-service-symlink: +-endif +- + obexd_src_obexd_SHORTNAME = obexd + + obexd_builtin_files = obexd/src/builtin.h $(obexd_builtin_nodist) diff --git a/packages/network/bluez/patches/bluez-22-Revert-build-Fix-distcheck.patch b/packages/network/bluez/patches/bluez-22-Revert-build-Fix-distcheck.patch new file mode 100644 index 0000000000..532a16701f --- /dev/null +++ b/packages/network/bluez/patches/bluez-22-Revert-build-Fix-distcheck.patch @@ -0,0 +1,50 @@ +From e679b29bcf4890d61294e4110bace5f783632e5a Mon Sep 17 00:00:00 2001 +From: Rudi Heitbaum +Date: Sat, 9 Mar 2024 08:55:24 +0000 +Subject: [PATCH] Revert "build: Fix distcheck" + +This reverts commit d5a9195a6269e703c6e3a47c40982ec94d8cc838. +--- + Makefile.tools | 6 +----- + configure.ac | 8 +------- + 2 files changed, 2 insertions(+), 12 deletions(-) + +diff --git a/Makefile.tools b/Makefile.tools +index 27a753762..c17244677 100644 +--- a/Makefile.tools ++++ b/Makefile.tools +@@ -539,11 +539,7 @@ endif + + if CUPS + +-if CUPS_SERVERBIN +-cupsdir = $(CUPS_SERVERBIN)/backend +-else +-cupsdir = $(libdir)/cups/backend +-endif ++cupsdir = $(CUPSDIR) + + cups_PROGRAMS = profiles/cups/bluetooth + +diff --git a/configure.ac b/configure.ac +index 9ebc250cf..0190e8271 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -247,13 +247,7 @@ AC_ARG_ENABLE(cups, AS_HELP_STRING([--disable-cups], + [disable CUPS printer support]), [enable_cups=${enableval}]) + AM_CONDITIONAL(CUPS, test "${enable_cups}" != "no") + if (test "${enable_cups}" != "no"); then +- AC_MSG_CHECKING([cups directory]) +- cups_serverbin=`$PKG_CONFIG cups --variable=cups_serverbin` +- AM_CONDITIONAL(CUPS_SERVERBIN, test "${cups_serverbin}" != "") +- if (test "${cups_serverbin}" != ""); then +- AC_SUBST(CUPS_SERVERBIN, ${cups_serverbin}) +- fi +- AC_MSG_RESULT([${cups_serverbin}]) ++ AC_SUBST(CUPSDIR, `$PKG_CONFIG cups --variable=cups_serverbin`/backend) + fi + + AC_ARG_ENABLE(mesh, AS_HELP_STRING([--enable-mesh], +-- +2.43.0 +