This commit is contained in:
Rmys
2021-06-17 08:44:56 +03:00
committed by GitHub
parent 95586b29d5
commit 90f1e7605b
2 changed files with 25 additions and 0 deletions
@@ -0,0 +1,22 @@
diff --git a/src/mltconnection.cpp b/src/mltconnection.cpp
index 13d0e8d8c..2820c8f7c 100644
--- a/src/mltconnection.cpp
+++ b/src/mltconnection.cpp
@@ -136,14 +136,14 @@ void MltConnection::locateMeltAndProfilesPath(const QString &mltPath)
#endif
QString meltPath;
if (qEnvironmentVariableIsSet("MLT_PREFIX")) {
- meltPath = qgetenv("MLT_PREFIX") + QStringLiteral("/bin/melt") + exeSuffix;
+ meltPath = qgetenv("MLT_PREFIX") + QStringLiteral("/bin/melt6") + exeSuffix;
} else {
meltPath = KdenliveSettings::rendererpath();
}
if (!QFile::exists(meltPath)) {
- meltPath = QDir::cleanPath(profilePath + QStringLiteral("/../../../bin/melt")) + exeSuffix;
+ meltPath = QDir::cleanPath(profilePath + QStringLiteral("/../../../bin/melt6")) + exeSuffix;
if (!QFile::exists(meltPath)) {
- meltPath = QStandardPaths::findExecutable("melt");
+ meltPath = QStandardPaths::findExecutable("melt6");
if (meltPath.isEmpty()) {
meltPath = QStandardPaths::findExecutable("mlt-melt");
}
@@ -54,6 +54,9 @@
<Dependency>kdeclarative-devel</Dependency>
<Dependency>kcrash-devel</Dependency>
</BuildDependencies>
<Patches>
<Patch level="1">kdenlive-mlt6.patch</Patch>
</Patches>
</Source>
<Package>