Split 'pipewire-zeroconf', remove backup, fix licenses

2 files changed, 47 insertions, 31 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 4c569363f879..4cc4b6890fb9 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = pipewire-full-git
 	pkgdesc = Low-latency audio/video router and processor
-	pkgver = 0.3.27.r132.gcdfd50e1
+	pkgver = 0.3.28.r0.gfb55cc47
 	pkgrel = 1
 	url = https://pipewire.org
 	arch = x86_64
@@ -8,7 +8,6 @@ pkgbase = pipewire-full-git
 	makedepends = git
 	makedepends = meson
 	makedepends = doxygen
-	makedepends = graphviz
 	makedepends = xmltoman
 	makedepends = ncurses
 	makedepends = libsndfile
@@ -55,6 +54,7 @@ pkgname = pipewire-full-git
 	optdepends = pipewire-full-jack-git: JACK support
 	optdepends = pipewire-full-jack-client-git: JACK device/client
 	optdepends = pipewire-full-pulse-git: PulseAudio replacement
+	optdepends = pipewire-full-zeroconf-git: Zeroconf support
 	optdepends = gst-plugin-pipewire-full-git: GStreamer support
 	optdepends = ofono: ofono Bluetooth HFP support
 	optdepends = hsphfpd: hsphfpd Bluetooth HSP/HFP support
@@ -65,19 +65,6 @@ pkgname = pipewire-full-git
 	conflicts = pipewire
 	conflicts = pipewire-media-session
 	conflicts = alsa-card-profiles
-	backup = usr/share/pipewire/pipewire.conf
-	backup = usr/share/pipewire/pipewire-pulse.conf
-	backup = usr/share/pipewire/client.conf
-	backup = usr/share/pipewire/client-rt.conf
-	backup = usr/share/pipewire/filter-chain/demonic.conf
-	backup = usr/share/pipewire/filter-chain/sink-dolby-surround.conf
-	backup = usr/share/pipewire/filter-chain/sink-eq6.conf
-	backup = usr/share/pipewire/filter-chain/sink-matrix-spatialiser.conf
-	backup = usr/share/pipewire/filter-chain/source-rnnoise.conf
-	backup = usr/share/pipewire/media-session.d/media-session.conf
-	backup = usr/share/pipewire/media-session.d/alsa-monitor.conf
-	backup = usr/share/pipewire/media-session.d/bluez-monitor.conf
-	backup = usr/share/pipewire/media-session.d/v4l2-monitor.conf
 
 pkgname = pipewire-full-docs-git
 	pkgdesc = Low-latency audio/video router and processor - documentation
@@ -96,13 +83,12 @@ pkgname = pipewire-full-alsa-git
 pkgname = pipewire-full-jack-git
 	pkgdesc = Low-latency audio/video router and processor - JACK support
 	license = MIT
-	license = GPL
+	license = GPL2
 	depends = pipewire-full-git
 	depends = libpipewire-0.3.so
 	depends = bash
 	provides = pipewire-jack
 	conflicts = pipewire-jack
-	backup = usr/share/pipewire/jack.conf
 
 pkgname = pipewire-full-pulse-git
 	pkgdesc = Low-latency audio/video router and processor - PulseAudio replacement
diff --git a/PKGBUILD b/PKGBUILD
index fe9607c3a93b..28907c8d60b8 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -9,13 +9,13 @@ pkgname=(pipewire-full-git pipewire-full-docs-git pipewire-full-alsa-git
          gst-plugin-pipewire-full-git
          pipewire-full-jack-client-git
          pipewire-full-vulkan-git pipewire-full-ffmpeg-git)
-pkgver=0.3.27.r132.gcdfd50e1
+pkgver=0.3.28.r0.gfb55cc47
 pkgrel=1
 pkgdesc="Low-latency audio/video router and processor"
 url="https://pipewire.org"
 license=(MIT)
 arch=(x86_64)
-makedepends=(git meson doxygen graphviz xmltoman
+makedepends=(git meson doxygen xmltoman
              ncurses libsndfile alsa-lib dbus rtkit
              libpulse avahi sdl2 gst-plugins-base-libs
              bluez-libs sbc libldac libopenaptx libfdk-aac
@@ -62,7 +62,7 @@ _pick() {
 _ver=${pkgver:0:3}
 
 package_pipewire-full-git() {
-  license=(MIT LGPL)
+  license+=(LGPL)
   depends=(rtkit libdbus-1.so libncursesw.so libsndfile.so
            libudev.so libasound.so libsystemd.so libpulse.so
            libavahi-common.so libavahi-client.so
@@ -73,23 +73,17 @@ package_pipewire-full-git() {
               'pipewire-full-jack-git: JACK support'
               'pipewire-full-jack-client-git: JACK device/client'
               'pipewire-full-pulse-git: PulseAudio replacement'
+              'pipewire-full-zeroconf-git: Zeroconf support'
               'gst-plugin-pipewire-full-git: GStreamer support'
               'ofono: ofono Bluetooth HFP support'
               'hsphfpd: hsphfpd Bluetooth HSP/HFP support')
   provides=(pipewire pipewire-media-session alsa-card-profiles libpipewire-$_ver.so)
   conflicts=(pipewire pipewire-media-session alsa-card-profiles)
-  backup=(usr/share/pipewire/{pipewire{,-pulse},client{,-rt}}.conf
-          usr/share/pipewire/filter-chain/demonic.conf
-          usr/share/pipewire/filter-chain/sink-{dolby-surround,eq6,matrix-spatialiser}.conf
-          usr/share/pipewire/filter-chain/source-rnnoise.conf
-          usr/share/pipewire/media-session.d/media-session.conf
-          usr/share/pipewire/media-session.d/{alsa,bluez,v4l2}-monitor.conf)
   install=pipewire.install
 
-  DESTDIR="$pkgdir" meson install -C build
+  meson install -C build --destdir "$pkgdir"
 
-  install -Dm644 "$_pkgbase/LICENSE" "$pkgdir/usr/share/licenses/$_pkgbase/LICENSE"
-  install -Dm644 "$_pkgbase/COPYING" "$pkgdir/usr/share/licenses/$_pkgbase/COPYING"
+  install -Dt "$pkgdir/usr/share/licenses/$pkgname" -m644 $_pkgbase/COPYING
 
   cd "$pkgdir"
 
@@ -101,6 +95,8 @@ package_pipewire-full-git() {
 
   _pick pulse usr/share/pipewire/media-session.d/with-pulseaudio
 
+  _pick zeroconf usr/lib/pipewire-$_ver/libpipewire-module-zeroconf-discover.so
+
   _pick gst usr/lib/gstreamer-1.0
 
   _pick jack-client usr/lib/spa-0.2/jack
@@ -116,7 +112,10 @@ package_pipewire-full-docs-git() {
   provides=(pipewire-docs)
   conflicts=(pipewire-docs)
   pkgdesc+=" - documentation"
+
   mv docs/* "$pkgdir"
+
+  install -Dt "$pkgdir/usr/share/licenses/$pkgname" -m644 $_pkgbase/COPYING
 }
 
 package_pipewire-full-alsa-git() {
@@ -129,16 +128,20 @@ package_pipewire-full-alsa-git() {
   ln -st "$pkgdir/etc/alsa/conf.d" \
     /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 $_pkgbase/COPYING
 }
 
 package_pipewire-full-jack-git() {
-  license=(MIT GPL)
+  license+=(GPL2)
   pkgdesc+=" - JACK support"
   depends=(pipewire-full-git libpipewire-$_ver.so bash)
   provides=(pipewire-jack)
   conflicts=(pipewire-jack)
-  backup=(usr/share/pipewire/jack.conf)
+
   mv jack/* "$pkgdir"
+
+  install -Dt "$pkgdir/usr/share/licenses/$pkgname" -m644 $_pkgbase/COPYING
 }
 
 package_pipewire-full-pulse-git() {
@@ -147,7 +150,22 @@ package_pipewire-full-pulse-git() {
   provides=(pipewire-pulse pulseaudio pulseaudio-bluetooth)
   conflicts=(pipewire-pulse pulseaudio pulseaudio-bluetooth)
   install=pipewire-pulse.install
+
   mv pulse/* "$pkgdir"
+
+  install -Dt "$pkgdir/usr/share/licenses/$pkgname" -m644 $_pkgbase/COPYING
+}
+
+package_pipewire-full-zeroconf-git() {
+  pkgdesc+=" - Zeroconf support"
+  depends=(pipewire-common-git libpipewire-$_ver.so
+           libavahi-{client,common}.so)
+  provides=(pipewire-zeroconf)
+  conflicts=(pipewire-zeroconf)
+
+  mv zeroconf/* "$pkgdir"
+
+  install -Dt "$pkgdir/usr/share/licenses/$pkgname" -m644 $_pkgbase/COPYING
 }
 
 package_gst-plugin-pipewire-full-git() {
@@ -155,7 +173,10 @@ package_gst-plugin-pipewire-full-git() {
   depends=(pipewire-full-git libpipewire-$_ver.so gst-plugins-base-libs)
   provides=(gst-plugin-pipewire)
   conflicts=(gst-plugin-pipewire)
+
   mv gst/* "$pkgdir"
+
+  install -Dt "$pkgdir/usr/share/licenses/$pkgname" -m644 $_pkgbase/COPYING
 }
 
 package_pipewire-full-jack-client-git() {
@@ -163,7 +184,10 @@ package_pipewire-full-jack-client-git() {
   depends=(pipewire-full-git libjack.so)
   provides=(pipewire-jack-client)
   conflicts=(pipewire-jack-client)
+
   mv jack-client/* "${pkgdir}"
+
+  install -Dt "$pkgdir/usr/share/licenses/$pkgname" -m644 $_pkgbase/COPYING
 }
 
 package_pipewire-full-vulkan-git() {
@@ -171,7 +195,10 @@ package_pipewire-full-vulkan-git() {
   depends=(pipewire-full-git vulkan-icd-loader)
   provides=(pipewire-vulkan)
   conflicts=(pipewire-vulkan)
+
   mv vulkan/* "${pkgdir}"
+
+  install -Dt "$pkgdir/usr/share/licenses/$pkgname" -m644 $_pkgbase/COPYING
 }
 
 package_pipewire-full-ffmpeg-git() {
@@ -179,5 +206,8 @@ package_pipewire-full-ffmpeg-git() {
   depends=(pipewire-full-git libavcodec.so libavformat.so)
   provides=(pipewire-ffmpeg)
   conflicts=(pipewire-ffmpeg)
+
   mv ffmpeg/* "${pkgdir}"
+
+  install -Dt "$pkgdir/usr/share/licenses/$pkgname" -m644 $_pkgbase/COPYING
 }