[arch-commits] Commit in bluez/repos (4 files)
Andreas Radke
andyrtr at archlinux.org
Sun Feb 11 09:16:16 UTC 2018
Date: Sunday, February 11, 2018 @ 09:16:15
Author: andyrtr
Revision: 316603
archrelease: copy trunk to testing-x86_64
Added:
bluez/repos/testing-x86_64/
bluez/repos/testing-x86_64/PKGBUILD
(from rev 316602, bluez/trunk/PKGBUILD)
bluez/repos/testing-x86_64/bluetooth.modprobe
(from rev 316602, bluez/trunk/bluetooth.modprobe)
bluez/repos/testing-x86_64/fixes_order_InterfaceAdded.diff
(from rev 316602, bluez/trunk/fixes_order_InterfaceAdded.diff)
---------------------------------+
PKGBUILD | 153 ++++++++++++++++++++++++++++++++++++++
bluetooth.modprobe | 3
fixes_order_InterfaceAdded.diff | 72 +++++++++++++++++
3 files changed, 228 insertions(+)
Copied: bluez/repos/testing-x86_64/PKGBUILD (from rev 316602, bluez/trunk/PKGBUILD)
===================================================================
--- testing-x86_64/PKGBUILD (rev 0)
+++ testing-x86_64/PKGBUILD 2018-02-11 09:16:15 UTC (rev 316603)
@@ -0,0 +1,153 @@
+# $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.48
+pkgrel=2
+url="http://www.bluez.org/"
+arch=('x86_64')
+license=('GPL2')
+makedepends=('dbus' 'libical' 'systemd' 'alsa-lib')
+source=(https://www.kernel.org/pub/linux/bluetooth/${pkgname}-${pkgver}.tar.{xz,sign}
+ fixes_order_InterfaceAdded.diff
+ bluetooth.modprobe)
+# see https://www.kernel.org/pub/linux/bluetooth/sha256sums.asc
+sha256sums=('b9a8723072ef66bae7ec301c774902ebcb444c9c5b149b5a199e60a1ba970e90'
+ 'SKIP'
+ '56e4bf467b285e4c6bc50eafc88f471e3683f3c3c76afe0ffe2bd6f0d17a1eae'
+ '46c021be659c9a1c4e55afd04df0c059af1f3d98a96338236412e449bf7477b4')
+validpgpkeys=('E932D120BC2AEC444E558F0106CA9F5D1DCF2659') # Marcel Holtmann <marcel at holtmann.org>
+
+prepare() {
+ cd $pkgname-$pkgver
+ patch -Np1 -i $srcdir/fixes_order_InterfaceAdded.diff
+}
+
+build() {
+ cd ${pkgname}-${pkgver}
+ ./configure \
+ --prefix=/usr \
+ --mandir=/usr/share/man \
+ --sysconfdir=/etc \
+ --localstatedir=/var \
+ --libexecdir=/usr/lib \
+ --enable-midi \
+ --enable-sixaxis \
+ --enable-experimental \
+ --enable-library # this is deprecated
+ make
+}
+
+check() {
+ cd $pkgname-$pkgver
+ make check || /bin/true # https://bugzilla.kernel.org/show_bug.cgi?id=196621
+}
+
+
+package_bluez() {
+ pkgdesc="Daemons for the bluetooth protocol stack"
+ depends=('libical' 'dbus' 'glib2' 'alsa-lib')
+ 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
+ # load module at system start required by some functions
+ # https://bugzilla.kernel.org/show_bug.cgi?id=196621
+ install -dm755 $pkgdir/usr/lib/modules-load.d
+ echo "crypto_user" > $pkgdir/usr/lib/modules-load.d/bluez.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
+
+ # 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/testing-x86_64/bluetooth.modprobe (from rev 316602, bluez/trunk/bluetooth.modprobe)
===================================================================
--- testing-x86_64/bluetooth.modprobe (rev 0)
+++ testing-x86_64/bluetooth.modprobe 2018-02-11 09:16:15 UTC (rev 316603)
@@ -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
Copied: bluez/repos/testing-x86_64/fixes_order_InterfaceAdded.diff (from rev 316602, bluez/trunk/fixes_order_InterfaceAdded.diff)
===================================================================
--- testing-x86_64/fixes_order_InterfaceAdded.diff (rev 0)
+++ testing-x86_64/fixes_order_InterfaceAdded.diff 2018-02-11 09:16:15 UTC (rev 316603)
@@ -0,0 +1,72 @@
+From 1873096352f518d3247f8efb3c2e0aa8804e50ac Mon Sep 17 00:00:00 2001
+From: Luiz Augusto von Dentz <luiz.von.dentz at intel.com>
+Date: Wed, 7 Feb 2018 09:35:07 -0200
+Subject: core: Fixes order InterfaceAdded
+
+Registering on the callback of MGMT_OP_READ_ADV_FEATURES causes
+InterfacesAdded to be reschedule after the device objects which causes
+tools such as PulseAudio to consider it invalid.
+
+Fixes https://bugzilla.redhat.com/show_bug.cgi?id=1534857
+---
+ src/advertising.c | 28 +++++++++++++++-------------
+ 1 file changed, 15 insertions(+), 13 deletions(-)
+
+diff --git a/src/advertising.c b/src/advertising.c
+index 94a8c40..970c3d8 100644
+--- a/src/advertising.c
++++ b/src/advertising.c
+@@ -1032,14 +1032,6 @@ static void read_adv_features_callback(uint8_t status, uint16_t length,
+ if (manager->max_ads == 0)
+ return;
+
+- if (!g_dbus_register_interface(btd_get_dbus_connection(),
+- adapter_get_path(manager->adapter),
+- LE_ADVERTISING_MGR_IFACE, methods,
+- NULL, properties, manager, NULL)) {
+- error("Failed to register " LE_ADVERTISING_MGR_IFACE);
+- return;
+- }
+-
+ /* Reset existing instances */
+ if (feat->num_instances)
+ remove_advertising(manager, 0);
+@@ -1061,19 +1053,29 @@ static struct btd_adv_manager *manager_create(struct btd_adapter *adapter)
+ }
+
+ manager->mgmt_index = btd_adapter_get_index(adapter);
++ manager->clients = queue_new();
++ manager->supported_flags = MGMT_ADV_FLAG_LOCAL_NAME;
++
++ if (!g_dbus_register_interface(btd_get_dbus_connection(),
++ adapter_get_path(manager->adapter),
++ LE_ADVERTISING_MGR_IFACE, methods,
++ NULL, properties, manager, NULL)) {
++ error("Failed to register " LE_ADVERTISING_MGR_IFACE);
++ goto fail;
++ }
+
+ if (!mgmt_send(manager->mgmt, MGMT_OP_READ_ADV_FEATURES,
+ manager->mgmt_index, 0, NULL,
+ read_adv_features_callback, manager, NULL)) {
+ error("Failed to read advertising features");
+- manager_destroy(manager);
+- return NULL;
++ goto fail;
+ }
+
+- manager->clients = queue_new();
+- manager->supported_flags = MGMT_ADV_FLAG_LOCAL_NAME;
+-
+ return manager;
++
++fail:
++ manager_destroy(manager);
++ return NULL;
+ }
+
+ struct btd_adv_manager *btd_adv_manager_new(struct btd_adapter *adapter)
+--
+cgit v1.1
+
+
More information about the arch-commits
mailing list