git » pipewire.git » commit 28b55bc

upgpkg: 1:1.0.0-1

author David Runge
2023-11-26 16:39:29 UTC
committer David Runge
2023-11-26 16:39:29 UTC
parent ed319f61d940504b4d61d51d1b88fef7a2b51d74

upgpkg: 1:1.0.0-1

Specifically enable man pages to be built and add all new ones to their respective packages.
Switch to correct SPDX license identifiers for project.
Simplify providing the soname version, as it is no longer bound to the version of the project.

.SRCINFO +7 -6
PKGBUILD +51 -42

diff --git a/.SRCINFO b/.SRCINFO
index 4c52f55..1cb6bdf 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = pipewire
 	pkgdesc = Low-latency audio/video router and processor
-	pkgver = 0.3.85
+	pkgver = 1.0.0
 	pkgrel = 1
 	epoch = 1
 	url = https://pipewire.org
@@ -44,16 +44,16 @@ pkgbase = pipewire
 	makedepends = systemd
 	makedepends = valgrind
 	makedepends = webrtc-audio-processing-1
-	source = git+https://gitlab.freedesktop.org/pipewire/pipewire.git#commit=7db1e7f643a454056327999b2d8e35d8097b5593
+	source = git+https://gitlab.freedesktop.org/pipewire/pipewire.git#commit=4debdcd40b055b3eaa83a8f4443aa990ea566bfe
 	b2sums = SKIP
 
 pkgname = pipewire
 	install = pipewire.install
 	license = MIT
-	license = LGPL
+	license = LGPL-2.1-or-later
 	depends = gcc-libs
 	depends = glibc
-	depends = libpipewire=1:0.3.85-1
+	depends = libpipewire=1:1.0.0-1
 	depends = libcamera-base.so
 	depends = libcamera.so
 	depends = libdbus-1.so
@@ -87,7 +87,7 @@ pkgname = libpipewire
 
 pkgname = alsa-card-profiles
 	pkgdesc = Low-latency audio/video router and processor - ALSA card profiles
-	license = LGPL
+	license = LGPL-2.1-or-later
 
 pkgname = pipewire-docs
 	pkgdesc = Low-latency audio/video router and processor - documentation
@@ -145,7 +145,8 @@ pkgname = pipewire-jack-client
 pkgname = pipewire-jack
 	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
diff --git a/PKGBUILD b/PKGBUILD
index 6d11480..5c05ad3 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -20,8 +20,9 @@ pkgname=(
   pipewire-v4l2
   pipewire-x11-bell
 )
-_commit=7db1e7f643a454056327999b2d8e35d8097b5593  # tags/0.3.85
-pkgver=0.3.85
+_commit=4debdcd40b055b3eaa83a8f4443aa990ea566bfe  # tags/1.0.0
+pkgver=1.0.0
+_so_ver=0.3
 pkgrel=1
 epoch=1
 pkgdesc="Low-latency audio/video router and processor"
@@ -90,6 +91,7 @@ build() {
     -D docs=enabled
     -D jack-devel=true
     -D libjack-path=/usr/lib
+    -D man=enabled
     -D rlimits-install=false
     -D selinux=disabled
     -D session-managers=[]
@@ -114,10 +116,8 @@ _pick() {
   done
 }
 
-_ver=${pkgver:0:3}
-
 package_pipewire() {
-  license+=(LGPL)  # libspa-alsa
+  license+=(LGPL-2.1-or-later)  # libspa-alsa
   depends=(
     gcc-libs
     glibc
@@ -127,7 +127,7 @@ package_pipewire() {
     libdbus-1.so
     libglib-2.0.so
     libncursesw.so
-    libpipewire-$_ver.so
+    libpipewire-$_so_ver.so
     libreadline.so
     libsystemd.so
     libudev.so
@@ -162,9 +162,9 @@ package_pipewire() {
       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
 
     _pick acp usr/lib/udev
     _pick acp usr/share/alsa-card-profile
@@ -176,28 +176,31 @@ package_pipewire() {
     _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
-    _pick audio usr/share/man/man1/pw-{cat,mididump}.1
+    _pick audio usr/share/man/man1/pw-{cat,loopback,mididump}.1
+    _pick audio usr/share/man/man7/libpipewire-module-{avb,echo-cancel,fallback-sink,filter-chain*,loopback,netjack2*,pipe-tunnel,protocol-simple,rtp-{sap,sink,source},vban*}.7
     _pick audio usr/share/pipewire/filter-chain*
     _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 ffado usr/share/man/man7/libpipewire-module-ffado-driver.7
 
-    _pick jack-client usr/lib/pipewire-$_ver/libpipewire-module-jack{-tunnel,dbus-detect}.so
+    _pick jack-client usr/lib/pipewire-$_so_ver/libpipewire-module-jack{-tunnel,dbus-detect}.so
     _pick jack-client usr/lib/spa-0.2/jack
+    _pick jack-client usr/share/man/man7/libpipewire-module-jack{-tunnel,dbus-detect}.7
 
     _pick jack usr/bin/pw-jack
     _pick jack usr/include/jack
@@ -207,22 +210,28 @@ package_pipewire() {
     _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/man/man5/pipewire-pulse.conf.5
+    _pick pulse usr/share/man/man7/pipewire-pulse*.7
+    _pick pulse usr/share/man/man7/libpipewire-module-{protocol-pulse,pulse-tunnel}.7
     _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 roc usr/share/man/man7/libpipewire-module-roc-{sink,source}.7
 
     _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 zeroconf usr/share/man/man7/libpipewire-module-{raop-*,rtp-session,zeroconf*}.7
 
-    _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 x11-bell usr/share/man/man7/libpipewire-module-x11-bell.7
 
     # directories for overrides
     mkdir -p etc/pipewire/{client-rt,client,minimal,pipewire}.conf.d
@@ -237,7 +246,7 @@ package_libpipewire() {
     glibc
     gcc-libs
   )
-  provides=(libpipewire-$_ver.so)
+  provides=(libpipewire-$_so_ver.so)
 
   mv lib/* "$pkgdir"
 
@@ -246,7 +255,7 @@ package_libpipewire() {
 
 package_alsa-card-profiles() {
   pkgdesc+=" - ALSA card profiles"
-  license=(LGPL)
+  license=(LGPL-2.1-or-later)
 
   mv acp/* "$pkgdir"
 }
@@ -276,7 +285,7 @@ package_pipewire-audio() {
     liblilv-0.so
     libmysofa.so
     libopus.so
-    libpipewire-$_ver.so
+    libpipewire-$_so_ver.so
     libsbc.so
     libsndfile.so
     libusb-1.0.so
@@ -319,7 +328,7 @@ package_pipewire-ffado() {
   depends=(
     glibc
     libffado.so
-    libpipewire-$_ver.so
+    libpipewire-$_so_ver.so
     pipewire
     pipewire-audio
   )
@@ -335,7 +344,7 @@ package_pipewire-jack-client() {
     glibc
     libdbus-1.so
     libjack.so
-    libpipewire-$_ver.so
+    libpipewire-$_so_ver.so
     pipewire
     pipewire-audio
   )
@@ -348,10 +357,10 @@ package_pipewire-jack-client() {
 
 package_pipewire-jack() {
   pkgdesc+=" - JACK replacement"
-  license+=(GPL2)  # libjackserver
+  license+=(LGPL-2.1-or-later GPL-2.0-only)  # libjackserver
   depends=(
     glibc
-    libpipewire-$_ver.so
+    libpipewire-$_so_ver.so
     pipewire
     pipewire-audio
     pipewire-session-manager
@@ -380,7 +389,7 @@ package_pipewire-pulse() {
     glibc
     libavahi-{client,common}.so
     libglib-2.0.so
-    libpipewire-$_ver.so
+    libpipewire-$_so_ver.so
     libpulse.so
     pipewire
     pipewire-audio
@@ -406,7 +415,7 @@ package_pipewire-roc() {
   pkgdesc+=" - ROC streaming support"
   depends=(
     glibc
-    libpipewire-$_ver.so
+    libpipewire-$_so_ver.so
     libroc.so
     pipewire
     pipewire-audio
@@ -425,7 +434,7 @@ package_gst-plugin-pipewire() {
     glibc
     gst-plugins-base-libs
     gstreamer
-    libpipewire-$_ver.so
+    libpipewire-$_so_ver.so
     pipewire
     pipewire-session-manager
   )
@@ -441,7 +450,7 @@ package_pipewire-zeroconf() {
     gcc-libs
     glibc
     libavahi-{client,common}.so
-    libpipewire-$_ver.so
+    libpipewire-$_so_ver.so
     openssl
     opus
     pipewire
@@ -457,7 +466,7 @@ package_pipewire-v4l2() {
   pkgdesc+=" - V4L2 interceptor"
   depends=(
     glibc
-    libpipewire-$_ver.so
+    libpipewire-$_so_ver.so
     pipewire
     pipewire-session-manager
     sh
@@ -473,7 +482,7 @@ package_pipewire-x11-bell() {
   depends=(
     glibc
     libcanberra.so
-    libpipewire-$_ver.so
+    libpipewire-$_so_ver.so
     libx11
     libxfixes
     pipewire