[arch-commits] Commit in bluez/trunk (2 files)

[Andreas Radke]

    Date: Wednesday, March 17, 2021 @ 15:51:49
  Author: andyrtr
Revision: 410166

upgpkg: bluez 5.56-2: fix devices disconnecting - FS#70037

Added:
  bluez/trunk/0001_Fix_removing_all_remote_SEPs_when_loading_from_cache.diff
Modified:
  bluez/trunk/PKGBUILD

----------------------------------------------------------------+
 0001_Fix_removing_all_remote_SEPs_when_loading_from_cache.diff |   27 ++++++++++
 PKGBUILD                                                       |   15 ++++-
 2 files changed, 39 insertions(+), 3 deletions(-)

Added: 0001_Fix_removing_all_remote_SEPs_when_loading_from_cache.diff
===================================================================
--- 0001_Fix_removing_all_remote_SEPs_when_loading_from_cache.diff	                        (rev 0)
+++ 0001_Fix_removing_all_remote_SEPs_when_loading_from_cache.diff	2021-03-17 15:51:49 UTC (rev 410166)
@@ -0,0 +1,27 @@
+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);

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2021-03-17 15:32:20 UTC (rev 410165)
+++ PKGBUILD	2021-03-17 15:51:49 UTC (rev 410166)
@@ -6,19 +6,28 @@
 pkgbase=bluez
 pkgname=('bluez' 'bluez-utils' 'bluez-libs' 'bluez-cups' 'bluez-hid2hci' 'bluez-plugins')
 pkgver=5.56
-pkgrel=1
+pkgrel=2
 url="http://www.bluez.org/"
 arch=('x86_64')
 license=('GPL2')
 makedepends=('dbus' 'libical' 'systemd' 'alsa-lib' 'json-c' 'ell')
 source=(https://www.kernel.org/pub/linux/bluetooth/${pkgname}-${pkgver}.tar.{xz,sign}
-        bluetooth.modprobe)
+        bluetooth.modprobe
+        0001_Fix_removing_all_remote_SEPs_when_loading_from_cache.diff
+)
 # see https://www.kernel.org/pub/linux/bluetooth/sha256sums.asc
 sha256sums=('59c4dba9fc8aae2a6a5f8f12f19bc1b0c2dc27355c7ca3123eed3fe6bd7d0b9d'
             'SKIP'
-            '46c021be659c9a1c4e55afd04df0c059af1f3d98a96338236412e449bf7477b4')
+            '46c021be659c9a1c4e55afd04df0c059af1f3d98a96338236412e449bf7477b4'
+            'dcf5a321f94b3f4f5923f212e8aba25807dce86bfda03212fcb5a96cf8ee6330')
 validpgpkeys=('E932D120BC2AEC444E558F0106CA9F5D1DCF2659') # Marcel Holtmann <marcel at holtmann.org>
 
+prepare() {
+  cd "${pkgname}"-${pkgver}
+  # FS#70037 / https://github.com/bluez/bluez/commit/28ddec8d6b829e002fa268c07b71e4c564ba9e16
+  patch -Np1 -i ../0001_Fix_removing_all_remote_SEPs_when_loading_from_cache.diff
+}
+
 build() {
   cd "${pkgname}"-${pkgver}
   ./configure \