git » pipewire.git » commit 39bf9d1

0.3.72-1

author Jan Alexander Steffens (heftig)
2023-06-28 22:52:42 UTC
committer Jan Alexander Steffens (heftig)
2023-06-28 23:20:45 UTC
parent 900217edac68c1397abee105a8ad5217d048e832

0.3.72-1

PKGBUILD +26 -10

diff --git a/PKGBUILD b/PKGBUILD
index 461abbb..2c92986 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -10,6 +10,7 @@ pkgname=(
   pipewire-docs
   pipewire-audio
   pipewire-alsa
+  pipewire-ffado
   pipewire-jack
   pipewire-pulse
   pipewire-roc
@@ -18,9 +19,9 @@ pkgname=(
   pipewire-v4l2
   pipewire-x11-bell
 )
-_commit=bd225b14bbda1a6e2dc7a52780eaf728920e0ff2  # tags/0.3.71
-pkgver=0.3.71
-pkgrel=2
+_commit=4cc22d60d2280fb3c771e6a246e79c90819fd485  # tags/0.3.72
+pkgver=0.3.72
+pkgrel=1
 epoch=1
 pkgdesc="Low-latency audio/video router and processor"
 url="https://pipewire.org"
@@ -39,6 +40,7 @@ makedepends=(
   libcamera
   libcanberra
   libfdk-aac
+  libffado
   libfreeaptx
   liblc3
   libldac
@@ -59,7 +61,6 @@ makedepends=(
   sbc
   sdl2
   systemd
-  tinycompress
   valgrind
   webrtc-audio-processing
 )
@@ -75,10 +76,6 @@ pkgver() {
 prepare() {
   cd pipewire
 
-  # Fix JACK emulation
-  # https://gitlab.freedesktop.org/pipewire/pipewire/-/issues/3226
-  git cherry-pick -n ce71b37b58d5e251ae7acda0799f696688df11c2
-
   # remove export of LD_LIBRARY_PATH for pw-jack as it would add /usr/lib
   sed -i '/LD_LIBRARY_PATH/d' pipewire-jack/src/pw-jack.in
 }
@@ -136,6 +133,7 @@ package_pipewire() {
     'pipewire-alsa: ALSA configuration'
     'pipewire-audio: Audio support'
     'pipewire-docs: Documentation'
+    'pipewire-ffado: FireWire support'
     'pipewire-jack: JACK support'
     'pipewire-pulse: PulseAudio replacement'
     'pipewire-roc: ROC streaming'
@@ -178,9 +176,10 @@ package_pipewire() {
     _pick audio usr/lib/pipewire-$_ver/libpipewire-module-fallback-sink.so
     _pick audio usr/lib/pipewire-$_ver/libpipewire-module-filter-chain.so
     _pick audio usr/lib/pipewire-$_ver/libpipewire-module-loopback.so
+    _pick audio usr/lib/pipewire-$_ver/libpipewire-module-netjack2-*.so
     _pick audio usr/lib/pipewire-$_ver/libpipewire-module-pipe-tunnel.so
     _pick audio usr/lib/pipewire-$_ver/libpipewire-module-protocol-simple.so
-    _pick audio usr/lib/pipewire-$_ver/libpipewire-module-rtp-*.so
+    _pick audio usr/lib/pipewire-$_ver/libpipewire-module-rtp-{sap,sink,source}.so
     _pick audio usr/lib/spa-0.2/{aec,alsa,audio*,avb,bluez5}
     _pick audio usr/lib/systemd/user/filter-chain.service
     _pick audio usr/share/alsa
@@ -189,6 +188,8 @@ package_pipewire() {
     _pick audio usr/share/pipewire/pipewire-{aes67,avb}.conf
     _pick audio usr/share/spa-0.2/bluez5
 
+    _pick ffado usr/lib/pipewire-$_ver/libpipewire-module-ffado*.so
+
     _pick jack usr/bin/pw-jack
     _pick jack usr/include/jack
     _pick jack usr/lib/libjack*
@@ -208,6 +209,7 @@ package_pipewire() {
     _pick gst usr/lib/gstreamer-1.0
 
     _pick zeroconf usr/lib/pipewire-$_ver/libpipewire-module-{raop,zeroconf}-*.so
+    _pick zeroconf usr/lib/pipewire-$_ver/libpipewire-module-rtp-session.so
 
     _pick v4l2 usr/bin/pw-v4l2 usr/lib/pipewire-$_ver/v4l2
 
@@ -263,7 +265,6 @@ package_pipewire-audio() {
     libpipewire-$_ver.so
     libsbc.so
     libsndfile.so
-    libtinycompress.so
     libusb-1.0.so
     libwebrtc_audio_processing.so
     pipewire
@@ -298,6 +299,20 @@ package_pipewire-alsa() {
   install -Dt "$pkgdir/usr/share/licenses/$pkgname" -m644 pipewire/COPYING
 }
 
+package_pipewire-ffado() {
+  pkgdesc+=" - FireWire support"
+  depends=(
+    libffado.so
+    libpipewire-$_ver.so
+    pipewire
+    pipewire-audio
+  )
+
+  mv ffado/* "$pkgdir"
+
+  install -Dt "$pkgdir/usr/share/licenses/$pkgname" -m644 pipewire/COPYING
+}
+
 package_pipewire-jack() {
   pkgdesc+=" - JACK support"
   license+=(GPL2)  # libjackserver
@@ -385,6 +400,7 @@ package_pipewire-zeroconf() {
     libpipewire-$_ver.so
     openssl
     pipewire
+    pipewire-audio
   )
 
   mv zeroconf/* "$pkgdir"