git » pipewire.git » commit 7248f75

diff --git a/.SRCINFO b/.SRCINFO
new file mode 100644
index 0000000..0e5f888
--- /dev/null
+++ b/.SRCINFO
@@ -0,0 +1,231 @@
+pkgbase = pipewire
+	pkgdesc = Low-latency audio/video router and processor
+	pkgver = 0.3.81
+	pkgrel = 1
+	epoch = 1
+	url = https://pipewire.org
+	arch = x86_64
+	license = MIT
+	checkdepends = desktop-file-utils
+	checkdepends = openal
+	makedepends = alsa-lib
+	makedepends = avahi
+	makedepends = bluez-libs
+	makedepends = dbus
+	makedepends = doxygen
+	makedepends = git
+	makedepends = glib2
+	makedepends = graphviz
+	makedepends = gst-plugins-base
+	makedepends = jack2
+	makedepends = libcamera
+	makedepends = libcanberra
+	makedepends = libfdk-aac
+	makedepends = libffado
+	makedepends = libfreeaptx
+	makedepends = liblc3
+	makedepends = libldac
+	makedepends = libmysofa
+	makedepends = libpulse
+	makedepends = libsndfile
+	makedepends = libusb
+	makedepends = libx11
+	makedepends = libxfixes
+	makedepends = lilv
+	makedepends = meson
+	makedepends = ncurses
+	makedepends = opus
+	makedepends = python-docutils
+	makedepends = readline
+	makedepends = roc-toolkit
+	makedepends = rtkit
+	makedepends = sbc
+	makedepends = sdl2
+	makedepends = systemd
+	makedepends = valgrind
+	makedepends = webrtc-audio-processing-1
+	source = git+https://gitlab.freedesktop.org/pipewire/pipewire.git#commit=181fbfee6d3fcc3afd3c93613f126a8346dad586
+	b2sums = SKIP
+
+pkgname = pipewire
+	install = pipewire.install
+	license = MIT
+	license = LGPL
+	depends = gcc-libs
+	depends = glibc
+	depends = libpipewire=1:0.3.81-1
+	depends = libcamera-base.so
+	depends = libcamera.so
+	depends = libdbus-1.so
+	depends = libglib-2.0.so
+	depends = libncursesw.so
+	depends = libpipewire-0.3.so
+	depends = libreadline.so
+	depends = libsystemd.so
+	depends = libudev.so
+	optdepends = gst-plugin-pipewire: GStreamer plugin
+	optdepends = pipewire-alsa: ALSA configuration
+	optdepends = pipewire-audio: Audio support
+	optdepends = pipewire-docs: Documentation
+	optdepends = pipewire-ffado: FireWire support
+	optdepends = pipewire-jack-client: PipeWire as JACK client
+	optdepends = pipewire-jack: JACK replacement
+	optdepends = pipewire-pulse: PulseAudio replacement
+	optdepends = pipewire-roc: ROC streaming
+	optdepends = pipewire-session-manager: Session manager
+	optdepends = pipewire-v4l2: V4L2 interceptor
+	optdepends = pipewire-x11-bell: X11 bell
+	optdepends = pipewire-zeroconf: Zeroconf support
+	optdepends = realtime-privileges: realtime privileges with rt module
+	optdepends = rtkit: realtime privileges with rtkit module
+
+pkgname = libpipewire
+	pkgdesc = Low-latency audio/video router and processor - client library
+	depends = glibc
+	depends = gcc-libs
+	provides = libpipewire-0.3.so
+
+pkgname = alsa-card-profiles
+	pkgdesc = Low-latency audio/video router and processor - ALSA card profiles
+	license = LGPL
+
+pkgname = pipewire-docs
+	pkgdesc = Low-latency audio/video router and processor - documentation
+
+pkgname = pipewire-audio
+	pkgdesc = Low-latency audio/video router and processor - Audio support
+	depends = alsa-card-profiles
+	depends = dbus
+	depends = gcc-libs
+	depends = glib2
+	depends = glibc
+	depends = libasound.so
+	depends = libbluetooth.so
+	depends = libfdk-aac.so
+	depends = libfreeaptx.so
+	depends = liblc3.so
+	depends = libldacBT_enc.so
+	depends = liblilv-0.so
+	depends = libmysofa.so
+	depends = libopus.so
+	depends = libpipewire-0.3.so
+	depends = libsbc.so
+	depends = libsndfile.so
+	depends = libusb-1.0.so
+	depends = libwebrtc-audio-processing-1.so
+	depends = pipewire
+	depends = systemd-libs
+
+pkgname = pipewire-alsa
+	pkgdesc = Low-latency audio/video router and processor - ALSA configuration
+	depends = pipewire
+	depends = pipewire-audio
+	depends = pipewire-session-manager
+	provides = pulseaudio-alsa
+	conflicts = pulseaudio-alsa
+
+pkgname = pipewire-ffado
+	pkgdesc = Low-latency audio/video router and processor - FireWire support
+	depends = glibc
+	depends = libffado.so
+	depends = libpipewire-0.3.so
+	depends = pipewire
+	depends = pipewire-audio
+
+pkgname = pipewire-jack-client
+	pkgdesc = Low-latency audio/video router and processor - PipeWire as JACK client
+	depends = glibc
+	depends = libdbus-1.so
+	depends = libjack.so
+	depends = libpipewire-0.3.so
+	depends = pipewire
+	depends = pipewire-audio
+	conflicts = pipewire-jack
+
+pkgname = pipewire-jack
+	pkgdesc = Low-latency audio/video router and processor - JACK replacement
+	license = MIT
+	license = GPL2
+	depends = glibc
+	depends = libpipewire-0.3.so
+	depends = pipewire
+	depends = pipewire-audio
+	depends = pipewire-session-manager
+	depends = sh
+	optdepends = jack-example-tools: for official JACK example-clients and tools
+	provides = jack
+	provides = libjack.so
+	provides = libjackserver.so
+	provides = libjacknet.so
+	conflicts = jack
+	conflicts = jack2
+	conflicts = pipewire-jack-client
+
+pkgname = pipewire-pulse
+	pkgdesc = Low-latency audio/video router and processor - PulseAudio replacement
+	install = pipewire-pulse.install
+	depends = dbus
+	depends = gcc-libs
+	depends = glibc
+	depends = libavahi-client.so
+	depends = libavahi-common.so
+	depends = libglib-2.0.so
+	depends = libpipewire-0.3.so
+	depends = libpulse.so
+	depends = pipewire
+	depends = pipewire-audio
+	depends = pipewire-session-manager
+	depends = systemd-libs
+	provides = pulseaudio
+	provides = pulseaudio-bluetooth
+	conflicts = pulseaudio
+	conflicts = pulseaudio-bluetooth
+
+pkgname = pipewire-roc
+	pkgdesc = Low-latency audio/video router and processor - ROC streaming support
+	depends = glibc
+	depends = libpipewire-0.3.so
+	depends = libroc.so
+	depends = pipewire
+	depends = pipewire-audio
+	depends = roc-toolkit
+
+pkgname = gst-plugin-pipewire
+	pkgdesc = Multimedia graph framework - pipewire plugin
+	depends = glib2
+	depends = glibc
+	depends = gst-plugins-base-libs
+	depends = gstreamer
+	depends = libpipewire-0.3.so
+	depends = pipewire
+	depends = pipewire-session-manager
+
+pkgname = pipewire-zeroconf
+	pkgdesc = Low-latency audio/video router and processor - Zeroconf support
+	depends = gcc-libs
+	depends = glibc
+	depends = libavahi-client.so
+	depends = libavahi-common.so
+	depends = libpipewire-0.3.so
+	depends = openssl
+	depends = opus
+	depends = pipewire
+	depends = pipewire-audio
+
+pkgname = pipewire-v4l2
+	pkgdesc = Low-latency audio/video router and processor - V4L2 interceptor
+	depends = glibc
+	depends = libpipewire-0.3.so
+	depends = pipewire
+	depends = pipewire-session-manager
+	depends = sh
+
+pkgname = pipewire-x11-bell
+	pkgdesc = Low-latency audio/video router and processor - X11 bell
+	depends = glibc
+	depends = libcanberra.so
+	depends = libpipewire-0.3.so
+	depends = libx11
+	depends = libxfixes
+	depends = pipewire
+	depends = pipewire-audio
diff --git a/0001-ci-ShellCheck-preprocessed-scripts-separately.patch b/0001-ci-ShellCheck-preprocessed-scripts-separately.patch
deleted file mode 100644
index e982a4d..0000000
--- a/0001-ci-ShellCheck-preprocessed-scripts-separately.patch
+++ /dev/null
@@ -1,73 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: "Jan Alexander Steffens (heftig)" <heftig@archlinux.org>
-Date: Tue, 29 Aug 2023 16:49:01 +0200
-Subject: [PATCH] ci: ShellCheck preprocessed scripts separately
-
-Change the shellcheck job so that we configure the build and check the
-preprocessed versions of the scripts, not the bare ones, which might not
-be syntactically valid yet.
----
- .gitlab-ci.yml               | 9 ++++++++-
- doc/input-filter-h.sh        | 1 +
- pipewire-jack/src/pw-jack.in | 2 ++
- pipewire-v4l2/src/pw-v4l2.in | 1 +
- 4 files changed, 12 insertions(+), 1 deletion(-)
-
-diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
-index 3a21cdd3841a..4311cef8d7aa 100644
---- a/.gitlab-ci.yml
-+++ b/.gitlab-ci.yml
-@@ -458,8 +458,15 @@ shellcheck:
-   extends:
-     - .build_on_fedora
-   stage: analysis
-+  variables:
-+    MESON_OPTIONS: >-
-+        -Dpipewire-v4l2=enabled
-+        -Dpipewire-jack=enabled
-   script:
--    - shellcheck $(git grep -l "#\!/.*bin/.*sh")
-+    - echo "Configuring with meson options $MESON_OPTIONS"
-+    - meson setup "$BUILD_DIR" --prefix="$PREFIX" $MESON_OPTIONS
-+    - shellcheck $(git ls-files '*.sh')
-+    - shellcheck $(grep -rl "#\!/.*bin/.*sh" "$BUILD_DIR")
- 
- spellcheck:
-   extends:
-diff --git a/doc/input-filter-h.sh b/doc/input-filter-h.sh
-index dc4604a79709..554837c8c0be 100755
---- a/doc/input-filter-h.sh
-+++ b/doc/input-filter-h.sh
-@@ -11,6 +11,7 @@ FILENAME="$1"
- # Add \ingroup commands for the file, for each \addgroup in it
- BASEFILE=$(echo "$FILENAME" | sed -e 's@.*src/pipewire/@pipewire/@; s@.*spa/include/spa/@spa/@; s@.*src/test/@test/@;')
- 
-+# shellcheck disable=SC2028 # \file is not an escape sequence
- echo "/** \file"
- echo "\`$BASEFILE\`"
- sed -n -e '/.*\\addtogroup [a-zA-Z0-9_].*/ { s/.*addtogroup /\\ingroup /; p; }' < "$FILENAME" | sort | uniq
-diff --git a/pipewire-jack/src/pw-jack.in b/pipewire-jack/src/pw-jack.in
-index 2f232f6253b0..0399f31fa0f3 100755
---- a/pipewire-jack/src/pw-jack.in
-+++ b/pipewire-jack/src/pw-jack.in
-@@ -52,6 +52,8 @@ if [ -n "$PERIOD" ]; then
- 	fi
- 	export PIPEWIRE_QUANTUM
- fi
-+
-+# shellcheck disable=SC2016 # ${LIB} is interpreted by ld.so, not the shell
- LD_LIBRARY_PATH='@LIBJACK_PATH@'"${LD_LIBRARY_PATH+":$LD_LIBRARY_PATH"}"
- export LD_LIBRARY_PATH
- 
-diff --git a/pipewire-v4l2/src/pw-v4l2.in b/pipewire-v4l2/src/pw-v4l2.in
-index 9591bf32f018..c02f17dbdfd3 100755
---- a/pipewire-v4l2/src/pw-v4l2.in
-+++ b/pipewire-v4l2/src/pw-v4l2.in
-@@ -37,6 +37,7 @@ shift $(( OPTIND - 1 ))
- if [ "$PW_UNINSTALLED" = 1 ] ; then
-    PW_V4L2_LD_PRELOAD="$PW_BUILDDIR"'/pipewire-v4l2/src/libpw-v4l2.so'
- else
-+   # shellcheck disable=SC2016 # ${LIB} is interpreted by ld.so, not the shell
-    PW_V4L2_LD_PRELOAD='@LIBV4L2_PATH@/libpw-v4l2.so'
- fi
- 
diff --git a/0002-pipewire-jack-Disable-LD_LIBRARY_PATH-when-libjack-i.patch b/0002-pipewire-jack-Disable-LD_LIBRARY_PATH-when-libjack-i.patch
deleted file mode 100644
index f89a68e..0000000
--- a/0002-pipewire-jack-Disable-LD_LIBRARY_PATH-when-libjack-i.patch
+++ /dev/null
@@ -1,51 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: "Jan Alexander Steffens (heftig)" <heftig@archlinux.org>
-Date: Thu, 3 Aug 2023 20:53:49 +0200
-Subject: [PATCH] pipewire-jack: Disable LD_LIBRARY_PATH when libjack is in
- libdir
-
-This avoids prepending /usr/lib to the LD_LIBRARY_PATH, which supersedes
-DT_RUNPATH and can cause library confusion.
----
- pipewire-jack/src/meson.build | 7 +++++++
- pipewire-jack/src/pw-jack.in  | 4 ++--
- 2 files changed, 9 insertions(+), 2 deletions(-)
-
-diff --git a/pipewire-jack/src/meson.build b/pipewire-jack/src/meson.build
-index daa4bcdef1ae..def7746afe20 100644
---- a/pipewire-jack/src/meson.build
-+++ b/pipewire-jack/src/meson.build
-@@ -21,12 +21,19 @@ libjack_path = get_option('libjack-path')
- if libjack_path == ''
-   libjack_path = modules_install_dir / 'jack'
-   libjack_path_dlopen = modules_install_dir_dlopen / 'jack'
-+  libjack_path_enable = ''
-+elif libjack_path == get_option('libdir') or libjack_path == pipewire_libdir
-+  libjack_path = pipewire_libdir
-+  libjack_path_dlopen = libjack_path
-+  libjack_path_enable = '#'
- else
-   libjack_path_dlopen = libjack_path
-+  libjack_path_enable = ''
- endif
- 
- tools_config = configuration_data()
- tools_config.set('LIBJACK_PATH', libjack_path_dlopen)
-+tools_config.set('LIBJACK_PATH_ENABLE', libjack_path_enable)
- 
- configure_file(input : 'pw-jack.in',
-                output : 'pw-jack',
-diff --git a/pipewire-jack/src/pw-jack.in b/pipewire-jack/src/pw-jack.in
-index 0399f31fa0f3..6c7e35a87495 100755
---- a/pipewire-jack/src/pw-jack.in
-+++ b/pipewire-jack/src/pw-jack.in
-@@ -54,7 +54,7 @@ if [ -n "$PERIOD" ]; then
- fi
- 
- # shellcheck disable=SC2016 # ${LIB} is interpreted by ld.so, not the shell
--LD_LIBRARY_PATH='@LIBJACK_PATH@'"${LD_LIBRARY_PATH+":$LD_LIBRARY_PATH"}"
--export LD_LIBRARY_PATH
-+@LIBJACK_PATH_ENABLE@LD_LIBRARY_PATH='@LIBJACK_PATH@'"${LD_LIBRARY_PATH+":$LD_LIBRARY_PATH"}"
-+@LIBJACK_PATH_ENABLE@export LD_LIBRARY_PATH
- 
- exec "$@"
diff --git a/PKGBUILD b/PKGBUILD
index ab85e41..2ac1e7f 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -20,8 +20,8 @@ pkgname=(
   pipewire-v4l2
   pipewire-x11-bell
 )
-_commit=35cca08d2bef14248ac25ff2a1efb0bf274d0a6f  # tags/0.3.80
-pkgver=0.3.80
+_commit=181fbfee6d3fcc3afd3c93613f126a8346dad586  # tags/0.3.81
+pkgver=0.3.81
 pkgrel=1
 epoch=1
 pkgdesc="Low-latency audio/video router and processor"
@@ -72,12 +72,8 @@ checkdepends=(
 )
 source=(
   "git+https://gitlab.freedesktop.org/pipewire/pipewire.git#commit=$_commit"
-  0001-ci-ShellCheck-preprocessed-scripts-separately.patch
-  0002-pipewire-jack-Disable-LD_LIBRARY_PATH-when-libjack-i.patch
 )
-b2sums=('SKIP'
-        'a3e0b77e7388444872c1a44ee130695ac42a71a07f49903b646a32c291940db9378e8b937f0439e5c21cdfebfe854df6a606479ccab0b3491ec091cb7f6d6da4'
-        '81b86b8a80c110ac944e608eed68ce7bbf77f68b388701eebce24c807131b30958aef16e43865dd227e1aa184e2c770c2603064edc64985aa46bda7de72861b3')
+b2sums=('SKIP')
 
 pkgver() {
   cd pipewire
@@ -86,11 +82,6 @@ pkgver() {
 
 prepare() {
   cd pipewire
-
-  # remove export of LD_LIBRARY_PATH for pw-jack as it would add /usr/lib
-  # https://gitlab.freedesktop.org/pipewire/pipewire/-/merge_requests/1674
-  git apply -3 ../0001-ci-ShellCheck-preprocessed-scripts-separately.patch
-  git apply -3 ../0002-pipewire-jack-Disable-LD_LIBRARY_PATH-when-libjack-i.patch
 }
 
 build() {