mirror of
git://slackware.nl/current.git
synced 2024-11-16 07:48:02 +01:00
3e4363cb32
ap/moc-2.6_alpha3-x86_64-4.txz: Rebuilt. The ffmpeg7 patch isn't 100% there, so rebuild without the ffmpeg plugin. ap/sqlite-3.46.1-x86_64-1.txz: Upgraded. kde/digikam-8.4.0-x86_64-2.txz: Rebuilt. Recompiled against ffmpeg-7.0.2. kde/ffmpegthumbs-23.08.5-x86_64-2.txz: Rebuilt. Recompiled against ffmpeg-7.0.2. kde/k3b-23.08.5-x86_64-2.txz: Rebuilt. Recompiled against ffmpeg-7.0.2. kde/kfilemetadata-5.116.0-x86_64-6.txz: Rebuilt. Recompiled against ffmpeg-7.0.2. kde/kpipewire-5.27.11-x86_64-2.txz: Rebuilt. Recompiled against ffmpeg-7.0.2. l/alsa-plugins-1.2.12-x86_64-2.txz: Rebuilt. Recompiled against ffmpeg-7.0.2. l/ffmpeg-7.0.2-x86_64-1.txz: Upgraded. Shared library .so-version bump. Compiled against vulkan-sdk-1.3.290.0. l/freetype-2.13.3-x86_64-1.txz: Upgraded. l/gegl-0.4.48-x86_64-2.txz: Rebuilt. Recompiled against ffmpeg-7.0.2. l/gst-plugins-bad-free-1.24.6-x86_64-2.txz: Rebuilt. Recompiled against vulkan-sdk-1.3.290.0. l/gst-plugins-libav-1.24.6-x86_64-2.txz: Rebuilt. Recompiled against ffmpeg-7.0.2. l/gtk4-4.14.4-x86_64-2.txz: Rebuilt. Recompiled against vulkan-sdk-1.3.290.0. l/libplacebo-7.349.0-x86_64-2.txz: Rebuilt. Recompiled against vulkan-sdk-1.3.290.0. l/mlt-7.24.0-x86_64-3.txz: Rebuilt. Recompiled against ffmpeg-7.0.2. l/opencv-4.10.0-x86_64-2.txz: Rebuilt. Recompiled against ffmpeg-7.0.2. l/pipewire-1.2.2-x86_64-2.txz: Rebuilt. Recompiled against ffmpeg-7.0.2. Recompiled against vulkan-sdk-1.3.290.0. l/qt5-5.15.14_20240716_ae0c8451-x86_64-2.txz: Rebuilt. Recompiled against ffmpeg-7.0.2. l/qt6-6.7.2_20240610_3f005f1e-x86_64-5.txz: Rebuilt. Recompiled against ffmpeg-7.0.2. l/spirv-llvm-translator-18.1.3-x86_64-2.txz: Rebuilt. Recompiled against vulkan-sdk-1.3.290.0. x/fcitx5-gtk-5.1.3-x86_64-2.txz: Rebuilt. Recompiled against vulkan-sdk-1.3.290.0. x/ibus-1.5.30-x86_64-2.txz: Rebuilt. Recompiled against vulkan-sdk-1.3.290.0. x/mesa-24.1.5-x86_64-2.txz: Rebuilt. Recompiled against vulkan-sdk-1.3.290.0. x/vulkan-sdk-1.3.290.0-x86_64-1.txz: Upgraded. xap/MPlayer-20240812-x86_64-1.txz: Upgraded. Recompiled against ffmpeg-7.0.2. xap/audacious-plugins-4.4-x86_64-3.txz: Rebuilt. Recompiled against ffmpeg-7.0.2. xap/ffmpegthumbnailer-2.2.2-x86_64-6.txz: Rebuilt. Recompiled against ffmpeg-7.0.2. xap/freerdp-2.11.7-x86_64-2.txz: Rebuilt. Recompiled against ffmpeg-7.0.2. xap/mpv-0.38.0-x86_64-5.txz: Rebuilt. Recompiled against ffmpeg-7.0.2. Recompiled against vulkan-sdk-1.3.290.0. xap/ssr-0.4.4-x86_64-3.txz: Rebuilt. Recompiled against ffmpeg-7.0.2. xap/xine-lib-1.2.13-x86_64-8.txz: Rebuilt. Recompiled against ffmpeg-7.0.2. xap/xscreensaver-6.09-x86_64-2.txz: Rebuilt. Recompiled against ffmpeg-7.0.2.
40 lines
1.8 KiB
Diff
40 lines
1.8 KiB
Diff
From: James Cowgill <jcowgill@debian.org>
|
|
Date: Fri, 14 Aug 2020 13:34:36 +0100
|
|
Subject: Load libssr-glinject.so from private libdir
|
|
|
|
The libssr-glinject.so library is not a public library. debian/rules sets the
|
|
libdir to a private path, while this patch adjusts the uses of LD_PRELOAD to
|
|
load from the correct directory.
|
|
Author: James Cowgill <jcowgill@debian.org>
|
|
---
|
|
scripts/ssr-glinject | 5 +++--
|
|
src/AV/Input/GLInjectInput.cpp | 2 +-
|
|
2 files changed, 4 insertions(+), 3 deletions(-)
|
|
|
|
diff --git a/scripts/ssr-glinject b/scripts/ssr-glinject
|
|
index 2320690..cca58f3 100755
|
|
--- a/scripts/ssr-glinject
|
|
+++ b/scripts/ssr-glinject
|
|
@@ -59,6 +59,7 @@ do
|
|
fi
|
|
done
|
|
|
|
-echo "ssr-glinject: LD_PRELOAD = $LD_PRELOAD:libssr-glinject.so" >& 2 || true
|
|
+SSR_GLINJECT="/usr/\$LIB/simplescreenrecorder/libssr-glinject.so"
|
|
+echo "ssr-glinject: LD_PRELOAD = $LD_PRELOAD:$SSR_GLINJECT" >& 2 || true
|
|
echo "ssr-glinject: command = $@" >& 2 || true
|
|
-LD_PRELOAD="$LD_PRELOAD:libssr-glinject.so" exec "$@"
|
|
+LD_PRELOAD="$LD_PRELOAD:$SSR_GLINJECT" exec "$@"
|
|
diff --git a/src/AV/Input/GLInjectInput.cpp b/src/AV/Input/GLInjectInput.cpp
|
|
index fc98f31..1aee8ad 100644
|
|
--- a/src/AV/Input/GLInjectInput.cpp
|
|
+++ b/src/AV/Input/GLInjectInput.cpp
|
|
@@ -207,7 +207,7 @@ void GLInjectInput::SetCapturing(bool capturing) {
|
|
bool GLInjectInput::LaunchApplication(const QString& channel, bool relax_permissions, const QString& command, const QString& working_directory) {
|
|
|
|
// prepare command
|
|
- QString full_command = "LD_PRELOAD=\"libssr-glinject.so\" ";
|
|
+ QString full_command = "LD_PRELOAD=\"/usr/" + ShellEscape("$LIB") + "/simplescreenrecorder/libssr-glinject.so\" ";
|
|
full_command += "SSR_CHANNEL=\"" + ShellEscape(channel) + "\" ";
|
|
if(relax_permissions)
|
|
full_command += "SSR_STREAM_RELAX_PERMISSIONS=1 ";
|