bump

2 files changed, 32 insertions, 34 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 48ec6db1ac6e..1c369ce92da5 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,17 +1,16 @@
 pkgbase = pipewire-git
 	pkgdesc = Low-latency audio/video router and processor (GIT version)
-	pkgver = 0.3.33.14.g33d8f14e4
+	pkgver = 0.3.38.15.gb418b876e
 	pkgrel = 1
 	url = https://pipewire.org
 	arch = x86_64
 	license = MIT
 	checkdepends = desktop-file-utils
+	checkdepends = valgrind
 	makedepends = git
 	makedepends = meson
 	makedepends = doxygen
 	makedepends = graphviz
-	makedepends = xmltoman
-	makedepends = valgrind
 	makedepends = libpulse
 	makedepends = alsa-lib
 	makedepends = sbc
@@ -29,12 +28,13 @@ pkgbase = pipewire-git
 	makedepends = vulkan-headers
 	makedepends = avahi
 	makedepends = webrtc-audio-processing
+	makedepends = python-docutils
 	source = git+https://gitlab.freedesktop.org/pipewire/pipewire.git
 	sha256sums = SKIP
 
 pkgname = pipewire-git
 	install = pipewire-git.install
-	depends = alsa-card-profiles-git=0.3.33.14.g33d8f14e4
+	depends = alsa-card-profiles-git=0.3.38.15.gb418b876e
 	depends = rtkit
 	depends = libasound.so
 	depends = libbluetooth.so
@@ -62,10 +62,6 @@ pkgname = pipewire-git
 	provides = pipewire
 	provides = libpipewire-0.3.so
 	conflicts = pipewire
-	backup = etc/pipewire/pipewire.conf
-	backup = etc/pipewire/pipewire-pulse.conf
-	backup = etc/pipewire/client.conf
-	backup = etc/pipewire/client-rt.conf
 	backup = usr/share/pipewire/pipewire.conf
 	backup = usr/share/pipewire/pipewire-pulse.conf
 	backup = usr/share/pipewire/client.conf
@@ -81,20 +77,22 @@ pkgname = pipewire-jack-git
 	pkgdesc = Low-latency audio/video router and processor (GIT version) - JACK support (GIT version)
 	license = MIT
 	license = GPL2
-	depends = pipewire-media-session-git=0.3.33.14.g33d8f14e4
+	depends = pipewire-media-session-git=0.3.38.15.gb418b876e
 	depends = libpipewire-0.3.so
 	provides = pipewire-jack
+	provides = jack2
 	provides = jack
 	provides = libjack.so
 	provides = libjackserver.so
+	provides = libjacknet.so
 	conflicts = pipewire-jack
-	conflicts = jack
-	backup = etc/pipewire/jack.conf
+	conflicts = jack2
+	backup = usr/share/pipewire/jack.conf
 
 pkgname = pipewire-alsa-git
 	pkgdesc = Low-latency audio/video router and processor (GIT version) - ALSA configuration (GIT version)
 	arch = any
-	depends = pipewire-media-session-git=0.3.33.14.g33d8f14e4
+	depends = pipewire-media-session-git=0.3.38.15.gb418b876e
 	provides = pipewire-alsa
 	provides = pulseaudio-alsa
 	conflicts = pipewire-alsa
@@ -103,7 +101,7 @@ pkgname = pipewire-pulse-git
 	pkgdesc = Low-latency audio/video router and processor (GIT version) - PulseAudio replacement (GIT version)
 	install = pipewire-pulse.install
 	arch = x86_64
-	depends = pipewire-media-session-git=0.3.33.14.g33d8f14e4
+	depends = pipewire-media-session-git=0.3.38.15.gb418b876e
 	depends = libpipewire-0.3.so
 	depends = libpulse.so
 	depends = libavahi-client.so
@@ -117,7 +115,7 @@ pkgname = pipewire-pulse-git
 
 pkgname = pipewire-ffmpeg-git
 	pkgdesc = Low-latency audio/video router and processor (GIT version) - FFmpeg SPA plugin (GIT version)
-	depends = pipewire-git=0.3.33.14.g33d8f14e4
+	depends = pipewire-git=0.3.38.15.gb418b876e
 	depends = libpipewire-0.3.so
 	depends = ffmpeg
 	provides = pipewire-ffmpeg
@@ -126,14 +124,10 @@ pkgname = pipewire-ffmpeg-git
 pkgname = pipewire-media-session-git
 	pkgdesc = Low-latency audio/video router and processor (GIT version) - Session manager (GIT version)
 	install = pipewire-media-session.install
-	depends = pipewire-git=0.3.33.14.g33d8f14e4
+	depends = pipewire-git=0.3.38.15.gb418b876e
 	depends = libpipewire-0.3.so
 	provides = pipewire-media-session
 	conflicts = pipewire-media-session
-	backup = etc/pipewire/media-session.d/media-session.conf
-	backup = etc/pipewire/media-session.d/alsa-monitor.conf
-	backup = etc/pipewire/media-session.d/bluez-monitor.conf
-	backup = etc/pipewire/media-session.d/v4l2-monitor.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
@@ -148,7 +142,7 @@ pkgname = alsa-card-profiles-git
 
 pkgname = pipewire-zeroconf-git
 	pkgdesc = Low-latency audio/video router and processor (GIT version) - Zeroconf support (GIT version)
-	depends = pipewire-git=0.3.33.14.g33d8f14e4
+	depends = pipewire-git=0.3.38.15.gb418b876e
 	depends = libpipewire-0.3.so
 	depends = libavahi-client.so
 	depends = libavahi-common.so
diff --git a/PKGBUILD b/PKGBUILD
index d183d4819543..3257aeece60e 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -11,7 +11,7 @@ pkgname=('pipewire-git'
          'alsa-card-profiles-git'
          'pipewire-zeroconf-git'
          )
-pkgver=0.3.33.14.g33d8f14e4
+pkgver=0.3.38.15.gb418b876e
 pkgrel=1
 pkgdesc='Low-latency audio/video router and processor (GIT version)'
 arch=('x86_64')
@@ -21,8 +21,6 @@ makedepends=('git'
              'meson'
              'doxygen'
              'graphviz'
-             'xmltoman'
-             'valgrind'
              'libpulse'
              'alsa-lib'
              'sbc'
@@ -40,9 +38,12 @@ makedepends=('git'
              'vulkan-headers'
              'avahi'
              'webrtc-audio-processing'
+             'python-docutils'
 #              'roc-git'
              )
-checkdepends=('desktop-file-utils')
+checkdepends=('desktop-file-utils'
+              'valgrind'
+              )
 source=('git+https://gitlab.freedesktop.org/pipewire/pipewire.git')
 sha256sums=('SKIP')
 
@@ -53,15 +54,19 @@ pkgver() {
 
 prepare() {
   mkdir -p build
+
+  # silence warning about limit of DOT nodes
+  echo 'DOT_GRAPH_MAX_NODES = 100' >> pipewire/doc/Doxyfile.in
 }
 
 build() {
   cd "${srcdir}/build"
 
+  DOT_GRAPH_MAX_NODES=100
+
   arch-meson ../pipewire \
     -D udevrulesdir=/usr/lib/udev/rules.d \
     -D docs=enabled \
-    -D jack=disabled \
     -D gstreamer=disabled \
     -D gstreamer-device-provider=disabled \
     -D roc=disabled \
@@ -118,9 +123,7 @@ package_pipewire-git() {
             "libpipewire-${pkgver:0:3}.so"
             )
   conflicts=('pipewire')
-  backup=(etc/pipewire/{pipewire{,-pulse},client{,-rt}}.conf
-          usr/share/pipewire/{pipewire{,-pulse},client{,-rt}}.conf
-          )
+  backup=(usr/share/pipewire/{pipewire{,-pulse},client{,-rt}}.conf)
   install=pipewire-git.install
 
   DESTDIR="${pkgdir}" meson install -C build
@@ -137,6 +140,7 @@ package_pipewire-git() {
   _pick pms usr/share/pipewire/media-session.d/*.conf
 
   _pick jack usr/bin/pw-jack usr/lib/libjack* usr/lib/pkgconfig/jack.pc
+  _pick jack usr/lib/spa-0.2/jack/libspa-jack.so
   _pick jack usr/include/jack
   _pick jack usr/share/pipewire/{jack.conf,media-session.d/with-jack}
   _pick jack usr/share/man/man1/pw-jack.1
@@ -172,14 +176,16 @@ package_pipewire-jack-git() {
   depends=("pipewire-media-session-git=${pkgver}"
            "libpipewire-${pkgver:0:3}.so"
            )
-  backup=('etc/pipewire/jack.conf')
+  backup=('usr/share/pipewire/jack.conf')
   provides=('pipewire-jack'
+            'jack2'
             'jack'
             'libjack.so'
             'libjackserver.so'
+            'libjacknet.so'
             )
   conflicts=('pipewire-jack'
-            'jack'
+            'jack2'
             )
 
   mv jack/* "${pkgdir}"
@@ -250,10 +256,8 @@ package_pipewire-media-session-git() {
            )
   provides=('pipewire-media-session')
   conflicts=('pipewire-media-session')
-  backup=('etc/pipewire/media-session.d/media-session.conf'
-          etc/pipewire/media-session.d/{alsa,bluez,v4l2}-monitor.conf
-          'usr/share/pipewire/media-session.d/media-session.conf'
-          usr/share/pipewire/media-session.d/{alsa,bluez,v4l2}-monitor.conf
+  backup=('usr/share/pipewire/media-session.d/media-session.conf'
+           usr/share/pipewire/media-session.d/{alsa,bluez,v4l2}-monitor.conf
           )
   install=pipewire-media-session.install