From 623ee73d661e5ed8475cb264511f683407d87365 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sun, 12 Apr 2020 03:41:30 +0100 Subject: gentoo Easter resync : 12.04.2020 --- kde-apps/kdenlive/Manifest | 12 +- .../files/kdenlive-19.08.3-qt-5.14-1.patch | 203 --------------------- .../files/kdenlive-19.08.3-qt-5.14-2.patch | 32 ---- ...kdenlive-19.12.3-qt-5.14-crash-on-close-1.patch | 69 +++++++ ...kdenlive-19.12.3-qt-5.14-crash-on-close-2.patch | 62 +++++++ kde-apps/kdenlive/kdenlive-19.08.3.ebuild | 91 --------- kde-apps/kdenlive/kdenlive-19.12.2.ebuild | 87 --------- kde-apps/kdenlive/kdenlive-19.12.3-r2.ebuild | 91 +++++++++ kde-apps/kdenlive/metadata.xml | 1 - 9 files changed, 227 insertions(+), 421 deletions(-) delete mode 100644 kde-apps/kdenlive/files/kdenlive-19.08.3-qt-5.14-1.patch delete mode 100644 kde-apps/kdenlive/files/kdenlive-19.08.3-qt-5.14-2.patch create mode 100644 kde-apps/kdenlive/files/kdenlive-19.12.3-qt-5.14-crash-on-close-1.patch create mode 100644 kde-apps/kdenlive/files/kdenlive-19.12.3-qt-5.14-crash-on-close-2.patch delete mode 100644 kde-apps/kdenlive/kdenlive-19.08.3.ebuild delete mode 100644 kde-apps/kdenlive/kdenlive-19.12.2.ebuild create mode 100644 kde-apps/kdenlive/kdenlive-19.12.3-r2.ebuild (limited to 'kde-apps/kdenlive') diff --git a/kde-apps/kdenlive/Manifest b/kde-apps/kdenlive/Manifest index d0238e3a8be5..8b7ba8435843 100644 --- a/kde-apps/kdenlive/Manifest +++ b/kde-apps/kdenlive/Manifest @@ -1,7 +1,5 @@ -AUX kdenlive-19.08.3-qt-5.14-1.patch 7106 BLAKE2B c2c3e00603ec83fd98af7a4350f08e422e4e6e5f086119d30637608d10229f2cecde5789af060596bd51991c1f28bd88aafad945c1278266800fcf0282cc1194 SHA512 9076bd07c418be6376d83e223010bb0e64e159a0fb8aef9e58479811158ca851fedd9cd30c42086bfa13edb230dbcf61ad9bd1be4e6570c76d0abab92a685d9a -AUX kdenlive-19.08.3-qt-5.14-2.patch 1038 BLAKE2B 2e45cbd32a81fd70eb6794ad4aeaf87f9f5dddce820237b00a4aceaea9a02c212cdd7727c414788c23baeebd52231e8fdbbb80a79b85ae89bbc93e0606bcf816 SHA512 0abd4615c6eaff86836220cb39b2785a40436324c701a253a4d1cc8f6aad37a7d11a3c75338f34a1f50cab68a869230af5c74d6d00e8827f77b4016cc877986e -DIST kdenlive-19.08.3.tar.xz 12418064 BLAKE2B bf0765e28f374a21371a9bf3fbc6059d6ac81118d79b0978fd10a3c4959f1343d06773ae278cb6e9a3890c1c1daff79f0a709cebd186b1bc586318e5384ca5da SHA512 187651de7542b86f9332c3eb79e2a27b664f0b4ead19fbb6035963b7be41a2a53b65de37e8c18c50aa794145cfaa2ebaf1b9f721d379c014da9c5f9475048738 -DIST kdenlive-19.12.2.tar.xz 11441780 BLAKE2B c91d456a2b2ce61962cfd2d02d87d73410b763649084c541bbe24bb0585f5e38f0c262a1baf08322f6d35eb0838f8651b7a5cc1da3de72212341d26803c8020b SHA512 c6773d09aa9af2284ff93ee0bb163dd553b15891c0262350975902b076d5465ad664181e009023aac179dea84b837bc4c7dcd5b4b3914e9f99c624e89e962ba4 -EBUILD kdenlive-19.08.3.ebuild 2602 BLAKE2B ea19aa28bf618a45c937223a494eb038766a64364146cc741798a16f96bc865981e74e27dead848a9414c3cdfa53b3c0d81dd991a2c168fd46041bb014673bc9 SHA512 679b492f6a3480a72e902c8f59533e8b507d415695c92943ade61470c12029afbb10ac18021444731910cd90332e3d245fc57516874bc8bf39770d2f5fb7f904 -EBUILD kdenlive-19.12.2.ebuild 2516 BLAKE2B 915879a5fcc889b1b579946bbff976cdd48e9f97890afccb781d3829f8273a1ea18e6aa6156060f260d6f433584ddfbe1748c39563eda7aa78d5b3ac5cc78cf1 SHA512 43bf287318543d4464b6c88860e4b23484ced00f131d7c9e414db4e588e547460be90f79c6c483159347312b0cd2ce65626a77bcc56e87d413d3be92f1018313 -MISC metadata.xml 559 BLAKE2B 4fb6ac38398866a869611dcdc0d9513c5618e7b1864b221d155e5bf1200ffd1081ff8b7dc408d85a97be6146eaf60b1ff1ac695c02e22c2a1537b18a8a1d8f4c SHA512 b76a5322a9fe2a6b7597ac7a6c45525e921cd0102e156939e013c96d876b355b258c0bb917e72a73686819672a2a5a47e7c7d0232468c709e4e88f888ee26cbb +AUX kdenlive-19.12.3-qt-5.14-crash-on-close-1.patch 2628 BLAKE2B 96cdf43294b453f8b10a7aef762735070ba8f89e7a8626b2e614d91ca77e4d7f27b0ddb104b8be81ceb26505c9f8863a32e550a8c1fb59dd28826e860ae1518f SHA512 85cdb2b3aff8e65910ae81583ca22715f482f08e446ecafedf885a3522ca47cd8ef3ef118d4169c069e06ece2e9b97953dce6839e78b18cfe509a47df5b4029e +AUX kdenlive-19.12.3-qt-5.14-crash-on-close-2.patch 2753 BLAKE2B c3a34521a8314d5d4fa5a9b2e68d6fb9081cd2878eb91b06a9411bcaca77824c1d0d7a0232eb92f6e2a6790717ee8bbcdc4860f930c8a30015b96c62b3afcf60 SHA512 13e4f938e47c605aca526d2578ea83cbc00c4fe9cade5e8a63a56b35044915327eb5cf5878589d7d67aaced815d364fc4541a413e5a99276d9f031595a5a60fa +DIST kdenlive-19.12.3.tar.xz 11393740 BLAKE2B a41d52a028204ad689b947aa0964afa5edb521f5560c2c6702df0a66d85ff9e3bbd31fcd2339b6586cdb2559d9041b6551bbbaf65a1cccde554f4bf2c1ac4492 SHA512 f3e96ec336fdbecfb1c98eef8af87ce98c32ebd16f9810c9d12d1bbe7b23af3c1272396f46799b68d455a243500a3fb0532ad935bde0f25fd5e14e318c3530ad +EBUILD kdenlive-19.12.3-r2.ebuild 2648 BLAKE2B 4e12bf9d02195a371427f6553d0375f7f320cdd78faf4112b6e2d5c812f6d1bd2a3608a4ae43a49582b32d1d774fc1f3956c93813639b7b26997da6476cd0e0a SHA512 dc399dd5303576ddaa593885df4556118a095f86ad8f78f6697f9fffa5c39bc81df95a0da1df062518f6b6040535d1a0314bdf48972623530d6102c71e9c27c2 +MISC metadata.xml 486 BLAKE2B fb7e3b5c16a68c4993cadc893d28438138d81e74ed899c0e56230e7284913af8237269483eefdebd77e6a4880023d6d5e1d200debc1e916761d7156fddc59c41 SHA512 b110a1cec041bcf91c7a9028ac31292ff41c0a70a0f1c5462918671d300c9642ae0e04b4360f03dba344d5c4c7e67f8c4fd95f169f38f30a3628433c5ec1379f 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 -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 - #include - #include -+#include - #include - // 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 -+#include - #include - #include - -@@ -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 - 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 -+#include - #include - - 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 - #include - #include -+#include - - #include "timeline2/model/timelineitemmodel.hpp" - -@@ -182,7 +183,7 @@ private: - - KdenliveDoc *m_project{nullptr}; - std::shared_ptr 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 -Date: Thu, 31 Oct 2019 20:33:54 +0100 -Subject: [PATCH] Fix build with Qt 5.14 - -std::hash 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 - { - std::size_t operator()(const QString &k) const { return qHash(k); } - }; -+#endif - template <> struct hash - { - std::size_t operator()(const QPersistentModelIndex &k) const { return qHash(k); } --- -2.17.1 diff --git a/kde-apps/kdenlive/files/kdenlive-19.12.3-qt-5.14-crash-on-close-1.patch b/kde-apps/kdenlive/files/kdenlive-19.12.3-qt-5.14-crash-on-close-1.patch new file mode 100644 index 000000000000..421452dc6488 --- /dev/null +++ b/kde-apps/kdenlive/files/kdenlive-19.12.3-qt-5.14-crash-on-close-1.patch @@ -0,0 +1,69 @@ +From 78f8880a3d9c1e37548b5146d9f61f05ab7032ea Mon Sep 17 00:00:00 2001 +From: Jean-Baptiste Mardelle +Date: Fri, 31 Jan 2020 13:26:25 +0100 +Subject: Fix crash on exit + +--- + src/effects/effectlist/view/effectlistwidget.cpp | 1 - + src/timeline2/view/timelinetabs.cpp | 6 ++++++ + src/timeline2/view/timelinetabs.hpp | 2 +- + src/transitions/transitionlist/view/transitionlistwidget.cpp | 1 - + 4 files changed, 7 insertions(+), 3 deletions(-) + +diff --git a/src/effects/effectlist/view/effectlistwidget.cpp b/src/effects/effectlist/view/effectlistwidget.cpp +index c734e15..66b9a94 100644 +--- a/src/effects/effectlist/view/effectlistwidget.cpp ++++ b/src/effects/effectlist/view/effectlistwidget.cpp +@@ -60,7 +60,6 @@ void EffectListWidget::updateFavorite(const QModelIndex &index) + + EffectListWidget::~EffectListWidget() + { +- delete m_proxy; + qDebug() << " - - -Deleting effect list widget"; + } + +diff --git a/src/timeline2/view/timelinetabs.cpp b/src/timeline2/view/timelinetabs.cpp +index 74bb10b..9a72729 100644 +--- a/src/timeline2/view/timelinetabs.cpp ++++ b/src/timeline2/view/timelinetabs.cpp +@@ -57,6 +57,12 @@ TimelineTabs::TimelineTabs(QWidget *parent) + connect(pCore->monitorManager()->projectMonitor(), &Monitor::addEffect, m_mainTimeline->controller(), &TimelineController::addEffectToCurrentClip); + } + ++TimelineTabs::~TimelineTabs() ++{ ++ // clear source ++ m_mainTimeline->setSource(QUrl()); ++} ++ + TimelineWidget *TimelineTabs::getMainTimeline() const + { + return m_mainTimeline; +diff --git a/src/timeline2/view/timelinetabs.hpp b/src/timeline2/view/timelinetabs.hpp +index aba3e23..977af13 100644 +--- a/src/timeline2/view/timelinetabs.hpp ++++ b/src/timeline2/view/timelinetabs.hpp +@@ -49,7 +49,7 @@ class TimelineTabs : public QTabWidget + public: + /* Construct the tabs as well as the widget for the main timeline */ + TimelineTabs(QWidget *parent); +- ++ virtual ~TimelineTabs(); + /* @brief Returns a pointer to the main timeline */ + TimelineWidget *getMainTimeline() const; + +diff --git a/src/transitions/transitionlist/view/transitionlistwidget.cpp b/src/transitions/transitionlist/view/transitionlistwidget.cpp +index 309de55..afd122f 100644 +--- a/src/transitions/transitionlist/view/transitionlistwidget.cpp ++++ b/src/transitions/transitionlist/view/transitionlistwidget.cpp +@@ -53,7 +53,6 @@ TransitionListWidget::TransitionListWidget(QWidget *parent) + + TransitionListWidget::~TransitionListWidget() + { +- delete m_proxy; + qDebug() << " - - -Deleting transition list widget"; + } + +-- +cgit v1.1 + diff --git a/kde-apps/kdenlive/files/kdenlive-19.12.3-qt-5.14-crash-on-close-2.patch b/kde-apps/kdenlive/files/kdenlive-19.12.3-qt-5.14-crash-on-close-2.patch new file mode 100644 index 000000000000..3af886f68ddb --- /dev/null +++ b/kde-apps/kdenlive/files/kdenlive-19.12.3-qt-5.14-crash-on-close-2.patch @@ -0,0 +1,62 @@ +From 936307aceca3619f2b1d1e2f12d21ee4e8608cd6 Mon Sep 17 00:00:00 2001 +From: Jean-Baptiste Mardelle +Date: Thu, 5 Mar 2020 08:13:14 +0100 +Subject: [PATCH] Fix crash on close. Fixes #571 + +--- + src/core.cpp | 10 +++++----- + 1 file changed, 5 insertions(+), 5 deletions(-) + +diff --git a/src/core.cpp b/src/core.cpp +index 7c590a3f2..a48e1602f 100644 +--- a/src/core.cpp ++++ b/src/core.cpp +@@ -120,11 +120,11 @@ void Core::build(bool isAppImage, const QString &MltPath) + + void Core::initGUI(const QUrl &Url, const QString &clipsToLoad) + { +- m_guiConstructed = true; + m_profile = KdenliveSettings::default_profile(); + m_currentProfile = m_profile; + profileChanged(); + m_mainWindow = new MainWindow(); ++ m_guiConstructed = true; + connect(this, &Core::showConfigDialog, m_mainWindow, &MainWindow::slotPreferences); + + // load default profile and ask user to select one if not found. +@@ -658,13 +658,13 @@ std::shared_ptr Core::projectItemModel() + + void Core::invalidateRange(QSize range) + { +- if (!m_mainWindow || m_mainWindow->getCurrentTimeline()->loading) return; ++ if (!m_guiConstructed || m_mainWindow->getCurrentTimeline()->loading) return; + m_mainWindow->getCurrentTimeline()->controller()->invalidateZone(range.width(), range.height()); + } + + void Core::invalidateItem(ObjectId itemId) + { +- if (!m_mainWindow || !m_mainWindow->getCurrentTimeline() || m_mainWindow->getCurrentTimeline()->loading) return; ++ if (!m_guiConstructed || !m_mainWindow->getCurrentTimeline() || m_mainWindow->getCurrentTimeline()->loading) return; + switch (itemId.first) { + case ObjectType::TimelineClip: + case ObjectType::TimelineComposition: +@@ -692,14 +692,14 @@ double Core::getClipSpeed(int id) const + + void Core::updateItemKeyframes(ObjectId id) + { +- if (id.first == ObjectType::TimelineClip && m_mainWindow) { ++ if (id.first == ObjectType::TimelineClip && m_guiConstructed) { + m_mainWindow->getCurrentTimeline()->controller()->updateClip(id.second, {TimelineModel::KeyframesRole}); + } + } + + void Core::updateItemModel(ObjectId id, const QString &service) + { +- if (m_mainWindow && id.first == ObjectType::TimelineClip && !m_mainWindow->getCurrentTimeline()->loading && service.startsWith(QLatin1String("fade"))) { ++ if (m_guiConstructed && id.first == ObjectType::TimelineClip && !m_mainWindow->getCurrentTimeline()->loading && service.startsWith(QLatin1String("fade"))) { + bool startFade = service == QLatin1String("fadein") || service == QLatin1String("fade_from_black"); + m_mainWindow->getCurrentTimeline()->controller()->updateClip(id.second, {startFade ? TimelineModel::FadeInRole : TimelineModel::FadeOutRole}); + } +-- +2.25.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 1b49405064c9..000000000000 --- a/kde-apps/kdenlive/kdenlive-19.08.3.ebuild +++ /dev/null @@ -1,91 +0,0 @@ -# Copyright 1999-2019 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="amd64 arm64 x86" -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 -} diff --git a/kde-apps/kdenlive/kdenlive-19.12.2.ebuild b/kde-apps/kdenlive/kdenlive-19.12.2.ebuild deleted file mode 100644 index 0df5c81ab67a..000000000000 --- a/kde-apps/kdenlive/kdenlive-19.12.2.ebuild +++ /dev/null @@ -1,87 +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" -KFMIN=5.63.0 -QTMIN=5.12.3 -VIRTUALX_REQUIRED="test" -inherit ecm kde.org - -DESCRIPTION="Non-linear video editing suite by KDE" -HOMEPAGE="https://kdenlive.org/en/" - -LICENSE="GPL-2" -SLOT="5" -KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86" -IUSE="freesound gles2 semantic-desktop share v4l" - -BDEPEND=" - sys-devel/gettext -" -DEPEND=" - dev-cpp/rttr - >=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 - >=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 - >=media-libs/mlt-6.18.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] -" - -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 -} diff --git a/kde-apps/kdenlive/kdenlive-19.12.3-r2.ebuild b/kde-apps/kdenlive/kdenlive-19.12.3-r2.ebuild new file mode 100644 index 000000000000..ad9f640faca8 --- /dev/null +++ b/kde-apps/kdenlive/kdenlive-19.12.3-r2.ebuild @@ -0,0 +1,91 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +ECM_HANDBOOK="optional" +ECM_TEST="true" +KFMIN=5.63.0 +QTMIN=5.12.3 +VIRTUALX_REQUIRED="test" +inherit ecm kde.org + +DESCRIPTION="Non-linear video editing suite by KDE" +HOMEPAGE="https://kdenlive.org/en/" + +LICENSE="GPL-2" +SLOT="5" +KEYWORDS="amd64 arm64 ~ppc64 x86" +IUSE="freesound gles2-only semantic-desktop share v4l" + +BDEPEND=" + sys-devel/gettext +" +DEPEND=" + dev-cpp/rttr + >=dev-qt/qtconcurrent-${QTMIN}:5 + >=dev-qt/qtdbus-${QTMIN}:5 + >=dev-qt/qtdeclarative-${QTMIN}:5 + >=dev-qt/qtgui-${QTMIN}:5[gles2-only=] + >=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 + >=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 + >=media-libs/mlt-6.18.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-crash-on-close-{1,2}.patch ) # 20.04 branch + +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 +} diff --git a/kde-apps/kdenlive/metadata.xml b/kde-apps/kdenlive/metadata.xml index aacea79d5498..350073ec742f 100644 --- a/kde-apps/kdenlive/metadata.xml +++ b/kde-apps/kdenlive/metadata.xml @@ -7,7 +7,6 @@ Enable freesound.org credentials support via dev-qt/qtwebkit to download files - Use GLES 2.0 or later instead of full OpenGL Enable support for a share menu using kde-frameworks/purpose -- cgit v1.2.3