Skip to content

Commit

Permalink
obs-studio 30.1.2-1
Browse files Browse the repository at this point in the history
  • Loading branch information
tnut committed May 11, 2024
1 parent dbb2882 commit af43215
Show file tree
Hide file tree
Showing 4 changed files with 31 additions and 106 deletions.
96 changes: 0 additions & 96 deletions gui-extra/obs-studio/2e79d4c9.patch

This file was deleted.

19 changes: 9 additions & 10 deletions gui-extra/obs-studio/Pkgfile → man-at-work/obs-studio/Pkgfile
Original file line number Diff line number Diff line change
@@ -1,29 +1,28 @@
description="Free, open source software for live streaming and recording"
url="https://obsproject.com"

packager="spiky <spiky@nutyx.org>"
contributors="Greg,Fabienwang,Tnut"
packager="tnut <tnut@nutyx.org>"
contributors="Greg,Fabienwang,Spiky"

makedepends=(ffmpeg jansson xorg-libxinerama libxkbcommon
qtx11extras cmake xorg-libxcomposite
vlc swig python luajit fdk-aac zlib
qt6-svg cmake xorg-libxcomposite libvpl
vlc swig python luajit fdk-aac zlib swig
wayland pipewire xdg-utils cef-minimal)
run=(gtk-update-icon-cache x264 curl jack)

name=obs-studio
version=29.1.3
version=30.1.2

PKGMK_KEEP_SOURCES="no"

source=(ignore_unused_submodules.patch
https://github.com/obsproject/obs-studio/archive/refs/tags/$version.tar.gz
2e79d4c9.patch)
source=(ignore_unused_submodules.patch fix_python_binary_loading.patch
https://github.com/obsproject/obs-studio/archive/refs/tags/$version.tar.gz)

build() {
cd $name-$version

patch -Np1 -i ../fix_python_binary_loading.patch
patch -Np1 -i ../ignore_unused_submodules.patch
# patch -Np1 -i ../2e79d4c9.patch

mkdir build
cd build
Expand All @@ -35,7 +34,7 @@ build() {
-DENABLE_AJA=OFF \
-DENABLE_BROWSER=OFF \
-DENABLE_VLC=OFF \
-DBUILD_VST=OFF ..
-DBUILD_VST=ON ..
make
}

Expand Down
22 changes: 22 additions & 0 deletions man-at-work/obs-studio/fix_python_binary_loading.patch
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
From c482159ce93deafc7f1fc5755ba15135709ae726 Mon Sep 17 00:00:00 2001
From: Matt Gajownik <matt@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,

0 comments on commit af43215

Please sign in to comment.