Re: [PR PATCH] [Updated] pipewire: update to 0.3.33

[paper42 <paper42@users.noreply.github.com>]

[-- Attachment #1: Type: text/plain, Size: 1600 bytes --]

There is an updated pull request by paper42 against master on the void-packages repository

https://github.com/st3r4g/void-packages pipewire-0.3.33
https://github.com/void-linux/void-packages/pull/32375

pipewire: update to 0.3.33
<!-- Mark items with [x] where applicable -->

#### General
- [ ] This is a new package and it conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements)

#### Have the results of the proposed changes been tested?
- [x] I use the packages affected by the proposed changes on a regular basis and confirm this PR works for me
- [ ] I generally don't use the affected packages but briefly tested this PR

<!--
If GitHub CI cannot be used to validate the build result (for example, if the
build is likely to take several hours), make sure to
[skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration).
When skipping CI, uncomment and fill out the following section.
Note: for builds that are likely to complete in less than 2 hours, it is not
acceptable to skip CI.
-->
<!-- 
#### Does it build and run successfully? 
(Please choose at least one native build and, if supported, at least one cross build. More are better.)
- [ ] I built this PR locally for my native architecture, (ARCH-LIBC)
- [ ] I built this PR locally for these architectures (if supported. mark crossbuilds):
  - [ ] aarch64-musl
  - [ ] armv7l
  - [ ] armv6l-musl
-->


A patch file from https://github.com/void-linux/void-packages/pull/32375.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-pipewire-0.3.33-32375.patch --]
[-- Type: text/x-diff, Size: 10035 bytes --]

From 4917c8d38ffed92fb5df10d6e9bf3206d5321d06 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sat, 7 Aug 2021 13:53:00 +0200
Subject: [PATCH 1/4] New package: libfreeaptx-0.1.1

---
 common/shlibs                |  1 +
 srcpkgs/libfreeaptx-devel    |  1 +
 srcpkgs/libfreeaptx/template | 21 +++++++++++++++++++++
 3 files changed, 23 insertions(+)
 create mode 120000 srcpkgs/libfreeaptx-devel
 create mode 100644 srcpkgs/libfreeaptx/template

diff --git a/common/shlibs b/common/shlibs
index b8fda590d5f3..5a8f068165c4 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -4015,6 +4015,7 @@ libspdlog.so.1 libspdlog-1.8.2_2
 libmd.so.0 libmd-1.0.3_1
 libldacBT_abr.so.2 ldacBT-2.0.2.3_1
 libldacBT_enc.so.2 ldacBT-2.0.2.3_1
+libfreeaptx.so.0 libfreeaptx-0.1.1_1
 libgumbo.so.1 gumbo-parser-0.10.1_2
 libmariadb.so.3 libmariadbclient-10.5.9_1
 libmariadbd.so.19 libmariadbclient-10.5.9_1
diff --git a/srcpkgs/libfreeaptx-devel b/srcpkgs/libfreeaptx-devel
new file mode 120000
index 000000000000..fe4a33a76eb2
--- /dev/null
+++ b/srcpkgs/libfreeaptx-devel
@@ -0,0 +1 @@
+libfreeaptx
\ No newline at end of file
diff --git a/srcpkgs/libfreeaptx/template b/srcpkgs/libfreeaptx/template
new file mode 100644
index 000000000000..81306855682a
--- /dev/null
+++ b/srcpkgs/libfreeaptx/template
@@ -0,0 +1,21 @@
+# Template file for 'libfreeaptx'
+pkgname=libfreeaptx
+version=0.1.1
+revision=1
+build_style=gnu-makefile
+short_desc="Open Source implementation of Audio Processing Technology codec (aptX)"
+maintainer="Michal Vasilek <michal@vasilek.cz>"
+license="LGPL-2.1-or-later"
+homepage="https://github.com/iamthehorker/libfreeaptx/"
+distfiles="https://github.com/iamthehorker/libfreeaptx/archive/refs/tags/$version.tar.gz"
+checksum=7acf514446cae59585d9bc21e4f98f4a3856f4741c3a7a09d06e8ac5bf2f7315
+
+libfreeaptx-devel_package() {
+	depends="libfreeaptx>=${version}_${revision}"
+	short_desc+=" - development files"
+	pkg_install() {
+		vmove usr/include
+		vmove usr/lib/pkgconfig
+		vmove "usr/lib/*.so"
+	}
+}

From bced7b688c266a6cd1ac2afa34eb1b2136a8e83a Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sat, 7 Aug 2021 13:53:35 +0200
Subject: [PATCH 2/4] libopenaptx: remove

replaced by libfreeaptx
---
 common/shlibs                |  1 -
 srcpkgs/libopenaptx-devel    |  1 -
 srcpkgs/libopenaptx/template | 23 -----------------------
 srcpkgs/libopenaptx/update   |  2 --
 4 files changed, 27 deletions(-)
 delete mode 120000 srcpkgs/libopenaptx-devel
 delete mode 100644 srcpkgs/libopenaptx/template
 delete mode 100644 srcpkgs/libopenaptx/update

diff --git a/common/shlibs b/common/shlibs
index 5a8f068165c4..2a0230e30116 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -4000,7 +4000,6 @@ libutil-cmdline-samba4.so samba-libs-4.13.2_1
 libwinbind-client-samba4.so samba-libs-4.13.2_1
 libsixel.so.1 libsixel-1.8.6_1
 libpamtest.so.0 pam_wrapper-1.1.3_1
-libopenaptx.so.0 libopenaptx-0.2.0_1
 libsimavr.so.1 simavr-1.6_2
 libsimavrparts.so.1 simavr-1.6_2
 libsword-1.8.1.so libsword-1.8.1_6
diff --git a/srcpkgs/libopenaptx-devel b/srcpkgs/libopenaptx-devel
deleted file mode 120000
index 2791f43ede1e..000000000000
--- a/srcpkgs/libopenaptx-devel
+++ /dev/null
@@ -1 +0,0 @@
-libopenaptx
\ No newline at end of file
diff --git a/srcpkgs/libopenaptx/template b/srcpkgs/libopenaptx/template
deleted file mode 100644
index 1de961067037..000000000000
--- a/srcpkgs/libopenaptx/template
+++ /dev/null
@@ -1,23 +0,0 @@
-# Template file for 'libopenaptx'
-pkgname=libopenaptx
-# Version 0.2.1 changes the license to GPLv3 in order to make it incompatible
-# with freedesktop.org projects including pipewire and other non-GPL projects.
-version=0.2.0
-revision=1
-build_style=gnu-makefile
-short_desc="Open Source implementation of Audio Processing Technology codec (aptX)"
-maintainer="Michal Vasilek <michal@vasilek.cz>"
-license="LGPL-2.1-or-later"
-homepage="https://github.com/pali/libopenaptx/"
-distfiles="https://github.com/pali/libopenaptx/releases/download/${version}/libopenaptx-${version}.tar.gz"
-checksum=51a13a34bb188a87ab1deb64a090ab42a4755d7b02c2bdaf3b8136f749b71b84
-
-libopenaptx-devel_package() {
-	depends="libopenaptx>=${version}_${revision}"
-	short_desc+=" - development files"
-	pkg_install() {
-		vmove usr/include
-		vmove usr/lib/pkgconfig
-		vmove "usr/lib/*.so"
-	}
-}
diff --git a/srcpkgs/libopenaptx/update b/srcpkgs/libopenaptx/update
deleted file mode 100644
index 79a56b053128..000000000000
--- a/srcpkgs/libopenaptx/update
+++ /dev/null
@@ -1,2 +0,0 @@
-# see comment in the template
-ignore="0.2.*"

From 714da56c75366f823689ca2d3bb1dfc452dcd29e Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sat, 7 Aug 2021 13:56:31 +0200
Subject: [PATCH 3/4] removed-packages: add libopenaptx and bump

---
 srcpkgs/removed-packages/template | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/removed-packages/template b/srcpkgs/removed-packages/template
index 78ba7731cc3e..ab7f5440b756 100644
--- a/srcpkgs/removed-packages/template
+++ b/srcpkgs/removed-packages/template
@@ -1,7 +1,7 @@
 # Template file for 'removed-packages'
 pkgname=removed-packages
 version=0.1
-revision=47
+revision=48
 build_style=meta
 short_desc="Uninstalls packages removed from repository"
 maintainer="Piotr Wójcik <chocimier@tlen.pl>"
@@ -85,6 +85,7 @@ replaces="
  gtkhtml-devel<=4.10.0_1
  gx-go<=1.9.0_1
  libgtkhtml<=4.10.0_1
+ libopenaptx<=0.2.0_1
  httperf<=0.9.0_9
  icecat<=78.6.1_1
  icecat-i18n-ach<=78.6.1_1

From 4164a31b76b5dea023906c6c7fb791508722d424 Mon Sep 17 00:00:00 2001
From: Stefano Ragni <stefano.ragni@outlook.com>
Date: Fri, 6 Aug 2021 23:28:40 +0200
Subject: [PATCH 4/4] pipewire: update to 0.3.33

---
 srcpkgs/pipewire/patches/gettid.patch | 64 ---------------------------
 srcpkgs/pipewire/template             |  6 +--
 2 files changed, 3 insertions(+), 67 deletions(-)
 delete mode 100644 srcpkgs/pipewire/patches/gettid.patch

diff --git a/srcpkgs/pipewire/patches/gettid.patch b/srcpkgs/pipewire/patches/gettid.patch
deleted file mode 100644
index 0911051e1a0c..000000000000
--- a/srcpkgs/pipewire/patches/gettid.patch
+++ /dev/null
@@ -1,64 +0,0 @@
-From master, will be in 0.3.33
-diff --git a/meson.build b/meson.build
-index 838fb66be8ca0e2d66009696f6c00c2ff7580b6e..977ce9ba1f22a2785efcb1b5a5bee08cf2e4bec3 100644
---- a/meson.build
-+++ b/meson.build
-@@ -254,6 +254,9 @@ endif
- if cc.has_function('getpagesize', prefix : '#include<unistd.h>')
-   cdata.set('HAVE_GETPAGESIZE', 1)
- endif
-+if cc.has_function('gettid', prefix : '#include<unistd.h>', args: [ '-D_GNU_SOURCE' ])
-+  cdata.set('HAVE_GETTID', 1)
-+endif
- if cc.has_function('clock_gettime', prefix : '#include <time.h>')
-   cdata.set('HAVE_CLOCK_GETTIME', 1)
- endif
-diff --git a/src/modules/module-rtkit.c b/src/modules/module-rtkit.c
-index 1f13aa371192bee738c4e10b45917473d2f9856d..7d55fb758cdc0a3073e3e3f2536949e824ffa223 100644
---- a/src/modules/module-rtkit.c
-+++ b/src/modules/module-rtkit.c
-@@ -182,12 +182,16 @@ void pw_rtkit_bus_free(struct pw_rtkit_bus *system_bus)
- 
- static pid_t _gettid(void)
- {
--#ifndef __FreeBSD__
-+#if defined(HAVE_GETTID)
- 	return (pid_t) gettid();
--#else
-+#elif defined(__linux__)
-+	return syscall(SYS_gettid);
-+#elif defined(__FreeBSD__)
- 	long pid;
- 	thr_self(&pid);
- 	return (pid_t)pid;
-+#else
-+#error "No gettid impl"
- #endif
- }
- 
-diff --git a/src/modules/module-rtkit.c b/src/modules/module-rtkit.c
-index de30f4123cf017f8be2eb7d4cd3bababb51da6fc..419e4be815a46d0f466969a02813f481d48ee5a1 100644
---- a/src/modules/module-rtkit.c
-+++ b/src/modules/module-rtkit.c
-@@ -518,7 +518,7 @@ static void *custom_start(void *data)
- 	struct impl *impl = this->impl;
- 
- 	pthread_mutex_lock(&impl->lock);
--	this->pid = gettid();
-+	this->pid = _gettid();
- 	pthread_cond_broadcast(&impl->cond);
- 	pthread_mutex_unlock(&impl->lock);
- 
-diff --git a/src/modules/module-rtkit.c b/src/modules/module-rtkit.c
-index 419e4be815a46d0f466969a02813f481d48ee5a1..1f13aa371192bee738c4e10b45917473d2f9856d 100644
---- a/src/modules/module-rtkit.c
-+++ b/src/modules/module-rtkit.c
-@@ -592,7 +592,7 @@ static pid_t impl_gettid(struct impl *impl, pthread_t pt)
- 	if ((thr = find_thread_by_pt(impl, pt)) != NULL)
- 		pid = thr->pid;
- 	else
--		pid = getpid();
-+		pid = _gettid();
- 	pthread_mutex_unlock(&impl->lock);
- 
- 	return pid;
diff --git a/srcpkgs/pipewire/template b/srcpkgs/pipewire/template
index b61c6a74e63e..046fc699158b 100644
--- a/srcpkgs/pipewire/template
+++ b/srcpkgs/pipewire/template
@@ -1,6 +1,6 @@
 # Template file for 'pipewire'
 pkgname=pipewire
-version=0.3.32
+version=0.3.33
 revision=1
 build_style=meson
 configure_args="-Dman=enabled -Dgstreamer=enabled -Ddocs=enabled -Dsystemd=disabled
@@ -8,7 +8,7 @@ configure_args="-Dman=enabled -Dgstreamer=enabled -Ddocs=enabled -Dsystemd=disab
  -Dvulkan=enabled -Dudevrulesdir=/usr/lib/udev/rules.d -Db_ndebug=false"
 hostmakedepends="doxygen graphviz pkg-config xmltoman gettext"
 makedepends="ffmpeg-devel gst-plugins-base1-devel jack-devel sbc-devel v4l-utils-devel
- libva-devel libbluetooth-devel ncurses-devel libopenaptx-devel libusb-devel fdk-aac-devel
+ libva-devel libbluetooth-devel ncurses-devel libfreeaptx-devel libusb-devel fdk-aac-devel
  libsndfile-devel Vulkan-Headers vulkan-loader $(vopt_if sdl2 SDL2-devel)"
 depends="libspa-alsa>=${version}_${revision} libspa-audioconvert>=${version}_${revision}
  libspa-audiomixer>=${version}_${revision} libspa-control>=${version}_${revision}"
@@ -18,7 +18,7 @@ license="MIT"
 homepage="https://pipewire.org/"
 changelog="https://gitlab.freedesktop.org/pipewire/pipewire/-/raw/master/NEWS"
 distfiles="https://gitlab.freedesktop.org/pipewire/pipewire/-/archive/${version}/pipewire-${version}.tar.gz"
-checksum=8b2af6138529fd9214dd148f2a6304f13c16e0b0d3a4a98c1afa87b7e65c574f
+checksum=f60662be410523cbb767dbee81156f9e9e3bd2b06d0ea21e94c11eb7a6530bcc
 make_dirs="/var/lib/pipewire 0755 _pipewire _pipewire"
 system_accounts="_pipewire"