Date: Monday, June 21, 2010 @ 13:11:18 Author: andrea Revision: 83433
upgpkg: bluez 4.66-1 upstream release; hid2hci is provided by udev; added serial.conf file; descriptions for optdepends; added libsndfile support Modified: bluez/trunk/PKGBUILD bluez/trunk/bluetooth.conf.d bluez/trunk/rc.bluetooth ------------------+ PKGBUILD | 60 ++++++++++++++++++++++++++++++----------------------- bluetooth.conf.d | 3 -- rc.bluetooth | 7 ------ 3 files changed, 34 insertions(+), 36 deletions(-) Modified: PKGBUILD =================================================================== --- PKGBUILD 2010-06-21 15:55:32 UTC (rev 83432) +++ PKGBUILD 2010-06-21 17:11:18 UTC (rev 83433) @@ -3,26 +3,32 @@ # Contributor: Geoffroy Carrier <[email protected]> pkgname=bluez -pkgver=4.65 +pkgver=4.66 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') -makedepends=('gstreamer0.10-base' 'alsa-lib' 'libusb' 'libnl') -optdepends=('gstreamer0.10-base' 'alsa-lib' 'libusb' 'libnl' 'dbus-python') +makedepends=('gstreamer0.10-base' 'libusb' 'libnl' 'libsndfile') +optdepends=("gstreamer0.10-base: bluetooth GStreamer support" + "alsa-lib: Audio bluetooth devices support" + "dbus-python: to run bluez-simple-agent" + "libusb: USB adapters support" + "cups: CUPS backend" + "libnl: netlink plugin") conflicts=('bluez-libs' 'bluez-utils') provides=('bluez-libs' 'bluez-utils') replaces=('bluez-libs' 'bluez-utils') options=('!libtool') -backup=(etc/bluetooth/{main,rfcomm,audio,network,input}.conf +backup=(etc/bluetooth/{main,rfcomm,audio,network,input,serial}.conf etc/conf.d/bluetooth) source=("http://www.kernel.org/pub/linux/bluetooth/${pkgname}-${pkgver}.tar.bz2"; - 'bluetooth.conf.d' 'rc.bluetooth') -md5sums=('8045fa05b16fae807a95532689eda9b4' - 'd12be5b494525bb1ba6eac5c3983dd3e' - '4a2b3f9d94ee3233f051443f3523b1dd') + 'bluetooth.conf.d' + 'rc.bluetooth') +md5sums=('74b5961098d1b507c77bc0553d5efaf5' + '8f60a5eb9d84b9c64c478d63e1c24b10' + 'ca4c39eb4bb201bd2eacad01492cd735') build() { cd "${srcdir}/${pkgname}-${pkgver}" @@ -32,38 +38,40 @@ --localstatedir=/var \ --libexecdir=/lib \ --mandir=/usr/share/man \ - --enable-gstreamer \ + --enable-network \ + --enable-serial \ + --enable-input \ + --enable-audio \ + --enable-service \ + --enable-gstreamer \ --enable-alsa \ --enable-usb \ --enable-netlink \ --enable-tools \ --enable-bccmd \ - --enable-hid2hci \ --enable-dfutool \ - --enable-hidd \ - --enable-pand \ - --enable-dund \ + --enable-hidd \ + --enable-pand \ + --enable-dund \ --enable-cups \ - --enable-configfiles || return 1 - make || return 1 + --enable-udevrules \ + --enable-configfiles + make } package() { cd ${srcdir}/${pkgname}-${pkgver} - make DESTDIR=${pkgdir} install || return 1 + make DESTDIR=${pkgdir} install - install -Dm755 ${srcdir}/rc.bluetooth ${pkgdir}/etc/rc.d/bluetooth || return 1 + install -Dm755 ${srcdir}/rc.bluetooth ${pkgdir}/etc/rc.d/bluetooth install -d ${pkgdir}/etc/bluetooth - install -m644 network/network.conf input/input.conf audio/audio.conf \ - ${pkgdir}/etc/bluetooth/ || return 1 + install -m644 network/network.conf \ + input/input.conf \ + audio/audio.conf \ + serial/serial.conf \ + ${pkgdir}/etc/bluetooth/ install -Dm644 ${srcdir}/bluetooth.conf.d \ - ${pkgdir}/etc/conf.d/bluetooth || return 1 - - install -Dm755 scripts/bluetooth_serial \ - ${pkgdir}/lib/udev/bluetooth_serial || return 1 - - install -Dm755 test/simple-agent \ - ${pkgdir}/usr/bin/bluez-simple-agent || return 1 + ${pkgdir}/etc/conf.d/bluetooth } Modified: bluetooth.conf.d =================================================================== --- bluetooth.conf.d 2010-06-21 15:55:32 UTC (rev 83432) +++ bluetooth.conf.d 2010-06-21 17:11:18 UTC (rev 83433) @@ -5,9 +5,6 @@ # Run the bluetoothd daemon (default: true) #DAEMON_ENABLE="false" -# Run hid2hci (default: false) -#HID2HCI_ENABLE="true" - # Run the sdp daemon (default: false) # If this is disabled, hcid's internal sdp daemon will be used #SDPD_ENABLE="true" Modified: rc.bluetooth =================================================================== --- rc.bluetooth 2010-06-21 15:55:32 UTC (rev 83432) +++ rc.bluetooth 2010-06-21 17:11:18 UTC (rev 83433) @@ -7,21 +7,18 @@ . /etc/rc.d/functions DAEMON_NAME="bluetoothd" -HID2HCI_NAME="hid2hci" HIDD_NAME="hidd" RFCOMM_NAME="rfcomm" PAND_NAME="pand" DUND_NAME="dund" DAEMON_EXEC="/usr/sbin/bluetoothd" -HID2HCI_EXEC="/usr/sbin/hid2hci" HIDD_EXEC="/usr/bin/hidd" RFCOMM_EXEC="/usr/bin/rfcomm" PAND_EXEC="/usr/bin/pand" DUND_EXEC="/usr/bin/dund" DAEMON_ENABLE="true" -HID2HCI_ENABLE="false" HIDD_ENABLE="false" RFCOMM_ENABLE="false" DUND_ENABLE="false" @@ -43,10 +40,6 @@ $DAEMON_EXEC sleep 1 fi - if [ "$HID2HCI_ENABLE" = "true" -a -x "$HID2HCI_EXEC" ] ; then - stat_append " $HID2HCI_NAME" - $HID2HCI_EXEC --tohci > /dev/null 2>&1 || true - fi if [ "$SDPD_ENABLE" = "true" -a -x "$SDPD_EXEC" ] ; then stat_append " $SDPD_NAME" $SDPD_EXEC
