git » kdenlive.git » commit cba20f7

Update to 21.08.0

author Antonio Rojas
2021-08-12 09:05:06 UTC
committer Antonio Rojas
2021-08-12 09:05:06 UTC
parent 2f864e18292f1a76b4d7d2ff6bcfca7eb4725fcd

Update to 21.08.0

PKGBUILD +7 -17
kdenlive-mlt6.patch +0 -22

diff --git a/PKGBUILD b/PKGBUILD
index 2cab645..24061c5 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -5,42 +5,32 @@
 # Contributor: Gustavo Alvarez <sl1pkn07@gmail.com>
 
 pkgname=kdenlive
-pkgver=21.04.3
+pkgver=21.08.0
 pkgrel=1
 pkgdesc='A non-linear video editor for Linux using the MLT video framework'
 arch=(x86_64)
 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)
 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=('754fae49644afbc8ecc0f5a4d579f09738f189a7626c99f862e5e4cdb6426df1'
-            'SKIP'
-            'db0819cea73fc7c2926c39a3de66fba86e94a6ca2e1f97e7bad1166ac6aec5bb')
+source=(https://download.kde.org/stable/release-service/$pkgver/src/$pkgname-$pkgver.tar.xz{,.sig})
+sha256sums=('e441df27deab64cb342f4b1b874313f149950d4baada12f074ad833aa996ce22'
+            '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
-}
-
 build() {
   cmake -B build -S $pkgname-$pkgver \
     -DBUILD_TESTING=OFF \
-    -DCRASH_AUTO_TEST=ON
+    -DBUILD_QCH=ON
   cmake --build build
 }
 
diff --git a/kdenlive-mlt6.patch b/kdenlive-mlt6.patch
deleted file mode 100644
index f86f93d..0000000
--- a/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");
-             }