bump

2 files changed, 32 insertions, 29 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 51f8697bda89..3f6ac2ceed13 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = pipewire-git
 	pkgdesc = Low-latency audio/video router and processor (GIT version)
-	pkgver = 0.3.59.126.gfacf73b01
+	pkgver = 0.3.61.5.gc933c5ed7
 	pkgrel = 1
 	url = https://pipewire.org
 	arch = x86_64
@@ -27,7 +27,7 @@ pkgbase = pipewire-git
 	makedepends = opus
 	makedepends = libfreeaptx
 	makedepends = libfdk-aac
-	makedepends = libcamera-git
+	makedepends = libcamera
 	makedepends = vulkan-headers
 	makedepends = vulkan-icd-loader
 	makedepends = avahi
@@ -66,7 +66,7 @@ pkgname = pipewire-git
 	optdepends = pipewire-x11-bell-git: X11 bell
 	optdepends = realtime-privileges: realtime privileges with rt module
 	optdepends = rtkit: realtime privileges with rtkit module
-	provides = pipewire=0.3.59.126.gfacf73b01
+	provides = pipewire=0.3.61.5.gc933c5ed7
 	provides = libpipewire-0.3.so
 	conflicts = pipewire
 	backup = usr/share/pipewire/client.conf
@@ -77,7 +77,7 @@ pkgname = pipewire-git
 pkgname = pipewire-docs-git
 	pkgdesc = Low-latency audio/video router and processor (GIT version) - documentation (GIT Version)
 	arch = any
-	provides = pipewire-docs=0.3.59.126.gfacf73b01
+	provides = pipewire-docs=0.3.61.5.gc933c5ed7
 	conflicts = pipewire-docs
 
 pkgname = pipewire-audio-git
@@ -96,7 +96,7 @@ pkgname = pipewire-audio-git
 	depends = libusb-1.0.so
 	depends = libwebrtc_audio_processing.so
 	depends = pipewire-git
-	provides = pipewire-audio=0.3.59.126.gfacf73b01
+	provides = pipewire-audio=0.3.61.5.gc933c5ed7
 	conflicts = pipewire-audio
 
 pkgname = pipewire-jack-git
@@ -107,7 +107,7 @@ pkgname = pipewire-jack-git
 	depends = libpipewire-0.3.so
 	depends = sh
 	optdepends = jack-example-tools: for official JACK example-clients and tools
-	provides = pipewire-jack=0.3.59.126.gfacf73b01
+	provides = pipewire-jack=0.3.61.5.gc933c5ed7
 	provides = jack
 	provides = libjack.so
 	provides = libjackserver.so
@@ -119,13 +119,14 @@ pkgname = pipewire-jack-git
 
 pkgname = pipewire-alsa-git
 	pkgdesc = Low-latency audio/video router and processor (GIT version) - ALSA configuration (GIT version)
-	depends = pipewire-git=0.3.59.126.gfacf73b01
+	depends = pipewire-git=0.3.61.5.gc933c5ed7
 	depends = libpipewire-0.3.so
 	depends = libasound.so
 	depends = pipewire-session-manager
-	provides = pipewire-alsa=0.3.59.126.gfacf73b01
+	provides = pipewire-alsa=0.3.61.5.gc933c5ed7
 	provides = pulseaudio-alsa
 	conflicts = pipewire-alsa
+	conflicts = pulseaudio-alsa
 	backup = usr/share/alsa/alsa.conf.d/50-pipewire.conf
 	backup = usr/share/alsa/alsa.conf.d/99-pipewire-default.conf
 
@@ -137,7 +138,7 @@ pkgname = pipewire-pulse-git
 	depends = libpulse.so
 	depends = libavahi-client.so
 	depends = libavahi-common.so
-	provides = pipewire-pulse=0.3.59.126.gfacf73b01
+	provides = pipewire-pulse=0.3.61.5.gc933c5ed7
 	provides = pulseaudio
 	provides = pulseaudio-bluetooth
 	provides = alsa-card-profiles
@@ -149,45 +150,46 @@ 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.59.126.gfacf73b01
+	depends = pipewire-git=0.3.61.5.gc933c5ed7
 	depends = libpipewire-0.3.so
 	depends = ffmpeg
-	provides = pipewire-ffmpeg=0.3.59.126.gfacf73b01
+	provides = pipewire-ffmpeg=0.3.61.5.gc933c5ed7
 	conflicts = pipewire-ffmpeg
 
 pkgname = pipewire-zeroconf-git
 	pkgdesc = Low-latency audio/video router and processor (GIT version) - Zeroconf support (GIT version)
-	depends = pipewire-git=0.3.59.126.gfacf73b01
+	depends = pipewire-git=0.3.61.5.gc933c5ed7
 	depends = libpipewire-0.3.so
 	depends = libavahi-client.so
 	depends = libavahi-common.so
-	provides = pipewire-zeroconf=0.3.59.126.gfacf73b01
+	provides = pipewire-zeroconf=0.3.61.5.gc933c5ed7
 	conflicts = pipewire-zeroconf
 
 pkgname = pipewire-v4l2-git
 	pkgdesc = Low-latency audio/video router and processor (GIT version) - V4L2 interceptor (GIT version)
-	depends = pipewire-git=0.3.59.126.gfacf73b01
+	depends = pipewire-git=0.3.61.5.gc933c5ed7
 	depends = pipewire-session-manager
 	depends = libpipewire-0.3.so
 	depends = sh
-	provides = pipewire-v4l2=0.3.59.126.gfacf73b01
+	provides = pipewire-v4l2=0.3.61.5.gc933c5ed7
 	conflicts = pipewire-v4l2
 
 pkgname = pipewire-roc-git
 	pkgdesc = Low-latency audio/video router and processor (GIT version) - ROC support (GIT version)
-	depends = pipewire-git=0.3.59.126.gfacf73b01
+	depends = pipewire-git=0.3.61.5.gc933c5ed7
 	depends = libpipewire-0.3.so
 	depends = roc-toolkit-git
-	provides = pipewire-roc=0.3.59.126.gfacf73b01
+	provides = pipewire-roc=0.3.61.5.gc933c5ed7
 	conflicts = pipewire-roc
 
 pkgname = pipewire-libcamera-git
 	pkgdesc = Low-latency audio/video router and processor (GIT version) - libcamera support (GIT version)
-	depends = pipewire-git=0.3.59.126.gfacf73b01
+	depends = pipewire-git=0.3.61.5.gc933c5ed7
 	depends = libpipewire-0.3.so
-	depends = libcamera-git
+	depends = libcamera.so
+	depends = libcamera-base.so
 	depends = gcc-libs
-	provides = pipewire-libcamera=0.3.59.126.gfacf73b01
+	provides = pipewire-libcamera=0.3.61.5.gc933c5ed7
 	conflicts = pipewire-libcamera
 
 pkgname = pipewire-x11-bell-git
@@ -195,5 +197,5 @@ pkgname = pipewire-x11-bell-git
 	depends = libcanberra.so
 	depends = libpipewire-0.3.so
 	depends = libxfixes
-	provides = pipewire-x11-bell=0.3.59.126.gfacf73b01
+	provides = pipewire-x11-bell=0.3.61.5.gc933c5ed7
 	conflicts = pipewire-x11-bell
diff --git a/PKGBUILD b/PKGBUILD
index 92ab059031ba..0fc696d239d9 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -14,7 +14,7 @@ pkgname=('pipewire-git'
          'pipewire-libcamera-git'
          'pipewire-x11-bell-git'
          )
-pkgver=0.3.59.126.gfacf73b01
+pkgver=0.3.61.5.gc933c5ed7
 pkgrel=1
 pkgdesc='Low-latency audio/video router and processor (GIT version)'
 arch=('x86_64')
@@ -40,7 +40,7 @@ makedepends=('git'
              'opus'
              'libfreeaptx'
              'libfdk-aac'
-             'libcamera-git'
+             'libcamera'
              'vulkan-headers'
              'vulkan-icd-loader'
              'avahi'
@@ -76,9 +76,7 @@ prepare() {
 }
 
 build() {
-  cd "${srcdir}/build"
-
-  arch-meson ../pipewire \
+  arch-meson pipewire build\
     -D udevrulesdir=/usr/lib/udev/rules.d \
     -D docs=enabled \
     -D gstreamer=disabled \
@@ -91,7 +89,7 @@ build() {
     -D session-managers=[] \
     -D bluez5-codec-lc3plus=disabled
 
-  ninja
+  meson compile -C build
 }
 
 check() {
@@ -325,7 +323,9 @@ package_pipewire-alsa-git() {
   provides=("pipewire-alsa=${pkgver}"
             'pulseaudio-alsa'
             )
-  conflicts=('pipewire-alsa')
+  conflicts=('pipewire-alsa'
+             'pulseaudio-alsa'
+             )
 
   mv alsa/* "${pkgdir}"
 
@@ -400,7 +400,8 @@ package_pipewire-libcamera-git() {
   pkgdesc+=" - libcamera support (GIT version)"
   depends=("pipewire-git=${pkgver}"
            "libpipewire-${_ver}.so"
-           'libcamera-git'
+           'libcamera.so'
+           'libcamera-base.so'
            'gcc-libs'
            )
   provides=("pipewire-libcamera=${pkgver}")