summaryrefslogtreecommitdiff
path: root/extra/bluez
diff options
context:
space:
mode:
authorroot <root@rshg054.dnsready.net>2012-06-03 00:04:14 +0000
committerroot <root@rshg054.dnsready.net>2012-06-03 00:04:14 +0000
commitd915cad658736d96368750201c34df752048751a (patch)
treea6d70fb8b01aaa111efbc8a6874a8f94b882626d /extra/bluez
parent211709a2f09bd677aa1deac0dc82fde6ce1c8626 (diff)
Sun Jun 3 00:04:13 UTC 2012
Diffstat (limited to 'extra/bluez')
-rw-r--r--extra/bluez/0001-udev-remove-deprecated-function.patch27
-rw-r--r--extra/bluez/PKGBUILD14
2 files changed, 37 insertions, 4 deletions
diff --git a/extra/bluez/0001-udev-remove-deprecated-function.patch b/extra/bluez/0001-udev-remove-deprecated-function.patch
new file mode 100644
index 000000000..7dadf5cd1
--- /dev/null
+++ b/extra/bluez/0001-udev-remove-deprecated-function.patch
@@ -0,0 +1,27 @@
+From 9e850650bd98e9d05fc937489692b26a64924d16 Mon Sep 17 00:00:00 2001
+From: Tom Gundersen <teg@jklm.no>
+Date: Sun, 27 May 2012 00:53:36 +0200
+Subject: [PATCH] udev: remove deprecated function
+
+This function has in the past returned "/sys" unconditionally. As of udev-183 it
+is gone, so just replace it with the string.
+---
+ tools/hid2hci.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/tools/hid2hci.c b/tools/hid2hci.c
+index 45a3a3d..e3a5b2e 100644
+--- a/tools/hid2hci.c
++++ b/tools/hid2hci.c
+@@ -291,7 +291,7 @@ int main(int argc, char *argv[])
+ if (udev == NULL)
+ goto exit;
+
+- snprintf(syspath, sizeof(syspath), "%s/%s", udev_get_sys_path(udev), devpath);
++ snprintf(syspath, sizeof(syspath), "/sys/%s", devpath);
+ udev_dev = udev_device_new_from_syspath(udev, syspath);
+ if (udev_dev == NULL) {
+ fprintf(stderr, "error: could not find '%s'\n", devpath);
+--
+1.7.10.2
+
diff --git a/extra/bluez/PKGBUILD b/extra/bluez/PKGBUILD
index e63cd2c66..d56ba44cd 100644
--- a/extra/bluez/PKGBUILD
+++ b/extra/bluez/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 155739 2012-04-06 00:05:49Z tomegun $
+# $Id: PKGBUILD 160353 2012-06-01 12:58:12Z dreisner $
# Maintainer: Tom Gundersen <teg@jklm.no>
# Contributor: Andrea Scarpino <andrea@archlinux.org>
# Contributor: Geoffroy Carrier <geoffroy@archlinux.org>
pkgname=bluez
pkgver=4.99
-pkgrel=2
+pkgrel=6
pkgdesc="Libraries and tools for the Bluetooth protocol stack"
url="http://www.bluez.org/"
arch=('i686' 'x86_64')
@@ -25,6 +25,7 @@ options=('!libtool')
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"
+ '0001-udev-remove-deprecated-function.patch'
'bluetooth.conf.d'
'rc.bluetooth')
@@ -47,7 +48,11 @@ build() {
--enable-dund \
--enable-cups \
--enable-wiimote \
- --disable-test
+ --disable-test \
+ --with-systemdunitdir=/usr/lib/systemd/system
+
+ patch -p1 -i ../0001-udev-remove-deprecated-function.patch
+
make
}
@@ -76,9 +81,10 @@ package() {
"${pkgdir}"/usr/bin/bluez-test-device \
"${pkgdir}"/usr/bin/bluez-test-input
- # http://mailman.archlinux.org/pipermail/arch-general/2011-April/019787.html
+ # fixed upstream in git
rm "${pkgdir}"/usr/lib/udev/rules.d/97-bluetooth.rules
}
md5sums=('2387053eb5a7b02f37df4871df022a02'
+ '3175155fbaf73f01377f6c35b5c5e468'
'7412982b440f29fa7f76a41a87fef985'
'8f9498707f809506928b2e480d3b6789')