From 18b105803566af274b6a9b5a89dd3e5e64bbaf9b 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 | 13 +++++++++++
 srcpkgs/pipewire/template                   | 21 +++++++++++++----
 3 files changed, 30 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..669002721527
--- /dev/null
+++ b/srcpkgs/pipewire/patches/no-LIB-token.patch
@@ -0,0 +1,13 @@
+diff --git a/meson.build.orig b/meson.build
+index 7172ee4..5c24e7e 100644
+--- a/meson.build
++++ b/meson.build
+@@ -48,7 +48,7 @@ if host_machine.system() == 'linux'
+   # 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
++  modules_install_dir_dlopen = prefix / 'lib' / pipewire_name
+ else
+   modules_install_dir_dlopen = modules_install_dir
+ endif
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"