[arch-commits] Commit in bluez/trunk (PKGBUILD fix_registering_to_player_events.diff)

[Andreas Radke]

    Date: Friday, April 1, 2016 @ 16:42:28
  Author: andyrtr
Revision: 263721

upgpkg: bluez 5.38-3

add another upstream fix for further audio crashes

Added:
  bluez/trunk/fix_registering_to_player_events.diff
Modified:
  bluez/trunk/PKGBUILD

---------------------------------------+
 PKGBUILD                              |   10 +++++++---
 fix_registering_to_player_events.diff |   30 ++++++++++++++++++++++++++++++
 2 files changed, 37 insertions(+), 3 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2016-04-01 11:44:51 UTC (rev 263720)
+++ PKGBUILD	2016-04-01 14:42:28 UTC (rev 263721)
@@ -6,7 +6,7 @@
 pkgbase=bluez
 pkgname=('bluez' 'bluez-utils' 'bluez-libs' 'bluez-cups' 'bluez-hid2hci' 'bluez-plugins')
 pkgver=5.38
-pkgrel=2
+pkgrel=3
 url="http://www.bluez.org/"
 arch=('i686' 'x86_64')
 license=('GPL2')
@@ -13,12 +13,14 @@
 makedepends=('dbus' 'libical' 'systemd')
 source=(http://www.kernel.org/pub/linux/bluetooth/${pkgname}-${pkgver}.tar.{xz,sign}
         bluetooth.modprobe
-        fix_crash_when_connecting_to_controllers.diff)
+        fix_crash_when_connecting_to_controllers.diff
+        fix_registering_to_player_events.diff)
 # see https://www.kernel.org/pub/linux/bluetooth/sha256sums.asc
 sha256sums=('0618c5440be6715805060ab5eea930526f34089c437bf61819447b160254f4df'
             'SKIP'
             '46c021be659c9a1c4e55afd04df0c059af1f3d98a96338236412e449bf7477b4'
-            '27296fb6cce5e62a04fbeb0779d852995779ecef553cc2e692d91d89eff8c673')
+            '27296fb6cce5e62a04fbeb0779d852995779ecef553cc2e692d91d89eff8c673'
+            'a3f39bf73a14b7621c36fb1ab8237914c80aaddd7a3dae46d29a515c5121ed38')
 validpgpkeys=('E932D120BC2AEC444E558F0106CA9F5D1DCF2659') # Marcel Holtmann <marcel at holtmann.org>
 
 prepare() {
@@ -25,6 +27,8 @@
   cd ${pkgname}-${pkgver}
   # FS#48644, http://git.kernel.org/cgit/bluetooth/bluez.git/commit/?id=177d27c8c3db4588ec13dae0368f240902c42825
   patch -Np1 -i ${srcdir}/fix_crash_when_connecting_to_controllers.diff
+  # http://git.kernel.org/cgit/bluetooth/bluez.git/commit/?id=cc235a8d528b36cad2cf9fe6517d54711613331a
+  patch -Np1 -i ${srcdir}/fix_registering_to_player_events.diff
 }
 
 build() {

Added: fix_registering_to_player_events.diff
===================================================================
--- fix_registering_to_player_events.diff	                        (rev 0)
+++ fix_registering_to_player_events.diff	2016-04-01 14:42:28 UTC (rev 263721)
@@ -0,0 +1,30 @@
+From cc235a8d528b36cad2cf9fe6517d54711613331a Mon Sep 17 00:00:00 2001
+From: Luiz Augusto von Dentz <luiz.von.dentz at intel.com>
+Date: Fri, 1 Apr 2016 11:07:15 +0300
+Subject: audio/avrcp: Fix registering to player events
+
+If controller does not have a player skip registering to events which
+requires a player.
+---
+ profiles/audio/avrcp.c | 5 +++--
+ 1 file changed, 3 insertions(+), 2 deletions(-)
+
+diff --git a/profiles/audio/avrcp.c b/profiles/audio/avrcp.c
+index 0c6279a..37bc291 100644
+--- a/profiles/audio/avrcp.c
++++ b/profiles/audio/avrcp.c
+@@ -3647,8 +3647,9 @@ static gboolean avrcp_get_capabilities_resp(struct avctp *conn,
+ 		case AVRCP_EVENT_ADDRESSED_PLAYER_CHANGED:
+ 		case AVRCP_EVENT_UIDS_CHANGED:
+ 		case AVRCP_EVENT_AVAILABLE_PLAYERS_CHANGED:
+-			/* These events above are controller specific */
+-			if (!session->controller)
++			/* These events above requires a player */
++			if (!session->controller ||
++						!session->controller->player)
+ 				break;
+ 		case AVRCP_EVENT_VOLUME_CHANGED:
+ 			avrcp_register_notification(session, event);
+-- 
+cgit v0.12
+