[arch-commits] Commit in obs-studio/trunk (PKGBUILD fix_python_binary_loading.patch)

[Frederik Schwan]

    Date: Wednesday, October 7, 2020 @ 17:19:07
  Author: freswa
Revision: 720764

fix #68132

Added:
  obs-studio/trunk/fix_python_binary_loading.patch
Modified:
  obs-studio/trunk/PKGBUILD

---------------------------------+
 PKGBUILD                        |   13 ++++++++++---
 fix_python_binary_loading.patch |   24 ++++++++++++++++++++++++
 2 files changed, 34 insertions(+), 3 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2020-10-07 17:18:57 UTC (rev 720763)
+++ PKGBUILD	2020-10-07 17:19:07 UTC (rev 720764)
@@ -3,7 +3,7 @@
 
 pkgname=obs-studio
 pkgver=26.0.2
-pkgrel=1
+pkgrel=2
 pkgdesc="Free, open source software for live streaming and recording"
 arch=('x86_64')
 url="https://obsproject.com"
@@ -18,9 +18,16 @@
             'luajit: scripting support'
             'python: scripting support'
             'vlc: VLC Media Source support')
-source=($pkgname-$pkgver.tar.gz::https://github.com/jp9000/obs-studio/archive/$pkgver.tar.gz)
-md5sums=('75dea679867dce642c8d1910ef6da0a5')
+source=($pkgname-$pkgver.tar.gz::https://github.com/jp9000/obs-studio/archive/$pkgver.tar.gz
+	fix_python_binary_loading.patch)
+md5sums=('75dea679867dce642c8d1910ef6da0a5'
+         '051b90f05e26bff99236b8fb1ad377d1')
 
+prepare() {
+  cd $pkgname-$pkgver
+  patch -Np1 < "$srcdir"/fix_python_binary_loading.patch
+}
+
 build() {
   cd $pkgname-$pkgver
 

Added: fix_python_binary_loading.patch
===================================================================
--- fix_python_binary_loading.patch	                        (rev 0)
+++ fix_python_binary_loading.patch	2020-10-07 17:19:07 UTC (rev 720764)
@@ -0,0 +1,24 @@
+From c482159ce93deafc7f1fc5755ba15135709ae726 Mon Sep 17 00:00:00 2001
+From: Matt Gajownik <matt at obsproject.com>
+Date: Tue, 25 Aug 2020 19:28:26 +1000
+Subject: [PATCH] libobs/util: Fix loading Python binary modules on *nix
+
+Fixes #2222
+---
+ libobs/util/platform-nix.c | 3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+diff --git a/libobs/util/platform-nix.c b/libobs/util/platform-nix.c
+index 26800d52f7..997b62db1a 100644
+--- a/libobs/util/platform-nix.c
++++ b/libobs/util/platform-nix.c
+@@ -71,7 +71,8 @@ void *os_dlopen(const char *path)
+ #ifdef __APPLE__
+ 	void *res = dlopen(dylib_name.array, RTLD_LAZY | RTLD_FIRST);
+ #else
+-	void *res = dlopen(dylib_name.array, RTLD_LAZY);
++	void *res = dlopen(dylib_name.array,
++			   RTLD_LAZY | RTLD_DEEPBIND | RTLD_GLOBAL);
+ #endif
+ 	if (!res)
+ 		blog(LOG_ERROR, "os_dlopen(%s->%s): %s\n", path,