commit 8732143c4063398851ec583c2f6bddd541d979eb Author: Leigh Scott <leigh123linux(a)gmail.com&gt; Date: Tue Sep 13 12:48:00 2022 +0100 Update to 28.0.1 .gitignore | 2 ++ obs-studio-27.2.4-ffmpeg5.patch | 39 ---------------------------------- obs-studio.spec | 46 ++++++++++++++++++++++++++--------------- sources | 5 +++-- 4 files changed, 34 insertions(+), 58 deletions(-) --- diff --git a/.gitignore b/.gitignore index c3ea7c9..64daa9e 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,4 @@ /obs-studio-*.tar.gz /obs-vst-*.tar.gz +/obs-browser-b6e0888.tar.gz +/obs-websocket-b6e0888.tar.gz diff --git a/obs-studio.spec b/obs-studio.spec index 58c5c21..484e5b8 100644 --- a/obs-studio.spec +++ b/obs-studio.spec @@ -1,10 +1,13 @@ -%undefine __cmake_in_source_build +%global __brp_check_rpaths %{nil} # bytecompile with Python 3 %global __python %{__python3} -%global commit1 8ad3f64e702ac4f1799b209a511620eb1d096a01 +%global commit1 b6e0888084ab623f0a73e8cb7ee5dc341e56fda1 %global shortcommit1 %(c=%{commit1}; echo ${c:0:7}) +%global commit2 5716577019b1ccda01a12db2cba35a023082b7ad +%global shortcommit2 %(c=%{commit1}; echo ${c:0:7}) + %ifarch %{power64} # LuaJIT is not available for POWER %bcond_with lua_scripting @@ -13,17 +16,16 @@ %endif Name: obs-studio -Version: 27.2.4 -Release: 5%{?dist} +Version: 28.0.1 +Release: 1%{?dist} Summary: Open Broadcaster Software Studio License: GPLv2+ URL: https://obsproject.com/ Source0: https://github.com/obsproject/obs-studio/archive/%{version}/%{name}-%{ver... -Source1: https://github.com/obsproject/obs-vst/archive/%{commit1}/obs-vst-%{shortc... - -# https://github.com/obsproject/obs-studio/commit/e66542075d5d2cb51a14a0bdf... -Patch100: %{name}-27.2.4-ffmpeg5.patch +# Add the missing submodules and set as disabled +Source1: https://github.com/obsproject/obs-browser/archive/%{commit1}/obs-browser-... +Source2: https://github.com/obsproject/obs-websocket/archive/%{commit2}/obs-websoc... BuildRequires: gcc BuildRequires: cmake >= 3.0 @@ -56,11 +58,10 @@ BuildRequires: pciutils-devel BuildRequires: pipewire-devel BuildRequires: pulseaudio-libs-devel BuildRequires: python3-devel -BuildRequires: qt5-qtbase-devel -BuildRequires: qt5-qtbase-private-devel -BuildRequires: qt5-qtsvg-devel -BuildRequires: qt5-qtwayland-devel -BuildRequires: qt5-qtx11extras-devel +BuildRequires: qt6-qtbase-devel +BuildRequires: qt6-qtbase-private-devel +BuildRequires: qt6-qtsvg-devel +BuildRequires: qt6-qtwayland-devel BuildRequires: speexdsp-devel BuildRequires: swig BuildRequires: systemd-devel @@ -98,8 +99,9 @@ Header files for Open Broadcaster Software # replace OBS_MULTIARCH_SUFFIX by LIB_SUFFIX sed -i 's|OBS_MULTIARCH_SUFFIX|LIB_SUFFIX|g' cmake/Modules/ObsHelpers.cmake -# Prepare plugins/obs-vst -tar -xf %{SOURCE1} -C plugins/obs-vst --strip-components=1 +# Prepare the missing submodules +tar -xf %{SOURCE1} -C plugins/obs-browser --strip-components=1 +tar -xf %{SOURCE2} -C plugins/obs-websocket --strip-components=1 # remove -Werror flag to mitigate FTBFS with ffmpeg 5.1 sed -i 's|-Werror-implicit-function-declaration||g' CMakeLists.txt @@ -108,6 +110,9 @@ sed -i 's|-Werror-implicit-function-declaration||g' CMakeLists.txt %cmake -DOBS_VERSION_OVERRIDE=%{version} \ -DUNIX_STRUCTURE=1 -GNinja \ -DBUILD_BROWSER=OFF \ + -DENABLE_WEBSOCKET=OFF \ + -DENABLE_NEW_MPEGTS_OUTPUT=OFF \ + -DENABLE_AJA=OFF \ %if ! %{with lua_scripting} -DDISABLE_LUA=ON \ %endif @@ -120,7 +125,7 @@ sed -i 's|-Werror-implicit-function-declaration||g' CMakeLists.txt # Add missing files to enable the build of obs-ndi install -Dm644 UI/obs-frontend-api/obs-frontend-api.h %{buildroot}%{_includedir}/obs/ -install -Dm644 cmake/external/ObsPluginHelpers.cmake %{buildroot}%{_libdir}/cmake/LibObs/ +install -Dm644 cmake/external/ObsPluginHelpers.cmake %{buildroot}%{_libdir}/cmake/libobs/ %check /usr/bin/desktop-file-validate %{buildroot}/%{_datadir}/applications/com.obsproject.Studio.desktop @@ -145,11 +150,18 @@ appstream-util validate-relax --nonet %{buildroot}%{_datadir}/metainfo/*.appdata %{_libdir}/*.so.* %files devel -%{_libdir}/cmake/LibObs/ +%{_libdir}/cmake/libobs/ +%{_libdir}/cmake/obs-frontend-api/ %{_libdir}/pkgconfig/libobs.pc %{_includedir}/obs/ %changelog +* Tue Sep 13 2022 Leigh Scott <leigh123linux(a)gmail.com&gt; - 28.0.1-1 +- Update to 28.0.1 +- Remove vst sub-module as it's qt5 only +- Add browser and websocket sub-modules so the source compiles + Upstream can fix their own mess! + * Sun Aug 07 2022 RPM Fusion Release Engineering <sergiomb(a)rpmfusion.org&gt; - 27.2.4-5 - Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild and ffmpeg 5.1 diff --git a/sources b/sources index 2a88fb1..0423135 100644 --- a/sources +++ b/sources @@ -1,2 +1,3 @@ -SHA512 (obs-studio-27.2.4.tar.gz) = 575341dd3d9240b21881517a16d01ca11f833e08b40ca7990f0360b4cd1076e8217a9bb8dddf174eca5429e6eadaadb6cfdbd61d24e0eb13ebeaa7f29cfad8bf -SHA512 (obs-vst-8ad3f64.tar.gz) = b3608e856668671d9e245c7bc5bfa24c5ed2a53cf78d71ca210885bea64d4057644e97d21c8ad0c08595c1ee7556a894a3684aa286279f75c618f60bd868505e +SHA512 (obs-studio-28.0.1.tar.gz) = fc7b03ce116f61da281af430c8bcc44baee6ebef62aacb6ec6d41efdfc6f5440d86c1679dafc3608c0ced1513f19ed8aead29e26d77e3d3eb6bacb4a1038f6d6 +SHA512 (obs-browser-b6e0888.tar.gz) = 49d7033bc4b7ca867a4a0e76e45b487ad9a5ab395ce1cd68a92a78a9e12ddcfaf9fe3223729d9e0ee9910f05e084499ca689415e025528efd531eb1f542f3d08 +SHA512 (obs-websocket-b6e0888.tar.gz) = 9bb511c9693889f9837cd001fafe403762d44f2ecc80bad42e592d7555e3807a148ab19638724871b7807e71edf5f62a1e0ea62f362fd1b9a6e9bf49000b8a5c