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

[Andreas Radke]

    Date: Friday, April 2, 2021 @ 19:12:54
  Author: andyrtr
Revision: 411429

upgpkg: bluez 5.57-1: upstream update 5.57

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

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

Deleted: 0001_Fix_removing_all_remote_SEPs_when_loading_from_cache.diff
===================================================================
--- 0001_Fix_removing_all_remote_SEPs_when_loading_from_cache.diff	2021-04-02 18:49:55 UTC (rev 411428)
+++ 0001_Fix_removing_all_remote_SEPs_when_loading_from_cache.diff	2021-04-02 19:12:54 UTC (rev 411429)
@@ -1,27 +0,0 @@
-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-04-02 18:49:55 UTC (rev 411428)
+++ PKGBUILD	2021-04-02 19:12:54 UTC (rev 411429)
@@ -5,8 +5,8 @@
 
 pkgbase=bluez
 pkgname=('bluez' 'bluez-utils' 'bluez-libs' 'bluez-cups' 'bluez-hid2hci' 'bluez-plugins')
-pkgver=5.56
-pkgrel=2
+pkgver=5.57
+pkgrel=1
 url="http://www.bluez.org/"
 arch=('x86_64')
 license=('GPL2')
@@ -13,21 +13,13 @@
 makedepends=('dbus' 'libical' 'systemd' 'alsa-lib' 'json-c' 'ell')
 source=(https://www.kernel.org/pub/linux/bluetooth/${pkgname}-${pkgver}.tar.{xz,sign}
         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'
+sha256sums=('73b258d965769dcfdb7a27c5c9b4c9a8b3f72635e53278b73313c8742cf0f69c'
             'SKIP'
-            '46c021be659c9a1c4e55afd04df0c059af1f3d98a96338236412e449bf7477b4'
-            'dcf5a321f94b3f4f5923f212e8aba25807dce86bfda03212fcb5a96cf8ee6330')
+            '46c021be659c9a1c4e55afd04df0c059af1f3d98a96338236412e449bf7477b4')
 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 \