commit 5c782b58c062c33c43afb0159d3b1cc521908869 Author: Leigh Scott <leigh123linux(a)gmail.com&gt; Date: Tue Sep 13 13:31:06 2022 +0100 touch the missing sub-modules instead obs-studio.spec | 20 +++++++------------- sources | 2 -- 2 files changed, 7 insertions(+), 15 deletions(-) --- diff --git a/obs-studio.spec b/obs-studio.spec index 484e5b8..b66b45f 100644 --- a/obs-studio.spec +++ b/obs-studio.spec @@ -2,12 +2,6 @@ # bytecompile with Python 3 %global __python %{__python3} -%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 @@ -17,15 +11,12 @@ Name: obs-studio Version: 28.0.1 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Open Broadcaster Software Studio License: GPLv2+ URL: https://obsproject.com/ Source0: https://github.com/obsproject/obs-studio/archive/%{version}/%{name}-%{ver... -# 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 @@ -99,9 +90,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 the missing submodules -tar -xf %{SOURCE1} -C plugins/obs-browser --strip-components=1 -tar -xf %{SOURCE2} -C plugins/obs-websocket --strip-components=1 +# touch the missing submodules +touch plugins/obs-browser/CMakeLists.txt +touch plugins/obs-websocket/CMakeLists.txt # remove -Werror flag to mitigate FTBFS with ffmpeg 5.1 sed -i 's|-Werror-implicit-function-declaration||g' CMakeLists.txt @@ -156,6 +147,9 @@ appstream-util validate-relax --nonet %{buildroot}%{_datadir}/metainfo/*.appdata %{_includedir}/obs/ %changelog +* Tue Sep 13 2022 Leigh Scott <leigh123linux(a)gmail.com&gt; - 28.0.1-2 +- touch the missing sub-modules instead + * 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 diff --git a/sources b/sources index 0423135..fec9630 100644 --- a/sources +++ b/sources @@ -1,3 +1 @@ SHA512 (obs-studio-28.0.1.tar.gz) = fc7b03ce116f61da281af430c8bcc44baee6ebef62aacb6ec6d41efdfc6f5440d86c1679dafc3608c0ced1513f19ed8aead29e26d77e3d3eb6bacb4a1038f6d6 -SHA512 (obs-browser-b6e0888.tar.gz) = 49d7033bc4b7ca867a4a0e76e45b487ad9a5ab395ce1cd68a92a78a9e12ddcfaf9fe3223729d9e0ee9910f05e084499ca689415e025528efd531eb1f542f3d08 -SHA512 (obs-websocket-b6e0888.tar.gz) = 9bb511c9693889f9837cd001fafe403762d44f2ecc80bad42e592d7555e3807a148ab19638724871b7807e71edf5f62a1e0ea62f362fd1b9a6e9bf49000b8a5c