git » pipewire.git » commit 9e85ac4

diff --git a/0001-ci-ShellCheck-preprocessed-scripts-separately.patch b/0001-ci-ShellCheck-preprocessed-scripts-separately.patch
new file mode 100644
index 0000000..e982a4d
--- /dev/null
+++ b/0001-ci-ShellCheck-preprocessed-scripts-separately.patch
@@ -0,0 +1,73 @@
+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/0001-pipewire-jack-Disable-LD_LIBRARY_PATH-when-libjack-i.patch b/0002-pipewire-jack-Disable-LD_LIBRARY_PATH-when-libjack-i.patch
similarity index 91%
rename from 0001-pipewire-jack-Disable-LD_LIBRARY_PATH-when-libjack-i.patch
rename to 0002-pipewire-jack-Disable-LD_LIBRARY_PATH-when-libjack-i.patch
index 650d2a0..f89a68e 100644
--- a/0001-pipewire-jack-Disable-LD_LIBRARY_PATH-when-libjack-i.patch
+++ b/0002-pipewire-jack-Disable-LD_LIBRARY_PATH-when-libjack-i.patch
@@ -36,13 +36,13 @@ index daa4bcdef1ae..def7746afe20 100644
  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 2f232f6253b0..e9714284878a 100755
+index 0399f31fa0f3..6c7e35a87495 100755
 --- a/pipewire-jack/src/pw-jack.in
 +++ b/pipewire-jack/src/pw-jack.in
-@@ -52,7 +52,7 @@ if [ -n "$PERIOD" ]; then
- 	fi
- 	export PIPEWIRE_QUANTUM
+@@ -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"}"
diff --git a/PKGBUILD b/PKGBUILD
index 55ab4c3..ab85e41 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -20,9 +20,9 @@ pkgname=(
   pipewire-v4l2
   pipewire-x11-bell
 )
-_commit=b5c3f217926f9066a1afbee7eb20967dd6896c56  # tags/0.3.79
-pkgver=0.3.79
-pkgrel=2
+_commit=35cca08d2bef14248ac25ff2a1efb0bf274d0a6f  # tags/0.3.80
+pkgver=0.3.80
+pkgrel=1
 epoch=1
 pkgdesc="Low-latency audio/video router and processor"
 url="https://pipewire.org"
@@ -64,7 +64,7 @@ makedepends=(
   sdl2
   systemd
   valgrind
-  webrtc-audio-processing
+  webrtc-audio-processing-1
 )
 checkdepends=(
   desktop-file-utils
@@ -72,10 +72,12 @@ checkdepends=(
 )
 source=(
   "git+https://gitlab.freedesktop.org/pipewire/pipewire.git#commit=$_commit"
-  0001-pipewire-jack-Disable-LD_LIBRARY_PATH-when-libjack-i.patch
+  0001-ci-ShellCheck-preprocessed-scripts-separately.patch
+  0002-pipewire-jack-Disable-LD_LIBRARY_PATH-when-libjack-i.patch
 )
 b2sums=('SKIP'
-        '17de92c7209e4b927f1de7cf11aa5b7b92fbdd41cea26850ecd2159c393ee8a30a93b178681ab05b408fb2fffac111c29b5eebf41119d7ad8f5bbed7122fc3f3')
+        'a3e0b77e7388444872c1a44ee130695ac42a71a07f49903b646a32c291940db9378e8b937f0439e5c21cdfebfe854df6a606479ccab0b3491ec091cb7f6d6da4'
+        '81b86b8a80c110ac944e608eed68ce7bbf77f68b388701eebce24c807131b30958aef16e43865dd227e1aa184e2c770c2603064edc64985aa46bda7de72861b3')
 
 pkgver() {
   cd pipewire
@@ -86,7 +88,9 @@ prepare() {
   cd pipewire
 
   # remove export of LD_LIBRARY_PATH for pw-jack as it would add /usr/lib
-  git apply -3 ../0001-pipewire-jack-Disable-LD_LIBRARY_PATH-when-libjack-i.patch
+  # 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() {
@@ -284,7 +288,7 @@ package_pipewire-audio() {
     libsbc.so
     libsndfile.so
     libusb-1.0.so
-    libwebrtc_audio_processing.so
+    libwebrtc-audio-processing-1.so
     pipewire
     systemd-libs
   )