diff options
| author | Michał Masłowski <mtjm@mtjm.eu> | 2011-12-22 09:09:45 +0100 |
|---|---|---|
| committer | Michał Masłowski <mtjm@mtjm.eu> | 2011-12-22 09:09:45 +0100 |
| commit | 3680463fea4793ab39000b102bacf1bb66eceafc (patch) | |
| tree | 7ed09ff631c5955e24bcf6fb1c6eb1a3cc4456fd /extra/bluez | |
| parent | cf1b8826accdb5f1a092ed387f66f061920c4953 (diff) | |
| parent | 69d24275e4d5296a5f02e4c4d0fc438a80d159b8 (diff) | |
Merge branch 'master' of ssh://parabolagnulinux.org:1863/home/parabola/abslibre-pre-mips64el
Conflicts:
community-testing/qtcreator/PKGBUILD
core/glibc/PKGBUILD
core/openldap/PKGBUILD
extra/libgsf/PKGBUILD
extra/phonon/PKGBUILD
extra/poppler/PKGBUILD
extra/smartmontools/PKGBUILD
extra/vlc/PKGBUILD
extra/xfwm4/PKGBUILD
kde-unstable/calligra/PKGBUILD
kde-unstable/kdelibs/PKGBUILD
multilib/lib32-glibc/PKGBUILD
multilib/lib32-keyutils/PKGBUILD
multilib/lib32-krb5/PKGBUILD
multilib/lib32-libcap/PKGBUILD
multilib/lib32-libdrm/PKGBUILD
multilib/lib32-libogg/PKGBUILD
multilib/lib32-libssh2/PKGBUILD
multilib/lib32-libxcursor/PKGBUILD
multilib/lib32-libxext/PKGBUILD
multilib/lib32-libxfixes/PKGBUILD
multilib/lib32-libxi/PKGBUILD
multilib/lib32-libxrandr/PKGBUILD
multilib/lib32-llvm/PKGBUILD
multilib/lib32-llvm/clang-pure64.patch
multilib/lib32-llvm/enable-lto.patch
multilib/lib32-mesa/PKGBUILD
multilib/lib32-pcre/PKGBUILD
multilib/lib32-pixman/PKGBUILD
multilib/lib32-readline/PKGBUILD
multilib/lib32-udev/PKGBUILD
multilib/lib32-v4l-utils/PKGBUILD
Diffstat (limited to 'extra/bluez')
| -rw-r--r-- | extra/bluez/PKGBUILD | 23 | ||||
| -rw-r--r-- | extra/bluez/bluetooth.conf.d | 2 | ||||
| -rw-r--r-- | extra/bluez/rc.bluetooth | 2 |
3 files changed, 16 insertions, 11 deletions
diff --git a/extra/bluez/PKGBUILD b/extra/bluez/PKGBUILD index 80773fdf5..ce21d53a7 100644 --- a/extra/bluez/PKGBUILD +++ b/extra/bluez/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 134029 2011-08-01 10:30:12Z andrea $ +# $Id: PKGBUILD 145250 2011-12-20 08:51:40Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> # Contributor: Geoffroy Carrier <geoffroy@archlinux.org> pkgname=bluez pkgver=4.96 -pkgrel=1 +pkgrel=3 pkgdesc="Libraries and tools for the Bluetooth protocol stack" url="http://www.bluez.org/" arch=('i686' 'x86_64' 'mips64el') @@ -24,12 +24,13 @@ replaces=('bluez-libs' 'bluez-utils') options=('!libtool' 'emptydirs') 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" +#source=("http://www.kernel.org/pub/linux/bluetooth/${pkgname}-${pkgver}.tar.bz2" +source=("ftp://ftp.archlinux.org/other/${pkgname}/${pkgname}-${pkgver}.tar.bz2" 'bluetooth.conf.d' 'rc.bluetooth') md5sums=('255c3dda8b93210ab0dcf8d04ddaf69f' - '8f60a5eb9d84b9c64c478d63e1c24b10' - 'ca4c39eb4bb201bd2eacad01492cd735') + '7412982b440f29fa7f76a41a87fef985' + '8f9498707f809506928b2e480d3b6789') build() { cd "${srcdir}/${pkgname}-${pkgver}" @@ -49,8 +50,7 @@ build() { --enable-pand \ --enable-dund \ --enable-cups \ - --enable-udevrules \ - --enable-configfiles + --enable-wiimote make } @@ -70,9 +70,14 @@ package() { install -Dm644 ${srcdir}/bluetooth.conf.d \ ${pkgdir}/etc/conf.d/bluetooth - install -Dm755 test/simple-agent ${pkgdir}/usr/bin/bluez-simple-agent + # FS#27630 + install -Dm755 test/simple-agent "${pkgdir}"/usr/bin/bluez-simple-agent + install -Dm755 test/test-device "${pkgdir}"/usr/bin/bluez-test-device + install -Dm755 test/test-input "${pkgdir}"/usr/bin/bluez-test-input sed -i 's#/usr/bin/python#/usr/bin/python2#' \ - ${pkgdir}/usr/bin/bluez-simple-agent + "${pkgdir}"/usr/bin/bluez-simple-agent \ + "${pkgdir}"/usr/bin/bluez-test-device \ + "${pkgdir}"/usr/bin/bluez-test-input # http://mailman.archlinux.org/pipermail/arch-general/2011-April/019787.html rm "${pkgdir}"/lib/udev/rules.d/97-bluetooth.rules diff --git a/extra/bluez/bluetooth.conf.d b/extra/bluez/bluetooth.conf.d index 6648740eb..1c1e02589 100644 --- a/extra/bluez/bluetooth.conf.d +++ b/extra/bluez/bluetooth.conf.d @@ -25,6 +25,6 @@ #RFCOMM_CONFIG="/etc/bluetooth/rfcomm.conf" # Options for hidd, dund and pand (default: none) -#HIDD_OPTIONS="" +HIDD_OPTIONS="--server" #DUND_OPTIONS="" #PAND_OPTIONS="" diff --git a/extra/bluez/rc.bluetooth b/extra/bluez/rc.bluetooth index 096242011..a46ee2abb 100644 --- a/extra/bluez/rc.bluetooth +++ b/extra/bluez/rc.bluetooth @@ -46,7 +46,7 @@ case "$1" in fi if [ "$HIDD_ENABLE" = "true" -a -x "$HIDD_EXEC" ]; then stat_append " $HIDD_NAME" - $HIDD_EXEC $HIDD_OPTIONS --server + $HIDD_EXEC $HIDD_OPTIONS fi if [ "$RFCOMM_ENABLE" = "true" -a -x "$RFCOMM_EXEC" -a -f "$RFCOMM_CONFIG" ]; then stat_append " $RFCOMM_NAME" |