Date: Sunday, January 31, 2021 @ 21:08:16 Author: jsteel Revision: 838710
archrelease: copy trunk to community-x86_64 Added: obs-studio/repos/community-x86_64/PKGBUILD (from rev 838709, obs-studio/trunk/PKGBUILD) obs-studio/repos/community-x86_64/fix_python_binary_loading.patch (from rev 838709, obs-studio/trunk/fix_python_binary_loading.patch) Deleted: obs-studio/repos/community-x86_64/PKGBUILD obs-studio/repos/community-x86_64/fix_python_binary_loading.patch ---------------------------------+ PKGBUILD | 94 +++++++++++++++++++------------------- fix_python_binary_loading.patch | 48 +++++++++---------- 2 files changed, 71 insertions(+), 71 deletions(-) Deleted: PKGBUILD =================================================================== --- PKGBUILD 2021-01-31 21:08:07 UTC (rev 838709) +++ PKGBUILD 2021-01-31 21:08:16 UTC (rev 838710) @@ -1,47 +0,0 @@ -# Maintainer: Jonathan Steel <jsteel at archlinux.org> -# Contributor: Benjamin Klettbach <b.klettb...@gmail.com> - -pkgname=obs-studio -pkgver=26.1.0 -pkgrel=2 -pkgdesc="Free, open source software for live streaming and recording" -arch=('x86_64') -url="https://obsproject.com" -license=('GPL2') -depends=('ffmpeg' 'jansson' 'libxinerama' 'libxkbcommon-x11' 'mbedtls' - 'qt5-svg' 'qt5-x11extras' 'curl' 'jack' 'gtk-update-icon-cache') -makedepends=('cmake' 'libfdk-aac' 'libxcomposite' 'x264' 'vlc' 'swig' 'python' 'luajit') -optdepends=('libfdk-aac: FDK AAC codec support' - 'libxcomposite: XComposite capture support' - 'libva-intel-driver: hardware encoding' - 'libva-mesa-driver: hardware encoding' - '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 - fix_python_binary_loading.patch) -md5sums=('f8bb9216ece8587f2067ead1ef12a7c9' - '051b90f05e26bff99236b8fb1ad377d1') - -prepare() { - cd $pkgname-$pkgver - patch -Np1 < "$srcdir"/fix_python_binary_loading.patch -} - -build() { - cd $pkgname-$pkgver - - mkdir -p build; cd build - - cmake -DCMAKE_INSTALL_PREFIX="/usr" \ - -DBUILD_CAPTIONS=ON \ - -DOBS_VERSION_OVERRIDE="$pkgver-$pkgrel" .. - - make -} - -package() { - cd $pkgname-$pkgver/build - - make install DESTDIR="$pkgdir" -} Copied: obs-studio/repos/community-x86_64/PKGBUILD (from rev 838709, obs-studio/trunk/PKGBUILD) =================================================================== --- PKGBUILD (rev 0) +++ PKGBUILD 2021-01-31 21:08:16 UTC (rev 838710) @@ -0,0 +1,47 @@ +# Maintainer: Jonathan Steel <jsteel at archlinux.org> +# Contributor: Benjamin Klettbach <b.klettb...@gmail.com> + +pkgname=obs-studio +pkgver=26.1.2 +pkgrel=1 +pkgdesc="Free, open source software for live streaming and recording" +arch=('x86_64') +url="https://obsproject.com" +license=('GPL2') +depends=('ffmpeg' 'jansson' 'libxinerama' 'libxkbcommon-x11' 'mbedtls' + 'qt5-svg' 'qt5-x11extras' 'curl' 'jack' 'gtk-update-icon-cache') +makedepends=('cmake' 'libfdk-aac' 'libxcomposite' 'x264' 'vlc' 'swig' 'python' 'luajit') +optdepends=('libfdk-aac: FDK AAC codec support' + 'libxcomposite: XComposite capture support' + 'libva-intel-driver: hardware encoding' + 'libva-mesa-driver: hardware encoding' + '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 + fix_python_binary_loading.patch) +md5sums=('179a87c9f45e1330dcbd0d4ad48dadae' + '051b90f05e26bff99236b8fb1ad377d1') + +prepare() { + cd $pkgname-$pkgver + patch -Np1 < "$srcdir"/fix_python_binary_loading.patch +} + +build() { + cd $pkgname-$pkgver + + mkdir -p build; cd build + + cmake -DCMAKE_INSTALL_PREFIX="/usr" \ + -DBUILD_CAPTIONS=ON \ + -DOBS_VERSION_OVERRIDE="$pkgver-$pkgrel" .. + + make +} + +package() { + cd $pkgname-$pkgver/build + + make install DESTDIR="$pkgdir" +} Deleted: fix_python_binary_loading.patch =================================================================== --- fix_python_binary_loading.patch 2021-01-31 21:08:07 UTC (rev 838709) +++ fix_python_binary_loading.patch 2021-01-31 21:08:16 UTC (rev 838710) @@ -1,24 +0,0 @@ -From c482159ce93deafc7f1fc5755ba15135709ae726 Mon Sep 17 00:00:00 2001 -From: Matt Gajownik <m...@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, Copied: obs-studio/repos/community-x86_64/fix_python_binary_loading.patch (from rev 838709, obs-studio/trunk/fix_python_binary_loading.patch) =================================================================== --- fix_python_binary_loading.patch (rev 0) +++ fix_python_binary_loading.patch 2021-01-31 21:08:16 UTC (rev 838710) @@ -0,0 +1,24 @@ +From c482159ce93deafc7f1fc5755ba15135709ae726 Mon Sep 17 00:00:00 2001 +From: Matt Gajownik <m...@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,