From e7075b9bddbd1ed54bed457d708f9cf39dd1155a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=89rico=20Rolim?= Date: Thu, 4 Feb 2021 15:24:12 -0300 Subject: [PATCH 1/3] ell: update to 0.39. Add warnings about ABI stability. --- common/shlibs | 2 +- srcpkgs/ell/template | 5 +++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/common/shlibs b/common/shlibs index 42f37d8a08bc..8ae3931ab654 100644 --- a/common/shlibs +++ b/common/shlibs @@ -1005,7 +1005,7 @@ libgsm.so.1 libgsm-1.0.13_13 libcgroup.so.1 libcgroup-0.37.1_1 libxdg-basedir.so.1 libxdg-basedir-1.1.1_1 libev.so.4 libev-4.04_1 -libell.so.0 ell-0.20_1 +libell.so.0 ell-0.38_1 libgvnc-1.0.so.0 gtk-vnc-0.4.4_1 libgtk-vnc-2.0.so.0 gtk-vnc-0.4.4_1 libyaml-0.so.2 libyaml-0.1.4_1 diff --git a/srcpkgs/ell/template b/srcpkgs/ell/template index 19634a337aa0..9c798a84e8ae 100644 --- a/srcpkgs/ell/template +++ b/srcpkgs/ell/template @@ -1,6 +1,7 @@ # Template file for 'ell' +# ell ABI isn't stable! Always test dependants after updates and update common/shlibs pkgname=ell -version=0.36 +version=0.39 revision=1 build_style=gnu-configure configure_args="--enable-glib" @@ -12,7 +13,7 @@ maintainer="Érico Nogueira " license="GPL-2.0-only" homepage="https://01.org/ell" distfiles="${KERNEL_SITE}/libs/${pkgname}/${pkgname}-${version}.tar.xz" -checksum=2f99e743a235b1c834b19112e4e0283d02da93b863899381466cde47bf159cf6 +checksum=653e2e139e23ed31e03c56c05f15321a9e818e2dca00a315c18d2c7b72f15d08 # tests depend on kernel features make_check=extended From 003dcc9731a0cfc010f8044972e933cae2bc3b39 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=89rico=20Rolim?= Date: Fri, 26 Feb 2021 17:19:50 -0300 Subject: [PATCH 2/3] ofono: revbump for ell. --- srcpkgs/ofono/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/ofono/template b/srcpkgs/ofono/template index 16695994583a..248e58d9502d 100644 --- a/srcpkgs/ofono/template +++ b/srcpkgs/ofono/template @@ -1,7 +1,7 @@ # Template file for 'ofono' pkgname=ofono version=1.31 -revision=1 +revision=2 build_style=gnu-configure configure_args="--disable-bluez4 --enable-external-ell" conf_files="/etc/ofono/phonesim.conf /etc/dbus-1/system.d/ofono.conf" From ec33fdd8613dec2e7f5a70cb0e9835720a340379 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=89rico=20Rolim?= Date: Fri, 26 Feb 2021 17:19:43 -0300 Subject: [PATCH 3/3] bluez: update to 5.58. Requested by paper42: - add logging to services - add experimental build option --- srcpkgs/bluez/files/bluetooth-meshd/log/run | 1 + srcpkgs/bluez/files/bluetooth-meshd/run | 3 ++- srcpkgs/bluez/files/bluetoothd/log/run | 1 + srcpkgs/bluez/files/bluetoothd/run | 3 ++- srcpkgs/bluez/template | 12 +++++++----- 5 files changed, 13 insertions(+), 7 deletions(-) create mode 120000 srcpkgs/bluez/files/bluetooth-meshd/log/run create mode 120000 srcpkgs/bluez/files/bluetoothd/log/run diff --git a/srcpkgs/bluez/files/bluetooth-meshd/log/run b/srcpkgs/bluez/files/bluetooth-meshd/log/run new file mode 120000 index 000000000000..3a5b4a586051 --- /dev/null +++ b/srcpkgs/bluez/files/bluetooth-meshd/log/run @@ -0,0 +1 @@ +/usr/bin/vlogger \ No newline at end of file diff --git a/srcpkgs/bluez/files/bluetooth-meshd/run b/srcpkgs/bluez/files/bluetooth-meshd/run index 752dbcc37bf7..2594d5fe56e4 100755 --- a/srcpkgs/bluez/files/bluetooth-meshd/run +++ b/srcpkgs/bluez/files/bluetooth-meshd/run @@ -1,3 +1,4 @@ #!/bin/sh sv check dbus >/dev/null || exit 1 -exec /usr/libexec/bluetooth/bluetooth-meshd --nodetach >/dev/null +exec 2>&1 +exec /usr/libexec/bluetooth/bluetooth-meshd --nodetach diff --git a/srcpkgs/bluez/files/bluetoothd/log/run b/srcpkgs/bluez/files/bluetoothd/log/run new file mode 120000 index 000000000000..3a5b4a586051 --- /dev/null +++ b/srcpkgs/bluez/files/bluetoothd/log/run @@ -0,0 +1 @@ +/usr/bin/vlogger \ No newline at end of file diff --git a/srcpkgs/bluez/files/bluetoothd/run b/srcpkgs/bluez/files/bluetoothd/run index 2b96adcdcdc6..860fa4bf80b3 100755 --- a/srcpkgs/bluez/files/bluetoothd/run +++ b/srcpkgs/bluez/files/bluetoothd/run @@ -1,3 +1,4 @@ #!/bin/sh sv check dbus >/dev/null || exit 1 -exec /usr/libexec/bluetooth/bluetoothd -n >/dev/null +exec 2>&1 +exec /usr/libexec/bluetooth/bluetoothd -n diff --git a/srcpkgs/bluez/template b/srcpkgs/bluez/template index 80fcf51c85a0..2130b7340580 100644 --- a/srcpkgs/bluez/template +++ b/srcpkgs/bluez/template @@ -1,11 +1,12 @@ # Template file for 'bluez' pkgname=bluez -version=5.55 +version=5.58 revision=1 build_style=gnu-configure configure_args="--with-udevdir=/usr/lib/udev --disable-systemd --enable-sixaxis --enable-threads --enable-library --enable-deprecated - --enable-external-ell $(vopt_enable mesh) $(vopt_enable nfc)" + --enable-external-ell $(vopt_enable mesh) $(vopt_enable nfc) + $(vopt_enable experimental)" hostmakedepends="automake flex libtool pkg-config" makedepends="cups-devel eudev-libudev-devel libglib-devel libical-devel readline-devel ell-devel $(vopt_if mesh json-c-devel)" @@ -14,19 +15,20 @@ maintainer="Doan Tran Cong Danh " 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=8863717113c4897e2ad3271fc808ea245319e6fd95eed2e934fae8e0894e9b88 +checksum=c8065e75a5eb67236849ef68a354b1700540305a8c88ef0a0fd6288f19daf1f1 conf_files="/etc/bluetooth/main.conf" system_groups="bluetooth" -build_options="mesh nfc" patch_args="-Np1" +build_options="mesh nfc experimental" + if [ "$XBPS_TARGET_LIBC" = musl ]; then makedepends+=" musl-legacy-compat" fi post_patch() { # Use system ell - rm -rf ell/* + rm -r ell/* } pre_configure() {