Merge pull request #5939 from SupervisedThinking/bluez

[le11] bluez: update to 5.62
This commit is contained in:
CvH 2021-12-08 12:01:06 +01:00 committed by GitHub
commit 629317df2a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 7 additions and 47 deletions

View File

@ -3,8 +3,8 @@
# Copyright (C) 2019-present Team LibreELEC (https://libreelec.tv)
PKG_NAME="bluez"
PKG_VERSION="5.56"
PKG_SHA256="59c4dba9fc8aae2a6a5f8f12f19bc1b0c2dc27355c7ca3123eed3fe6bd7d0b9d"
PKG_VERSION="5.62"
PKG_SHA256="38090a5b750e17fc08d3e52178ed8d3254c5f4bd2c48830d5c1955b88e3bc0c2"
PKG_LICENSE="GPL"
PKG_SITE="http://www.bluez.org/"
PKG_URL="https://www.kernel.org/pub/linux/bluetooth/${PKG_NAME}-${PKG_VERSION}.tar.xz"
@ -31,6 +31,7 @@ PKG_CONFIGURE_OPTS_TARGET="--disable-dependency-tracking \
--enable-systemd \
--enable-tools --enable-deprecated \
--enable-datafiles \
--disable-manpages \
--disable-experimental \
--enable-sixaxis \
--with-gnu-ld \
@ -46,11 +47,10 @@ pre_configure_target() {
}
post_makeinstall_target() {
rm -rf ${INSTALL}/usr/lib/systemd
rm -rf ${INSTALL}/usr/bin/bccmd
rm -rf ${INSTALL}/usr/bin/bluemoon
rm -rf ${INSTALL}/usr/bin/ciptool
rm -rf ${INSTALL}/usr/share/dbus-1
safe_remove ${INSTALL}/usr/lib/systemd
safe_remove ${INSTALL}/usr/bin/bluemoon
safe_remove ${INSTALL}/usr/bin/ciptool
safe_remove ${INSTALL}/usr/share/dbus-1
mkdir -p ${INSTALL}/etc/bluetooth
cp src/main.conf ${INSTALL}/etc/bluetooth

View File

@ -1,40 +0,0 @@
From 28ddec8d6b829e002fa268c07b71e4c564ba9e16 Mon Sep 17 00:00:00 2001
From: Luiz Augusto von Dentz <luiz.von.dentz@intel.com>
Date: Thu, 11 Mar 2021 07:36:07 -0800
Subject: [PATCH] avdtp: Fix removing all remote SEPs when loading from cache
If avdtp_discover is called after cache has been loaded it end up
removing all remote SEPs as they have not been discovered yet.
Fixes: https://github.com/bluez/bluez/issues/102
---
profiles/audio/avdtp.c | 16 ++++++++++++----
1 file changed, 12 insertions(+), 4 deletions(-)
diff --git a/profiles/audio/avdtp.c b/profiles/audio/avdtp.c
index 088ca58b3..1d5871c62 100644
--- a/profiles/audio/avdtp.c
+++ b/profiles/audio/avdtp.c
@@ -3381,10 +3381,18 @@ int avdtp_discover(struct avdtp *session, avdtp_discover_cb_t cb,
session->discover = g_new0(struct discover_callback, 1);
if (session->seps) {
- session->discover->cb = cb;
- session->discover->user_data = user_data;
- session->discover->id = g_idle_add(process_discover, session);
- return 0;
+ struct avdtp_remote_sep *sep = session->seps->data;
+
+ /* Check that SEP have been discovered as it may be loaded from
+ * cache.
+ */
+ if (sep->discovered) {
+ session->discover->cb = cb;
+ session->discover->user_data = user_data;
+ session->discover->id = g_idle_add(process_discover,
+ session);
+ return 0;
+ }
}
err = send_request(session, FALSE, NULL, AVDTP_DISCOVER, NULL, 0);