[arch-commits] Commit in bluez/repos (10 files)

Andreas Radke andyrtr at archlinux.org
Mon Sep 26 15:30:07 UTC 2016


    Date: Monday, September 26, 2016 @ 15:30:06
  Author: andyrtr
Revision: 276968

archrelease: copy trunk to extra-i686, extra-x86_64

Added:
  bluez/repos/extra-i686/PKGBUILD
    (from rev 276967, bluez/trunk/PKGBUILD)
  bluez/repos/extra-i686/bluetooth.modprobe
    (from rev 276967, bluez/trunk/bluetooth.modprobe)
  bluez/repos/extra-x86_64/PKGBUILD
    (from rev 276967, bluez/trunk/PKGBUILD)
  bluez/repos/extra-x86_64/bluetooth.modprobe
    (from rev 276967, bluez/trunk/bluetooth.modprobe)
Deleted:
  bluez/repos/extra-i686/PKGBUILD
  bluez/repos/extra-i686/bluetooth.modprobe
  bluez/repos/extra-i686/fix_commands_via_pipe_broken.diff
  bluez/repos/extra-x86_64/PKGBUILD
  bluez/repos/extra-x86_64/bluetooth.modprobe
  bluez/repos/extra-x86_64/fix_commands_via_pipe_broken.diff

------------------------------------------------+
 /PKGBUILD                                      |  286 +++++++++++++++++++++++
 /bluetooth.modprobe                            |    6 
 extra-i686/PKGBUILD                            |  150 ------------
 extra-i686/bluetooth.modprobe                  |    3 
 extra-i686/fix_commands_via_pipe_broken.diff   |   30 --
 extra-x86_64/PKGBUILD                          |  150 ------------
 extra-x86_64/bluetooth.modprobe                |    3 
 extra-x86_64/fix_commands_via_pipe_broken.diff |   30 --
 8 files changed, 292 insertions(+), 366 deletions(-)

Deleted: extra-i686/PKGBUILD
===================================================================
--- extra-i686/PKGBUILD	2016-09-26 15:29:51 UTC (rev 276967)
+++ extra-i686/PKGBUILD	2016-09-26 15:30:06 UTC (rev 276968)
@@ -1,150 +0,0 @@
-# $Id$
-# Maintainer: Tom Gundersen <teg at jklm.no>
-# Contributor: Andrea Scarpino <andrea at archlinux.org>
-# Contributor: Geoffroy Carrier <geoffroy at archlinux.org>
-
-pkgbase=bluez
-pkgname=('bluez' 'bluez-utils' 'bluez-libs' 'bluez-cups' 'bluez-hid2hci' 'bluez-plugins')
-pkgver=5.41
-pkgrel=2
-url="http://www.bluez.org/"
-arch=('i686' 'x86_64')
-license=('GPL2')
-makedepends=('dbus' 'libical' 'systemd')
-source=(http://www.kernel.org/pub/linux/bluetooth/${pkgname}-${pkgver}.tar.{xz,sign}
-        fix_commands_via_pipe_broken.diff
-        bluetooth.modprobe)
-# see https://www.kernel.org/pub/linux/bluetooth/sha256sums.asc
-sha256sums=('df7dc4462494dad4e60a2943240d584f6e760235dca64f5f10eba46dbab7f5f0'
-            'SKIP'
-            '807d84588df5ea49338c6adb5605d091855fb234b47476dc6a0eb3f2f7ca3f72'
-            '46c021be659c9a1c4e55afd04df0c059af1f3d98a96338236412e449bf7477b4')
-validpgpkeys=('E932D120BC2AEC444E558F0106CA9F5D1DCF2659') # Marcel Holtmann <marcel at holtmann.org>
-
-prepare() {
-  cd ${pkgname}-${pkgver}
-  patch -Np1 -i ../fix_commands_via_pipe_broken.diff
-}
-
-build() {
-  cd ${pkgname}-${pkgver}
-  ./configure \
-          --prefix=/usr \
-          --mandir=/usr/share/man \
-          --sysconfdir=/etc \
-          --localstatedir=/var \
-          --libexecdir=/usr/lib \
-          --enable-sixaxis \
-          --enable-experimental \
-          --enable-library # this is deprecated
-  make
-}
-
-check() {
-  cd $pkgname-$pkgver
-  make check
-}
-
-
-package_bluez() {
-  pkgdesc="Daemons for the bluetooth protocol stack"
-  depends=('libical' 'dbus' 'glib2')
-  backup=('etc/dbus-1/system.d/bluetooth.conf'
-          'etc/bluetooth/main.conf')
-  conflicts=('obexd-client' 'obexd-server')
-
-  cd ${pkgbase}-${pkgver}
-  make DESTDIR=${pkgdir} \
-       install-libexecPROGRAMS \
-       install-dbussessionbusDATA \
-       install-systemdsystemunitDATA \
-       install-systemduserunitDATA \
-       install-dbussystembusDATA \
-       install-dbusDATA \
-       install-man8
-
-  # ship upstream main config file
-  install -dm755 ${pkgdir}/etc/bluetooth
-  install -Dm644 ${srcdir}/${pkgbase}-${pkgver}/src/main.conf ${pkgdir}/etc/bluetooth/main.conf
-
-  # add basic documention
-  install -dm755 ${pkgdir}/usr/share/doc/${pkgbase}/dbus-apis
-  cp -a doc/*.txt ${pkgdir}/usr/share/doc/${pkgbase}/dbus-apis/
-  # fix module loading errors
-  install -dm755 ${pkgdir}/usr/lib/modprobe.d
-  install -Dm644 ${srcdir}/bluetooth.modprobe ${pkgdir}/usr/lib/modprobe.d/bluetooth-usb.conf	
-  
-  # fix obex file transfer - https://bugs.archlinux.org/task/45816
-  ln -fs /usr/lib/systemd/user/obex.service ${pkgdir}/usr/lib/systemd/user/dbus-org.bluez.obex.service
-}
-
-package_bluez-utils() {
-  pkgdesc="Development and debugging utilities for the bluetooth protocol stack"
-  depends=('dbus' 'systemd' 'glib2')
-  conflicts=('bluez-hcidump')
-  provides=('bluez-hcidump')
-  replaces=('bluez-hcidump' 'bluez<=4.101')
-
-  cd ${pkgbase}-${pkgver}
-  make DESTDIR=${pkgdir} \
-       install-binPROGRAMS \
-       install-man1
-
-  # add missing tools FS#41132, FS#41687, FS#42716
-  for files in `find tools/ -type f -perm -755`; do
-    filename=$(basename $files)
-    install -Dm755 ${srcdir}/${pkgbase}-${pkgver}/tools/$filename ${pkgdir}/usr/bin/$filename
-  done
-  # add gatttool usefulbdaddr with Bluetooth 4.0LE 
-  install -Dm755 ${srcdir}/${pkgbase}-${pkgver}/attrib/gatttool ${pkgdir}/usr/bin/gatttool
-  
-  # libbluetooth.so* are part of libLTLIBRARIES and binPROGRAMS targets
-  #make DESTDIR=${pkgdir} uninstall-libLTLIBRARIES
-  #rmdir ${pkgdir}/usr/lib
-  rm -rf ${pkgdir}/usr/lib
-  
-  # move the hid2hci man page out
-  mv ${pkgdir}/usr/share/man/man1/hid2hci.1 ${srcdir}/
-}
-
-package_bluez-libs() {
-  pkgdesc="Deprecated libraries for the bluetooth protocol stack"
-  depends=('glibc')
-  license=('LGPL2.1')
-
-  cd ${pkgbase}-${pkgver}
-  make DESTDIR=${pkgdir} \
-       install-includeHEADERS \
-       install-libLTLIBRARIES \
-       install-pkgconfigDATA
-}
-
-package_bluez-cups() {
-  pkgdesc="CUPS printer backend for Bluetooth printers"
-  depends=('cups')
-
-  cd ${pkgbase}-${pkgver}
-  make DESTDIR=${pkgdir} install-cupsPROGRAMS
-}
-
-package_bluez-hid2hci() {
-  pkgdesc="Put HID proxying bluetooth HCI's into HCI mode"
-  depends=('systemd')
-
-  cd ${pkgbase}-${pkgver}
-  make DESTDIR=${pkgdir} \
-       install-udevPROGRAMS \
-       install-rulesDATA
-  
-  install -dm755 ${pkgdir}/usr/share/man/man1
-  mv ${srcdir}/hid2hci.1 ${pkgdir}/usr/share/man/man1/hid2hci.1
-}
-
-package_bluez-plugins() {
-  pkgdesc="bluez plugins (PS3 Sixaxis controller)"
-  depends=('systemd')
-
-  cd ${pkgbase}-${pkgver}
-  make DESTDIR=${pkgdir} \
-       install-pluginLTLIBRARIES
-}

Copied: bluez/repos/extra-i686/PKGBUILD (from rev 276967, bluez/trunk/PKGBUILD)
===================================================================
--- extra-i686/PKGBUILD	                        (rev 0)
+++ extra-i686/PKGBUILD	2016-09-26 15:30:06 UTC (rev 276968)
@@ -0,0 +1,143 @@
+# $Id$
+# Maintainer: Tom Gundersen <teg at jklm.no>
+# Contributor: Andrea Scarpino <andrea at archlinux.org>
+# Contributor: Geoffroy Carrier <geoffroy at archlinux.org>
+
+pkgbase=bluez
+pkgname=('bluez' 'bluez-utils' 'bluez-libs' 'bluez-cups' 'bluez-hid2hci' 'bluez-plugins')
+pkgver=5.42
+pkgrel=1
+url="http://www.bluez.org/"
+arch=('i686' 'x86_64')
+license=('GPL2')
+makedepends=('dbus' 'libical' 'systemd')
+source=(http://www.kernel.org/pub/linux/bluetooth/${pkgname}-${pkgver}.tar.{xz,sign}
+        bluetooth.modprobe)
+# see https://www.kernel.org/pub/linux/bluetooth/sha256sums.asc
+sha256sums=('4f166fed80fc017396d6f2b3cae5185520875ab456d1c74d6b4eaa4da0e16109'
+            'SKIP'
+            '46c021be659c9a1c4e55afd04df0c059af1f3d98a96338236412e449bf7477b4')
+validpgpkeys=('E932D120BC2AEC444E558F0106CA9F5D1DCF2659') # Marcel Holtmann <marcel at holtmann.org>
+
+build() {
+  cd ${pkgname}-${pkgver}
+  ./configure \
+          --prefix=/usr \
+          --mandir=/usr/share/man \
+          --sysconfdir=/etc \
+          --localstatedir=/var \
+          --libexecdir=/usr/lib \
+          --enable-sixaxis \
+          --enable-experimental \
+          --enable-library # this is deprecated
+  make
+}
+
+check() {
+  cd $pkgname-$pkgver
+  make check
+}
+
+
+package_bluez() {
+  pkgdesc="Daemons for the bluetooth protocol stack"
+  depends=('libical' 'dbus' 'glib2')
+  backup=('etc/dbus-1/system.d/bluetooth.conf'
+          'etc/bluetooth/main.conf')
+  conflicts=('obexd-client' 'obexd-server')
+
+  cd ${pkgbase}-${pkgver}
+  make DESTDIR=${pkgdir} \
+       install-libexecPROGRAMS \
+       install-dbussessionbusDATA \
+       install-systemdsystemunitDATA \
+       install-systemduserunitDATA \
+       install-dbussystembusDATA \
+       install-dbusDATA \
+       install-man8
+
+  # ship upstream main config file
+  install -dm755 ${pkgdir}/etc/bluetooth
+  install -Dm644 ${srcdir}/${pkgbase}-${pkgver}/src/main.conf ${pkgdir}/etc/bluetooth/main.conf
+
+  # add basic documention
+  install -dm755 ${pkgdir}/usr/share/doc/${pkgbase}/dbus-apis
+  cp -a doc/*.txt ${pkgdir}/usr/share/doc/${pkgbase}/dbus-apis/
+  # fix module loading errors
+  install -dm755 ${pkgdir}/usr/lib/modprobe.d
+  install -Dm644 ${srcdir}/bluetooth.modprobe ${pkgdir}/usr/lib/modprobe.d/bluetooth-usb.conf	
+  
+  # fix obex file transfer - https://bugs.archlinux.org/task/45816
+  ln -fs /usr/lib/systemd/user/obex.service ${pkgdir}/usr/lib/systemd/user/dbus-org.bluez.obex.service
+}
+
+package_bluez-utils() {
+  pkgdesc="Development and debugging utilities for the bluetooth protocol stack"
+  depends=('dbus' 'systemd' 'glib2')
+  conflicts=('bluez-hcidump')
+  provides=('bluez-hcidump')
+  replaces=('bluez-hcidump' 'bluez<=4.101')
+
+  cd ${pkgbase}-${pkgver}
+  make DESTDIR=${pkgdir} \
+       install-binPROGRAMS \
+       install-man1
+
+  # add missing tools FS#41132, FS#41687, FS#42716
+  for files in `find tools/ -type f -perm -755`; do
+    filename=$(basename $files)
+    install -Dm755 ${srcdir}/${pkgbase}-${pkgver}/tools/$filename ${pkgdir}/usr/bin/$filename
+  done
+  # add gatttool usefulbdaddr with Bluetooth 4.0LE 
+  install -Dm755 ${srcdir}/${pkgbase}-${pkgver}/attrib/gatttool ${pkgdir}/usr/bin/gatttool
+  
+  # libbluetooth.so* are part of libLTLIBRARIES and binPROGRAMS targets
+  #make DESTDIR=${pkgdir} uninstall-libLTLIBRARIES
+  #rmdir ${pkgdir}/usr/lib
+  rm -rf ${pkgdir}/usr/lib
+  
+  # move the hid2hci man page out
+  mv ${pkgdir}/usr/share/man/man1/hid2hci.1 ${srcdir}/
+}
+
+package_bluez-libs() {
+  pkgdesc="Deprecated libraries for the bluetooth protocol stack"
+  depends=('glibc')
+  license=('LGPL2.1')
+
+  cd ${pkgbase}-${pkgver}
+  make DESTDIR=${pkgdir} \
+       install-includeHEADERS \
+       install-libLTLIBRARIES \
+       install-pkgconfigDATA
+}
+
+package_bluez-cups() {
+  pkgdesc="CUPS printer backend for Bluetooth printers"
+  depends=('cups')
+
+  cd ${pkgbase}-${pkgver}
+  make DESTDIR=${pkgdir} install-cupsPROGRAMS
+}
+
+package_bluez-hid2hci() {
+  pkgdesc="Put HID proxying bluetooth HCI's into HCI mode"
+  depends=('systemd')
+
+  cd ${pkgbase}-${pkgver}
+  make DESTDIR=${pkgdir} \
+       install-udevPROGRAMS \
+       install-rulesDATA
+  
+  install -dm755 ${pkgdir}/usr/share/man/man1
+  mv ${srcdir}/hid2hci.1 ${pkgdir}/usr/share/man/man1/hid2hci.1
+}
+
+package_bluez-plugins() {
+  pkgdesc="bluez plugins (PS3 Sixaxis controller)"
+  depends=('systemd')
+
+  cd ${pkgbase}-${pkgver}
+  make DESTDIR=${pkgdir} \
+       install-pluginLTLIBRARIES
+}

Deleted: extra-i686/bluetooth.modprobe
===================================================================
--- extra-i686/bluetooth.modprobe	2016-09-26 15:29:51 UTC (rev 276967)
+++ extra-i686/bluetooth.modprobe	2016-09-26 15:30:06 UTC (rev 276968)
@@ -1,3 +0,0 @@
-# use "reset=1" as default, since it should be safe for recent devices and
-# solves all kind of problems.
-options btusb reset=1

Copied: bluez/repos/extra-i686/bluetooth.modprobe (from rev 276967, bluez/trunk/bluetooth.modprobe)
===================================================================
--- extra-i686/bluetooth.modprobe	                        (rev 0)
+++ extra-i686/bluetooth.modprobe	2016-09-26 15:30:06 UTC (rev 276968)
@@ -0,0 +1,3 @@
+# use "reset=1" as default, since it should be safe for recent devices and
+# solves all kind of problems.
+options btusb reset=1

Deleted: extra-i686/fix_commands_via_pipe_broken.diff
===================================================================
--- extra-i686/fix_commands_via_pipe_broken.diff	2016-09-26 15:29:51 UTC (rev 276967)
+++ extra-i686/fix_commands_via_pipe_broken.diff	2016-09-26 15:30:06 UTC (rev 276968)
@@ -1,30 +0,0 @@
-From 5f2c8a15228f58f1f7ac772b738fcc1b98b761d1 Mon Sep 17 00:00:00 2001
-From: Johan Hedberg <johan.hedberg at intel.com>
-Date: Sun, 24 Jul 2016 16:18:37 +0300
-Subject: client: Don't attach stdin in connect_handler()
-
-connect_handler() gets called when we're connected to D-Bus but before
-introspection of the remote service (org.bluez) is complete. The
-client_ready() callback otoh waits until the introspection is complete
-and is already also taking care of attaching input.
----
- client/main.c | 3 ---
- 1 file changed, 3 deletions(-)
-
-diff --git a/client/main.c b/client/main.c
-index 32341ad..056331f 100644
---- a/client/main.c
-+++ b/client/main.c
-@@ -120,9 +120,6 @@ static void connect_handler(DBusConnection *connection, void *user_data)
- 	printf("\r");
- 	rl_on_new_line();
- 	rl_redisplay();
--
--	if (!input)
--		input = setup_standard_input();
- }
- 
- static void disconnect_handler(DBusConnection *connection, void *user_data)
--- 
-cgit v0.12
-

Deleted: extra-x86_64/PKGBUILD
===================================================================
--- extra-x86_64/PKGBUILD	2016-09-26 15:29:51 UTC (rev 276967)
+++ extra-x86_64/PKGBUILD	2016-09-26 15:30:06 UTC (rev 276968)
@@ -1,150 +0,0 @@
-# $Id$
-# Maintainer: Tom Gundersen <teg at jklm.no>
-# Contributor: Andrea Scarpino <andrea at archlinux.org>
-# Contributor: Geoffroy Carrier <geoffroy at archlinux.org>
-
-pkgbase=bluez
-pkgname=('bluez' 'bluez-utils' 'bluez-libs' 'bluez-cups' 'bluez-hid2hci' 'bluez-plugins')
-pkgver=5.41
-pkgrel=2
-url="http://www.bluez.org/"
-arch=('i686' 'x86_64')
-license=('GPL2')
-makedepends=('dbus' 'libical' 'systemd')
-source=(http://www.kernel.org/pub/linux/bluetooth/${pkgname}-${pkgver}.tar.{xz,sign}
-        fix_commands_via_pipe_broken.diff
-        bluetooth.modprobe)
-# see https://www.kernel.org/pub/linux/bluetooth/sha256sums.asc
-sha256sums=('df7dc4462494dad4e60a2943240d584f6e760235dca64f5f10eba46dbab7f5f0'
-            'SKIP'
-            '807d84588df5ea49338c6adb5605d091855fb234b47476dc6a0eb3f2f7ca3f72'
-            '46c021be659c9a1c4e55afd04df0c059af1f3d98a96338236412e449bf7477b4')
-validpgpkeys=('E932D120BC2AEC444E558F0106CA9F5D1DCF2659') # Marcel Holtmann <marcel at holtmann.org>
-
-prepare() {
-  cd ${pkgname}-${pkgver}
-  patch -Np1 -i ../fix_commands_via_pipe_broken.diff
-}
-
-build() {
-  cd ${pkgname}-${pkgver}
-  ./configure \
-          --prefix=/usr \
-          --mandir=/usr/share/man \
-          --sysconfdir=/etc \
-          --localstatedir=/var \
-          --libexecdir=/usr/lib \
-          --enable-sixaxis \
-          --enable-experimental \
-          --enable-library # this is deprecated
-  make
-}
-
-check() {
-  cd $pkgname-$pkgver
-  make check
-}
-
-
-package_bluez() {
-  pkgdesc="Daemons for the bluetooth protocol stack"
-  depends=('libical' 'dbus' 'glib2')
-  backup=('etc/dbus-1/system.d/bluetooth.conf'
-          'etc/bluetooth/main.conf')
-  conflicts=('obexd-client' 'obexd-server')
-
-  cd ${pkgbase}-${pkgver}
-  make DESTDIR=${pkgdir} \
-       install-libexecPROGRAMS \
-       install-dbussessionbusDATA \
-       install-systemdsystemunitDATA \
-       install-systemduserunitDATA \
-       install-dbussystembusDATA \
-       install-dbusDATA \
-       install-man8
-
-  # ship upstream main config file
-  install -dm755 ${pkgdir}/etc/bluetooth
-  install -Dm644 ${srcdir}/${pkgbase}-${pkgver}/src/main.conf ${pkgdir}/etc/bluetooth/main.conf
-
-  # add basic documention
-  install -dm755 ${pkgdir}/usr/share/doc/${pkgbase}/dbus-apis
-  cp -a doc/*.txt ${pkgdir}/usr/share/doc/${pkgbase}/dbus-apis/
-  # fix module loading errors
-  install -dm755 ${pkgdir}/usr/lib/modprobe.d
-  install -Dm644 ${srcdir}/bluetooth.modprobe ${pkgdir}/usr/lib/modprobe.d/bluetooth-usb.conf	
-  
-  # fix obex file transfer - https://bugs.archlinux.org/task/45816
-  ln -fs /usr/lib/systemd/user/obex.service ${pkgdir}/usr/lib/systemd/user/dbus-org.bluez.obex.service
-}
-
-package_bluez-utils() {
-  pkgdesc="Development and debugging utilities for the bluetooth protocol stack"
-  depends=('dbus' 'systemd' 'glib2')
-  conflicts=('bluez-hcidump')
-  provides=('bluez-hcidump')
-  replaces=('bluez-hcidump' 'bluez<=4.101')
-
-  cd ${pkgbase}-${pkgver}
-  make DESTDIR=${pkgdir} \
-       install-binPROGRAMS \
-       install-man1
-
-  # add missing tools FS#41132, FS#41687, FS#42716
-  for files in `find tools/ -type f -perm -755`; do
-    filename=$(basename $files)
-    install -Dm755 ${srcdir}/${pkgbase}-${pkgver}/tools/$filename ${pkgdir}/usr/bin/$filename
-  done
-  # add gatttool usefulbdaddr with Bluetooth 4.0LE 
-  install -Dm755 ${srcdir}/${pkgbase}-${pkgver}/attrib/gatttool ${pkgdir}/usr/bin/gatttool
-  
-  # libbluetooth.so* are part of libLTLIBRARIES and binPROGRAMS targets
-  #make DESTDIR=${pkgdir} uninstall-libLTLIBRARIES
-  #rmdir ${pkgdir}/usr/lib
-  rm -rf ${pkgdir}/usr/lib
-  
-  # move the hid2hci man page out
-  mv ${pkgdir}/usr/share/man/man1/hid2hci.1 ${srcdir}/
-}
-
-package_bluez-libs() {
-  pkgdesc="Deprecated libraries for the bluetooth protocol stack"
-  depends=('glibc')
-  license=('LGPL2.1')
-
-  cd ${pkgbase}-${pkgver}
-  make DESTDIR=${pkgdir} \
-       install-includeHEADERS \
-       install-libLTLIBRARIES \
-       install-pkgconfigDATA
-}
-
-package_bluez-cups() {
-  pkgdesc="CUPS printer backend for Bluetooth printers"
-  depends=('cups')
-
-  cd ${pkgbase}-${pkgver}
-  make DESTDIR=${pkgdir} install-cupsPROGRAMS
-}
-
-package_bluez-hid2hci() {
-  pkgdesc="Put HID proxying bluetooth HCI's into HCI mode"
-  depends=('systemd')
-
-  cd ${pkgbase}-${pkgver}
-  make DESTDIR=${pkgdir} \
-       install-udevPROGRAMS \
-       install-rulesDATA
-  
-  install -dm755 ${pkgdir}/usr/share/man/man1
-  mv ${srcdir}/hid2hci.1 ${pkgdir}/usr/share/man/man1/hid2hci.1
-}
-
-package_bluez-plugins() {
-  pkgdesc="bluez plugins (PS3 Sixaxis controller)"
-  depends=('systemd')
-
-  cd ${pkgbase}-${pkgver}
-  make DESTDIR=${pkgdir} \
-       install-pluginLTLIBRARIES
-}

Copied: bluez/repos/extra-x86_64/PKGBUILD (from rev 276967, bluez/trunk/PKGBUILD)
===================================================================
--- extra-x86_64/PKGBUILD	                        (rev 0)
+++ extra-x86_64/PKGBUILD	2016-09-26 15:30:06 UTC (rev 276968)
@@ -0,0 +1,143 @@
+# $Id$
+# Maintainer: Tom Gundersen <teg at jklm.no>
+# Contributor: Andrea Scarpino <andrea at archlinux.org>
+# Contributor: Geoffroy Carrier <geoffroy at archlinux.org>
+
+pkgbase=bluez
+pkgname=('bluez' 'bluez-utils' 'bluez-libs' 'bluez-cups' 'bluez-hid2hci' 'bluez-plugins')
+pkgver=5.42
+pkgrel=1
+url="http://www.bluez.org/"
+arch=('i686' 'x86_64')
+license=('GPL2')
+makedepends=('dbus' 'libical' 'systemd')
+source=(http://www.kernel.org/pub/linux/bluetooth/${pkgname}-${pkgver}.tar.{xz,sign}
+        bluetooth.modprobe)
+# see https://www.kernel.org/pub/linux/bluetooth/sha256sums.asc
+sha256sums=('4f166fed80fc017396d6f2b3cae5185520875ab456d1c74d6b4eaa4da0e16109'
+            'SKIP'
+            '46c021be659c9a1c4e55afd04df0c059af1f3d98a96338236412e449bf7477b4')
+validpgpkeys=('E932D120BC2AEC444E558F0106CA9F5D1DCF2659') # Marcel Holtmann <marcel at holtmann.org>
+
+build() {
+  cd ${pkgname}-${pkgver}
+  ./configure \
+          --prefix=/usr \
+          --mandir=/usr/share/man \
+          --sysconfdir=/etc \
+          --localstatedir=/var \
+          --libexecdir=/usr/lib \
+          --enable-sixaxis \
+          --enable-experimental \
+          --enable-library # this is deprecated
+  make
+}
+
+check() {
+  cd $pkgname-$pkgver
+  make check
+}
+
+
+package_bluez() {
+  pkgdesc="Daemons for the bluetooth protocol stack"
+  depends=('libical' 'dbus' 'glib2')
+  backup=('etc/dbus-1/system.d/bluetooth.conf'
+          'etc/bluetooth/main.conf')
+  conflicts=('obexd-client' 'obexd-server')
+
+  cd ${pkgbase}-${pkgver}
+  make DESTDIR=${pkgdir} \
+       install-libexecPROGRAMS \
+       install-dbussessionbusDATA \
+       install-systemdsystemunitDATA \
+       install-systemduserunitDATA \
+       install-dbussystembusDATA \
+       install-dbusDATA \
+       install-man8
+
+  # ship upstream main config file
+  install -dm755 ${pkgdir}/etc/bluetooth
+  install -Dm644 ${srcdir}/${pkgbase}-${pkgver}/src/main.conf ${pkgdir}/etc/bluetooth/main.conf
+
+  # add basic documention
+  install -dm755 ${pkgdir}/usr/share/doc/${pkgbase}/dbus-apis
+  cp -a doc/*.txt ${pkgdir}/usr/share/doc/${pkgbase}/dbus-apis/
+  # fix module loading errors
+  install -dm755 ${pkgdir}/usr/lib/modprobe.d
+  install -Dm644 ${srcdir}/bluetooth.modprobe ${pkgdir}/usr/lib/modprobe.d/bluetooth-usb.conf	
+  
+  # fix obex file transfer - https://bugs.archlinux.org/task/45816
+  ln -fs /usr/lib/systemd/user/obex.service ${pkgdir}/usr/lib/systemd/user/dbus-org.bluez.obex.service
+}
+
+package_bluez-utils() {
+  pkgdesc="Development and debugging utilities for the bluetooth protocol stack"
+  depends=('dbus' 'systemd' 'glib2')
+  conflicts=('bluez-hcidump')
+  provides=('bluez-hcidump')
+  replaces=('bluez-hcidump' 'bluez<=4.101')
+
+  cd ${pkgbase}-${pkgver}
+  make DESTDIR=${pkgdir} \
+       install-binPROGRAMS \
+       install-man1
+
+  # add missing tools FS#41132, FS#41687, FS#42716
+  for files in `find tools/ -type f -perm -755`; do
+    filename=$(basename $files)
+    install -Dm755 ${srcdir}/${pkgbase}-${pkgver}/tools/$filename ${pkgdir}/usr/bin/$filename
+  done
+  # add gatttool usefulbdaddr with Bluetooth 4.0LE 
+  install -Dm755 ${srcdir}/${pkgbase}-${pkgver}/attrib/gatttool ${pkgdir}/usr/bin/gatttool
+  
+  # libbluetooth.so* are part of libLTLIBRARIES and binPROGRAMS targets
+  #make DESTDIR=${pkgdir} uninstall-libLTLIBRARIES
+  #rmdir ${pkgdir}/usr/lib
+  rm -rf ${pkgdir}/usr/lib
+  
+  # move the hid2hci man page out
+  mv ${pkgdir}/usr/share/man/man1/hid2hci.1 ${srcdir}/
+}
+
+package_bluez-libs() {
+  pkgdesc="Deprecated libraries for the bluetooth protocol stack"
+  depends=('glibc')
+  license=('LGPL2.1')
+
+  cd ${pkgbase}-${pkgver}
+  make DESTDIR=${pkgdir} \
+       install-includeHEADERS \
+       install-libLTLIBRARIES \
+       install-pkgconfigDATA
+}
+
+package_bluez-cups() {
+  pkgdesc="CUPS printer backend for Bluetooth printers"
+  depends=('cups')
+
+  cd ${pkgbase}-${pkgver}
+  make DESTDIR=${pkgdir} install-cupsPROGRAMS
+}
+
+package_bluez-hid2hci() {
+  pkgdesc="Put HID proxying bluetooth HCI's into HCI mode"
+  depends=('systemd')
+
+  cd ${pkgbase}-${pkgver}
+  make DESTDIR=${pkgdir} \
+       install-udevPROGRAMS \
+       install-rulesDATA
+  
+  install -dm755 ${pkgdir}/usr/share/man/man1
+  mv ${srcdir}/hid2hci.1 ${pkgdir}/usr/share/man/man1/hid2hci.1
+}
+
+package_bluez-plugins() {
+  pkgdesc="bluez plugins (PS3 Sixaxis controller)"
+  depends=('systemd')
+
+  cd ${pkgbase}-${pkgver}
+  make DESTDIR=${pkgdir} \
+       install-pluginLTLIBRARIES
+}

Deleted: extra-x86_64/bluetooth.modprobe
===================================================================
--- extra-x86_64/bluetooth.modprobe	2016-09-26 15:29:51 UTC (rev 276967)
+++ extra-x86_64/bluetooth.modprobe	2016-09-26 15:30:06 UTC (rev 276968)
@@ -1,3 +0,0 @@
-# use "reset=1" as default, since it should be safe for recent devices and
-# solves all kind of problems.
-options btusb reset=1

Copied: bluez/repos/extra-x86_64/bluetooth.modprobe (from rev 276967, bluez/trunk/bluetooth.modprobe)
===================================================================
--- extra-x86_64/bluetooth.modprobe	                        (rev 0)
+++ extra-x86_64/bluetooth.modprobe	2016-09-26 15:30:06 UTC (rev 276968)
@@ -0,0 +1,3 @@
+# use "reset=1" as default, since it should be safe for recent devices and
+# solves all kind of problems.
+options btusb reset=1

Deleted: extra-x86_64/fix_commands_via_pipe_broken.diff
===================================================================
--- extra-x86_64/fix_commands_via_pipe_broken.diff	2016-09-26 15:29:51 UTC (rev 276967)
+++ extra-x86_64/fix_commands_via_pipe_broken.diff	2016-09-26 15:30:06 UTC (rev 276968)
@@ -1,30 +0,0 @@
-From 5f2c8a15228f58f1f7ac772b738fcc1b98b761d1 Mon Sep 17 00:00:00 2001
-From: Johan Hedberg <johan.hedberg at intel.com>
-Date: Sun, 24 Jul 2016 16:18:37 +0300
-Subject: client: Don't attach stdin in connect_handler()
-
-connect_handler() gets called when we're connected to D-Bus but before
-introspection of the remote service (org.bluez) is complete. The
-client_ready() callback otoh waits until the introspection is complete
-and is already also taking care of attaching input.
----
- client/main.c | 3 ---
- 1 file changed, 3 deletions(-)
-
-diff --git a/client/main.c b/client/main.c
-index 32341ad..056331f 100644
---- a/client/main.c
-+++ b/client/main.c
-@@ -120,9 +120,6 @@ static void connect_handler(DBusConnection *connection, void *user_data)
- 	printf("\r");
- 	rl_on_new_line();
- 	rl_redisplay();
--
--	if (!input)
--		input = setup_standard_input();
- }
- 
- static void disconnect_handler(DBusConnection *connection, void *user_data)
--- 
-cgit v0.12
-



More information about the arch-commits mailing list