[SCM] simplescreenrecorder/master: Install libssr-ginject.so in a private lib directory

jcowgill at users.alioth.debian.org jcowgill at users.alioth.debian.org
Sun Nov 26 12:24:14 UTC 2017


The following commit has been merged in the master branch:
commit 56803f4466e60404de6e04514241d9f3aca3046f
Author: James Cowgill <jcowgill at debian.org>
Date:   Sun Nov 26 10:05:34 2017 +0000

    Install libssr-ginject.so in a private lib directory

diff --git a/debian/patches/01-private-glinject.patch b/debian/patches/01-private-glinject.patch
new file mode 100644
index 0000000..1b92b29
--- /dev/null
+++ b/debian/patches/01-private-glinject.patch
@@ -0,0 +1,30 @@
+Description: 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 at debian.org>
+---
+This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
+--- 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"
++SSR_GLINJECT="/usr/lib/simplescreenrecorder/libssr-glinject.so"
++echo "ssr-glinject: LD_PRELOAD = $LD_PRELOAD:$SSR_GLINJECT"
+ echo "ssr-glinject: command = $@"
+-LD_PRELOAD="$LD_PRELOAD:libssr-glinject.so" "$@"
++LD_PRELOAD="$LD_PRELOAD:$SSR_GLINJECT" "$@"
+--- a/src/AV/Input/GLInjectInput.cpp
++++ b/src/AV/Input/GLInjectInput.cpp
+@@ -96,7 +96,7 @@ void GLInjectInput::SetCapturing(bool ca
+ 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/lib/simplescreenrecorder/libssr-glinject.so\" ";
+ 	full_command += "SSR_CHANNEL=\"" + ShellEscape(channel) + "\" ";
+ 	if(relax_permissions)
+ 		full_command += "SSR_STREAM_RELAX_PERMISSIONS=1 ";
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..47d77c1
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1 @@
+01-private-glinject.patch
diff --git a/debian/rules b/debian/rules
index 690e00f..b8c8946 100755
--- a/debian/rules
+++ b/debian/rules
@@ -14,7 +14,8 @@ include /usr/share/dpkg/architecture.mk
 override_dh_auto_configure:
 ifneq ($(filter $(DEB_HOST_ARCH_CPU), amd64 i386),)
 	dh_auto_configure -- \
-		--disable-assert
+		--disable-assert \
+		--libdir=/usr/lib/simplescreenrecorder
 else
 	dh_auto_configure -- \
 		--disable-x86-asm \

-- 
simplescreenrecorder packaging



More information about the pkg-multimedia-commits mailing list