updpkg: nonsystemd/pipewire 1:0.3.31-1.nonsystemd1

Signed-off-by: David P <megver83@parabola.nu>

1 files changed, 79 insertions, 35 deletions

diff --git a/nonsystemd/pipewire/PKGBUILD b/nonsystemd/pipewire/PKGBUILD
index 30a75bfcd..6fd0d4e01 100644
--- a/nonsystemd/pipewire/PKGBUILD
+++ b/nonsystemd/pipewire/PKGBUILD
@@ -4,40 +4,45 @@
 
 pkgbase=pipewire
 pkgname=(pipewire alsa-card-profiles pipewire-docs pipewire-media-session
-         pipewire-alsa pipewire-jack pipewire-pulse gst-plugin-pipewire)
-pkgver=0.3.25
+         pipewire-alsa pipewire-jack pipewire-pulse gst-plugin-pipewire
+         pipewire-zeroconf)
+pkgver=0.3.31
 pkgrel=1
 pkgrel+=.nonsystemd1
 epoch=1
 pkgdesc="Low-latency audio/video router and processor"
 url="https://pipewire.org"
-license=(LGPL)
+license=(MIT)
 arch=(x86_64)
 arch+=(i686 armv7h)
-makedepends=(git meson doxygen graphviz xmltoman valgrind libpulse alsa-lib
+makedepends=(git meson doxygen xmltoman valgrind libpulse alsa-lib
              gst-plugins-base rtkit dbus sdl2 ncurses libsndfile bluez-libs sbc
-             libldac libopenaptx libfdk-aac vulkan-headers vulkan-icd-loader)
+             libldac libopenaptx libfdk-aac avahi webrtc-audio-processing)
 checkdepends=(desktop-file-utils)
-_commit=c324107211718043553337cb10d022fe9d2d12d8  # tags/0.3.25
+_commit=c43dabcc96e2e072cdf08e5f094bb677d9017c6b  # tags/0.3.31
 source=("git+https://gitlab.freedesktop.org/pipewire/pipewire.git#commit=$_commit")
 sha256sums=('SKIP')
 
 pkgver() {
-  cd $pkgbase
+  cd pipewire
   git describe --tags | sed 's/-/+/g'
 }
 
 prepare() {
-  cd $pkgbase
+  cd pipewire
 }
 
 build() {
-  arch-meson $pkgbase build \
-    -D docs=enabled \
-    -D systemd=disabled \
-    -D jack=disabled \
-    -D libcamera=disabled \
+  local meson_options=(
+    -D docs=enabled
+    -D jack=disabled
+    -D libcamera=disabled
     -D udevrulesdir=/usr/lib/udev/rules.d
+    -D systemd=disabled
+    -D roc=disabled
+  )
+
+  arch-meson pipewire build "${meson_options[@]}"
   meson compile -C build
 }
 
@@ -58,55 +63,71 @@ _pick() {
 _ver=${pkgver:0:3}
 
 package_pipewire() {
+  license+=(LGPL)  # libspa-alsa
   depends=(rtkit alsa-card-profiles libdbus-1.so libncursesw.so libsndfile.so
-           libudev.so libasound.so libbluetooth.so libsbc.so
-           libldacBT_enc.so libopenaptx.so libfdk-aac.so libvulkan.so)
+           libudev.so libusb-1.0.so libasound.so libbluetooth.so
+           libsbc.so libldacBT_enc.so libopenaptx.so libfdk-aac.so
+           libwebrtc_audio_processing.so)
   optdepends=('pipewire-docs: Documentation'
               'pipewire-media-session: Default session manager'
               'pipewire-alsa: ALSA configuration'
               'pipewire-jack: JACK support'
               'pipewire-pulse: PulseAudio replacement'
-              'gst-plugin-pipewire: GStreamer support')
+              'gst-plugin-pipewire: GStreamer support'
+              'pipewire-zeroconf: Zeroconf support')
   provides=(libpipewire-$_ver.so)
-  backup=(etc/pipewire/{pipewire{,-pulse},client{,-rt}}.conf)
 
-  DESTDIR="$pkgdir" meson install -C build
+  meson install -C build --destdir "$pkgdir"
+
+  ( cd "$pkgdir"
+
+    _pick acp usr/lib/udev
+    _pick acp usr/share/alsa-card-profile
 
-  cd "$pkgdir"
+    _pick docs usr/share/doc
 
-  _pick acp usr/lib/udev
-  _pick acp usr/share/alsa-card-profile
+    _pick pms usr/bin/pipewire-media-session
+    _pick pms usr/share/pipewire/media-session.d/*.conf
 
-  _pick docs usr/share/doc
+    _pick jack usr/bin/pw-jack usr/lib/pipewire-$_ver/jack
+    _pick jack usr/share/man/man1/pw-jack.1
+    _pick jack usr/share/pipewire/{jack.conf,media-session.d/with-jack}
 
-  _pick pms etc/pipewire/media-session.d/*.conf
-  _pick pms usr/bin/pipewire-media-session
+    _pick pulse usr/bin/pipewire-pulse
+    _pick pulse usr/lib/pipewire-$_ver/libpipewire-module-protocol-pulse.so
+    _pick pulse usr/lib/pipewire-$_ver/libpipewire-module-pulse-tunnel.so
+    _pick pulse usr/share/pipewire/media-session.d/with-pulseaudio
 
-  _pick jack etc/pipewire/{jack.conf,media-session.d/with-jack}
-  _pick jack usr/bin/pw-jack usr/lib/pipewire-$_ver/jack
-  _pick jack usr/share/man/man1/pw-jack.1
+    _pick gst usr/lib/gstreamer-1.0
 
-  _pick pulse etc/pipewire/media-session.d/with-pulseaudio
+    _pick zeroconf usr/lib/pipewire-$_ver/libpipewire-module-zeroconf-discover.so
+  )
 
-  _pick gst usr/lib/gstreamer-1.0
+  install -Dt "$pkgdir/usr/share/licenses/$pkgname" -m644 pipewire/COPYING
 }
 
 package_alsa-card-profiles() {
   pkgdesc+=" - ALSA card profiles"
+  license=(LGPL)
+
   mv acp/* "$pkgdir"
 }
 
 package_pipewire-docs() {
   pkgdesc+=" - documentation"
+
   mv docs/* "$pkgdir"
+
+  install -Dt "$pkgdir/usr/share/licenses/$pkgname" -m644 pipewire/COPYING
 }
 
 package_pipewire-media-session() {
   pkgdesc+=" - Session manager"
   depends=(pipewire libpipewire-$_ver.so)
-  backup=(etc/pipewire/media-session.d/media-session.conf
-          etc/pipewire/media-session.d/{alsa,bluez,v4l2}-monitor.conf)
+
   mv pms/* "$pkgdir"
+
+  install -Dt "$pkgdir/usr/share/licenses/$pkgname" -m644 pipewire/COPYING
 }
 
 package_pipewire-alsa() {
@@ -116,29 +137,52 @@ package_pipewire-alsa() {
 
   mkdir -p "$pkgdir/etc/alsa/conf.d"
   ln -st "$pkgdir/etc/alsa/conf.d" \
-    /usr/share/alsa/alsa.conf.d/{50-pipewire,99-pipewire-default}.conf 
-  install -Dm644 /dev/null "$pkgdir/etc/pipewire/media-session.d/with-alsa"
+    /usr/share/alsa/alsa.conf.d/{50-pipewire,99-pipewire-default}.conf
+
+  install -Dm644 /dev/null \
+    "$pkgdir/usr/share/pipewire/media-session.d/with-alsa"
+
+  install -Dt "$pkgdir/usr/share/licenses/$pkgname" -m644 pipewire/COPYING
 }
 
 package_pipewire-jack() {
   pkgdesc+=" - JACK support"
+  license+=(GPL2)  # libjackserver
   depends=(pipewire-media-session libpipewire-$_ver.so)
-  backup=(etc/pipewire/jack.conf)
+
   mv jack/* "$pkgdir"
+
+  install -Dt "$pkgdir/usr/share/licenses/$pkgname" -m644 pipewire/COPYING
 }
 
 package_pipewire-pulse() {
   pkgdesc+=" - PulseAudio replacement"
-  depends=(pipewire-media-session libpulse)
+  depends=(pipewire-media-session libpipewire-$_ver.so libpulse.so
+           libavahi-{client,common}.so)
   provides=(pulseaudio pulseaudio-bluetooth)
   conflicts=(pulseaudio pulseaudio-bluetooth)
+
   mv pulse/* "$pkgdir"
+
+  install -Dt "$pkgdir/usr/share/licenses/$pkgname" -m644 pipewire/COPYING
 }
 
 package_gst-plugin-pipewire() {
   pkgdesc="Multimedia graph framework - pipewire plugin"
   depends=(pipewire-media-session libpipewire-$_ver.so gst-plugins-base-libs)
+
   mv gst/* "$pkgdir"
+
+  install -Dt "$pkgdir/usr/share/licenses/$pkgname" -m644 pipewire/COPYING
+}
+
+package_pipewire-zeroconf() {
+  pkgdesc+=" - Zeroconf support"
+  depends=(pipewire libpipewire-$_ver.so libavahi-{client,common}.so)
+
+  mv zeroconf/* "$pkgdir"
+
+  install -Dt "$pkgdir/usr/share/licenses/$pkgname" -m644 pipewire/COPYING
 }
 
 # vim:set sw=2 et: