git » pipewire.git » commit c7ef214

0.3.79-2: FS#78592 add pipewire-jack-client

author Jan Alexander Steffens (heftig)
2023-09-05 22:42:22 UTC
committer Jan Alexander Steffens (heftig)
2023-09-05 22:42:22 UTC
parent d13828b9590290452925d9dc2400c1c8dae8a593

0.3.79-2: FS#78592 add pipewire-jack-client

PKGBUILD +27 -5

diff --git a/PKGBUILD b/PKGBUILD
index a5132cd..55ab4c3 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -11,6 +11,7 @@ pkgname=(
   pipewire-audio
   pipewire-alsa
   pipewire-ffado
+  pipewire-jack-client
   pipewire-jack
   pipewire-pulse
   pipewire-roc
@@ -21,7 +22,7 @@ pkgname=(
 )
 _commit=b5c3f217926f9066a1afbee7eb20967dd6896c56  # tags/0.3.79
 pkgver=0.3.79
-pkgrel=1
+pkgrel=2
 epoch=1
 pkgdesc="Low-latency audio/video router and processor"
 url="https://pipewire.org"
@@ -37,6 +38,7 @@ makedepends=(
   glib2
   graphviz
   gst-plugins-base
+  jack2
   libcamera
   libcanberra
   libfdk-aac
@@ -92,7 +94,6 @@ build() {
     -D bluez5-codec-lc3plus=disabled
     -D docs=enabled
     -D jack-devel=true
-    -D jack=disabled
     -D libjack-path=/usr/lib
     -D rlimits-install=false
     -D session-managers=[]
@@ -141,7 +142,8 @@ package_pipewire() {
     'pipewire-audio: Audio support'
     'pipewire-docs: Documentation'
     'pipewire-ffado: FireWire support'
-    'pipewire-jack: JACK support'
+    'pipewire-jack-client: PipeWire as JACK client'
+    'pipewire-jack: JACK replacement'
     'pipewire-pulse: PulseAudio replacement'
     'pipewire-roc: ROC streaming'
     'pipewire-session-manager: Session manager'
@@ -198,6 +200,9 @@ package_pipewire() {
 
     _pick ffado usr/lib/pipewire-$_ver/libpipewire-module-ffado*.so
 
+    _pick jack-client usr/lib/pipewire-$_ver/libpipewire-module-jack{-tunnel,dbus-detect}.so
+    _pick jack-client usr/lib/spa-0.2/jack
+
     _pick jack usr/bin/pw-jack
     _pick jack usr/include/jack
     _pick jack usr/lib/libjack*
@@ -328,8 +333,25 @@ package_pipewire-ffado() {
   install -Dt "$pkgdir/usr/share/licenses/$pkgname" -m644 pipewire/COPYING
 }
 
+package_pipewire-jack-client() {
+  pkgdesc+=" - PipeWire as JACK client"
+  depends=(
+    glibc
+    libdbus-1.so
+    libjack.so
+    libpipewire-$_ver.so
+    pipewire
+    pipewire-audio
+  )
+  conflicts=(pipewire-jack)
+
+  mv jack-client/* "$pkgdir"
+
+  install -Dt "$pkgdir/usr/share/licenses/$pkgname" -m644 pipewire/COPYING
+}
+
 package_pipewire-jack() {
-  pkgdesc+=" - JACK support"
+  pkgdesc+=" - JACK replacement"
   license+=(GPL2)  # libjackserver
   depends=(
     glibc
@@ -340,7 +362,7 @@ package_pipewire-jack() {
     sh
   )
   optdepends=('jack-example-tools: for official JACK example-clients and tools')
-  conflicts=(jack jack2)
+  conflicts=(jack jack2 pipewire-jack-client)
   provides=(jack libjack.so libjackserver.so libjacknet.so)
 
   mv jack/* "$pkgdir"