bump

2 files changed, 85 insertions, 77 deletions

diff --git a/.SRCINFO b/.SRCINFO
index def9f539b174..2b2f3b7859ca 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.77.2.g1daae4c36
+	pkgver = 0.3.80.50.g4be0c5f36
 	pkgrel = 1
 	url = https://pipewire.org
 	arch = x86_64
@@ -47,13 +47,11 @@ pkgbase = pipewire-git
 	makedepends = chrpath
 	options = debug
 	source = git+https://gitlab.freedesktop.org/pipewire/pipewire.git
-	source = https://gitlab.archlinux.org/archlinux/packaging/packages/pipewire/-/raw/b5821f17c218519a793ada1d29c0ff8aca6dcd1a/0001-pipewire-jack-Disable-LD_LIBRARY_PATH-when-libjack-i.patch
 	sha256sums = SKIP
-	sha256sums = 7b9ff9e44d79a82a30e6ca35aa534ace3aeb574c2f1f1c27615d09e3780776ed
 
 pkgname = pipewire-git
 	install = pipewire-git.install
-	depends = libpipewire-git=0.3.77.2.g1daae4c36
+	depends = libpipewire-git=0.3.80.50.g4be0c5f36
 	depends = libpipewire-0.3.so
 	depends = libcamera
 	depends = libcamera-base.so
@@ -72,6 +70,9 @@ pkgname = pipewire-git
 	depends = libsystemd.so
 	depends = vulkan-icd-loader
 	depends = libvulkan.so
+	depends = gcc-libs
+	depends = glibc
+	depends = libdrm
 	optdepends = pipewire-alsa-git: ALSA support
 	optdepends = pipewire-audio-git: Audio support
 	optdepends = pipewire-ffado-git: FireWire support
@@ -86,7 +87,7 @@ pkgname = pipewire-git
 	optdepends = gst-plugin-pipewire-git: gstreamer support
 	optdepends = realtime-privileges: realtime privileges with rt module
 	optdepends = rtkit: realtime privileges with rtkit module
-	provides = pipewire=0.3.77.2.g1daae4c36
+	provides = pipewire=0.3.80.50.g4be0c5f36
 	conflicts = pipewire
 	conflicts = pipewire-libcamera-git
 	backup = usr/share/pipewire/client.conf
@@ -98,29 +99,30 @@ pkgname = libpipewire-git
 	pkgdesc = Low-latency audio/video router and processor (GIT version) - client library (GIT Version)
 	depends = gcc-libs
 	depends = glibc
-	provides = libpipewire=0.3.77.2.g1daae4c36
+	provides = libpipewire=0.3.80.50.g4be0c5f36
 	provides = libpipewire-0.3.so
 	conflicts = libpipewire
 
 pkgname = pipewire-docs-git
 	pkgdesc = Low-latency audio/video router and processor (GIT version) - documentation (GIT Version)
 	arch = any
-	provides = pipewire-docs=0.3.77.2.g1daae4c36
+	provides = pipewire-docs=0.3.80.50.g4be0c5f36
 	conflicts = pipewire-docs
 
 pkgname = pipewire-audio-git
 	pkgdesc = Low-latency audio/video router and processor (GIT version) - Audio support (GIT Version)
-	depends = pipewire-git=0.3.77.2.g1daae4c36
-	depends = libpipewire=0.3.77.2.g1daae4c36
+	depends = pipewire-git=0.3.80.50.g4be0c5f36
+	depends = libpipewire=0.3.80.50.g4be0c5f36
 	depends = libpipewire-0.3.so
 	depends = gcc-libs
 	depends = glibc
+	depends = glib2
+	depends = libgio-2.0.so
+	depends = libglib-2.0.so
+	depends = libgobject-2.0.so
 	depends = alsa-card-profiles
 	depends = alsa-lib
 	depends = libasound.so
-	depends = avahi
-	depends = libavahi-client.so
-	depends = libavahi-common.so
 	depends = ffmpeg
 	depends = libavcodec.so
 	depends = libavformat.so
@@ -133,10 +135,6 @@ pkgname = pipewire-audio-git
 	depends = libfdk-aac.so
 	depends = libfreeaptx
 	depends = libfreeaptx.so
-	depends = glib2
-	depends = libgio-2.0.so
-	depends = libglib-2.0.so
-	depends = libgobject-2.0.so
 	depends = liblc3
 	depends = liblc3.so
 	depends = libldac
@@ -156,21 +154,24 @@ pkgname = pipewire-audio-git
 	depends = libusb-1.0.so
 	depends = webrtc-audio-processing
 	depends = libwebrtc_audio_processing.so
-	provides = pipewire-audio=0.3.77.2.g1daae4c36
+	provides = pipewire-audio=0.3.80.50.g4be0c5f36
 	conflicts = pipewire-audio
 	conflicts = pipewire-ffmpeg-git
 
 pkgname = pipewire-alsa-git
 	pkgdesc = Low-latency audio/video router and processor (GIT version) - ALSA configuration (GIT version)
-	depends = pipewire-git=0.3.77.2.g1daae4c36
-	depends = pipewire-audio-git=0.3.77.2.g1daae4c36
+	depends = pipewire-git=0.3.80.50.g4be0c5f36
+	depends = libpipewire=0.3.80.50.g4be0c5f36
+	depends = libpipewire-0.3.so
+	depends = pipewire-audio-git=0.3.80.50.g4be0c5f36
 	depends = pipewire-session-manager
+	depends = gcc-libs
 	depends = glibc
 	depends = alsa-lib
 	depends = libasound.so
 	depends = systemd-libs
 	depends = libudev.so
-	provides = pipewire-alsa=0.3.77.2.g1daae4c36
+	provides = pipewire-alsa=0.3.80.50.g4be0c5f36
 	provides = pulseaudio-alsa
 	conflicts = pipewire-alsa
 	conflicts = pulseaudio-alsa
@@ -181,19 +182,26 @@ pkgname = pipewire-jack-git
 	pkgdesc = Low-latency audio/video router and processor (GIT version) - JACK support (GIT version)
 	license = MIT
 	license = GPL2
-	depends = pipewire-git=0.3.77.2.g1daae4c36
-	depends = libpipewire=0.3.77.2.g1daae4c36
+	depends = pipewire-git=0.3.80.50.g4be0c5f36
+	depends = libpipewire=0.3.80.50.g4be0c5f36
 	depends = libpipewire-0.3.so
-	depends = pipewire-audio-git=0.3.77.2.g1daae4c36
+	depends = pipewire-audio-git=0.3.80.50.g4be0c5f36
 	depends = pipewire-session-manager
 	depends = glibc
 	depends = sh
+	depends = dbus
+	depends = libdbus-1.so
+	depends = opus
+	depends = libopus.so
 	optdepends = jack-example-tools: for official JACK example-clients and tools
-	provides = pipewire-jack=0.3.77.2.g1daae4c36
+	provides = pipewire-jack-client
+	provides = pipewire-jack=0.3.80.50.g4be0c5f36
 	provides = jack
 	provides = libjack.so
 	provides = libjackserver.so
 	provides = libjacknet.so
+	provides = jack2
+	conflicts = pipewire-jack-client
 	conflicts = pipewire-jack
 	conflicts = jack
 	conflicts = jack2
@@ -201,20 +209,21 @@ pkgname = pipewire-jack-git
 
 pkgname = pipewire-ffado-git
 	pkgdesc = Low-latency audio/video router and processor (GIT version) - FireWire support (GIT version)
-	depends = libpipewire=0.3.77.2.g1daae4c36
+	depends = libpipewire=0.3.80.50.g4be0c5f36
 	depends = libpipewire-0.3.so
-	depends = pipewire-git=0.3.77.2.g1daae4c36
-	depends = pipewire-audio-git=0.3.77.2.g1daae4c36
+	depends = pipewire-git=0.3.80.50.g4be0c5f36
+	depends = pipewire-audio-git=0.3.80.50.g4be0c5f36
 	depends = libffado
 	depends = libffado.so
+	depends = glibc
 
 pkgname = pipewire-pulse-git
 	pkgdesc = Low-latency audio/video router and processor (GIT version) - PulseAudio replacement (GIT version)
 	install = pipewire-pulse.install
-	depends = pipewire-git=0.3.77.2.g1daae4c36
-	depends = libpipewire=0.3.77.2.g1daae4c36
+	depends = pipewire-git=0.3.80.50.g4be0c5f36
+	depends = libpipewire=0.3.80.50.g4be0c5f36
 	depends = libpipewire-0.3.so
-	depends = pipewire-audio-git=0.3.77.2.g1daae4c36
+	depends = pipewire-audio-git=0.3.80.50.g4be0c5f36
 	depends = pipewire-session-manager
 	depends = gcc-libs
 	depends = glibc
@@ -231,7 +240,7 @@ pkgname = pipewire-pulse-git
 	depends = libpulse.so
 	depends = systemd-libs
 	depends = libsystemd.so
-	provides = pipewire-pulse=0.3.77.2.g1daae4c36
+	provides = pipewire-pulse=0.3.80.50.g4be0c5f36
 	provides = pulseaudio
 	provides = pulseaudio-bluetooth
 	provides = alsa-card-profiles
@@ -243,52 +252,54 @@ pkgname = pipewire-pulse-git
 
 pkgname = pipewire-roc-git
 	pkgdesc = Low-latency audio/video router and processor (GIT version) - ROC support (GIT version)
-	depends = pipewire-git=0.3.77.2.g1daae4c36
-	depends = libpipewire=0.3.77.2.g1daae4c36
+	depends = pipewire-git=0.3.80.50.g4be0c5f36
+	depends = libpipewire=0.3.80.50.g4be0c5f36
 	depends = libpipewire-0.3.so
-	depends = pipewire-audio-git=0.3.77.2.g1daae4c36
+	depends = pipewire-audio-git=0.3.80.50.g4be0c5f36
 	depends = glibc
 	depends = roc-toolkit
 	depends = libroc.so
-	provides = pipewire-roc=0.3.77.2.g1daae4c36
+	provides = pipewire-roc=0.3.80.50.g4be0c5f36
 	conflicts = pipewire-roc
 
 pkgname = pipewire-v4l2-git
 	pkgdesc = Low-latency audio/video router and processor (GIT version) - V4L2 interceptor (GIT version)
-	depends = pipewire-git=0.3.77.2.g1daae4c36
-	depends = libpipewire=0.3.77.2.g1daae4c36
+	depends = pipewire-git=0.3.80.50.g4be0c5f36
+	depends = libpipewire=0.3.80.50.g4be0c5f36
 	depends = libpipewire-0.3.so
 	depends = pipewire-session-manager
 	depends = glibc
 	depends = systemd-libs
 	depends = libudev.so
 	depends = sh
-	provides = pipewire-v4l2=0.3.77.2.g1daae4c36
+	provides = pipewire-v4l2=0.3.80.50.g4be0c5f36
 	conflicts = pipewire-v4l2
 
 pkgname = pipewire-x11-bell-git
 	pkgdesc = Low-latency audio/video router and processor (GIT version) - X11 bell (GIT version)
-	depends = pipewire-git=0.3.77.2.g1daae4c36
-	depends = libpipewire=0.3.77.2.g1daae4c36
+	depends = pipewire-git=0.3.80.50.g4be0c5f36
+	depends = libpipewire=0.3.80.50.g4be0c5f36
 	depends = libpipewire-0.3.so
-	depends = pipewire-audio-git=0.3.77.2.g1daae4c36
+	depends = pipewire-audio-git=0.3.80.50.g4be0c5f36
 	depends = glibc
 	depends = libcanberra
 	depends = libcanberra.so
 	depends = libx11
 	depends = libxfixes
-	provides = pipewire-x11-bell=0.3.77.2.g1daae4c36
+	provides = pipewire-x11-bell=0.3.80.50.g4be0c5f36
 	conflicts = pipewire-x11-bell
 
 pkgname = pipewire-zeroconf-git
 	pkgdesc = Low-latency audio/video router and processor (GIT version) - Zeroconf support (GIT version)
-	depends = pipewire-git=0.3.77.2.g1daae4c36
-	depends = libpipewire=0.3.77.2.g1daae4c36
+	depends = pipewire-git=0.3.80.50.g4be0c5f36
+	depends = libpipewire=0.3.80.50.g4be0c5f36
 	depends = libpipewire-0.3.so
-	depends = pipewire-audio-git=0.3.77.2.g1daae4c36
+	depends = pipewire-audio-git=0.3.80.50.g4be0c5f36
 	depends = glibc
 	depends = avahi
 	depends = libavahi-client.so
 	depends = libavahi-common.so
-	provides = pipewire-zeroconf=0.3.77.2.g1daae4c36
+	depends = opus
+	depends = libopus.so
+	provides = pipewire-zeroconf=0.3.80.50.g4be0c5f36
 	conflicts = pipewire-zeroconf
diff --git a/PKGBUILD b/PKGBUILD
index ce1665366a64..7b70bfbd84a7 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -15,7 +15,7 @@ pkgname=(
   'pipewire-x11-bell-git'
   'pipewire-zeroconf-git'
 )
-pkgver=0.3.77.2.g1daae4c36
+pkgver=0.3.80.50.g4be0c5f36
 pkgrel=1
 pkgdesc='Low-latency audio/video router and processor (GIT version)'
 arch=('x86_64')
@@ -65,14 +65,8 @@ checkdepends=(
   'desktop-file-utils'
   'openal'
 )
-source=(
-  'git+https://gitlab.freedesktop.org/pipewire/pipewire.git'
-  'https://gitlab.archlinux.org/archlinux/packaging/packages/pipewire/-/raw/b5821f17c218519a793ada1d29c0ff8aca6dcd1a/0001-pipewire-jack-Disable-LD_LIBRARY_PATH-when-libjack-i.patch'
-)
-sha256sums=(
-  'SKIP'
-  '7b9ff9e44d79a82a30e6ca35aa534ace3aeb574c2f1f1c27615d09e3780776ed'
-)
+source=('git+https://gitlab.freedesktop.org/pipewire/pipewire.git')
+sha256sums=('SKIP')
 options=('debug')
 
 pkgver() {
@@ -83,10 +77,7 @@ pkgver() {
 prepare() {
   mkdir -p build
 
-  # remove export of LD_LIBRARY_PATH for pw-jack as it would add /usr/lib
-  patch -d pipewire -p1 -i "${srcdir}/0001-pipewire-jack-Disable-LD_LIBRARY_PATH-when-libjack-i.patch"
-
-  # silence warning about limit of DOT nodes
+  # Silence warning about limit of DOT nodes
   echo 'DOT_GRAPH_MAX_NODES = 100' >> pipewire/doc/Doxyfile.in
 }
 
@@ -128,8 +119,7 @@ _ver=${pkgver:0:3}
 
 package_pipewire-git() {
   depends=(
-    "libpipewire-git=${pkgver}"
-    "libpipewire-${_ver}.so"
+    "libpipewire-git=${pkgver}" "libpipewire-${_ver}.so"
     'libcamera' 'libcamera-base.so' 'libcamera.so'
     'openssl' 'libcrypto.so'
     'dbus' 'libdbus-1.so'
@@ -138,6 +128,9 @@ package_pipewire-git() {
     'readline' 'libreadline.so'
     'systemd-libs' 'libsystemd.so'
     'vulkan-icd-loader' 'libvulkan.so'
+    'gcc-libs'
+    'glibc'
+    'libdrm'
   )
   optdepends=(
     'pipewire-alsa-git: ALSA support'
@@ -175,7 +168,8 @@ package_pipewire-git() {
 
   rm -fr "${srcdir}"/{audio,alsa,docs,jack,pulse,roc,v4l2,x11-bell,zeroconf}
 
-  (cd "${pkgdir}"
+  (
+  cd "${pkgdir}"
 
   _pick lib usr/include/{pipewire-${_ver},spa-0.2}
   _pick lib usr/lib/libpipewire-${_ver}.so*
@@ -188,9 +182,8 @@ package_pipewire-git() {
   _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-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
@@ -208,17 +201,20 @@ package_pipewire-git() {
   _pick jack usr/bin/pw-jack
   _pick jack usr/include/jack
   _pick jack usr/lib/libjack*
+  _pick jack "usr/lib/pipewire-${_ver}/libpipewire-module-jackdbus-detect.so"
+  _pick jack "usr/lib/pipewire-${_ver}/libpipewire-module-jack-tunnel.so"
+  _pick jack "usr/lib/pipewire-${_ver}/"libpipewire-module-netjack2-*.so
   _pick jack usr/lib/pkgconfig/jack.pc
   _pick jack usr/lib/spa-0.2/jack
-  _pick jack usr/share/man/man1/pw-jack.1
   _pick jack usr/share/pipewire/jack.conf
+  _pick jack usr/share/man/man1/pw-jack.1
 
   _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/systemd/user/pipewire-pulse.*
-  _pick pulse usr/share/man/man1/pipewire-pulse.1
   _pick pulse usr/share/pipewire/pipewire-pulse.conf
+  _pick pulse usr/share/man/man1/pipewire-pulse.1
   _pick pulse usr/lib/udev
   _pick pulse usr/share/alsa-card-profile
 
@@ -265,10 +261,7 @@ package_libpipewire-git() {
     'gcc-libs'
     'glibc'
   )
-  provides=(
-    "libpipewire=${pkgver}"
-    "libpipewire-${_ver}.so"
-  )
+  provides=("libpipewire=${pkgver}" "libpipewire-${_ver}.so")
   conflicts=('libpipewire')
 
   mv lib/* "${pkgdir}"
@@ -294,15 +287,14 @@ package_pipewire-audio-git() {
     "libpipewire=${pkgver}" "libpipewire-${_ver}.so"
     'gcc-libs'
     'glibc'
+    'glib2' 'libgio-2.0.so' 'libglib-2.0.so' 'libgobject-2.0.so'
     'alsa-card-profiles'
     'alsa-lib' 'libasound.so'
-    'avahi' 'libavahi-client.so' 'libavahi-common.so'
     'ffmpeg' 'libavcodec.so' 'libavformat.so' 'libavutil.so'
     'bluez-libs' 'libbluetooth.so'
     'dbus' 'libdbus-1.so'
     'libfdk-aac' 'libfdk-aac.so'
     'libfreeaptx' 'libfreeaptx.so'
-    'glib2' 'libgio-2.0.so' 'libglib-2.0.so' 'libgobject-2.0.so'
     'liblc3' 'liblc3.so'
     'libldac' 'libldacBT_abr.so' 'libldacBT_enc.so'
     'lilv' 'liblilv-0.so'
@@ -337,8 +329,10 @@ package_pipewire-alsa-git() {
   pkgdesc+=" - ALSA configuration (GIT version)"
   depends=(
     "pipewire-git=${pkgver}"
+    "libpipewire=${pkgver}" "libpipewire-${_ver}.so"
     "pipewire-audio-git=${pkgver}"
     'pipewire-session-manager'
+    'gcc-libs'
     'glibc'
     'alsa-lib' 'libasound.so'
     'systemd-libs' 'libudev.so'
@@ -374,6 +368,7 @@ package_pipewire-ffado-git() {
     "pipewire-git=${pkgver}"
     "pipewire-audio-git=${pkgver}"
     'libffado' 'libffado.so'
+    'glibc'
   )
 
   mv ffado/* "${pkgdir}"
@@ -381,7 +376,6 @@ package_pipewire-ffado-git() {
   install -Dt "$pkgdir/usr/share/licenses/${pkgname}" -m644 pipewire/COPYING
 }
 
-
 package_pipewire-jack-git() {
   pkgdesc+=" - JACK support (GIT version)"
   license+=('GPL2')  # libjackserver
@@ -392,16 +386,18 @@ package_pipewire-jack-git() {
     'pipewire-session-manager'
     'glibc'
     'sh'
+    'dbus' 'libdbus-1.so'
+    'opus' 'libopus.so'
   )
   optdepends=('jack-example-tools: for official JACK example-clients and tools')
   provides=(
+    'pipewire-jack-client'
     "pipewire-jack=${pkgver}"
-    'jack'
-    'libjack.so'
-    'libjackserver.so'
-    'libjacknet.so'
+    'jack' 'libjack.so' 'libjackserver.so' 'libjacknet.so'
+    'jack2'
   )
   conflicts=(
+    'pipewire-jack-client'
     'pipewire-jack'
     'jack'
     'jack2'
@@ -528,6 +524,7 @@ package_pipewire-zeroconf-git() {
     "pipewire-audio-git=${pkgver}"
     'glibc'
     'avahi' 'libavahi-client.so' 'libavahi-common.so'
+    'opus' 'libopus.so'
   )
   provides=("pipewire-zeroconf=${pkgver}")
   conflicts=('pipewire-zeroconf')