commit 208407c8fde16fdbc819328224aff9b3d4e97168
Author: Rex Dieter <rdieter(a)gmail.com>
Date: Fri Mar 29 10:59:56 2019 -0500
respin melt.patch for real this time
kdenlive-18.12.3-mlt_melt.patch | 10 ++++++----
kdenlive.spec | 5 ++++-
2 files changed, 10 insertions(+), 5 deletions(-)
---
diff --git a/kdenlive-18.12.3-mlt_melt.patch b/kdenlive-18.12.3-mlt_melt.patch
index 328f75d..bdf12dc 100644
--- a/kdenlive-18.12.3-mlt_melt.patch
+++ b/kdenlive-18.12.3-mlt_melt.patch
@@ -1,12 +1,14 @@
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
++++ kdenlive-18.12.3/src/mltconnection.cpp 2019-03-29 08:34:40.715613792 -0500
+@@ -73,7 +73,10 @@ void MltConnection::locateMeltAndProfile
+ meltPath = QDir::cleanPath(profilePath +
QStringLiteral("/../../../bin/melt")) + exeSuffix;
}
if (!QFile::exists(meltPath)) {
- meltPath = QStandardPaths::findExecutable("melt");
+- meltPath = QStandardPaths::findExecutable("melt");
++ meltPath = QStandardPaths::findExecutable("mlt-melt");
+ if (meltPath.isEmpty()) {
-+ meltPath = QStandardPaths::findExecutable("mlt-melt");
++ meltPath = QStandardPaths::findExecutable("melt");
+ }
}
KdenliveSettings::setRendererpath(meltPath);
diff --git a/kdenlive.spec b/kdenlive.spec
index 2ecec33..ab6101f 100644
--- a/kdenlive.spec
+++ b/kdenlive.spec
@@ -2,7 +2,7 @@
Name: kdenlive
Summary: Non-linear video editor
Version: 18.12.3
-Release: 2%{?dist}
+Release: 3%{?dist}
License: GPLv2+
URL:
http://www.kdenlive.org
@@ -160,6 +160,9 @@ fi
%changelog
+* Fri Mar 29 2019 Rex Dieter <rdieter(a)fedoraproject.org> - 18.12.3-3
+- respin melt.patch for real this time
+
* Fri Mar 29 2019 Rex Dieter <rdieter(a)fedoraproject.org> - 18.12.3-2
- respin melt patch to give mlt-melt priority over melt