* update pipewire to 1:0.3.77-2

This commit is contained in:
Alexander Baldeck 2023-08-27 11:43:08 +02:00
parent 4638bfa944
commit 30657ab6fe
2 changed files with 61 additions and 5 deletions

View File

@ -0,0 +1,51 @@
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 2f232f6253b0..e9714284878a 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
fi
-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 "$@"

View File

@ -20,8 +20,8 @@ pkgname=(
pipewire-v4l2
pipewire-x11-bell
)
_commit=9bcc90fdc3ece16a4e0a91446641e56332b979fd # tags/0.3.76
pkgver=0.3.76
_commit=31cd694602cc37ada3a6d02a5a381f4e3933ecef # tags/0.3.77
pkgver=0.3.77
pkgrel=2
epoch=1
pkgdesc="Low-latency audio/video router and processor"
@ -70,8 +70,10 @@ makedepends_x86_64=(libldac)
checkdepends=(desktop-file-utils)
source=(
"git+https://gitlab.freedesktop.org/pipewire/pipewire.git#commit=$_commit"
0001-pipewire-jack-Disable-LD_LIBRARY_PATH-when-libjack-i.patch
)
b2sums=('SKIP')
b2sums=('SKIP'
'17de92c7209e4b927f1de7cf11aa5b7b92fbdd41cea26850ecd2159c393ee8a30a93b178681ab05b408fb2fffac111c29b5eebf41119d7ad8f5bbed7122fc3f3')
pkgver() {
cd pipewire
@ -81,15 +83,18 @@ pkgver() {
prepare() {
cd pipewire
# https://bugs.archlinux.org/task/79355
# https://gitlab.freedesktop.org/pipewire/pipewire/-/issues/3414
git cherry-pick -n 820ca90705ae78124958f1b96de3bdc7889c2d1e
# remove export of LD_LIBRARY_PATH for pw-jack as it would add /usr/lib
sed -i '/LD_LIBRARY_PATH/d' pipewire-jack/src/pw-jack.in
git apply -3 ../0001-pipewire-jack-Disable-LD_LIBRARY_PATH-when-libjack-i.patch
}
build() {
local meson_options=(
-D bluez5-codec-lc3=enabled
-D bluez5-codec-lc3plus=disabled
-D compress-offload=enabled
-D docs=enabled
-D jack-devel=true
-D jack=disabled