diff options
author | Nicolás Reynolds <fauno@kiwwwi.com.ar> | 2012-06-21 01:12:38 -0300 |
---|---|---|
committer | Nicolás Reynolds <fauno@kiwwwi.com.ar> | 2012-06-21 01:12:38 -0300 |
commit | 62130de96451044ea587d1cef2302c4cf3f910c4 (patch) | |
tree | 7ab5036739c0b7c3aa0ac787287b38652f1bcffb /extra/bluez | |
parent | 46d785933a49b1f2d742ca828f7b12c6a9a9d401 (diff) | |
parent | 6d22541bcebb7236bedfb98a96d5a1292072e86c (diff) |
Merge branch 'master' of ssh://vparabola/home/parabola/abslibre-pre-mips64el
Conflicts:
community-testing/vhba-module/60-vhba.rules
community-testing/vhba-module/PKGBUILD
community-testing/vhba-module/vhba-module.install
core/gcc/PKGBUILD
core/gzip/PKGBUILD
core/logrotate/PKGBUILD
extra/bluez/PKGBUILD
extra/kdeplasma-addons/PKGBUILD
kde-unstable/kdebase-runtime/PKGBUILD
kde-unstable/kdebindings-smokekde/PKGBUILD
kde-unstable/kdeplasma-addons/PKGBUILD
multilib/gcc-multilib/PKGBUILD
multilib/libtool-multilib/PKGBUILD
Diffstat (limited to 'extra/bluez')
-rw-r--r-- | extra/bluez/PKGBUILD | 27 | ||||
-rw-r--r-- | extra/bluez/org.bluez.service | 5 |
2 files changed, 17 insertions, 15 deletions
diff --git a/extra/bluez/PKGBUILD b/extra/bluez/PKGBUILD index bf4757a20..3a8ebccc7 100644 --- a/extra/bluez/PKGBUILD +++ b/extra/bluez/PKGBUILD @@ -1,17 +1,17 @@ -# $Id: PKGBUILD 160353 2012-06-01 12:58:12Z dreisner $ +# $Id: PKGBUILD 162066 2012-06-19 12:10:02Z tomegun $ # Maintainer: Tom Gundersen <teg@jklm.no> # Contributor: Andrea Scarpino <andrea@archlinux.org> # Contributor: Geoffroy Carrier <geoffroy@archlinux.org> pkgname=bluez -pkgver=4.99 -pkgrel=6.1 +pkgver=4.100 +pkgrel=1 pkgdesc="Libraries and tools for the Bluetooth protocol stack" url="http://www.bluez.org/" arch=('i686' 'x86_64' 'mips64el') license=('GPL2') -depends=('dbus-core' 'python2' 'udev') -makedepends=('gstreamer0.10-base' 'libusb-compat' 'libsndfile') +depends=('dbus-core' 'python2' 'systemd-tools') +makedepends=('gstreamer0.10-base' 'libusb-compat' 'libsndfile' 'libusbx') optdepends=("gstreamer0.10-base: bluetooth GStreamer support" "alsa-lib: Audio bluetooth devices support" "dbus-python: to run bluez-simple-agent" @@ -25,13 +25,15 @@ 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') + 'rc.bluetooth' + 'org.bluez.service') build() { cd "${srcdir}/${pkgname}-${pkgver}" + cp ../org.bluez.service src/ + ./configure --prefix=/usr \ --sysconfdir=/etc \ --localstatedir=/var \ @@ -51,8 +53,6 @@ build() { --disable-test \ --with-systemdunitdir=/usr/lib/systemd/system - patch -p1 -i ../0001-udev-remove-deprecated-function.patch - make } @@ -80,11 +80,8 @@ package() { "${pkgdir}"/usr/bin/bluez-simple-agent \ "${pkgdir}"/usr/bin/bluez-test-device \ "${pkgdir}"/usr/bin/bluez-test-input - - # fixed upstream in git - rm "${pkgdir}"/usr/lib/udev/rules.d/97-bluetooth.rules } -md5sums=('2387053eb5a7b02f37df4871df022a02' - '3175155fbaf73f01377f6c35b5c5e468' +md5sums=('54809d476c52665ff64594b6828016b5' '7412982b440f29fa7f76a41a87fef985' - '8f9498707f809506928b2e480d3b6789') + '8f9498707f809506928b2e480d3b6789' + '54c7de598327bf11d56592235d0702f4') diff --git a/extra/bluez/org.bluez.service b/extra/bluez/org.bluez.service new file mode 100644 index 000000000..dd7ae8f1c --- /dev/null +++ b/extra/bluez/org.bluez.service @@ -0,0 +1,5 @@ +[D-BUS Service] +Name=org.bluez +Exec=/bin/false +User=root +SystemdService=dbus-org.bluez.service |