[arch-commits] Commit in kdenlive/repos/extra-x86_64 (4 files)

Antonio Rojas arojas at archlinux.org
Fri Jun 18 16:25:47 UTC 2021


    Date: Friday, June 18, 2021 @ 16:25:46
  Author: arojas
Revision: 418435

archrelease: copy trunk to extra-x86_64

Added:
  kdenlive/repos/extra-x86_64/PKGBUILD
    (from rev 418434, kdenlive/trunk/PKGBUILD)
  kdenlive/repos/extra-x86_64/kdenlive-mlt6.patch
    (from rev 418434, kdenlive/trunk/kdenlive-mlt6.patch)
Deleted:
  kdenlive/repos/extra-x86_64/PKGBUILD
  kdenlive/repos/extra-x86_64/kdenlive-mlt6.patch

---------------------+
 PKGBUILD            |  101 +++++++++++++++++++++++++-------------------------
 kdenlive-mlt6.patch |   44 ++++++++++-----------
 2 files changed, 74 insertions(+), 71 deletions(-)

Deleted: PKGBUILD
===================================================================
--- PKGBUILD	2021-06-18 16:25:35 UTC (rev 418434)
+++ PKGBUILD	2021-06-18 16:25:46 UTC (rev 418435)
@@ -1,49 +0,0 @@
-# Maintainer: Antonio Rojas <arojas at archlinux.org>
-# Contributor: Sergej Pupykin <pupykin.s+arch at gmail.com>
-# Contributor: Zuf <kontakt.zuf at gmail.com>
-# Contributor: Darwin Bautista <djclue917 at gmail.com>
-# Contributor: Gustavo Alvarez <sl1pkn07 at gmail.com>
-
-pkgname=kdenlive
-pkgver=21.04.2
-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)
-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=('5510106b6bdda3f2048702b23d90f7438d4ec4d2ddb932e53df716e6d4afdd4f'
-            'SKIP'
-            'db0819cea73fc7c2926c39a3de66fba86e94a6ca2e1f97e7bad1166ac6aec5bb')
-validpgpkeys=(CA262C6C83DE4D2FB28A332A3A6A4DB839EAA6D7  # Albert Astals Cid <aacid at kde.org>
-              F23275E4BF10AFC1DF6914A6DBD2CE893E2D1C87  # Christoph Feck <cfeck at kde.org>
-              D81C0CB38EB725EF6691C385BB463350D6EF31EF) # Heiko Becker <heiko.becker at 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
-  cmake --build build
-}
-
-package() {
-  DESTDIR="$pkgdir" cmake --install build
-}

Copied: kdenlive/repos/extra-x86_64/PKGBUILD (from rev 418434, kdenlive/trunk/PKGBUILD)
===================================================================
--- PKGBUILD	                        (rev 0)
+++ PKGBUILD	2021-06-18 16:25:46 UTC (rev 418435)
@@ -0,0 +1,52 @@
+# Maintainer: Antonio Rojas <arojas at archlinux.org>
+# Contributor: Sergej Pupykin <pupykin.s+arch at gmail.com>
+# Contributor: Zuf <kontakt.zuf at gmail.com>
+# Contributor: Darwin Bautista <djclue917 at gmail.com>
+# Contributor: Gustavo Alvarez <sl1pkn07 at gmail.com>
+
+pkgname=kdenlive
+pkgver=21.04.2
+pkgrel=2
+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)
+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
+        https://invent.kde.org/multimedia/kdenlive/commit/185b3036.patch)
+sha256sums=('5510106b6bdda3f2048702b23d90f7438d4ec4d2ddb932e53df716e6d4afdd4f'
+            'SKIP'
+            'db0819cea73fc7c2926c39a3de66fba86e94a6ca2e1f97e7bad1166ac6aec5bb'
+            '2b82e00650db2e63c6717a00550158bd748a2c0556e4620344e18b4a52ae20a0')
+validpgpkeys=(CA262C6C83DE4D2FB28A332A3A6A4DB839EAA6D7  # Albert Astals Cid <aacid at kde.org>
+              F23275E4BF10AFC1DF6914A6DBD2CE893E2D1C87  # Christoph Feck <cfeck at kde.org>
+              D81C0CB38EB725EF6691C385BB463350D6EF31EF) # Heiko Becker <heiko.becker at kde.org>
+
+prepare() {
+  patch -d $pkgname-$pkgver -p1 < kdenlive-mlt6.patch # Use melt6 executable name
+  patch -d $pkgname-$pkgver -p1 < 185b3036.patch # Fix startup crash on Wayland
+}
+
+build() {
+  cmake -B build -S $pkgname-$pkgver \
+    -DBUILD_TESTING=OFF \
+    -DCRASH_AUTO_TEST=ON
+  cmake --build build
+}
+
+package() {
+  DESTDIR="$pkgdir" cmake --install build
+}

Deleted: kdenlive-mlt6.patch
===================================================================
--- kdenlive-mlt6.patch	2021-06-18 16:25:35 UTC (rev 418434)
+++ kdenlive-mlt6.patch	2021-06-18 16:25:46 UTC (rev 418435)
@@ -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");
-             }

Copied: kdenlive/repos/extra-x86_64/kdenlive-mlt6.patch (from rev 418434, kdenlive/trunk/kdenlive-mlt6.patch)
===================================================================
--- kdenlive-mlt6.patch	                        (rev 0)
+++ kdenlive-mlt6.patch	2021-06-18 16:25:46 UTC (rev 418435)
@@ -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");
+             }



More information about the arch-commits mailing list