From 9f14fd683a746c8b91f251dd521bc2b553ce7bde Mon Sep 17 00:00:00 2001
From: David Beauchamp <david@archlinuxarm.org>
Date: Tue, 18 Jan 2022 18:47:21 -0500
Subject: [PATCH] extra/pipewire to 0.3.43-5

---
 extra/pipewire/PKGBUILD | 17 ++++++++++++-----
 1 file changed, 12 insertions(+), 5 deletions(-)

diff --git a/extra/pipewire/PKGBUILD b/extra/pipewire/PKGBUILD
index e36f919c0..1fa19c5fb 100644
--- a/extra/pipewire/PKGBUILD
+++ b/extra/pipewire/PKGBUILD
@@ -10,7 +10,7 @@ pkgbase=pipewire
 pkgname=(pipewire alsa-card-profiles pipewire-docs pipewire-alsa pipewire-jack
          pipewire-pulse gst-plugin-pipewire pipewire-zeroconf pipewire-v4l2)
 pkgver=0.3.43
-pkgrel=1
+pkgrel=5
 epoch=1
 pkgdesc="Low-latency audio/video router and processor"
 url="https://pipewire.org"
@@ -34,9 +34,8 @@ pkgver() {
 
 prepare() {
   cd pipewire
-
-  # https://gitlab.freedesktop.org/pipewire/pipewire/-/issues/1930
-  git cherry-pick -n 3c66d4600750b2039f6f969a35fce82605754b9c
+  # remove export of LD_LIBRARY_PATH for pw-jack as it would add /usr/lib
+  sed -e '/LD_LIBRARY_PATH/d' -i pipewire-jack/src/pw-jack.in
 
   if [[ $CARCH != "aarch64" ]]; then
     git cherry-pick -n 651f0decea5f83730c271e9bed03cdd0048fcd49
@@ -48,6 +47,8 @@ build() {
   local meson_options=(
     -D docs=enabled
     -D jack=disabled
+    -D jack-devel=true
+    -D libjack-path=/usr/lib
     -D libcamera=disabled
     -D udevrulesdir=/usr/lib/udev/rules.d
     -D roc=disabled
@@ -100,7 +101,10 @@ package_pipewire() {
 
     _pick docs usr/share/doc
 
-    _pick jack usr/bin/pw-jack usr/lib/pipewire-$_ver/jack
+    _pick jack usr/bin/pw-jack
+    _pick jack usr/include/jack
+    _pick jack usr/lib/libjack*
+    _pick jack usr/lib/pkgconfig/jack.pc
     _pick jack usr/share/man/man1/pw-jack.1
     _pick jack usr/share/pipewire/jack.conf
 
@@ -157,6 +161,9 @@ package_pipewire-jack() {
   pkgdesc+=" - JACK support"
   license+=(GPL2)  # libjackserver
   depends=(pipewire-session-manager libpipewire-$_ver.so)
+  optdepends=('jack-example-tools: for official JACK example-clients and tools')
+  conflicts=(jack jack2)
+  provides=(jack libjack.so libjackserver.so libjacknet.so)
 
   mv jack/* "$pkgdir"