commit 6799d077b7df5ba772b8321230fa5d730ccee2fe Author: Leigh Scott <leigh123linux(a)gmail.com&gt; Date: Sun Dec 12 11:12:30 2021 +0000 Revert "Update to 21.10.31", needs mlt7 This reverts commit 37cd6d71da3fedfb8ddd5e200c691a7c207e7e3c. .gitignore | 1 - mlt_path.patch | 16 ++++++++-------- shotcut.spec | 7 ++----- sources | 2 +- 4 files changed, 11 insertions(+), 15 deletions(-) --- diff --git a/.gitignore b/.gitignore index fb9b8df..e18998f 100644 --- a/.gitignore +++ b/.gitignore @@ -42,4 +42,3 @@ /shotcut-21.02.15.tar.gz /shotcut-21.02.27.tar.gz /shotcut-21.03.21.tar.gz -/shotcut-21.10.31.tar.gz diff --git a/mlt_path.patch b/mlt_path.patch index 3d8c98b..3f0338d 100644 --- a/mlt_path.patch +++ b/mlt_path.patch @@ -1,11 +1,11 @@ ---- src/jobs/meltjob.cpp.orig 2021-10-30 23:37:09.000000000 +0100 -+++ src/jobs/meltjob.cpp 2021-12-12 10:17:16.258891583 +0000 -@@ -96,7 +96,7 @@ void MeltJob::start() +--- src/jobs/meltjob.cpp.orig 2020-11-30 16:40:41.045006301 +0100 ++++ src/jobs/meltjob.cpp 2020-11-30 16:44:27.679336104 +0100 +@@ -95,7 +95,7 @@ + return; } QString shotcutPath = qApp->applicationDirPath(); - #if defined(Q_OS_UNIX) && !defined(Q_OS_MAC) -- QFileInfo meltPath(shotcutPath, "melt-7"); +- QFileInfo meltPath(shotcutPath, "melt"); + QFileInfo meltPath(shotcutPath, "mlt-melt"); - #else - QFileInfo meltPath(shotcutPath, "melt"); - #endif + setReadChannel(QProcess::StandardError); + QStringList args; + args << "-verbose"; diff --git a/shotcut.spec b/shotcut.spec index c48ee01..3802add 100644 --- a/shotcut.spec +++ b/shotcut.spec @@ -3,8 +3,8 @@ %define _vstring %(echo %{version} |tr -d ".") Name: shotcut -Version: 21.10.31 -Release: 1%{dist} +Version: 21.03.21 +Release: 3%{dist} #Release: 0.1.beta1%%{dist} Summary: A free, open source, cross-platform video editor # The entire source code is GPLv3+ except mvcp/ which is LGPLv2+ @@ -186,9 +186,6 @@ appstream-util validate-relax --nonet %{buildroot}/%{_metainfodir}/org.%{name}.S %doc doc %changelog -* Sun Dec 12 2021 Leigh Scott <leigh123linux(a)gmail.com&gt; - 21.10.31-1 -- Update to 21.10.31 - * Tue Aug 03 2021 RPM Fusion Release Engineering <leigh123linux(a)gmail.com&gt; - 21.03.21-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild diff --git a/sources b/sources index 22e0821..325d164 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (shotcut-21.10.31.tar.gz) = de5d9992a41217323b3d96cc7618ed5adc633e7d0e65b6f8f189405008f6faba011a80f38cda0126b18ab28a359f6784078cb298b2ee29dcdfdc6769963714f3 +SHA512 (shotcut-21.03.21.tar.gz) = 402d714df7285d49269891e5def0b8a1a46f54b6ec88b0201981bdf8d866c49e83bbbf513805795630e39335e0fddc2457e1a7db582affe4a4d057ac5ab4e2bb