[arch-commits] Commit in bluez/trunk (PKGBUILD fix-a2dp.patch fix-compile-issue.patch)
Tom Gundersen
tomegun at archlinux.org
Tue Mar 6 23:09:17 UTC 2012
Date: Tuesday, March 6, 2012 @ 18:09:17
Author: tomegun
Revision: 152439
upgpkg: bluez 4.99-1
Modified:
bluez/trunk/PKGBUILD
Deleted:
bluez/trunk/fix-a2dp.patch
bluez/trunk/fix-compile-issue.patch
-------------------------+
PKGBUILD | 22 +++++---------
fix-a2dp.patch | 68 ----------------------------------------------
fix-compile-issue.patch | 50 ---------------------------------
3 files changed, 8 insertions(+), 132 deletions(-)
Modified: PKGBUILD
===================================================================
--- PKGBUILD 2012-03-06 21:21:29 UTC (rev 152438)
+++ PKGBUILD 2012-03-06 23:09:17 UTC (rev 152439)
@@ -4,13 +4,13 @@
# Contributor: Geoffroy Carrier <geoffroy at archlinux.org>
pkgname=bluez
-pkgver=4.98
-pkgrel=4
+pkgver=4.99
+pkgrel=1
pkgdesc="Libraries and tools for the Bluetooth protocol stack"
url="http://www.bluez.org/"
arch=('i686' 'x86_64')
license=('GPL2')
-depends=('dbus-core')
+depends=('dbus-core' 'python2' 'udev')
makedepends=('gstreamer0.10-base' 'libusb-compat' 'libsndfile')
optdepends=("gstreamer0.10-base: bluetooth GStreamer support"
"alsa-lib: Audio bluetooth devices support"
@@ -25,21 +25,12 @@
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'
- 'fix-a2dp.patch'
- 'fix-compile-issue.patch')
-md5sums=('4aca8a0929250212e9a75fb60dd75b05'
- '7412982b440f29fa7f76a41a87fef985'
- '8f9498707f809506928b2e480d3b6789'
- 'd6a34317e56b7c2bd990791d89d6c3cb'
- 'd81860cd0d7c3ddd2515591453a85e65')
+ 'bluetooth.conf.d'
+ 'rc.bluetooth')
build() {
cd "${srcdir}/${pkgname}-${pkgver}"
- patch -p1 -i "${srcdir}/fix-a2dp.patch"
- patch -p1 -i "${srcdir}/fix-compile-issue.patch"
-
./configure --prefix=/usr \
--sysconfdir=/etc \
--localstatedir=/var \
@@ -88,3 +79,6 @@
# http://mailman.archlinux.org/pipermail/arch-general/2011-April/019787.html
rm "${pkgdir}"/lib/udev/rules.d/97-bluetooth.rules
}
+md5sums=('2387053eb5a7b02f37df4871df022a02'
+ '7412982b440f29fa7f76a41a87fef985'
+ '8f9498707f809506928b2e480d3b6789')
Deleted: fix-a2dp.patch
===================================================================
--- fix-a2dp.patch 2012-03-06 21:21:29 UTC (rev 152438)
+++ fix-a2dp.patch 2012-03-06 23:09:17 UTC (rev 152439)
@@ -1,68 +0,0 @@
-From 0109fa0b6fa731c00b4c6b78d5694b2aaa088862 Mon Sep 17 00:00:00 2001
-From: Luiz Augusto von Dentz <luiz.von.dentz at intel.com>
-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
-
Deleted: fix-compile-issue.patch
===================================================================
--- fix-compile-issue.patch 2012-03-06 21:21:29 UTC (rev 152438)
+++ fix-compile-issue.patch 2012-03-06 23:09:17 UTC (rev 152439)
@@ -1,50 +0,0 @@
-From 4002cf271e3939714296c535a1ed8d4f0d5ac005 Mon Sep 17 00:00:00 2001
-From: Patrick Ohly <patrick.ohly at intel.com>
-Date: Mon, 16 Jan 2012 11:11:55 +0100
-Subject: [PATCH] lib: Fix compile issue when using in C++
-MIME-Version: 1.0
-Content-Type: text/plain; charset=utf8
-Content-Transfer-Encoding: 8bit
-
-The compiler error is:
- /usr/include/bluetooth/bluetooth.h::131:9: error: invalid conversion from 'void*' to 'bt_get_le64(void*)::<anonymous struct>*'
- ...
-
-The reason is that C++, in contrast to C, does not allow conversion of
-void * to anything, and this code gets compiled as C++ when the app is
-written in C++. The macro with the assignment itself is older, but only
-recent Bluez starts to use it in inline functions, thus triggering the
-problem.
-
-This patch keeps the "struct __attribute__((packed))" magic and merely
-changes the typecast so that it works in C and C++. Like the existing
-macro this patch relies on support for typeof.
----
- lib/bluetooth.h | 4 ++--
- 1 files changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/lib/bluetooth.h b/lib/bluetooth.h
-index ea7373d..0541842 100644
---- a/lib/bluetooth.h
-+++ b/lib/bluetooth.h
-@@ -141,7 +141,7 @@ enum {
- ({ \
- struct __attribute__((packed)) { \
- typeof(*(ptr)) __v; \
-- } *__p = (void *) (ptr); \
-+ } *__p = (typeof(__p)) (ptr); \
- __p->__v; \
- })
-
-@@ -149,7 +149,7 @@ enum {
- do { \
- struct __attribute__((packed)) { \
- typeof(*(ptr)) __v; \
-- } *__p = (void *) (ptr); \
-+ } *__p = (typeof(__p)) (ptr); \
- __p->__v = (val); \
- } while(0)
-
---
-1.7.6.5
-
More information about the arch-commits
mailing list