From 0d33f29e117e1204367a7f3d11a45f9faf584485 Mon Sep 17 00:00:00 2001
From: "A. Wilcox" <AWilcox@Wilcox-Tech.com>
Date: Tue, 25 Feb 2020 06:34:57 +0000
Subject: user/bluez: Bump to 5.53, enable tools and stuff

---
 user/bluez/APKBUILD | 50 +++++++++++++++++++++++++++++++++++++-------------
 1 file changed, 37 insertions(+), 13 deletions(-)

(limited to 'user/bluez')

diff --git a/user/bluez/APKBUILD b/user/bluez/APKBUILD
index 7a05abb09..001fcb72e 100644
--- a/user/bluez/APKBUILD
+++ b/user/bluez/APKBUILD
@@ -1,6 +1,6 @@
 # Maintainer: A. Wilcox <awilfox@adelielinux.org>
 pkgname=bluez
-pkgver=5.52
+pkgver=5.53
 pkgrel=0
 pkgdesc="Linux Bluetooth protocol stack"
 url="http://www.bluez.org/"
@@ -8,11 +8,12 @@ arch="all"
 license="GPL-2.0+"
 depends="consolekit2 dbus"
 makedepends="alsa-lib-dev dbus-dev eudev-dev glib-dev libical-dev
-	linux-headers"
+	linux-headers ncurses-dev"
 subpackages="$pkgname-dev $pkgname-doc $pkgname-libs $pkgname-bccmd
 	$pkgname-btmon $pkgname-cups $pkgname-deprecated $pkgname-hid2hci
-	$pkgname-obexd $pkgname-openrc"
+	$pkgname-obexd $pkgname-openrc $pkgname-tools"
 source="https://www.kernel.org/pub/linux/bluetooth/bluez-$pkgver.tar.xz
+	https://ftp.gnu.org/gnu/readline/readline-8.0.tar.gz
 	bluetooth.initd
 	rfcomm.initd
 	rfcomm.confd
@@ -25,8 +26,20 @@ source="https://www.kernel.org/pub/linux/bluetooth/bluez-$pkgver.tar.xz
 	fix-endianness.patch
 	"
 
-build() {
+prepare() {
+	cd "$srcdir"/readline-8.0
 	./configure \
+		--build=$CBUILD \
+		--host=$CHOST \
+		--prefix="$srcdir"/readline \
+		--enable-static \
+		--disable-shared
+	make install
+}
+
+build() {
+	CFLAGS="$CFLAGS -I$srcdir/readline/include -L$srcdir/readline/lib" \
+	CPPFLAGS="$CPPFLAGS -I$srcdir/readline/include" LIBS="-ltinfo" ./configure \
 		--build=$CBUILD \
 		--host=$CHOST \
 		--prefix=/usr \
@@ -35,9 +48,11 @@ build() {
 		--localstatedir=/var \
 		--libexecdir=/usr/lib \
 		--disable-systemd \
-		--disable-client \
+		--enable-client \
 		--enable-library \
-		--enable-deprecated
+		--enable-deprecated \
+		--enable-experimental \
+		--enable-tools
 	make
 }
 
@@ -56,33 +71,33 @@ package() {
 }
 
 bccmd() {
-	pkgdesc="Bluez utility for the CSR BCCMD interface"
+	pkgdesc="BlueZ utility for the CSR BCCMD interface"
 	mkdir -p "$subpkgdir"/usr/bin
 	mv "$pkgdir"/usr/bin/bccmd "$subpkgdir"/usr/bin/
 }
 
 btmon() {
-	pkgdesc="Bluez bluetooth monitor"
+	pkgdesc="BlueZ Bluetooth monitor"
 	mkdir -p "$subpkgdir"/usr/bin
 	mv "$pkgdir"/usr/bin/btmon "$subpkgdir"/usr/bin/
 }
 
 cups() {
-	pkgdesc="Bluez backend for CUPS"
+	pkgdesc="BlueZ backend for CUPS"
 	depends="cups"
 	mkdir -p "$subpkgdir"/usr/lib/
 	mv "$pkgdir"/usr/lib/cups "$subpkgdir"/usr/lib/
 }
 
 hid2hci() {
-	pkgdesc="Put HID proxying bluetooth HCI's into HCI mode"
+	pkgdesc="Put HID proxying Bluetooth HCIs into HCI mode"
 	replaces="bluez"
 	mkdir -p "$subpkgdir"
 	mv "$pkgdir"/lib "$subpkgdir"/
 }
 
 deprecated() {
-	pkgdesc="Deprecated bluetooth tools"
+	pkgdesc="Deprecated Bluetooth tools"
 	mkdir -p "$subpkgdir"/usr/bin
 	mv "$pkgdir"/usr/bin/ciptool \
 		"$pkgdir"/usr/bin/hciattach \
@@ -95,12 +110,21 @@ deprecated() {
 }
 
 obexd() {
-	pkgdesc="Bluez OBEX daemon"
+	pkgdesc="BlueZ OBEX daemon"
 	mkdir -p "$subpkgdir"/usr/lib/bluetooth
 	mv "$pkgdir"/usr/lib/bluetooth/obexd "$subpkgdir"/usr/lib/bluetooth
 }
 
-sha512sums="9024481910d1dee85578bf3d7a4fc4be2bece516e6216c91aa1a7ac18537f092b47c41c4a5506ddd7e279599d58002e98203c5439745c01df4dbc22a75234c84  bluez-5.52.tar.xz
+tools() {
+	pkgdesc="Bluetooth tools"
+	mkdir -p "$subpkgdir"/usr/bin
+	for _tool in bluetooth-player mpris-proxy; do
+		install -Dm755 "$builddir"/tools/$_tool "$subpkgdir"/usr/bin/$_tool
+	done
+}
+
+sha512sums="62956e6293ec2517ec453dc7a6c82d34a8c446df8add8fe411b0a45fd5604817f3a19fbc646ad6f68df435f3cd2bd10ae040890e30db83b022f90b54cc6b3c74  bluez-5.53.tar.xz
+41759d27bc3a258fefd7f4ff3277fa6ab9c21abb7b160e1a75aa8eba547bd90b288514e76264bd94fb0172da8a4faa54aab2c07b68a0356918ecf7f1969e866f  readline-8.0.tar.gz
 fc43c78ed248ea412529eed5ae8bb47bacca9bf5b3b10de121ddd4e792c85893561a88be4aa2c6318106e5d2146a721445152d44fa60ca257ca0b4eb87318c1e  bluetooth.initd
 8d7b7c8938a2316ce0a855e9bdf1ef8fcdf33d23f4011df828270a088b88b140a19c432e83fef15355d0829e3c86be05b63e7718fef88563254ea239b8dc12ac  rfcomm.initd
 a70aa0dbbabe7e29ee81540a6f98bf191a850da55a28f678975635caf34b363cf4d461a801b3484120ee28fdd21240bd456a4f5d706262700924bd2e9a0972fb  rfcomm.confd
-- 
cgit v1.2.3-60-g2f50