From 169abf52b7e3f078a666e1d298930b10bd799266 Mon Sep 17 00:00:00 2001 From: Silvan Calarco Date: Sat, 6 Jan 2024 07:48:43 +0100 Subject: [PATCH] patched to fix binary modules search path ( /usr/lib64/obs-plugins ) [release 28.0.1-2mamba;Wed Sep 21 2022] --- ...io-28.0.1-fix-module-bin-search-path.patch | 11 ++++ obs-studio.spec | 65 ++++++++++++------- 2 files changed, 53 insertions(+), 23 deletions(-) create mode 100644 obs-studio-28.0.1-fix-module-bin-search-path.patch diff --git a/obs-studio-28.0.1-fix-module-bin-search-path.patch b/obs-studio-28.0.1-fix-module-bin-search-path.patch new file mode 100644 index 0000000..eb79aaf --- /dev/null +++ b/obs-studio-28.0.1-fix-module-bin-search-path.patch @@ -0,0 +1,11 @@ +--- obs-studio-28.0.1/libobs/obs-nix.c.orig 2022-09-21 15:15:56.006332309 +0200 ++++ obs-studio-28.0.1/libobs/obs-nix.c 2022-09-21 15:16:05.069285078 +0200 +@@ -54,7 +54,7 @@ + #define FLATPAK_PLUGIN_PATH "/app/plugins" + + static const char *module_bin[] = { +- OBS_INSTALL_PREFIX "/" OBS_PLUGIN_DESTINATION, ++ OBS_PLUGIN_DESTINATION, + "../../obs-plugins/" BIT_STRING, + FLATPAK_PLUGIN_PATH "/" OBS_PLUGIN_DESTINATION, + }; diff --git a/obs-studio.spec b/obs-studio.spec index 93c0e2d..3e548f8 100644 --- a/obs-studio.spec +++ b/obs-studio.spec @@ -1,27 +1,20 @@ Name: obs-studio Epoch: 1 -Version: 26.1.2 -Release: 1mamba +Version: 28.0.1 +Release: 2mamba Summary: Video recording and live streaming Group: Graphical Desktop/Applications/Multimedia Vendor: openmamba Distribution: openmamba -Packager: Ercole 'ercolinux' Carpanetto +Packager: Silvan Calarco URL: https://obsproject.com/ -## GITSOURCE https://github.com/jp9000/obs-studio.git master Source: https://github.com/jp9000/obs-studio.git/%{version}/obs-studio-%{version}.tar.bz2 Patch0: obs-studio-25.0.8-gcc-10.0.1.patch +Patch1: obs-studio-28.0.1-fix-module-bin-search-path.patch License: GPL ## AUTOBUILDREQ-BEGIN BuildRequires: glibc-devel -BuildRequires: ldconfig -BuildRequires: libGL-devel -BuildRequires: libICE-devel -BuildRequires: libSM-devel BuildRequires: libX11-devel -BuildRequires: libXcomposite-devel -BuildRequires: libXext-devel -BuildRequires: libXfixes-devel BuildRequires: libalsa-devel BuildRequires: libavcodec-ffmpeg-devel BuildRequires: libavdevice-ffmpeg-devel @@ -29,28 +22,39 @@ BuildRequires: libavfilter-ffmpeg-devel BuildRequires: libavformat-ffmpeg-devel BuildRequires: libavutil-ffmpeg-devel BuildRequires: libcurl-devel -BuildRequires: libdbus-devel BuildRequires: libfontconfig-devel BuildRequires: libfreetype-devel BuildRequires: libgcc -BuildRequires: libjack-devel +BuildRequires: libglib-devel +BuildRequires: libglvnd-devel BuildRequires: libjansson-devel +BuildRequires: libmbedtls-devel +BuildRequires: libpci-devel +BuildRequires: libpipewire-devel BuildRequires: libpulseaudio-devel -BuildRequires: libpython3-devel -BuildRequires: libqt5-devel -BuildRequires: libspeex-devel +BuildRequires: libpython310-devel +BuildRequires: librist-devel +BuildRequires: librnnoise-devel +BuildRequires: libspeexdsp-devel +BuildRequires: libsrt-devel BuildRequires: libstdc++6-devel BuildRequires: libswresample-ffmpeg-devel BuildRequires: libswscale-ffmpeg-devel BuildRequires: libudev-devel BuildRequires: libv4l-devel +BuildRequires: libwayland-devel +BuildRequires: libwayland-egl-devel BuildRequires: libx264-devel BuildRequires: libxcb-devel +BuildRequires: libxkbcommon-devel BuildRequires: libz-devel +BuildRequires: qt6-qtbase-devel +BuildRequires: qt6-qtsvg-devel ## AUTOBUILDREQ-END BuildRequires: cmake +BuildRequires: librist-devel +BuildRequires: libajantv2-devel Requires: lib%{name} = %{?epoch:%epoch:}%{version}-%{release} -BuildRoot: %{_tmppath}/%{name}-%{version}-root %description Free and open source software for video recording and live streaming @@ -74,16 +78,22 @@ This package contains libraries and header files for developing applications tha %prep %setup -q +#-D -T +#:<< _EOF #%patch0 -p1 +%patch1 -p1 %build %cmake -d build \ - -DBUILD_BROWSER=ON \ + -DBUILD_BROWSER=OFF \ + -DOBS_VERSION_OVERRIDE="%{version}-%{release}" \ + -DCMAKE_SHARED_LINKER_FLAGS="-lgio-2.0" \ %ifarch x86_64 -DOBS_MULTIARCH_SUFFIX=64 %endif -%make +# 28.0.1: DESTDIR: workaround for files being installed to root while make +%make DESTDIR=$PWD/p %install [ "%{buildroot}" != / ] && rm -rf "%{buildroot}" @@ -100,18 +110,20 @@ This package contains libraries and header files for developing applications tha %{_bindir}/obs %{_bindir}/obs-ffmpeg-mux %{_datadir}/applications/com.obsproject.Studio.desktop -%{_datadir}/icons/hicolor/256x256/apps/com.obsproject.Studio.png %{_datadir}/metainfo/com.obsproject.Studio.appdata.xml %{_datadir}/obs/libobs/*.effect %dir %{_datadir}/obs/obs-plugins %{_datadir}/obs/obs-plugins/* %dir %{_datadir}/obs/obs-studio %{_datadir}/obs/obs-studio/* +%{_datadir}/icons/hicolor/*/apps/com.obsproject.Studio.png +%{_datadir}/icons/hicolor/scalable/apps/com.obsproject.Studio.svg %doc AUTHORS COPYING %files -n lib%{name} %defattr(-,root,root) %{_libdir}/libobs*.so.* +%{_libdir}/libobs*.so %dir %{_libdir}/obs-plugins %{_libdir}/obs-plugins/*.so %dir %{_libdir}/obs-scripting @@ -121,13 +133,20 @@ This package contains libraries and header files for developing applications tha %defattr(-,root,root) %dir %{_includedir}/obs %{_includedir}/obs/* -%{_libdir}/libobs*.so -%dir %{_libdir}/cmake/LibObs -%{_libdir}/cmake/LibObs/LibObs*.cmake +%dir %{_libdir}/cmake/libobs +%{_libdir}/cmake/libobs/libobs*.cmake +%dir %{_libdir}/cmake/obs-frontend-api +%{_libdir}/cmake/obs-frontend-api/obs-frontend*.cmake %{_libdir}/pkgconfig/libobs.pc %doc README.rst %changelog +* Wed Sep 21 2022 Silvan Calarco 28.0.1-2mamba +- patched to fix binary modules search path ( /usr/lib64/obs-plugins ) + +* Tue Sep 20 2022 Automatic Build System 28.0.1-1mamba +- automatic version update by autodist + * Mon Feb 01 2021 Automatic Build System 26.1.2-1mamba - automatic version update by autodist