[lilac] updated to 1.0.0.r2.g9daca346-1

2 files changed, 48 insertions, 47 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 9159097ab997..1a60acfef13a 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = pipewire-full-git
 	pkgdesc = Low-latency audio/video router and processor
-	pkgver = 0.3.85.r31.ga3e86f17
+	pkgver = 1.0.0.r2.g9daca346
 	pkgrel = 1
 	url = https://pipewire.org
 	arch = x86_64
@@ -54,10 +54,10 @@ pkgbase = pipewire-full-git
 pkgname = pipewire-full-git
 	install = pipewire.install
 	license = MIT
-	license = LGPL
+	license = LGPL-2.1-or-later
 	depends = gcc-libs
 	depends = glibc
-	depends = libpipewire-full-git=0.3.85.r31.ga3e86f17-1
+	depends = libpipewire-full-git=1.0.0.r2.g9daca346-1
 	depends = libcamera-base.so
 	depends = libcamera.so
 	depends = libdbus-1.so
@@ -81,14 +81,14 @@ pkgname = pipewire-full-git
 	optdepends = pipewire-full-zeroconf-git: Zeroconf support
 	optdepends = realtime-privileges: realtime privileges with rt module
 	optdepends = rtkit: realtime privileges with rtkit module
-	provides = pipewire=0.3.85
+	provides = pipewire=1.0.0
 	conflicts = pipewire
 
 pkgname = libpipewire-full-git
 	pkgdesc = Low-latency audio/video router and processor - client library
 	depends = glibc
 	depends = gcc-libs
-	provides = libpipewire=0.3.85
+	provides = libpipewire=1.0.0
 	provides = libpipewire-0.3.so
 	conflicts = libpipewire
 
@@ -150,9 +150,10 @@ pkgname = pipewire-full-ffado-git
 	conflicts = pipewire-ffado
 
 pkgname = pipewire-full-jack-git
-	pkgdesc = Low-latency audio/video router and processor - JACK support
+	pkgdesc = Low-latency audio/video router and processor - JACK replacement
 	license = MIT
-	license = GPL2
+	license = LGPL-2.1-or-later
+	license = GPL-2.0-only
 	depends = glibc
 	depends = libpipewire-0.3.so
 	depends = pipewire-full-git
diff --git a/PKGBUILD b/PKGBUILD
index 6786b53c6941..3253cf0e1fcf 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -22,7 +22,9 @@ pkgname=(
   pipewire-full-vulkan-git
   pipewire-full-ffmpeg-git
 )
-pkgver=0.3.85.r31.ga3e86f17
+pkgver=1.0.0.r2.g9daca346
+_so_ver=0.3
+_short_pkgver=${pkgver%%.r*}
 pkgrel=1
 pkgdesc="Low-latency audio/video router and processor"
 url="https://pipewire.org"
@@ -102,6 +104,7 @@ build() {
   local meson_options=(
     -D bluez5-codec-lc3plus=disabled
     -D docs=enabled
+    -D man=enabled
     -D jack-devel=true
     -D libjack-path=/usr/lib
     -D rlimits-install=false
@@ -133,11 +136,8 @@ _pick() {
   done
 }
 
-_ver=${pkgver:0:3}
-_short_pkgver=${pkgver%%.r*}
-
 package_pipewire-full-git() {
-  license+=(LGPL)  # libspa-alsa
+  license+=(LGPL-2.1-or-later)  # libspa-alsa
   provides=("pipewire=$_short_pkgver")
   conflicts=(pipewire)
   depends=(
@@ -149,7 +149,7 @@ package_pipewire-full-git() {
     libdbus-1.so
     libglib-2.0.so
     libncursesw.so
-    libpipewire-$_ver.so
+    libpipewire-$_so_ver.so
     libreadline.so
     libsystemd.so
     libudev.so
@@ -183,9 +183,9 @@ package_pipewire-full-git() {
       ln -sf pipewire usr/bin/$_f
     done
 
-    _pick lib usr/include/{pipewire-$_ver,spa-0.2}
-    _pick lib usr/lib/libpipewire-$_ver.so*
-    _pick lib usr/lib/pkgconfig/lib{pipewire-$_ver,spa-0.2}.pc
+    _pick lib usr/include/{pipewire-$_so_ver,spa-0.2}
+    _pick lib usr/lib/libpipewire-$_so_ver.so*
+    _pick lib usr/lib/pkgconfig/lib{pipewire-$_so_ver,spa-0.2}.pc
 
     # ACP
     _pick audio usr/lib/udev
@@ -198,16 +198,16 @@ package_pipewire-full-git() {
     _pick audio usr/bin/pw-{loopback,mididump}
     _pick audio usr/bin/spa-{acp-tool,resample}
     _pick audio usr/lib/alsa-lib
-    _pick audio usr/lib/pipewire-$_ver/libpipewire-module-avb.so
-    _pick audio usr/lib/pipewire-$_ver/libpipewire-module-echo-cancel.so
-    _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-{sap,sink,source}.so
-    _pick audio usr/lib/pipewire-$_ver/libpipewire-module-vban-{recv,send}.so
+    _pick audio usr/lib/pipewire-$_so_ver/libpipewire-module-avb.so
+    _pick audio usr/lib/pipewire-$_so_ver/libpipewire-module-echo-cancel.so
+    _pick audio usr/lib/pipewire-$_so_ver/libpipewire-module-fallback-sink.so
+    _pick audio usr/lib/pipewire-$_so_ver/libpipewire-module-filter-chain*.so
+    _pick audio usr/lib/pipewire-$_so_ver/libpipewire-module-loopback.so
+    _pick audio usr/lib/pipewire-$_so_ver/libpipewire-module-netjack2-*.so
+    _pick audio usr/lib/pipewire-$_so_ver/libpipewire-module-pipe-tunnel.so
+    _pick audio usr/lib/pipewire-$_so_ver/libpipewire-module-protocol-simple.so
+    _pick audio usr/lib/pipewire-$_so_ver/libpipewire-module-rtp-{sap,sink,source}.so
+    _pick audio usr/lib/pipewire-$_so_ver/libpipewire-module-vban-{recv,send}.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
@@ -216,7 +216,7 @@ package_pipewire-full-git() {
     _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 ffado usr/lib/pipewire-$_so_ver/libpipewire-module-ffado*.so
 
     _pick jack usr/bin/pw-jack
     _pick jack usr/include/jack
@@ -226,22 +226,22 @@ package_pipewire-full-git() {
     _pick jack usr/share/pipewire/jack.conf
 
     _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/lib/pipewire-$_so_ver/libpipewire-module-protocol-pulse.so
+    _pick pulse usr/lib/pipewire-$_so_ver/libpipewire-module-pulse-tunnel.so
     _pick pulse usr/lib/systemd/user/pipewire-pulse.*
     _pick pulse usr/share/man/man1/pipewire-pulse.1
     _pick pulse usr/share/pipewire/pipewire-pulse.conf
 
-    _pick roc usr/lib/pipewire-$_ver/libpipewire-module-roc*.so
+    _pick roc usr/lib/pipewire-$_so_ver/libpipewire-module-roc*.so
 
     _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 zeroconf usr/lib/pipewire-$_so_ver/libpipewire-module-{raop,zeroconf}-*.so
+    _pick zeroconf usr/lib/pipewire-$_so_ver/libpipewire-module-rtp-session.so
 
-    _pick v4l2 usr/bin/pw-v4l2 usr/lib/pipewire-$_ver/v4l2
+    _pick v4l2 usr/bin/pw-v4l2 usr/lib/pipewire-$_so_ver/v4l2
 
-    _pick x11-bell usr/lib/pipewire-$_ver/libpipewire-module-x11-bell.so
+    _pick x11-bell usr/lib/pipewire-$_so_ver/libpipewire-module-x11-bell.so
 
     _pick jack-client usr/lib/spa-0.2/jack
 
@@ -264,7 +264,7 @@ package_libpipewire-full-git() {
   )
   provides=(
     "libpipewire=$_short_pkgver"
-    libpipewire-$_ver.so
+    libpipewire-$_so_ver.so
   )
   conflicts=(libpipewire)
 
@@ -302,7 +302,7 @@ package_pipewire-full-audio-git() {
     liblilv-0.so
     libmysofa.so
     libopus.so
-    libpipewire-$_ver.so
+    libpipewire-$_so_ver.so
     libsbc.so
     libsndfile.so
     libusb-1.0.so
@@ -347,7 +347,7 @@ package_pipewire-full-ffado-git() {
   depends=(
     glibc
     libffado.so
-    libpipewire-$_ver.so
+    libpipewire-$_so_ver.so
     pipewire-full-git
     pipewire-full-audio-git
   )
@@ -360,11 +360,11 @@ package_pipewire-full-ffado-git() {
 }
 
 package_pipewire-full-jack-git() {
-  pkgdesc+=" - JACK support"
-  license+=(GPL2)  # libjackserver
+  pkgdesc+=" - JACK replacement"
+  license+=(LGPL-2.1-or-later GPL-2.0-only)  # libjackserver
   depends=(
     glibc
-    libpipewire-$_ver.so
+    libpipewire-$_so_ver.so
     pipewire-full-git
     pipewire-full-audio-git
     pipewire-session-manager
@@ -393,7 +393,7 @@ package_pipewire-full-pulse-git() {
     glibc
     libavahi-{client,common}.so
     libglib-2.0.so
-    libpipewire-$_ver.so
+    libpipewire-$_so_ver.so
     libpulse.so
     pipewire-full-git
     pipewire-full-audio-git
@@ -421,7 +421,7 @@ package_pipewire-full-roc-git() {
   conflicts=(pipewire-roc)
   depends=(
     glibc
-    libpipewire-$_ver.so
+    libpipewire-$_so_ver.so
     libroc.so
     pipewire-full-git
     pipewire-full-audio-git
@@ -442,7 +442,7 @@ package_gst-plugin-pipewire-full-git() {
     glibc
     gst-plugins-base-libs
     gstreamer
-    libpipewire-$_ver.so
+    libpipewire-$_so_ver.so
     pipewire-full-git
     pipewire-session-manager
   )
@@ -460,7 +460,7 @@ package_pipewire-full-zeroconf-git() {
     gcc-libs
     glibc
     libavahi-{client,common}.so
-    libpipewire-$_ver.so
+    libpipewire-$_so_ver.so
     openssl
     opus
     pipewire-full-git
@@ -478,7 +478,7 @@ package_pipewire-full-v4l2-git() {
   conflicts=(pipewire-v4l2)
   depends=(
     glibc
-    libpipewire-$_ver.so
+    libpipewire-$_so_ver.so
     pipewire-full-git
     pipewire-session-manager
     sh
@@ -494,7 +494,7 @@ package_pipewire-full-x11-bell-git() {
   depends=(
     glibc
     libcanberra.so
-    libpipewire-$_ver.so
+    libpipewire-$_so_ver.so
     libx11
     libxfixes
     pipewire-full-git
@@ -510,7 +510,7 @@ package_pipewire-full-x11-bell-git() {
 
 package_pipewire-full-jack-client-git() {
   pkgdesc="JACK client SPA plugin"
-  depends=(libjack.so libpipewire-$_ver.so)
+  depends=(libjack.so libpipewire-$_so_ver.so)
   provides=(pipewire-jack-client)
   conflicts=(pipewire-jack-client)