[kdenlive]: upgrade to v22.04.0

2 files changed, 8 insertions, 39 deletions

diff --git a/libre/kdenlive/PKGBUILD b/libre/kdenlive/PKGBUILD
index c80c13b49..e4bb8d34d 100644
--- a/libre/kdenlive/PKGBUILD
+++ b/libre/kdenlive/PKGBUILD
@@ -11,7 +11,7 @@
 
 
 pkgname=kdenlive
-pkgver=21.04.1
+pkgver=22.04.0
 pkgrel=1
 pkgrel+=.parabola1
 pkgdesc='A non-linear video editor for Linux using the MLT video framework'
@@ -20,36 +20,27 @@ arch+=(armv7h i686)
 url='https://apps.kde.org/kdenlive/'
 license=(GPL)
 groups=(kde-applications kde-multimedia)
-depends=(qt5-networkauth knewstuff knotifyconfig kfilemetadata purpose mlt6 rttr breeze-icons frei0r-plugins)
-makedepends=(extra-cmake-modules kdoctools v4l-utils)
+depends=(qt5-networkauth knewstuff knotifyconfig kfilemetadata purpose mlt breeze-icons frei0r-plugins)
+makedepends=(extra-cmake-modules kdoctools v4l-utils doxygen qt5-tools)
 # makedepends_i686=('kcodecs>=5.79.0' 'kconfig>=5.79.0') # in [testing]
 optdepends=('ffmpeg: for FFmpeg plugin'
-            'cdrtools: for creation of DVD ISO images'
-            'dvdauthor: for creation of DVD'
             'dvgrab: for firewire capture'
             'recordmydesktop: for screen capture'
-            'xine-ui: for DVD preview'
-            'vlc: for DVD preview'
             '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}
-        kdenlive-mlt6.patch)
-sha256sums=('9c2d0bc76b86fdf83cae1ac8c40b7630afbce4b92f9fd095bcfba1186851ef41'
-            'SKIP'
-            'db0819cea73fc7c2926c39a3de66fba86e94a6ca2e1f97e7bad1166ac6aec5bb')
+source=(https://download.kde.org/stable/release-service/$pkgver/src/$pkgname-$pkgver.tar.xz{,.sig})
+sha256sums=('66147b2f1a2cf6f05eda15e4cc3e9d9b126d2dbcc187ecc6d78dea2c7b2c6d79'
+            'SKIP')
 validpgpkeys=(CA262C6C83DE4D2FB28A332A3A6A4DB839EAA6D7  # Albert Astals Cid <aacid@kde.org>
               F23275E4BF10AFC1DF6914A6DBD2CE893E2D1C87  # Christoph Feck <cfeck@kde.org>
               D81C0CB38EB725EF6691C385BB463350D6EF31EF) # Heiko Becker <heiko.becker@kde.org>
-
-prepare() {
-  patch -d $pkgname-$pkgver -p1 < kdenlive-mlt6.patch # Use melt6 executable name
-}
+options=(debug)
 
 build() {
   cmake -B build -S $pkgname-$pkgver \
     -DBUILD_TESTING=OFF \
-    -DCRASH_AUTO_TEST=ON
+    -DBUILD_QCH=ON
   cmake --build build
 }
 
diff --git a/libre/kdenlive/kdenlive-mlt6.patch b/libre/kdenlive/kdenlive-mlt6.patch
deleted file mode 100644
index f86f93da9..000000000
--- a/libre/kdenlive/kdenlive-mlt6.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-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");
-             }