update and restore needed patch fix-module-bin-search-path [release 30.2.3-2mamba;Thu Nov 21 2024]

This commit is contained in:
Silvan Calarco 2024-11-21 17:30:52 +01:00
parent 43f2f8c42b
commit 21de41277a
2 changed files with 22 additions and 6 deletions

View File

@ -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,
};

View File

@ -1,7 +1,7 @@
Name: obs-studio Name: obs-studio
Epoch: 1 Epoch: 1
Version: 30.2.3 Version: 30.2.3
Release: 1mamba Release: 2mamba
Summary: Video recording and live streaming Summary: Video recording and live streaming
Group: Graphical Desktop/Applications/Multimedia Group: Graphical Desktop/Applications/Multimedia
Vendor: openmamba Vendor: openmamba
@ -10,7 +10,8 @@ Packager: Silvan Calarco <silvan.calarco@mambasoft.it>
URL: https://obsproject.com/ URL: https://obsproject.com/
Source: https://github.com/jp9000/obs-studio.git/%{version}/obs-studio-%{version}.tar.bz2 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 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 License: GPL
## AUTOBUILDREQ-BEGIN ## AUTOBUILDREQ-BEGIN
BuildRequires: glibc-devel BuildRequires: glibc-devel
@ -96,7 +97,8 @@ This package contains libraries and header files for developing applications tha
%setup -q -a1 %setup -q -a1
#% setup -q -D -T #% setup -q -D -T
#:<< _EOF #:<< _EOF
%patch 2 -p1 %patch 0 -p1
%patch 1 -p1
# Disable FFnvcodec detected via PkgConfig # Disable FFnvcodec detected via PkgConfig
sed -i "s|PC_FFnvcodec_VERSION VERSION_GREATER 0|0|" cmake/Modules/FindFFnvcodec.cmake 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 \ -DCALM_DEPRECATION=ON \
-DENABLE_WEBSOCKET=OFF \ -DENABLE_WEBSOCKET=OFF \
-Wno-dev \ -Wno-dev \
-DCMAKE_SHARED_LINKER_FLAGS="-lgio-2.0" \
%ifarch x86_64 %ifarch x86_64
-DOBS_MULTIARCH_SUFFIX=64 -DOBS_MULTIARCH_SUFFIX=64
%endif %endif
# 28.0.1: DESTDIR: workaround for files being installed to root while make #-DCMAKE_SHARED_LINKER_FLAGS="-lgio-2.0" \
export
# 28.0.1: DESTDIR: workaround for files being installed to root during make
%make DESTDIR=$PWD/p %make DESTDIR=$PWD/p
%install %install
@ -171,6 +173,9 @@ export
%doc README.rst %doc README.rst
%changelog %changelog
* Thu Nov 21 2024 Silvan Calarco <silvan.calarco@mambasoft.it> 30.2.3-2mamba
- update and restore needed patch fix-module-bin-search-path
* Thu Nov 14 2024 Automatic Build System <autodist@openmamba.org> 30.2.3-1mamba * Thu Nov 14 2024 Automatic Build System <autodist@openmamba.org> 30.2.3-1mamba
- automatic version update by autodist - automatic version update by autodist