Date: Friday, January 27, 2012 @ 10:45:14 Author: heftig Revision: 147727
Fix A2DP not working by default Added: bluez/trunk/fix-a2dp.patch Modified: bluez/trunk/PKGBUILD ----------------+ PKGBUILD | 10 ++++---- fix-a2dp.patch | 68 +++++++++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 74 insertions(+), 4 deletions(-) Modified: PKGBUILD =================================================================== --- PKGBUILD 2012-01-27 15:43:19 UTC (rev 147726) +++ PKGBUILD 2012-01-27 15:45:14 UTC (rev 147727) @@ -5,7 +5,7 @@ pkgname=bluez pkgver=4.98 -pkgrel=1 +pkgrel=2 pkgdesc="Libraries and tools for the Bluetooth protocol stack" url="http://www.bluez.org/"; arch=('i686' 'x86_64') @@ -26,15 +26,17 @@ backup=(etc/bluetooth/{main,rfcomm,audio,network,input,serial}.conf 'etc/conf.d/bluetooth' 'etc/dbus-1/system.d/bluetooth.conf') source=("http://www.kernel.org/pub/linux/bluetooth/${pkgname}-${pkgver}.tar.bz2"; - 'bluetooth.conf.d' - 'rc.bluetooth') + 'bluetooth.conf.d' 'rc.bluetooth' 'fix-a2dp.patch') md5sums=('4aca8a0929250212e9a75fb60dd75b05' '7412982b440f29fa7f76a41a87fef985' - '8f9498707f809506928b2e480d3b6789') + '8f9498707f809506928b2e480d3b6789' + 'd6a34317e56b7c2bd990791d89d6c3cb') build() { cd "${srcdir}/${pkgname}-${pkgver}" + patch -Np1 -i "${srcdir}/fix-a2dp.patch" + ./configure --prefix=/usr \ --sysconfdir=/etc \ --localstatedir=/var \ Added: fix-a2dp.patch =================================================================== --- fix-a2dp.patch (rev 0) +++ fix-a2dp.patch 2012-01-27 15:45:14 UTC (rev 147727) @@ -0,0 +1,68 @@ +From 0109fa0b6fa731c00b4c6b78d5694b2aaa088862 Mon Sep 17 00:00:00 2001 +From: Luiz Augusto von Dentz <[email protected]> +Date: Thu, 26 Jan 2012 23:39:02 +0200 +Subject: [PATCH] audio: Fix disabling local A2DP endpoints when UNIX socket + is disabled + +Local endpoints can only be used when UNIX socket API is available. +--- + audio/a2dp.c | 15 +++++++-------- + 1 files changed, 7 insertions(+), 8 deletions(-) + +diff --git a/audio/a2dp.c b/audio/a2dp.c +index 5ca105c..bbb91ce 100644 +--- a/audio/a2dp.c ++++ b/audio/a2dp.c +@@ -1388,9 +1388,9 @@ static struct a2dp_server *find_server(GSList *list, const bdaddr_t *src) + + int a2dp_register(DBusConnection *conn, const bdaddr_t *src, GKeyFile *config) + { +- int sbc_srcs = 1, sbc_sinks = 1; ++ int sbc_srcs = 0, sbc_sinks = 0; + int mpeg12_srcs = 0, mpeg12_sinks = 0; +- gboolean source = TRUE, sink = FALSE, socket = TRUE; ++ gboolean source = TRUE, sink = FALSE, socket = FALSE; + gboolean delay_reporting = FALSE; + char *str; + GError *err = NULL; +@@ -1410,6 +1410,8 @@ int a2dp_register(DBusConnection *conn, const bdaddr_t *src, GKeyFile *config) + source = TRUE; + if (strstr(str, "Source")) + sink = TRUE; ++ if (strstr(str, "Socket")) ++ socket = TRUE; + g_free(str); + } + +@@ -1429,18 +1431,14 @@ int a2dp_register(DBusConnection *conn, const bdaddr_t *src, GKeyFile *config) + } + + /* Don't register any local sep if Socket is disabled */ +- if (socket == FALSE) { +- sbc_srcs = 0; +- sbc_sinks = 0; +- mpeg12_srcs = 0; +- mpeg12_sinks = 0; ++ if (socket == FALSE) + goto proceed; +- } + + str = g_key_file_get_string(config, "A2DP", "SBCSources", &err); + if (err) { + DBG("audio.conf: %s", err->message); + g_clear_error(&err); ++ sbc_srcs = 1; + } else { + sbc_srcs = atoi(str); + g_free(str); +@@ -1459,6 +1457,7 @@ int a2dp_register(DBusConnection *conn, const bdaddr_t *src, GKeyFile *config) + if (err) { + DBG("audio.conf: %s", err->message); + g_clear_error(&err); ++ sbc_sinks = 1; + } else { + sbc_sinks = atoi(str); + g_free(str); +-- +1.7.6.5 +
