From 21de41277a54301ca55422ceb3bdc9644ef73865 Mon Sep 17 00:00:00 2001 From: Silvan Calarco Date: Thu, 21 Nov 2024 17:30:52 +0100 Subject: [PATCH] update and restore needed patch fix-module-bin-search-path [release 30.2.3-2mamba;Thu Nov 21 2024] --- ...udio-30.2.3-fix-module-bin-search-path.patch | 11 +++++++++++ obs-studio.spec | 17 +++++++++++------ 2 files changed, 22 insertions(+), 6 deletions(-) create mode 100644 obs-studio-30.2.3-fix-module-bin-search-path.patch diff --git a/obs-studio-30.2.3-fix-module-bin-search-path.patch b/obs-studio-30.2.3-fix-module-bin-search-path.patch new file mode 100644 index 0000000..dc80ba9 --- /dev/null +++ b/obs-studio-30.2.3-fix-module-bin-search-path.patch @@ -0,0 +1,11 @@ +--- obs-studio-30.2.3/libobs/obs-nix.c.orig 2024-11-21 14:56:28.855768157 +0100 ++++ obs-studio-30.2.3/libobs/obs-nix.c 2024-11-21 14:57:17.740858415 +0100 +@@ -51,7 +51,7 @@ + + static const char *module_bin[] = { + "../../obs-plugins/64bit", +- OBS_INSTALL_PREFIX "/" OBS_PLUGIN_DESTINATION, ++ OBS_PLUGIN_DESTINATION, + FLATPAK_PLUGIN_PATH "/" OBS_PLUGIN_DESTINATION, + }; + diff --git a/obs-studio.spec b/obs-studio.spec index ec852cd..67ec94a 100644 --- a/obs-studio.spec +++ b/obs-studio.spec @@ -1,7 +1,7 @@ Name: obs-studio Epoch: 1 Version: 30.2.3 -Release: 1mamba +Release: 2mamba Summary: Video recording and live streaming Group: Graphical Desktop/Applications/Multimedia Vendor: openmamba @@ -10,7 +10,8 @@ Packager: Silvan Calarco URL: https://obsproject.com/ Source: https://github.com/jp9000/obs-studio.git/%{version}/obs-studio-%{version}.tar.bz2 Source1: https://github.com/FFmpeg/nv-codec-headers/releases/download/n12.1.14.0/nv-codec-headers-12.1.14.0.tar.gz -Patch2: obs-studio-30.0.0-cmake-build-destdir.patch +Patch0: obs-studio-30.2.3-fix-module-bin-search-path.patch +Patch1: obs-studio-30.0.0-cmake-build-destdir.patch License: GPL ## AUTOBUILDREQ-BEGIN BuildRequires: glibc-devel @@ -96,7 +97,8 @@ This package contains libraries and header files for developing applications tha %setup -q -a1 #% setup -q -D -T #:<< _EOF -%patch 2 -p1 +%patch 0 -p1 +%patch 1 -p1 # Disable FFnvcodec detected via PkgConfig sed -i "s|PC_FFnvcodec_VERSION VERSION_GREATER 0|0|" cmake/Modules/FindFFnvcodec.cmake @@ -116,13 +118,13 @@ sed -i "s|PC_FFnvcodec_VERSION VERSION_GREATER 0|0|" cmake/Modules/FindFFnvcodec -DCALM_DEPRECATION=ON \ -DENABLE_WEBSOCKET=OFF \ -Wno-dev \ - -DCMAKE_SHARED_LINKER_FLAGS="-lgio-2.0" \ %ifarch x86_64 -DOBS_MULTIARCH_SUFFIX=64 %endif -# 28.0.1: DESTDIR: workaround for files being installed to root while make -export +#-DCMAKE_SHARED_LINKER_FLAGS="-lgio-2.0" \ + +# 28.0.1: DESTDIR: workaround for files being installed to root during make %make DESTDIR=$PWD/p %install @@ -171,6 +173,9 @@ export %doc README.rst %changelog +* Thu Nov 21 2024 Silvan Calarco 30.2.3-2mamba +- update and restore needed patch fix-module-bin-search-path + * Thu Nov 14 2024 Automatic Build System 30.2.3-1mamba - automatic version update by autodist