Date: Thursday, May 6, 2021 @ 07:03:18 Author: arojas Revision: 414436
Use melt6 executable name Added: kdenlive/trunk/kdenlive-mlt6.patch Modified: kdenlive/trunk/PKGBUILD ---------------------+ PKGBUILD | 12 +++++++++--- kdenlive-mlt6.patch | 22 ++++++++++++++++++++++ 2 files changed, 31 insertions(+), 3 deletions(-) Modified: PKGBUILD =================================================================== --- PKGBUILD 2021-05-06 06:44:36 UTC (rev 414435) +++ PKGBUILD 2021-05-06 07:03:18 UTC (rev 414436) @@ -6,7 +6,7 @@ pkgname=kdenlive pkgver=21.04.0 -pkgrel=2 +pkgrel=3 pkgdesc='A non-linear video editor for Linux using the MLT video framework' arch=(x86_64) url='https://apps.kde.org/kdenlive/' @@ -24,13 +24,19 @@ 'opencv: for motion tracking' 'plasma-desktop: theme configuration' 'opentimelineio: timeline export/import') -source=(https://download.kde.org/stable/release-service/$pkgver/src/$pkgname-$pkgver.tar.xz{,.sig}) +source=(https://download.kde.org/stable/release-service/$pkgver/src/$pkgname-$pkgver.tar.xz{,.sig} + kdenlive-mlt6.patch) sha256sums=('b0be8f0adef51d3305ec6bebde089b8e4d2fb4519c83456cd91647e7763d4bdf' - 'SKIP') + 'SKIP' + 'db0819cea73fc7c2926c39a3de66fba86e94a6ca2e1f97e7bad1166ac6aec5bb') validpgpkeys=(CA262C6C83DE4D2FB28A332A3A6A4DB839EAA6D7 # Albert Astals Cid <[email protected]> F23275E4BF10AFC1DF6914A6DBD2CE893E2D1C87 # Christoph Feck <[email protected]> D81C0CB38EB725EF6691C385BB463350D6EF31EF) # Heiko Becker <[email protected]> +prepare() { + patch -d $pkgname-$pkgver -p1 < kdenlive-mlt6.patch # Use melt6 executable name +} + build() { cmake -B build -S $pkgname-$pkgver \ -DBUILD_TESTING=OFF \ Added: kdenlive-mlt6.patch =================================================================== --- kdenlive-mlt6.patch (rev 0) +++ kdenlive-mlt6.patch 2021-05-06 07:03:18 UTC (rev 414436) @@ -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"); + }
