[kdenlive] 18.12.3 backport upstream fix for mlt-melt (kde#405564)

commit aac2d4e1522e2fdfe1838d2a2983e60e6f517801 Author: Rex Dieter <rdieter(a)gmail.com&gt; Date: Thu Mar 28 16:33:46 2019 -0500 18.12.3 backport upstream fix for mlt-melt (kde#405564) .gitignore | 1 + kdenlive-18.12.3-mlt_melt.patch | 13 +++++++++++++ kdenlive.spec | 11 +++++++++-- sources | 2 +- 4 files changed, 24 insertions(+), 3 deletions(-) --- diff --git a/.gitignore b/.gitignore index ab1a1d6..bec0ad4 100644 --- a/.gitignore +++ b/.gitignore @@ -17,3 +17,4 @@ /kdenlive-18.08.1.tar.xz /kdenlive-18.08.2.tar.xz /kdenlive-18.12.2.tar.xz +/kdenlive-18.12.3.tar.xz diff --git a/kdenlive-18.12.3-mlt_melt.patch b/kdenlive-18.12.3-mlt_melt.patch new file mode 100644 index 0000000..328f75d --- /dev/null +++ b/kdenlive-18.12.3-mlt_melt.patch @@ -0,0 +1,13 @@ +diff -up kdenlive-18.12.3/src/mltconnection.cpp.mlt kdenlive-18.12.3/src/mltconnection.cpp +--- kdenlive-18.12.3/src/mltconnection.cpp.mlt 2019-02-27 19:43:02.000000000 -0600 ++++ kdenlive-18.12.3/src/mltconnection.cpp 2019-03-28 16:26:00.482603257 -0500 +@@ -74,6 +74,9 @@ void MltConnection::locateMeltAndProfile + } + if (!QFile::exists(meltPath)) { + meltPath = QStandardPaths::findExecutable("melt"); ++ if (meltPath.isEmpty()) { ++ meltPath = QStandardPaths::findExecutable("mlt-melt"); ++ } + } + KdenliveSettings::setRendererpath(meltPath); + diff --git a/kdenlive.spec b/kdenlive.spec index ccacd4b..1544848 100644 --- a/kdenlive.spec +++ b/kdenlive.spec @@ -1,8 +1,8 @@ Name: kdenlive Summary: Non-linear video editor -Version: 18.12.2 -Release: 2%{?dist} +Version: 18.12.3 +Release: 1%{?dist} License: GPLv2+ URL: http://www.kdenlive.org @@ -15,6 +15,9 @@ URL: http://www.kdenlive.org Source0: http://download.kde.org/%{stable}/applications/%{version}/src/kdenlive-%{... Source100: kdenlive-find-lang.sh +## backport from master branch +Patch100: kdenlive-18.12.3-mlt_melt.patch + # Add support for finding html files with find-lang.sh --with-html on epel # https://github.com/rpm-software-management/rpm/commit/0c42871ff407a3eeb1e... %if 0%{?rhel} @@ -157,6 +160,10 @@ fi %changelog +* Thu Mar 28 2019 Rex Dieter <rdieter(a)fedoraproject.org&gt; - 18.12.3-1 +- 18.12.3 +- backport upstream fix for mlt-melt (kde#405564) + * Mon Mar 04 2019 RPM Fusion Release Engineering <leigh123linux(a)gmail.com&gt; - 18.12.2-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild diff --git a/sources b/sources index c2373c3..6a93a44 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -65964a00da12dd45839d255bc23111d5 kdenlive-18.12.2.tar.xz +57e49c3995117945938669e24aff9352 kdenlive-18.12.3.tar.xz