Date: Tuesday, December 20, 2011 @ 03:51:11 Author: andrea Revision: 145249
upgpkg: bluez 4.96-3 Add test-device and test-input needed for pairing wiimote (FS#27630); Move the server flag to the HIDD_OPTIONS in the conf.d/bluetooth file so users can setup their configurations (see FS#26667) Modified: bluez/trunk/PKGBUILD bluez/trunk/bluetooth.conf.d bluez/trunk/rc.bluetooth ------------------+ PKGBUILD | 20 ++++++++++++-------- bluetooth.conf.d | 2 +- rc.bluetooth | 2 +- 3 files changed, 14 insertions(+), 10 deletions(-) Modified: PKGBUILD =================================================================== --- PKGBUILD 2011-12-20 07:59:43 UTC (rev 145248) +++ PKGBUILD 2011-12-20 08:51:11 UTC (rev 145249) @@ -4,7 +4,7 @@ pkgname=bluez pkgver=4.96 -pkgrel=2 +pkgrel=3 pkgdesc="Libraries and tools for the Bluetooth protocol stack" url="http://www.bluez.org/"; arch=('i686' 'x86_64') @@ -24,12 +24,13 @@ 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,6 @@ --enable-pand \ --enable-dund \ --enable-cups \ - --enable-udevrules \ - --enable-configfiles \ --enable-wiimote make } @@ -71,9 +70,14 @@ 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 Modified: bluetooth.conf.d =================================================================== --- bluetooth.conf.d 2011-12-20 07:59:43 UTC (rev 145248) +++ bluetooth.conf.d 2011-12-20 08:51:11 UTC (rev 145249) @@ -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="" Modified: rc.bluetooth =================================================================== --- rc.bluetooth 2011-12-20 07:59:43 UTC (rev 145248) +++ rc.bluetooth 2011-12-20 08:51:11 UTC (rev 145249) @@ -46,7 +46,7 @@ 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"
