[arch-commits] Commit in bluez/trunk (PKGBUILD bluetooth.conf.d rc.bluetooth)

Tom Gundersen tomegun at nymeria.archlinux.org
Thu May 30 08:10:06 EDT 2013


    Date: Thursday, May 30, 2013 @ 14:10:06
  Author: tomegun
Revision: 186634

upgpkg: bluez 4.101-2

usrmove

Added:
  bluez/trunk/bluetooth.conf.d
    (from rev 180782, bluez/trunk/bluetooth.conf.d)
  bluez/trunk/rc.bluetooth
    (from rev 180782, bluez/trunk/rc.bluetooth)
Modified:
  bluez/trunk/PKGBUILD

------------------+
 PKGBUILD         |  121 ++++++++++++++++++++++++++++-------------------------
 bluetooth.conf.d |   30 +++++++++++++
 rc.bluetooth     |   93 ++++++++++++++++++++++++++++++++++++++++
 3 files changed, 189 insertions(+), 55 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2013-05-30 10:57:28 UTC (rev 186633)
+++ PKGBUILD	2013-05-30 12:10:06 UTC (rev 186634)
@@ -3,75 +3,86 @@
 # Contributor: Andrea Scarpino <andrea at archlinux.org>
 # Contributor: Geoffroy Carrier <geoffroy at archlinux.org>
 
-pkgbase=bluez
-pkgname=('bluez' 'bluez-utils' 'bluez-libs')
-pkgver=5.3
-pkgrel=1
+pkgname=bluez
+pkgver=4.101
+pkgrel=2
+pkgdesc="Libraries and tools for the Bluetooth protocol stack"
 url="http://www.bluez.org/"
 arch=('i686' 'x86_64')
 license=('GPL2')
-makedepends=('libusb-compat' 'dbus' 'libical' 'systemd')
-options=(!libtool)
-source=("http://www.kernel.org/pub/linux/bluetooth/${pkgname}-${pkgver}.tar.bz2")
+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"
+            "python2-dbus: to run bluez-simple-agent"
+            "python2-gobject: to run bluez-simple-agent"
+            "libusb-compat: USB adapters support"
+            "cups: CUPS backend")
+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,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"
+        'bluetooth.conf.d'
+	'rc.bluetooth')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
 
-  ./configure \
-          --prefix=/usr \
-          --mandir=/usr/share/man \
-          --sysconfdir=/etc \
-          --localstatedir=/var \
-          --libexecdir=/usr/lib \
-          --enable-library # this is deprecated
+  ./configure --prefix=/usr \
+    --sysconfdir=/etc \
+    --localstatedir=/var \
+    --libexecdir=/lib \
+    --enable-gstreamer \
+    --enable-alsa \
+    --enable-usb \
+    --enable-tools \
+    --enable-bccmd \
+    --enable-dfutool \
+    --enable-hid2hci \
+    --enable-hidd \
+    --enable-pand \
+    --enable-dund \
+    --enable-cups \
+    --enable-wiimote \
+    --disable-test \
+    --with-systemdunitdir=/usr/lib/systemd/system
 
   make
 }
 
-package_bluez() {
-  pkgdesc="Daemons for the bluetooth protocol stack"
-  depends=('libical' 'dbus' 'glib2')
-  optdepends=("cups: CUPS backend")
-  backup=('etc/dbus-1/system.d/bluetooth.conf')
-  conflicts=('obexd-client' 'obexd-server')
-  provides=('obexd-client' 'obexd-server')
-  replaces=('obexd-client' 'obexd-server')
-
+package() {
   cd ${srcdir}/${pkgname}-${pkgver}
   make DESTDIR=${pkgdir} install
 
-  ### split out bluez-utils
-  rm -rf "$srcdir/_utils"
-  install -dm755 "$srcdir"/_utils/usr/share/man
-  mv "$pkgdir"/usr/share/man/man1 "$srcdir"/_utils/usr/share/man/
-  install -dm755 "$srcdir"/_utils/usr/bin
-  mv "$pkgdir"/usr/bin/{bccmd,ciptool,hciattach,hciconfig,hcidump,hcitool,l2ping,l2test,rctest,rfcomm,sdptool}\
-          "$srcdir"/_utils/usr/bin/
-  install -dm755 "$srcdir"/_utils/usr/lib
-  mv "$pkgdir"/usr/lib/udev "$srcdir"/_utils/usr/lib/
+  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 \
+                serial/serial.conf \
+    ${pkgdir}/etc/bluetooth/
+  
+  install -Dm644 ${srcdir}/bluetooth.conf.d \
+    ${pkgdir}/etc/conf.d/bluetooth
 
-  ### split out bluez-libs
-  rm -rf "$srcdir/_libs"
-  install -dm755 "$srcdir"/_libs/usr/lib/
-  mv "$pkgdir"/usr/lib/{pkgconfig,libbluetooth*} \
-          "$srcdir"/_libs/usr/lib/
-  mv "$pkgdir"/usr/include \
-          "$srcdir"/_libs/usr/
-}
+  # 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-test-device \
+    "${pkgdir}"/usr/bin/bluez-test-input
 
-package_bluez-libs() {
-  pkgdesc="Deprecated libraries for the bluetooth protocol stack"
-  depends=('glibc')
-
-  mv "$srcdir/_libs"/* "$pkgdir"
+        # usrmove
+        cd "$pkgdir"
+        mv usr/sbin/* usr/bin
+        rmdir usr/sbin
 }
-package_bluez-utils() {
-  pkgdesc="Development and debugging utilities for the bluetooth protocol stack"
-  depends=('systemd' 'libusb-compat')
-  conflicts=('bluez-hcidump')
-  provides=('bluez-hcidump')
-  replaces=('bluez-hcidump')
-
-  mv "$srcdir/_utils"/* "$pkgdir"
-}
-md5sums=('257f10ebe0b114a68dc174ba913160d8')
+md5sums=('902b390af95c6c5d6d1a17d94c8344ab'
+         '7412982b440f29fa7f76a41a87fef985'
+         '864cbd24e6efc3592e9284b0b5fb2cfd')

Copied: bluez/trunk/bluetooth.conf.d (from rev 180782, bluez/trunk/bluetooth.conf.d)
===================================================================
--- bluetooth.conf.d	                        (rev 0)
+++ bluetooth.conf.d	2013-05-30 12:10:06 UTC (rev 186634)
@@ -0,0 +1,30 @@
+# Bluetooth configuraton file
+
+# Bluetooth services (allowed values are "true" and "false")
+
+# Run the bluetoothd daemon (default: true)
+#DAEMON_ENABLE="false"
+
+# Run the sdp daemon (default: false)
+# If this is disabled, hcid's internal sdp daemon will be used
+#SDPD_ENABLE="true"
+
+# Run the bluetooth HID daemon (default: false)
+#HIDD_ENABLE="true"
+
+# Activate rfcomm ports (default: false)
+#RFCOMM_ENABLE="true"
+
+# Run bluetooth dial-up networking daemon (default: false)
+#DUND_ENABLE="true"
+
+# Run bluetooth PAN daemon (default: false)
+#PAND_ENABLE="true"
+
+# rfcomm configuration file (default: /etc/bluetooth/rfcomm.conf)
+#RFCOMM_CONFIG="/etc/bluetooth/rfcomm.conf"
+
+# Options for hidd, dund and pand (default: none)
+HIDD_OPTIONS="--server"
+#DUND_OPTIONS=""
+#PAND_OPTIONS=""

Copied: bluez/trunk/rc.bluetooth (from rev 180782, bluez/trunk/rc.bluetooth)
===================================================================
--- rc.bluetooth	                        (rev 0)
+++ rc.bluetooth	2013-05-30 12:10:06 UTC (rev 186634)
@@ -0,0 +1,93 @@
+#!/bin/bash
+#
+# Start/stop the Bluetooth daemons
+#
+
+. /etc/rc.conf
+. /etc/rc.d/functions
+
+DAEMON_NAME="bluetoothd"
+HIDD_NAME="hidd"
+RFCOMM_NAME="rfcomm"
+PAND_NAME="pand"
+DUND_NAME="dund"
+
+DAEMON_EXEC="/usr/sbin/bluetoothd"
+HIDD_EXEC="/usr/bin/hidd"
+RFCOMM_EXEC="/usr/bin/rfcomm"
+PAND_EXEC="/usr/bin/pand"
+DUND_EXEC="/usr/bin/dund"
+
+DAEMON_ENABLE="true"
+HIDD_ENABLE="false"
+RFCOMM_ENABLE="false"
+PAND_ENABLE="false"
+DUND_ENABLE="false"
+
+RFCOMM_CONFIG="/etc/bluetooth/rfcomm.conf"
+
+HIDD_OPTIONS=""
+PAND_OPTIONS=""
+DUND_OPTIONS=""
+
+[ -f /etc/conf.d/bluetooth ] && . /etc/conf.d/bluetooth
+
+case "$1" in
+  start)
+    stat_busy "Starting bluetooth subsystem:"
+    if [ "$DAEMON_ENABLE" = "true" -a -x "$DAEMON_EXEC" ] ; then
+      stat_append " $DAEMON_NAME"
+      $DAEMON_EXEC
+      sleep 1
+    fi
+    if [ "$HIDD_ENABLE" = "true" -a -x "$HIDD_EXEC" ]; then
+      stat_append " $HIDD_NAME"
+      $HIDD_EXEC $HIDD_OPTIONS
+    fi
+    if [ "$RFCOMM_ENABLE" = "true" -a -x "$RFCOMM_EXEC" -a -f "$RFCOMM_CONFIG" ]; then
+      stat_append " $RFCOMM_NAME"
+      $RFCOMM_EXEC -f $RFCOMM_CONFIG bind all
+    fi
+    if [ "$PAND_ENABLE" = "true" -a -x "$PAND_EXEC" -a -n "$PAND_OPTIONS" ]; then
+      stat_append " $PAND_NAME"
+      $PAND_EXEC $PAND_OPTIONS
+    fi
+    if [ "$DUND_ENABLE" = "true" -a -x "$DUND_EXEC" -a -n "$DUND_OPTIONS" ]; then
+      stat_append " $DUND_NAME"
+      $DUND_EXEC $DUND_OPTIONS
+    fi
+    add_daemon bluetooth
+    stat_done
+    ;;
+  stop)
+    stat_busy "Stopping bluetooth subsystem:"
+
+    stat_append " $DUND_NAME"
+    killall $DUND_NAME >/dev/null 2>&1
+
+    stat_append " $PAND_NAME"
+    killall $PAND_NAME >/dev/null 2>&1
+
+    if [ -x "$RFCOMM_EXEC" ]; then
+      stat_append " $RFCOMM_NAME"
+      $RFCOMM_EXEC release all >/dev/null 2>&1
+    fi
+
+    stat_append " $HIDD_NAME"
+    killall $HIDD_NAME >/dev/null 2>&1
+
+    stat_append " $DAEMON_NAME"
+    killall $DAEMON_NAME >/dev/null 2>&1
+
+    rm_daemon bluetooth
+    stat_done
+    ;;
+  restart)
+    $0 stop
+    sleep 1
+    $0 start
+    ;;
+  *)
+    echo "usage: $0 {start|stop|restart}"  
+esac
+exit 0



More information about the arch-commits mailing list