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

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

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

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

https://github.com/st3r4g/void-packages pipewire-0.3.39
https://github.com/void-linux/void-packages/pull/33682

pipewire: update to 0.3.39
Still need to try the new v4l2 shim and decide whether to put it in a subpackage (probably not).

<!-- 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?
- [ ] 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/33682.patch is attached

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

From 19dbde66b25e1e43458a0e100f38610f7dde47e5 Mon Sep 17 00:00:00 2001
From: Stefano Ragni <stefano.ragni@outlook.com>
Date: Fri, 22 Oct 2021 00:19:53 +0200
Subject: [PATCH] pipewire: update to 0.3.39

---
 srcpkgs/pipewire/patches/f8817b4.patch      | 25 -------------------
 srcpkgs/pipewire/patches/no-LIB-token.patch | 27 +++++++++++++++++++++
 srcpkgs/pipewire/template                   | 21 +++++++++++++---
 3 files changed, 44 insertions(+), 29 deletions(-)
 delete mode 100644 srcpkgs/pipewire/patches/f8817b4.patch
 create mode 100644 srcpkgs/pipewire/patches/no-LIB-token.patch

diff --git a/srcpkgs/pipewire/patches/f8817b4.patch b/srcpkgs/pipewire/patches/f8817b4.patch
deleted file mode 100644
index ab410b061bd1..000000000000
--- a/srcpkgs/pipewire/patches/f8817b4.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From f8817b439433798bd7217dc4ae72197887b0fc96 Mon Sep 17 00:00:00 2001
-From: Wim Taymans <wtaymans@redhat.com>
-Date: Thu, 30 Sep 2021 11:12:27 +0200
-Subject: [PATCH] cpu: fix compilation on ARM
-
----
- spa/plugins/support/cpu-arm.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/spa/plugins/support/cpu-arm.c b/spa/plugins/support/cpu-arm.c
-index d80b8ad87..de07ebf41 100644
---- a/spa/plugins/support/cpu-arm.c
-+++ b/spa/plugins/support/cpu-arm.c
-@@ -80,7 +80,7 @@ arm_init(struct impl *impl)
- 	int arch;
- 
- 	if (!(cpuinfo = get_cpuinfo())) {
--		spa_log_warn(impl->log, NAME " %p: Can't read cpuinfo", impl);
-+		spa_log_warn(impl->log, "%p: Can't read cpuinfo", impl);
- 		return 1;
- 	}
- 
--- 
-GitLab
-
diff --git a/srcpkgs/pipewire/patches/no-LIB-token.patch b/srcpkgs/pipewire/patches/no-LIB-token.patch
new file mode 100644
index 000000000000..6573e2aeb7f4
--- /dev/null
+++ b/srcpkgs/pipewire/patches/no-LIB-token.patch
@@ -0,0 +1,27 @@
+As void doesn't support multiarch, remove the glibc specific $LIB dynamic string
+token, which otherwise breaks musl.
+diff --git a/meson.build.orig b/meson.build
+index 7172ee4..7af3373 100644
+--- a/meson.build
++++ b/meson.build
+@@ -39,19 +39,7 @@ pipewire_configdir = pipewire_sysconfdir / 'pipewire'
+ pipewire_confdatadir = pipewire_datadir / 'pipewire'
+ modules_install_dir = pipewire_libdir / pipewire_name
+ 
+-if host_machine.system() == 'linux'
+-  # glibc ld.so interprets ${LIB} in a library loading path with an
+-  # appropriate value for the current architecture, typically something
+-  # like lib, lib64 or lib/x86_64-linux-gnu.
+-  # This allows the same pw-jack script to work for both 32- and 64-bit
+-  # applications on biarch/multiarch distributions, by setting something
+-  # like LD_LIBRARY_PATH='/usr/${LIB}/pipewire-0.3/jack'.
+-  # Note that ${LIB} is a special token expanded by the runtime linker,
+-  # not an environment variable, and must be passed through literally.
+-  modules_install_dir_dlopen = prefix / '${LIB}' / pipewire_name
+-else
+-  modules_install_dir_dlopen = modules_install_dir
+-endif
++modules_install_dir_dlopen = modules_install_dir
+ 
+ spa_plugindir = pipewire_libdir / spa_name
+ spa_datadir = pipewire_datadir / spa_name
diff --git a/srcpkgs/pipewire/template b/srcpkgs/pipewire/template
index 53ab873c9d87..ff38808188ac 100644
--- a/srcpkgs/pipewire/template
+++ b/srcpkgs/pipewire/template
@@ -1,7 +1,8 @@
 # Template file for 'pipewire'
 pkgname=pipewire
-version=0.3.38
+version=0.3.39
 revision=1
+_pms_version=0.4.0
 build_style=meson
 configure_args="
  --auto-features=enabled
@@ -13,6 +14,7 @@ configure_args="
  -Dsystemd=disabled
  -Dudevrulesdir=/usr/lib/udev/rules.d
  -Dvulkan=enabled
+ -Dmedia-session:systemd=disabled
 "
 hostmakedepends="doxygen graphviz pkg-config python3-docutils gettext"
 makedepends="$(vopt_if sdl2 SDL2-devel) gst-plugins-base1-devel jack-devel
@@ -21,14 +23,21 @@ makedepends="$(vopt_if sdl2 SDL2-devel) gst-plugins-base1-devel jack-devel
  vulkan-loader pulseaudio-devel avahi-libs-devel webrtc-audio-processing-devel
  readline-devel"
 depends="libspa-alsa>=${version}_${revision} libspa-audioconvert>=${version}_${revision}
- libspa-audiomixer>=${version}_${revision} libspa-control>=${version}_${revision}"
+ libspa-audiomixer>=${version}_${revision} libspa-control>=${version}_${revision}
+ libspa-v4l2>=${version}_${revision}"
 short_desc="Server and user space API to deal with multimedia pipelines"
 maintainer="Stefano Ragni <stefano.ragni@outlook.com>"
 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=2a2424cea5bfdca88503fd8616fff891aa8355e850cab19e875050fe60c35ce7
+distfiles="
+ https://gitlab.freedesktop.org/pipewire/pipewire/-/archive/${version}/pipewire-${version}.tar.gz
+ https://gitlab.freedesktop.org/pipewire/media-session/-/archive/${_pms_version}/media-session-${_pms_version}.tar.gz
+"
+checksum="
+ 2112173c7d5e89b28ec289a25d30f2be5340e2ca6d104511d176324ffd0f968a
+ c04496f1606d60174ba30b0adc0dc14ec0e3d1bf1684dd42836a56511e64ba8b
+"
 make_dirs="/var/lib/pipewire 0755 _pipewire _pipewire"
 system_accounts="_pipewire"
 
@@ -47,6 +56,10 @@ else
 	configure_args+=" -Dbluez5-codec-ldac=disabled"
 fi
 
+post_extract() {
+	mv ${XBPS_BUILDDIR}/media-session-${_pms_version} ${wrksrc}/subprojects/media-session
+}
+
 post_install() {
 	vlicense LICENSE
 	vdoc "${FILESDIR}/README.voidlinux"