Get Gentoo!
gentoo.org sites
gentoo.org Wiki Bugs Forums Packages
Planet Archives Sources
Infra Status
summaryrefslogtreecommitdiff
path: root/kde-apps/kdenlive
diff options
context:
space:
mode:
Diffstat (limited to 'kde-apps/kdenlive')
-rw-r--r--kde-apps/kdenlive/Manifest1
-rw-r--r--kde-apps/kdenlive/files/kdenlive-19.08.3-qt-5.14-1.patch203
-rw-r--r--kde-apps/kdenlive/files/kdenlive-19.08.3-qt-5.14-2.patch32
-rw-r--r--kde-apps/kdenlive/kdenlive-19.08.3.ebuild91
4 files changed, 0 insertions, 327 deletions
diff --git a/kde-apps/kdenlive/Manifest b/kde-apps/kdenlive/Manifest
index 7f059f1578b9..f12625af90cc 100644
--- a/kde-apps/kdenlive/Manifest
+++ b/kde-apps/kdenlive/Manifest
@@ -1,2 +1 @@
-DIST kdenlive-19.08.3.tar.xz 12418064 BLAKE2B bf0765e28f374a21371a9bf3fbc6059d6ac81118d79b0978fd10a3c4959f1343d06773ae278cb6e9a3890c1c1daff79f0a709cebd186b1bc586318e5384ca5da SHA512 187651de7542b86f9332c3eb79e2a27b664f0b4ead19fbb6035963b7be41a2a53b65de37e8c18c50aa794145cfaa2ebaf1b9f721d379c014da9c5f9475048738
DIST kdenlive-19.12.3.tar.xz 11393740 BLAKE2B a41d52a028204ad689b947aa0964afa5edb521f5560c2c6702df0a66d85ff9e3bbd31fcd2339b6586cdb2559d9041b6551bbbaf65a1cccde554f4bf2c1ac4492 SHA512 f3e96ec336fdbecfb1c98eef8af87ce98c32ebd16f9810c9d12d1bbe7b23af3c1272396f46799b68d455a243500a3fb0532ad935bde0f25fd5e14e318c3530ad
diff --git a/kde-apps/kdenlive/files/kdenlive-19.08.3-qt-5.14-1.patch b/kde-apps/kdenlive/files/kdenlive-19.08.3-qt-5.14-1.patch
deleted file mode 100644
index 76822413f107..000000000000
--- a/kde-apps/kdenlive/files/kdenlive-19.08.3-qt-5.14-1.patch
+++ /dev/null
@@ -1,203 +0,0 @@
-From 3c287e282f84231f1e71482464e9593d7de27912 Mon Sep 17 00:00:00 2001
-From: Laurent Montel <montel@kde.org>
-Date: Fri, 27 Sep 2019 08:59:21 +0200
-Subject: Port some deprecated methods
-
----
- renderer/renderjob.cpp | 3 ++-
- src/assets/keyframes/view/keyframeview.cpp | 4 ++--
- src/bin/bin.cpp | 2 +-
- src/dvdwizard/dvdwizardvob.cpp | 2 +-
- src/lib/audio/audioCorrelation.cpp | 3 ++-
- src/lib/audio/fftCorrelation.cpp | 4 ++--
- src/lib/qtimerWithTime.cpp | 2 +-
- src/lib/qtimerWithTime.h | 6 +++---
- src/project/projectmanager.h | 3 ++-
- src/titler/unicodedialog.cpp | 2 +-
- 10 files changed, 17 insertions(+), 14 deletions(-)
-
-diff --git a/renderer/renderjob.cpp b/renderer/renderjob.cpp
-index 2214b37..c164bf0 100644
---- a/renderer/renderjob.cpp
-+++ b/renderer/renderjob.cpp
-@@ -23,6 +23,7 @@
- #include <QStringList>
- #include <QThread>
- #include <QtDBus>
-+#include <QElapsedTimer>
- #include <utility>
- // Can't believe I need to do this to sleep.
- class SleepThread : QThread
-@@ -165,7 +166,7 @@ void RenderJob::start()
- qWarning() << "No org.kde.JobViewServer registered, trying to start kuiserver";
- if (QProcess::startDetached(QStringLiteral("kuiserver"))) {
- // Give it a couple of seconds to start
-- QTime t;
-+ QElapsedTimer t;
- t.start();
- while (!interface->isServiceRegistered(QStringLiteral("org.kde.JobViewServer")) && t.elapsed() < 3000) {
- SleepThread::msleep(100); // Sleep 100 ms
-diff --git a/src/assets/keyframes/view/keyframeview.cpp b/src/assets/keyframes/view/keyframeview.cpp
-index 7e63141..867408f 100644
---- a/src/assets/keyframes/view/keyframeview.cpp
-+++ b/src/assets/keyframes/view/keyframeview.cpp
-@@ -267,14 +267,14 @@ void KeyframeView::mouseDoubleClickEvent(QMouseEvent *event)
- void KeyframeView::wheelEvent(QWheelEvent *event)
- {
- if (event->modifiers() & Qt::AltModifier) {
-- if (event->delta() > 0) {
-+ if (event->angleDelta().y() > 0) {
- slotGoToPrev();
- } else {
- slotGoToNext();
- }
- return;
- }
-- int change = event->delta() > 0 ? -1 : 1;
-+ int change = event->angleDelta().y() > 0 ? -1 : 1;
- int pos = qBound(0, m_position + change, m_duration - 1);
- emit seekToPos(pos);
- }
-diff --git a/src/bin/bin.cpp b/src/bin/bin.cpp
-index 13c9b2a..c1127d0 100644
---- a/src/bin/bin.cpp
-+++ b/src/bin/bin.cpp
-@@ -222,7 +222,7 @@ public:
- // Draw usage counter
- int usage = index.data(AbstractProjectItem::UsageCount).toInt();
- if (usage > 0) {
-- subText.append(QString().sprintf(" [%d]", usage));
-+ subText.append(QString::asprintf(" [%d]", usage));
- }
- painter->drawText(r2, Qt::AlignLeft | Qt::AlignTop, subText, &bounding);
-
-diff --git a/src/dvdwizard/dvdwizardvob.cpp b/src/dvdwizard/dvdwizardvob.cpp
-index 337d046..f5c89d6 100644
---- a/src/dvdwizard/dvdwizardvob.cpp
-+++ b/src/dvdwizard/dvdwizardvob.cpp
-@@ -86,7 +86,7 @@ DvdWizardVob::DvdWizardVob(QWidget *parent)
- m_view.button_down->setIcon(QIcon::fromTheme(QStringLiteral("go-down")));
- m_vobList = new DvdTreeWidget(this);
- auto *lay1 = new QVBoxLayout;
-- lay1->setMargin(0);
-+ lay1->setContentsMargins(0, 0, 0, 0);
- lay1->addWidget(m_vobList);
- m_view.list_frame->setLayout(lay1);
- m_vobList->setColumnCount(3);
-diff --git a/src/lib/audio/audioCorrelation.cpp b/src/lib/audio/audioCorrelation.cpp
-index 706b48a..66552fa 100644
---- a/src/lib/audio/audioCorrelation.cpp
-+++ b/src/lib/audio/audioCorrelation.cpp
-@@ -14,6 +14,7 @@ the Free Software Foundation, either version 3 of the License, or
- #include "kdenlive_debug.h"
- #include "klocalizedstring.h"
- #include <QTime>
-+#include <QElapsedTimer>
- #include <cmath>
- #include <iostream>
-
-@@ -128,7 +129,7 @@ void AudioCorrelation::correlate(const qint64 *envMain, size_t sizeMain, const q
-
- */
-
-- QTime t;
-+ QElapsedTimer t;
- t.start();
- for (int shift = -(int)sizeSub; shift <= (int)sizeMain; ++shift) {
-
-diff --git a/src/lib/audio/fftCorrelation.cpp b/src/lib/audio/fftCorrelation.cpp
-index c8119e9..6ed61c5 100644
---- a/src/lib/audio/fftCorrelation.cpp
-+++ b/src/lib/audio/fftCorrelation.cpp
-@@ -9,7 +9,7 @@ the Free Software Foundation, either version 3 of the License, or
- */
-
- #include "fftCorrelation.h"
--
-+#include <QElapsedTimer>
- extern "C" {
- #include "../external/kiss_fft/tools/kiss_fftr.h"
- }
-@@ -35,7 +35,7 @@ void FFTCorrelation::correlate(const qint64 *left, const size_t leftSize, const
-
- void FFTCorrelation::correlate(const qint64 *left, const size_t leftSize, const qint64 *right, const size_t rightSize, float *out_correlated)
- {
-- QTime t;
-+ QElapsedTimer t;
- t.start();
-
- auto *leftF = new float[leftSize];
-diff --git a/src/lib/qtimerWithTime.cpp b/src/lib/qtimerWithTime.cpp
-index 1d8b46f..9c1b362 100644
---- a/src/lib/qtimerWithTime.cpp
-+++ b/src/lib/qtimerWithTime.cpp
-@@ -25,7 +25,7 @@ void QTimerWithTime::start(int msec)
- m_time.start();
- }
-
--int QTimerWithTime::elapsed() const
-+qint64 QTimerWithTime::elapsed() const
- {
- return m_time.elapsed();
- }
-diff --git a/src/lib/qtimerWithTime.h b/src/lib/qtimerWithTime.h
-index ab3e1c7..93f0d53 100644
---- a/src/lib/qtimerWithTime.h
-+++ b/src/lib/qtimerWithTime.h
-@@ -20,7 +20,7 @@
- #ifndef QTIMERWITHTIME_H
- #define QTIMERWITHTIME_H
-
--#include <QTime>
-+#include <QElapsedTimer>
- #include <QTimer>
-
- class QTimerWithTime : public QTimer
-@@ -28,9 +28,9 @@ class QTimerWithTime : public QTimer
- Q_OBJECT
- public:
- virtual void start(int msec);
-- int elapsed() const;
-+ qint64 elapsed() const;
-
- private:
-- QTime m_time;
-+ QElapsedTimer m_time;
- };
- #endif
-diff --git a/src/project/projectmanager.h b/src/project/projectmanager.h
-index a8a5fbd..d91314c 100644
---- a/src/project/projectmanager.h
-+++ b/src/project/projectmanager.h
-@@ -18,6 +18,7 @@ the Free Software Foundation, either version 3 of the License, or
- #include <QTime>
- #include <QTimer>
- #include <QUrl>
-+#include <QElapsedTimer>
-
- #include "timeline2/model/timelineitemmodel.hpp"
-
-@@ -182,7 +183,7 @@ private:
-
- KdenliveDoc *m_project{nullptr};
- std::shared_ptr<TimelineItemModel> m_mainTimelineModel;
-- QTime m_lastSave;
-+ QElapsedTimer m_lastSave;
- QTimer m_autoSaveTimer;
- QUrl m_startUrl;
- QString m_loadClipsOnOpen;
-diff --git a/src/titler/unicodedialog.cpp b/src/titler/unicodedialog.cpp
-index d6b7382..f449aa2 100644
---- a/src/titler/unicodedialog.cpp
-+++ b/src/titler/unicodedialog.cpp
-@@ -409,7 +409,7 @@ void UnicodeWidget::slotPrevUnicode()
- void UnicodeWidget::wheelEvent(QWheelEvent *event)
- {
- if (frame->underMouse()) {
-- if (event->delta() > 0) {
-+ if (event->angleDelta().y() > 0) {
- slotNextUnicode();
- } else {
- slotPrevUnicode();
---
-cgit v1.1
diff --git a/kde-apps/kdenlive/files/kdenlive-19.08.3-qt-5.14-2.patch b/kde-apps/kdenlive/files/kdenlive-19.08.3-qt-5.14-2.patch
deleted file mode 100644
index 13d2fd39d4bc..000000000000
--- a/kde-apps/kdenlive/files/kdenlive-19.08.3-qt-5.14-2.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-From caf88fd638f67b505aa28521b6abda430f03e7c8 Mon Sep 17 00:00:00 2001
-From: Heiko Becker <heirecka@exherbo.org>
-Date: Thu, 31 Oct 2019 20:33:54 +0100
-Subject: [PATCH] Fix build with Qt 5.14
-
-std::hash<QString> is already specialized in Qt 5.14 [1], so we need
-to avoid redifining it with this version.
-
-[1] 4469e36d7203a55a4e158a50f0e9effc3f2fa3c2 in qtbase.git
----
- src/definitions.h | 2 ++
- 1 file changed, 2 insertions(+)
-
-diff --git a/src/definitions.h b/src/definitions.h
-index a55ec8df7..d2f67815b 100644
---- a/src/definitions.h
-+++ b/src/definitions.h
-@@ -252,10 +252,12 @@ QDebug operator<<(QDebug qd, const ItemInfo &info);
-
- // we provide hash function for qstring and QPersistentModelIndex
- namespace std {
-+#if (QT_VERSION < QT_VERSION_CHECK(5, 14, 0))
- template <> struct hash<QString>
- {
- std::size_t operator()(const QString &k) const { return qHash(k); }
- };
-+#endif
- template <> struct hash<QPersistentModelIndex>
- {
- std::size_t operator()(const QPersistentModelIndex &k) const { return qHash(k); }
---
-2.17.1
diff --git a/kde-apps/kdenlive/kdenlive-19.08.3.ebuild b/kde-apps/kdenlive/kdenlive-19.08.3.ebuild
deleted file mode 100644
index 011c389d9b2b..000000000000
--- a/kde-apps/kdenlive/kdenlive-19.08.3.ebuild
+++ /dev/null
@@ -1,91 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ECM_HANDBOOK="optional"
-ECM_TEST="true"
-VIRTUALX_REQUIRED="test"
-KFMIN=5.60.0
-QTMIN=5.12.3
-inherit ecm kde.org
-
-DESCRIPTION="Non-linear video editing suite by KDE"
-HOMEPAGE="https://www.kdenlive.org/"
-
-LICENSE="GPL-2"
-SLOT="5"
-KEYWORDS="arm64"
-IUSE="freesound gles2 semantic-desktop share v4l"
-
-BDEPEND="
- sys-devel/gettext
-"
-DEPEND="
- >=kde-frameworks/karchive-${KFMIN}:5
- >=kde-frameworks/kbookmarks-${KFMIN}:5
- >=kde-frameworks/kcompletion-${KFMIN}:5
- >=kde-frameworks/kconfig-${KFMIN}:5
- >=kde-frameworks/kconfigwidgets-${KFMIN}:5
- >=kde-frameworks/kcoreaddons-${KFMIN}:5
- >=kde-frameworks/kcrash-${KFMIN}:5
- >=kde-frameworks/kdbusaddons-${KFMIN}:5
- >=kde-frameworks/kdeclarative-${KFMIN}:5
- >=kde-frameworks/kguiaddons-${KFMIN}:5
- >=kde-frameworks/ki18n-${KFMIN}:5
- >=kde-frameworks/kiconthemes-${KFMIN}:5
- >=kde-frameworks/kio-${KFMIN}:5
- >=kde-frameworks/kitemviews-${KFMIN}:5
- >=kde-frameworks/kjobwidgets-${KFMIN}:5
- >=kde-frameworks/knewstuff-${KFMIN}:5
- >=kde-frameworks/knotifications-${KFMIN}:5
- >=kde-frameworks/knotifyconfig-${KFMIN}:5
- >=kde-frameworks/kservice-${KFMIN}:5
- >=kde-frameworks/ktextwidgets-${KFMIN}:5
- >=kde-frameworks/kwidgetsaddons-${KFMIN}:5
- >=kde-frameworks/kxmlgui-${KFMIN}:5
- >=kde-frameworks/solid-${KFMIN}:5
- >=dev-qt/qtconcurrent-${QTMIN}:5
- >=dev-qt/qtdbus-${QTMIN}:5
- >=dev-qt/qtdeclarative-${QTMIN}:5
- >=dev-qt/qtgui-${QTMIN}:5[gles2=]
- >=dev-qt/qtmultimedia-${QTMIN}:5
- >=dev-qt/qtnetwork-${QTMIN}:5
- >=dev-qt/qtsvg-${QTMIN}:5
- >=dev-qt/qtwidgets-${QTMIN}:5
- >=dev-qt/qtxml-${QTMIN}:5
- dev-cpp/rttr
- >=media-libs/mlt-6.16.0[ffmpeg,frei0r,kdenlive,melt,qt5,sdl,xml]
- freesound? ( >=dev-qt/qtwebkit-5.212.0_pre20180120:5 )
- semantic-desktop? ( >=kde-frameworks/kfilemetadata-${KFMIN}:5 )
- share? ( >=kde-frameworks/purpose-${KFMIN}:5 )
- v4l? ( media-libs/libv4l )
-"
-RDEPEND="${DEPEND}
- >=dev-qt/qtquickcontrols-${QTMIN}:5
- virtual/ffmpeg[encode,sdl,X]
-"
-
-RESTRICT+=" test" # segfaults, bug 684132
-
-PATCHES=( "${FILESDIR}"/${P}-qt-5.14-{1,2}.patch )
-
-src_configure() {
- local mycmakeargs=(
- $(cmake_use_find_package freesound Qt5WebKitWidgets)
- $(cmake_use_find_package semantic-desktop KF5FileMetaData)
- $(cmake_use_find_package share KF5Purpose)
- $(cmake_use_find_package v4l LibV4L2)
- )
-
- ecm_src_configure
-}
-
-pkg_postinst() {
- ecm_pkg_postinst
-
- # Gentoo bug 603168
- if ! has_version "media-libs/mlt[fftw]" ; then
- elog "For 'Crop and Transform/Rotate and Shear' effect, please build media-libs/mlt with USE=fftw enabled."
- fi
-}