bluez: update to 5.53.

srcpkgs/bluez/patches/0002-allow-obexd-on-non-systemd-system.patch

@@ -1,7 +1,7 @@
-From 82099f711ecd8281cebad23b53aadb8c875bc235 Mon Sep 17 00:00:00 2001
+From 5f27d3887b60c95cbcdefaeae5dea38f020c390e Mon Sep 17 00:00:00 2001
 From: Doan Tran Cong Danh <congdanhqx@gmail.com>
 Date: Thu, 3 Oct 2019 12:57:55 +0700
-Subject: [PATCH 2/9] allow obexd on non-systemd system
+Subject: [PATCH 2/8] allow obexd on non-systemd system
 
 ---
  Makefile.obexd                                              | 6 +++---
@@ -10,7 +10,7 @@ Subject: [PATCH 2/9] allow obexd on non-systemd system
  rename obexd/src/{org.bluez.obex.service => org.bluez.obex.service.in} (74%)
 
 diff --git a/Makefile.obexd b/Makefile.obexd
-index d36874770..c9996288c 100644
+index de59d297b..cb04bb1e2 100644
 --- a/Makefile.obexd
 +++ b/Makefile.obexd
 @@ -1,12 +1,12 @@
@@ -28,8 +28,8 @@ index d36874770..c9996288c 100644
  
  if OBEX
  
-@@ -106,6 +106,6 @@ obexd/src/plugin.$(OBJEXT): obexd/src/builtin.h
- obexd/src/builtin.h: obexd/src/genbuiltin $(obexd_builtin_sources)
+@@ -107,6 +107,6 @@ obexd/src/builtin.h: obexd/src/genbuiltin $(obexd_builtin_sources)
+ 	$(AM_V_at)$(MKDIR_P) $(dir $@)
  	$(AM_V_GEN)$(srcdir)/obexd/src/genbuiltin $(obexd_builtin_modules) > $@
  
 -CLEANFILES += obexd/src/builtin.h $(builtin_files) obexd/src/obex.service

srcpkgs/bluez/patches/0004-include-sys-time.h-for-musl-build.patch

@@ -1,7 +1,7 @@
-From 2a2eb634d481ab4eed0a444321dc12338de96d6a Mon Sep 17 00:00:00 2001
+From 1370cc9a32f8979158a894c3de75bcb3c29af03a Mon Sep 17 00:00:00 2001
 From: Doan Tran Cong Danh <congdanhqx@gmail.com>
 Date: Thu, 3 Oct 2019 12:59:56 +0700
-Subject: [PATCH 4/9] include sys/time.h for musl build
+Subject: [PATCH 4/8] include sys/time.h for musl build
 
 ---
  mesh/appkey.c         | 1 +
@@ -16,7 +16,7 @@ Subject: [PATCH 4/9] include sys/time.h for musl build
  9 files changed, 9 insertions(+), 1 deletion(-)
 
 diff --git a/mesh/appkey.c b/mesh/appkey.c
-index 6c65454c1..a455c83b6 100644
+index 45d604007..b570bff9d 100644
 --- a/mesh/appkey.c
 +++ b/mesh/appkey.c
 @@ -22,6 +22,7 @@
@@ -28,7 +28,7 @@ index 6c65454c1..a455c83b6 100644
  
  #include "mesh/mesh-defs.h"
 diff --git a/mesh/crypto.c b/mesh/crypto.c
-index cebdffe45..e1689c6d7 100644
+index 596a289f9..3ecdb564c 100644
 --- a/mesh/crypto.c
 +++ b/mesh/crypto.c
 @@ -24,6 +24,7 @@
@@ -38,9 +38,9 @@ index cebdffe45..e1689c6d7 100644
 +#include <sys/time.h>
  #include <ell/ell.h>
  
- #include <linux/if_alg.h>
+ #include "mesh/mesh-defs.h"
 diff --git a/mesh/friend.c b/mesh/friend.c
-index da2772870..ee48a3cc7 100644
+index 5f5f6f823..a5bab6929 100644
 --- a/mesh/friend.c
 +++ b/mesh/friend.c
 @@ -21,6 +21,7 @@
@@ -52,7 +52,7 @@ index da2772870..ee48a3cc7 100644
  
  #include "mesh/mesh-defs.h"
 diff --git a/mesh/manager.c b/mesh/manager.c
-index 501ec10fe..6b6219c56 100644
+index e4a7deaeb..e5837ed48 100644
 --- a/mesh/manager.c
 +++ b/mesh/manager.c
 @@ -22,6 +22,7 @@
@@ -64,7 +64,7 @@ index 501ec10fe..6b6219c56 100644
  
  #include "mesh/mesh-defs.h"
 diff --git a/mesh/mesh.c b/mesh/mesh.c
-index b660a7ef2..3ea8b2cb4 100644
+index 6d2f86b6d..1eef01eee 100644
 --- a/mesh/mesh.c
 +++ b/mesh/mesh.c
 @@ -22,6 +22,7 @@
@@ -76,7 +76,7 @@ index b660a7ef2..3ea8b2cb4 100644
  
  #include "mesh/mesh-io.h"
 diff --git a/mesh/net.c b/mesh/net.c
-index 2785039db..740e3c3af 100644
+index ec05b6be9..1d71a55b2 100644
 --- a/mesh/net.c
 +++ b/mesh/net.c
 @@ -22,7 +22,7 @@
@@ -89,7 +89,7 @@ index 2785039db..740e3c3af 100644
  
  #include "mesh/mesh-defs.h"
 diff --git a/mesh/pb-adv.c b/mesh/pb-adv.c
-index 6b4a70052..481f4ac8d 100644
+index 6ef45b8b0..797ff9da7 100644
 --- a/mesh/pb-adv.c
 +++ b/mesh/pb-adv.c
 @@ -21,6 +21,7 @@
@@ -101,7 +101,7 @@ index 6b4a70052..481f4ac8d 100644
  
  #include "mesh/mesh-defs.h"
 diff --git a/mesh/prov-acceptor.c b/mesh/prov-acceptor.c
-index 57eb1e750..50989b217 100644
+index 03972c227..1b38f1bdd 100644
 --- a/mesh/prov-acceptor.c
 +++ b/mesh/prov-acceptor.c
 @@ -21,6 +21,7 @@
@@ -113,7 +113,7 @@ index 57eb1e750..50989b217 100644
  
  #include "src/shared/ecc.h"
 diff --git a/mesh/prov-initiator.c b/mesh/prov-initiator.c
-index eb59f53f1..65cf194e6 100644
+index 7a767cfb3..c9ffea45d 100644
 --- a/mesh/prov-initiator.c
 +++ b/mesh/prov-initiator.c
 @@ -21,6 +21,7 @@

srcpkgs/bluez/patches/0005-remove-dirent.h-for-musl-build.patch

@@ -1,4 +0,0 @@
---- a/mesh/keyring.c	2019-11-02 19:35:04.114268710 +0300
-+++ b/mesh/keyring.c	2019-11-02 19:35:14.305444472 +0300
-@@ -30 +29,0 @@
--#include <dirent.h>

srcpkgs/bluez/template

@@ -1,32 +1,32 @@
 # Template file for 'bluez'
 pkgname=bluez
-version=5.52
+version=5.53
 revision=1
 build_style=gnu-configure
 configure_args="--with-udevdir=/usr/lib/udev --disable-systemd
  --enable-sixaxis --enable-threads --enable-library --enable-deprecated
- $(vopt_enable mesh) $(vopt_enable nfc)"
+ --enable-external-ell $(vopt_enable mesh) $(vopt_enable nfc)"
 hostmakedepends="automake flex libtool pkg-config"
 makedepends="cups-devel eudev-libudev-devel libglib-devel libical-devel
- readline-devel $(vopt_if mesh json-c-devel)"
+ readline-devel ell-devel $(vopt_if mesh json-c-devel)"
 short_desc="Bluetooth tools and daemons"
 maintainer="Doan Tran Cong Danh <congdanhqx@gmail.com>"
 license="GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="http://www.bluez.org/"
 distfiles="${KERNEL_SITE}/bluetooth/$pkgname-$version.tar.xz"
-checksum=f7144ce2039202cfac18ccb52426efea11c98e4f6e1bb8041bcb994b8378560a
+checksum=38aa2da8302fefad53116bb281a11968732a42eeb19c5fb3668342f39b7938bc
 conf_files="/etc/bluetooth/main.conf"
 system_groups="bluetooth"
 build_options="mesh nfc"
 patch_args="-Np1"
 
+if [ "$XBPS_TARGET_LIBC" = musl ]; then
+	makedepends+=" musl-legacy-compat"
+fi
+
 post_patch() {
-	find android -name '*.h' -exec \
-		sed -i\
-			-e 's/__BEGIN_DECLS/#ifdef __cplusplus\nextern "C" {\n#endif/' \
-			-e 's/__END_DECLS/#ifdef __cplusplus\n}\n#endif/' \
-			-e '/#include .sys\/cdefs.h/d' \
-			{} +
+	# Use system ell
+	rm -rf ell/*
 }
 
 pre_configure() {