From b284a3168fa91a038925d2ecf5e4791011ea5e7d Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Mon, 18 Nov 2019 10:15:03 +0000 Subject: gentoo resync : 18.11.2019 --- kde-apps/kdenlive/Manifest | 6 +- .../files/kdenlive-19.08.3-qt-5.14-1.patch | 203 +++++++++++++++++++++ .../files/kdenlive-19.08.3-qt-5.14-2.patch | 32 ++++ kde-apps/kdenlive/kdenlive-19.08.2.ebuild | 84 --------- kde-apps/kdenlive/kdenlive-19.08.3.ebuild | 89 +++++++++ 5 files changed, 328 insertions(+), 86 deletions(-) create mode 100644 kde-apps/kdenlive/files/kdenlive-19.08.3-qt-5.14-1.patch create mode 100644 kde-apps/kdenlive/files/kdenlive-19.08.3-qt-5.14-2.patch delete mode 100644 kde-apps/kdenlive/kdenlive-19.08.2.ebuild create mode 100644 kde-apps/kdenlive/kdenlive-19.08.3.ebuild (limited to 'kde-apps/kdenlive') diff --git a/kde-apps/kdenlive/Manifest b/kde-apps/kdenlive/Manifest index cd335306e57b..4aa5be9e9354 100644 --- a/kde-apps/kdenlive/Manifest +++ b/kde-apps/kdenlive/Manifest @@ -1,5 +1,7 @@ +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.04.3.tar.xz 11071112 BLAKE2B e43563e8ab679e08b7d654e38e7b092c9e919c46ec1f62374f29fb2210ba447ae8183afec2ff31472d64d557393e71f775175141e526923247c3624187bfc3fa SHA512 de8d7147a2d5f3b70bb1fe3f5e73acd3e3fe6289415c9fb68a5b4850e43ae55ac9e00d6143e1c717c5efc4e634be84626a2bbfcd460deee39e5638002f043aa3 -DIST kdenlive-19.08.2.tar.xz 12413952 BLAKE2B 1fef68119c30be11af1f0fb973ff90fdb894c3ce3db3f3ec4183bc27dd9471d7829b4ee3e869d041f27bb01164418c95184a956d9fe51ae42fe709c5ef4e329b SHA512 dc347962fafd9e96f90e898e9221dd41e4635fae2fc56ba704066964feebf24fb237c531d0e2b2decde9b4f07b7cf7b9af037ea27cc8e17550639063fbaabfc0 +DIST kdenlive-19.08.3.tar.xz 12418064 BLAKE2B bf0765e28f374a21371a9bf3fbc6059d6ac81118d79b0978fd10a3c4959f1343d06773ae278cb6e9a3890c1c1daff79f0a709cebd186b1bc586318e5384ca5da SHA512 187651de7542b86f9332c3eb79e2a27b664f0b4ead19fbb6035963b7be41a2a53b65de37e8c18c50aa794145cfaa2ebaf1b9f721d379c014da9c5f9475048738 EBUILD kdenlive-19.04.3.ebuild 2325 BLAKE2B db1e14709b4a783b29f717173368cfe8921a1cb62eba41511f76bd5aa20a45987f0edaf3abe63bb2d6dad8d4ddfffda7c15e2066c767a109d3768451d21b9ebb SHA512 afb7e58c574a5e1604be0afd15e76df587fa998f08d0e5ba80ac279aa0555ca49758b9191e6b25960685ba5c3e5d1e5cc2d7cfba451baab7f827cd18620b4d84 -EBUILD kdenlive-19.08.2.ebuild 2285 BLAKE2B 6323c14919fc112b5915821c75c6ea38635bf25dceca2a397f56f99bf085dce6b0610570517912193cce73c98d0ef0e76425f1e3c8df5183126921fce4af88df SHA512 85cbe2823793de219f69338714f78e5ebd31e727f7e2354b4404547c289f702ba2f97275f1966ab542f6f7621aedad7479dec39201eefc4e6c032df062ef0e54 +EBUILD kdenlive-19.08.3.ebuild 2586 BLAKE2B eed47dbe78a92c6d6a735bf8bb5d7cebc51d913187af137b41223ec8a7ab306a3288696d36d7a7ccb4d32b42b911fa35a9f54815b8934a0b38356781f3b96be6 SHA512 e6aadb625f9659794ec3a64bb47f61929672215010e9b43b8f676fa578aaabb0ab52cff6ee6f26c1677146fb8c9d1fdd365e59b84df8b92bf8f0aa221ba21347 MISC metadata.xml 559 BLAKE2B 4fb6ac38398866a869611dcdc0d9513c5618e7b1864b221d155e5bf1200ffd1081ff8b7dc408d85a97be6146eaf60b1ff1ac695c02e22c2a1537b18a8a1d8f4c SHA512 b76a5322a9fe2a6b7597ac7a6c45525e921cd0102e156939e013c96d876b355b258c0bb917e72a73686819672a2a5a47e7c7d0232468c709e4e88f888ee26cbb 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 new file mode 100644 index 000000000000..76822413f107 --- /dev/null +++ b/kde-apps/kdenlive/files/kdenlive-19.08.3-qt-5.14-1.patch @@ -0,0 +1,203 @@ +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 new file mode 100644 index 000000000000..13d2fd39d4bc --- /dev/null +++ b/kde-apps/kdenlive/files/kdenlive-19.08.3-qt-5.14-2.patch @@ -0,0 +1,32 @@ +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/kdenlive-19.08.2.ebuild b/kde-apps/kdenlive/kdenlive-19.08.2.ebuild deleted file mode 100644 index b479ace76227..000000000000 --- a/kde-apps/kdenlive/kdenlive-19.08.2.ebuild +++ /dev/null @@ -1,84 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -KDE_HANDBOOK="optional" -KDE_TEST="true" -VIRTUALX_REQUIRED="test" -inherit kde5 - -DESCRIPTION="Non-linear video editing suite by KDE" -HOMEPAGE="https://www.kdenlive.org/" - -LICENSE="GPL-2" -KEYWORDS="~amd64 ~arm64 ~x86" -IUSE="freesound gles2 semantic-desktop share v4l" - -BDEPEND=" - sys-devel/gettext -" -DEPEND=" - $(add_frameworks_dep karchive) - $(add_frameworks_dep kbookmarks) - $(add_frameworks_dep kcompletion) - $(add_frameworks_dep kconfig) - $(add_frameworks_dep kconfigwidgets) - $(add_frameworks_dep kcoreaddons) - $(add_frameworks_dep kcrash) - $(add_frameworks_dep kdbusaddons) - $(add_frameworks_dep kdeclarative) - $(add_frameworks_dep kguiaddons) - $(add_frameworks_dep ki18n) - $(add_frameworks_dep kiconthemes) - $(add_frameworks_dep kio) - $(add_frameworks_dep kitemviews) - $(add_frameworks_dep kjobwidgets) - $(add_frameworks_dep knewstuff) - $(add_frameworks_dep knotifications) - $(add_frameworks_dep knotifyconfig) - $(add_frameworks_dep kservice) - $(add_frameworks_dep ktextwidgets) - $(add_frameworks_dep kwidgetsaddons) - $(add_frameworks_dep kxmlgui) - $(add_frameworks_dep solid) - $(add_qt_dep qtconcurrent) - $(add_qt_dep qtdbus) - $(add_qt_dep qtdeclarative) - $(add_qt_dep qtgui 'gles2=') - $(add_qt_dep qtmultimedia) - $(add_qt_dep qtnetwork) - $(add_qt_dep qtsvg) - $(add_qt_dep qtwidgets) - $(add_qt_dep qtxml) - 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? ( $(add_frameworks_dep kfilemetadata) ) - share? ( $(add_frameworks_dep purpose) ) - v4l? ( media-libs/libv4l ) -" -RDEPEND="${DEPEND} - $(add_qt_dep qtquickcontrols) - virtual/ffmpeg[encode,sdl,X] -" - -src_configure() { - local mycmakeargs=( - $(cmake-utils_use_find_package freesound Qt5WebKitWidgets) - $(cmake-utils_use_find_package semantic-desktop KF5FileMetaData) - $(cmake-utils_use_find_package share KF5Purpose) - $(cmake-utils_use_find_package v4l LibV4L2) - ) - - kde5_src_configure -} - -pkg_postinst() { - kde5_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.08.3.ebuild b/kde-apps/kdenlive/kdenlive-19.08.3.ebuild new file mode 100644 index 000000000000..8e7dadce7f30 --- /dev/null +++ b/kde-apps/kdenlive/kdenlive-19.08.3.ebuild @@ -0,0 +1,89 @@ +# 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] +" + +PATCHES=( "${FILESDIR}"/${P}-qt-5.14-{1,2}.patch ) + +src_configure() { + local mycmakeargs=( + $(cmake-utils_use_find_package freesound Qt5WebKitWidgets) + $(cmake-utils_use_find_package semantic-desktop KF5FileMetaData) + $(cmake-utils_use_find_package share KF5Purpose) + $(cmake-utils_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 +} -- cgit v1.2.3