[arch-commits] Commit in pipewire/trunk (PKGBUILD)

[Jan Steffens]

    Date: Friday, February 18, 2022 @ 09:53:38
  Author: heftig
Revision: 437662

0.3.47-1

Modified:
  pipewire/trunk/PKGBUILD

----------+
 PKGBUILD |   39 ++++++++++++++++++++++-----------------
 1 file changed, 22 insertions(+), 17 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2022-02-18 07:50:38 UTC (rev 437661)
+++ PKGBUILD	2022-02-18 09:53:38 UTC (rev 437662)
@@ -4,8 +4,9 @@
 
 pkgbase=pipewire
 pkgname=(pipewire alsa-card-profiles pipewire-docs pipewire-alsa pipewire-jack
-         pipewire-pulse gst-plugin-pipewire pipewire-zeroconf pipewire-v4l2 pipewire-x11-bell)
-pkgver=0.3.46
+         pipewire-pulse gst-plugin-pipewire pipewire-zeroconf pipewire-v4l2
+         pipewire-x11-bell)
+pkgver=0.3.47
 pkgrel=1
 epoch=1
 pkgdesc="Low-latency audio/video router and processor"
@@ -13,12 +14,12 @@
 license=(MIT)
 arch=(x86_64)
 makedepends=(git meson doxygen graphviz python-docutils valgrind libpulse
-             alsa-lib libusb gst-plugins-base rtkit dbus sdl2 ncurses libcanberra libsndfile
-             bluez-libs sbc libldac libfreeaptx libfdk-aac avahi lilv
-             webrtc-audio-processing)
+             alsa-lib libusb gst-plugins-base rtkit dbus sdl2 ncurses
+             libcanberra libsndfile bluez-libs sbc libldac libfreeaptx
+             libfdk-aac avahi lilv webrtc-audio-processing)
 checkdepends=(desktop-file-utils)
 options=(debug)
-_commit=0df9d037292f7b815be59d265c47790ee7a495c9  # tags/0.3.46
+_commit=2af393889358723a2789caa3c856700b1c968ef0  # tags/0.3.47
 source=("git+https://gitlab.freedesktop.org/pipewire/pipewire.git#commit=$_commit")
 sha256sums=('SKIP')
 
@@ -29,8 +30,9 @@
 
 prepare() {
   cd pipewire
+
   # 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
+  sed -i '/LD_LIBRARY_PATH/d' pipewire-jack/src/pw-jack.in
 }
 
 build() {
@@ -87,9 +89,6 @@
 
   meson install -C build --destdir "$pkgdir"
 
-  # install directory for overrides
-  install -vdm 755 "$pkgdir/etc/$pkgbase/"
-
   ( cd "$pkgdir"
 
     _pick acp usr/lib/udev
@@ -114,13 +113,16 @@
     _pick zeroconf usr/lib/pipewire-$_ver/libpipewire-module-{raop,zeroconf}-discover.so
 
     _pick v4l2 usr/bin/pw-v4l2 usr/lib/pipewire-$_ver/v4l2
+
     _pick x11-bell usr/lib/pipewire-$_ver/libpipewire-module-x11-bell.so
+
+    mkdir -p etc/alsa/conf.d
+    ln -st etc/alsa/conf.d /usr/share/alsa/alsa.conf.d/50-pipewire.conf
+
+    # directories for overrides
+    mkdir -p etc/pipewire/{client-rt,client,minimal,pipewire,pipewire-pulse}.conf.d
   )
 
-  mkdir -p "$pkgdir/etc/alsa/conf.d"
-  ln -st "$pkgdir/etc/alsa/conf.d" \
-    /usr/share/alsa/alsa.conf.d/50-pipewire.conf
-
   install -Dt "$pkgdir/usr/share/licenses/$pkgname" -m644 pipewire/COPYING
 }
 
@@ -157,7 +159,7 @@
 package_pipewire-jack() {
   pkgdesc+=" - JACK support"
   license+=(GPL2)  # libjackserver
-  depends=(sh pipewire-session-manager libpipewire-$_ver.so)
+  depends=(pipewire-session-manager libpipewire-$_ver.so sh)
   optdepends=('jack-example-tools: for official JACK example-clients and tools')
   conflicts=(jack jack2)
   provides=(jack libjack.so libjackserver.so libjacknet.so)
@@ -167,6 +169,9 @@
   install -Dm644 /dev/null \
     "$pkgdir/usr/share/pipewire/media-session.d/with-jack"
 
+  # directories for overrides
+  mkdir -p "$pkgdir/etc/pipewire/jack.conf.d"
+
   install -Dt "$pkgdir/usr/share/licenses/$pkgname" -m644 pipewire/COPYING
 }
 
@@ -206,7 +211,7 @@
 
 package_pipewire-v4l2() {
   pkgdesc+=" - V4L2 interceptor"
-  depends=(sh pipewire-session-manager libpipewire-$_ver.so)
+  depends=(pipewire-session-manager libpipewire-$_ver.so sh)
 
   mv v4l2/* "$pkgdir"
 
@@ -216,7 +221,7 @@
 
 package_pipewire-x11-bell() {
   pkgdesc+=" - X11 bell"
-  depends=(libcanberra.so libpipewire-$_ver.so libx11)
+  depends=(pipewire libpipewire-$_ver.so libx11 libcanberra.so)
 
   mv x11-bell/* "$pkgdir"