* [gentoo-commits] repo/gentoo:master commit in: kde-apps/kdenlive/files/, kde-apps/kdenlive/
@ 2017-01-18 11:09 Michael Palimaka
0 siblings, 0 replies; 4+ messages in thread
From: Michael Palimaka @ 2017-01-18 11:09 UTC (permalink / raw
To: gentoo-commits
commit: 38ebbd3c17007231b035f1d768dd631da1c8a6d5
Author: Michael Palimaka <kensington <AT> gentoo <DOT> org>
AuthorDate: Wed Jan 18 11:08:47 2017 +0000
Commit: Michael Palimaka <kensington <AT> gentoo <DOT> org>
CommitDate: Wed Jan 18 11:09:01 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=38ebbd3c
kde-apps/kdenlive: backport patch from upstream solving crash
Gentoo-bug: 605610
Package-Manager: Portage-2.3.3, Repoman-2.3.1
.../kdenlive/files/kdenlive-16.12.1-crash.patch | 60 ++++++++++++++++++
kde-apps/kdenlive/kdenlive-16.12.1-r1.ebuild | 71 ++++++++++++++++++++++
2 files changed, 131 insertions(+)
diff --git a/kde-apps/kdenlive/files/kdenlive-16.12.1-crash.patch b/kde-apps/kdenlive/files/kdenlive-16.12.1-crash.patch
new file mode 100644
index 00000000..1f9b54e
--- /dev/null
+++ b/kde-apps/kdenlive/files/kdenlive-16.12.1-crash.patch
@@ -0,0 +1,60 @@
+From 8a20fca86e9e2ce3d04b3e024b0752e19f9d8c8e Mon Sep 17 00:00:00 2001
+From: Jean-Baptiste Mardelle <jb@kdenlive.org>
+Date: Mon, 16 Jan 2017 20:06:00 +0100
+Subject: [PATCH] Revert "Fix warning about QOffscreenSurface thread" Caused
+ startup crash on NVidia cards CCBUG: 375094
+
+This reverts commit 6675c4a509046aa3b57c60cbc3f31435e09c2df7.
+---
+ src/monitor/glwidget.cpp | 10 +++-------
+ src/monitor/glwidget.h | 1 -
+ 2 files changed, 3 insertions(+), 8 deletions(-)
+
+diff --git a/src/monitor/glwidget.cpp b/src/monitor/glwidget.cpp
+index e4089e6..cd4f56a 100644
+--- a/src/monitor/glwidget.cpp
++++ b/src/monitor/glwidget.cpp
+@@ -109,7 +109,6 @@ GLWidget::GLWidget(int id, QObject *parent)
+ mlt_properties_set_data(mlt_global_properties(), "glslManager", NULL, 0, NULL, NULL);
+ emit gpuNotSupported();
+ }
+- connect(this, SIGNAL(sceneGraphInitialized()), SLOT(createOffscreen()));
+ connect(this, SIGNAL(sceneGraphInitialized()), SLOT(initializeGL()), Qt::DirectConnection);
+ connect(this, SIGNAL(beforeRendering()), SLOT(paintGL()), Qt::DirectConnection);
+ }
+@@ -143,17 +142,14 @@ void GLWidget::updateAudioForAnalysis()
+ m_frameRenderer->sendAudioForAnalysis = KdenliveSettings::monitor_audio();
+ }
+
+-void GLWidget::createOffscreen()
++void GLWidget::initializeGL()
+ {
++ if (m_isInitialized || !isVisible() || !openglContext()) return;
+ if (!m_offscreenSurface.isValid()) {
+ m_offscreenSurface.setFormat(openglContext()->format());
+ m_offscreenSurface.create();
++ openglContext()->makeCurrent(this);
+ }
+-}
+-
+-void GLWidget::initializeGL()
+-{
+- if (m_isInitialized || !isVisible() || !openglContext()) return;
+ initializeOpenGLFunctions();
+ qDebug() << "OpenGL vendor: " << QString::fromUtf8((const char*) glGetString(GL_VENDOR));
+ qDebug() << "OpenGL renderer: " << QString::fromUtf8((const char*) glGetString(GL_RENDERER));
+diff --git a/src/monitor/glwidget.h b/src/monitor/glwidget.h
+index dc1e0e2..d12500a 100644
+--- a/src/monitor/glwidget.h
++++ b/src/monitor/glwidget.h
+@@ -182,7 +182,6 @@ private slots:
+ void updateTexture(GLuint yName, GLuint uName, GLuint vName);
+ void paintGL();
+ void onFrameDisplayed(const SharedFrame &frame);
+- void createOffscreen();
+
+ protected:
+ void resizeEvent(QResizeEvent* event);
+--
+2.10.2
+
diff --git a/kde-apps/kdenlive/kdenlive-16.12.1-r1.ebuild b/kde-apps/kdenlive/kdenlive-16.12.1-r1.ebuild
new file mode 100644
index 00000000..cc4b569
--- /dev/null
+++ b/kde-apps/kdenlive/kdenlive-16.12.1-r1.ebuild
@@ -0,0 +1,71 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+KDE_HANDBOOK="optional"
+inherit kde5
+
+DESCRIPTION="Non-linear video editing suite by KDE"
+HOMEPAGE="https://www.kdenlive.org/"
+
+LICENSE="GPL-2"
+KEYWORDS="~amd64 ~x86"
+IUSE="freesound gles2 jogshuttle semantic-desktop v4l"
+
+RDEPEND="
+ $(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 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 qtdbus)
+ $(add_qt_dep qtdeclarative)
+ $(add_qt_dep qtgui 'gles2=')
+ $(add_qt_dep qtnetwork)
+ $(add_qt_dep qtquickcontrols)
+ $(add_qt_dep qtscript)
+ $(add_qt_dep qtsvg)
+ $(add_qt_dep qtwidgets)
+ $(add_qt_dep qtxml)
+ >=media-libs/mlt-6.0.0[ffmpeg,kdenlive,melt,qt5,sdl,xml]
+ virtual/ffmpeg[encode,sdl,X]
+ virtual/opengl
+ freesound? ( $(add_qt_dep qtwebkit) )
+ semantic-desktop? ( $(add_frameworks_dep kfilemetadata) )
+ v4l? ( media-libs/libv4l )
+"
+DEPEND="${RDEPEND}
+ sys-devel/gettext
+"
+
+PATCHES=( "${FILESDIR}/${P}-crash.patch" )
+
+src_configure() {
+ local mycmakeargs=(
+ $(cmake-utils_use_find_package freesound Qt5WebKitWidgets)
+ -DWITH_JogShuttle=$(usex jogshuttle)
+ $(cmake-utils_use_find_package semantic-desktop KF5FileMetaData)
+ $(cmake-utils_use_find_package v4l LibV4L2)
+ )
+
+ kde5_src_configure
+}
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: kde-apps/kdenlive/files/, kde-apps/kdenlive/
@ 2020-01-15 19:09 Andreas Sturmlechner
0 siblings, 0 replies; 4+ messages in thread
From: Andreas Sturmlechner @ 2020-01-15 19:09 UTC (permalink / raw
To: gentoo-commits
commit: 0d574f603ae2467b5d18e88a9c8100abe7130f13
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Wed Jan 15 19:03:02 2020 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Wed Jan 15 19:09:34 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0d574f60
kde-apps/kdenlive: Backport upstream fix for startup crash
Closes: https://bugs.gentoo.org/703524
Package-Manager: Portage-2.3.84, Repoman-2.3.20
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
...denlive-19.12.1-qt-5.14-new-project-crash.patch | 44 +++++++++++
kde-apps/kdenlive/kdenlive-19.12.1-r1.ebuild | 89 ++++++++++++++++++++++
2 files changed, 133 insertions(+)
diff --git a/kde-apps/kdenlive/files/kdenlive-19.12.1-qt-5.14-new-project-crash.patch b/kde-apps/kdenlive/files/kdenlive-19.12.1-qt-5.14-new-project-crash.patch
new file mode 100644
index 00000000000..aa4d4914b44
--- /dev/null
+++ b/kde-apps/kdenlive/files/kdenlive-19.12.1-qt-5.14-new-project-crash.patch
@@ -0,0 +1,44 @@
+From b20a7307368932b35ec0d7cdebb68a710cbbf8ba Mon Sep 17 00:00:00 2001
+From: Jean-Baptiste Mardelle <jb@kdenlive.org>
+Date: Wed, 15 Jan 2020 11:30:20 +0100
+Subject: Fix crash on new project with Qt 5.14 Related to #494
+
+---
+ src/timeline2/view/timelinewidget.cpp | 5 +++--
+ 1 file changed, 3 insertions(+), 2 deletions(-)
+
+diff --git a/src/timeline2/view/timelinewidget.cpp b/src/timeline2/view/timelinewidget.cpp
+index 452e4d7..f8bf6ed 100644
+--- a/src/timeline2/view/timelinewidget.cpp
++++ b/src/timeline2/view/timelinewidget.cpp
+@@ -65,6 +65,7 @@ TimelineWidget::TimelineWidget(QWidget *parent)
+ // Build transition model for context menu
+ m_transitionModel = TransitionTreeModel::construct(true, this);
+ m_transitionProxyModel = std::make_unique<TransitionFilter>(this);
++ m_sortModel = std::make_unique<QSortFilterProxyModel>(this);
+ static_cast<TransitionFilter *>(m_transitionProxyModel.get())->setFilterType(true, TransitionType::Favorites);
+ m_transitionProxyModel->setSourceModel(m_transitionModel.get());
+ m_transitionProxyModel->setSortRole(AssetTreeModel::NameRole);
+@@ -89,6 +90,8 @@ TimelineWidget::TimelineWidget(QWidget *parent)
+
+ TimelineWidget::~TimelineWidget()
+ {
++ rootContext()->setContextProperty("multitrack", 0);
++ rootContext()->setContextProperty("timeline", 0);
+ delete m_proxy;
+ }
+
+@@ -113,11 +116,9 @@ const QStringList TimelineWidget::sortedItems(const QStringList &items, bool isT
+
+ void TimelineWidget::setModel(const std::shared_ptr<TimelineItemModel> &model, MonitorProxy *proxy)
+ {
+- m_sortModel = std::make_unique<QSortFilterProxyModel>(this);
+ m_sortModel->setSourceModel(model.get());
+ m_sortModel->setSortRole(TimelineItemModel::SortRole);
+ m_sortModel->sort(0, Qt::DescendingOrder);
+-
+ m_proxy->setModel(model);
+ rootContext()->setContextProperty("multitrack", m_sortModel.get());
+ rootContext()->setContextProperty("controller", model.get());
+--
+cgit v1.1
diff --git a/kde-apps/kdenlive/kdenlive-19.12.1-r1.ebuild b/kde-apps/kdenlive/kdenlive-19.12.1-r1.ebuild
new file mode 100644
index 00000000000..831ba8df241
--- /dev/null
+++ b/kde-apps/kdenlive/kdenlive-19.12.1-r1.ebuild
@@ -0,0 +1,89 @@
+# 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 ~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]
+"
+
+PATCHES=( "${FILESDIR}"/${P}-qt-5.14-new-project-crash.patch ) # bug #703524
+
+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
+}
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: kde-apps/kdenlive/files/, kde-apps/kdenlive/
@ 2020-10-26 17:12 Andreas Sturmlechner
0 siblings, 0 replies; 4+ messages in thread
From: Andreas Sturmlechner @ 2020-10-26 17:12 UTC (permalink / raw
To: gentoo-commits
commit: 70d1deeebe8d3d262693f60203068845a0083728
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Mon Oct 26 16:59:47 2020 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Mon Oct 26 17:12:00 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=70d1deee
kde-apps/kdenlive: Port to dev-qt/qtwebengine
Package-Manager: Portage-3.0.8, Repoman-3.0.2
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
.../files/kdenlive-20.08.3-webengine.patch | 213 +++++++++++++++++++++
kde-apps/kdenlive/kdenlive-20.08.2-r1.ebuild | 92 +++++++++
kde-apps/kdenlive/metadata.xml | 1 +
3 files changed, 306 insertions(+)
diff --git a/kde-apps/kdenlive/files/kdenlive-20.08.3-webengine.patch b/kde-apps/kdenlive/files/kdenlive-20.08.3-webengine.patch
new file mode 100644
index 00000000000..0ffff1b4a38
--- /dev/null
+++ b/kde-apps/kdenlive/files/kdenlive-20.08.3-webengine.patch
@@ -0,0 +1,213 @@
+From 51feccf3cc0939d42c3ff237eb17f9a6091f1dd8 Mon Sep 17 00:00:00 2001
+From: Andreas Sturmlechner <asturm@gentoo.org>
+Date: Fri, 23 Oct 2020 15:32:39 +0200
+Subject: [PATCH] Port to QtWebEngineWidgets
+
+Fixes https://invent.kde.org/multimedia/kdenlive/-/issues/775
+
+Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>
+---
+ CMakeLists.txt | 2 +-
+ src/CMakeLists.txt | 12 ++++++------
+ src/qt-oauth-lib/logindialog.cpp | 4 ++--
+ src/qt-oauth-lib/logindialog.h | 3 +--
+ src/qt-oauth-lib/oauth2.h | 4 ++--
+ src/ui/logindialog_ui.ui | 6 +++---
+ src/utils/resourcewidget.cpp | 14 +++++++-------
+ 7 files changed, 22 insertions(+), 23 deletions(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index d434f1e31..a3f838433 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -71,7 +71,7 @@ if(WIN32)
+ set(MLT_PREFIX "..")
+ else()
+ set(MLT_PREFIX ${MLT_ROOT_DIR})
+- find_package(Qt5 OPTIONAL_COMPONENTS WebKitWidgets QUIET)
++ find_package(Qt5 OPTIONAL_COMPONENTS WebEngineWidgets QUIET)
+ endif()
+
+ if(KF5FileMetaData_FOUND)
+diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
+index 551178133..8356d4e47 100644
+--- a/src/CMakeLists.txt
++++ b/src/CMakeLists.txt
+@@ -65,7 +65,7 @@ add_subdirectory(transitions)
+ add_subdirectory(utils)
+ add_subdirectory(widgets)
+ add_subdirectory(xml)
+-if(Qt5WebKitWidgets_FOUND)
++if(Qt5WebEngineWidgets_FOUND)
+ add_subdirectory(qt-oauth-lib)
+ endif()
+ ## top_SRCS
+@@ -178,12 +178,12 @@ if(KF5_PURPOSE)
+ target_link_libraries(kdenliveLib KF5::Purpose KF5::PurposeWidgets)
+ endif()
+
+-if(Qt5WebKitWidgets_FOUND)
+- message(STATUS "Found Qt5 WebKitWidgets. You can use your Freesound.org credentials to download files")
+- target_compile_definitions(kdenliveLib PRIVATE -DQT5_USE_WEBKIT)
+- target_link_libraries(kdenliveLib Qt5::WebKitWidgets)
++if(Qt5WebEngineWidgets_FOUND)
++ message(STATUS "Found Qt5 WebEngineWidgets. You can use your Freesound.org credentials to download files")
++ target_compile_definitions(kdenliveLib PRIVATE -DQT5_USE_WEBENGINE)
++ target_link_libraries(kdenliveLib Qt5::WebEngineWidgets)
+ else()
+- message(STATUS "Qt5 WebKitWidgets not found. You cannot use your Freesound.org credentials, only preview files can be downloaded from the Online Resources Widget")
++ message(STATUS "Qt5 WebEngineWidgets not found. You cannot use your Freesound.org credentials, only preview files can be downloaded from the Online Resources Widget")
+ endif()
+
+ if(Q_WS_X11)
+diff --git a/src/qt-oauth-lib/logindialog.cpp b/src/qt-oauth-lib/logindialog.cpp
+index a41aa420b..111978831 100644
+--- a/src/qt-oauth-lib/logindialog.cpp
++++ b/src/qt-oauth-lib/logindialog.cpp
+@@ -38,7 +38,7 @@
+ #include "ui_logindialog_ui.h"
+
+ #include "kdenlive_debug.h"
+-#include <QWebView>
++#include <QWebEngineView>
+
+ LoginDialog::LoginDialog(QWidget *parent)
+ : QDialog(parent)
+@@ -54,7 +54,7 @@ LoginDialog::LoginDialog(QWidget *parent)
+ i18n("Enter your freesound account details to download the highest quality version of this file. Or use the High Quality "
+ "preview file instead (no freesound account required)."));
+ // m_ui->textBrowser
+- connect(m_ui->webView, &QWebView::urlChanged, this, &LoginDialog::urlChanged);
++ connect(m_ui->webView, &QWebEngineView::urlChanged, this, &LoginDialog::urlChanged);
+ }
+
+ LoginDialog::~LoginDialog()
+diff --git a/src/qt-oauth-lib/logindialog.h b/src/qt-oauth-lib/logindialog.h
+index 963b38ec5..c34383bf2 100644
+--- a/src/qt-oauth-lib/logindialog.h
++++ b/src/qt-oauth-lib/logindialog.h
+@@ -47,11 +47,10 @@ class LoginDialog;
+
+ /**
+ \brief This is the dialog that is used to login to freesound
+- \details It contains a QWebView object to display the freesound web page. I did try using a QTextBrowser
++ \details It contains a QWebEngineView object to display the freesound web page. I did try using a QTextBrowser
+ for this purpose but it responds to the URL that is used to connect with
+ "No document for
+ https://www.freesound.org/apiv2/oauth2/authorize/?client_id=3duhagdr874c&redirect_uri=https://www.freesound.org/home/app_permissions/permission_granted/&response_type=code"
+- The use of QWebView adds a dependency on the KF5WebKit to kdenlive. Need install libkf5webkit5-dev package on ubuntu
+ */
+ class LoginDialog : public QDialog
+ {
+diff --git a/src/qt-oauth-lib/oauth2.h b/src/qt-oauth-lib/oauth2.h
+index f28724455..03993a214 100644
+--- a/src/qt-oauth-lib/oauth2.h
++++ b/src/qt-oauth-lib/oauth2.h
+@@ -45,7 +45,7 @@
+ const QLatin1String OAuth2_strClientSecret("441d88374716e7a3503997151e4780566f007313"); // obtained when ttguy registered the kdenlive application with freesound
+ #endif
+
+-#ifdef QT5_USE_WEBKIT
++#ifdef QT5_USE_WEBENGINE
+
+ class LoginDialog;
+
+@@ -135,6 +135,6 @@ private:
+ void buildLoginDialog();
+ };
+
+-#endif // QT5_USE_WEBKIT
++#endif // QT5_USE_WEBENGINE
+
+ #endif // OAUTH2_H
+diff --git a/src/ui/logindialog_ui.ui b/src/ui/logindialog_ui.ui
+index 20827d686..e98a68ed2 100644
+--- a/src/ui/logindialog_ui.ui
++++ b/src/ui/logindialog_ui.ui
+@@ -15,7 +15,7 @@
+ </property>
+ <layout class="QGridLayout" name="gridLayout">
+ <item row="1" column="0">
+- <widget class="QWebView" name="webView">
++ <widget class="QWebEngineView" name="webView">
+ <property name="url">
+ <url>
+ <string>about:blank</string>
+@@ -51,9 +51,9 @@
+ </widget>
+ <customwidgets>
+ <customwidget>
+- <class>QWebView</class>
++ <class>QWebEngineView</class>
+ <extends>QWidget</extends>
+- <header>QtWebKitWidgets/QWebView</header>
++ <header>QtWebEngineWidgets/QWebEngineView</header>
+ </customwidget>
+ </customwidgets>
+ <resources/>
+diff --git a/src/utils/resourcewidget.cpp b/src/utils/resourcewidget.cpp
+index 79bb48898..d0eaa225b 100644
+--- a/src/utils/resourcewidget.cpp
++++ b/src/utils/resourcewidget.cpp
+@@ -49,7 +49,7 @@
+ #include <QPixmap>
+ #include <klocalizedstring.h>
+
+-#ifdef QT5_USE_WEBKIT
++#ifdef QT5_USE_WEBENGINE
+ #include "qt-oauth-lib/oauth2.h"
+ #endif
+
+@@ -103,7 +103,7 @@ ResourceWidget::ResourceWidget(QString folder, QWidget *parent)
+ search_text->setFocus();
+ connect(search_text, SIGNAL(returnPressed()), this, SLOT(slotStartSearch()));
+
+-#ifdef QT5_USE_WEBKIT
++#ifdef QT5_USE_WEBENGINE
+ m_pOAuth2 = new OAuth2(this);
+ connect(m_pOAuth2, &OAuth2::accessTokenReceived, this, &ResourceWidget::slotAccessTokenReceived);
+ connect(m_pOAuth2, &OAuth2::accessDenied, this, &ResourceWidget::slotFreesoundAccessDenied);
+@@ -375,7 +375,7 @@ void ResourceWidget::slotSaveItem(const QString &originalUrl)
+ path.append(m_currentService->getDefaultDownloadName(item));
+
+ if (m_currentService->serviceType == AbstractService::FREESOUND) {
+-#ifdef QT5_USE_WEBKIT
++#ifdef QT5_USE_WEBENGINE
+ sFileExt = m_currentService->getExtension(search_results->currentItem());
+ #else
+ sFileExt = QStringLiteral("*.") + m_currentInfo.HQpreview.section(QLatin1Char('.'), -1);
+@@ -402,7 +402,7 @@ void ResourceWidget::slotSaveItem(const QString &originalUrl)
+ }
+ slotSetDescription(QString());
+ button_import->setEnabled(false); // disable buttons while download runs. enabled in slotGotFile
+-#ifdef QT5_USE_WEBKIT
++#ifdef QT5_USE_WEBENGINE
+ if (m_currentService->serviceType == AbstractService::FREESOUND) { // open a dialog to authenticate with free sound and download the file
+ m_pOAuth2->obtainAccessToken(); // when job finished ResourceWidget::slotAccessTokenReceived will be called
+ } else { // not freesound - do file download via a KIO file copy job
+@@ -841,7 +841,7 @@ void ResourceWidget::DownloadRequestFinished(QNetworkReply *reply)
+ m_desc.append(m_saveLocation);
+ updateLayout();
+ } else {
+-#ifdef QT5_USE_WEBKIT
++#ifdef QT5_USE_WEBENGINE
+ m_pOAuth2->ForgetAccessToken();
+ #endif
+ m_desc.append(QStringLiteral("<br>") + i18n("Error Saving File"));
+@@ -850,11 +850,11 @@ void ResourceWidget::DownloadRequestFinished(QNetworkReply *reply)
+ } else {
+
+ if (reply->error() == QNetworkReply::AuthenticationRequiredError) {
+-#ifdef QT5_USE_WEBKIT
++#ifdef QT5_USE_WEBENGINE
+ m_pOAuth2->obtainNewAccessToken();
+ #endif
+ } else {
+-#ifdef QT5_USE_WEBKIT
++#ifdef QT5_USE_WEBENGINE
+ m_pOAuth2->ForgetAccessToken();
+ #endif
+ m_desc.append(QStringLiteral("<br>") + i18n("Error Downloading File. Error code: %1", reply->error()) + QStringLiteral("<br>"));
+--
+2.29.1
+
diff --git a/kde-apps/kdenlive/kdenlive-20.08.2-r1.ebuild b/kde-apps/kdenlive/kdenlive-20.08.2-r1.ebuild
new file mode 100644
index 00000000000..02a490772ed
--- /dev/null
+++ b/kde-apps/kdenlive/kdenlive-20.08.2-r1.ebuild
@@ -0,0 +1,92 @@
+# 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.74.0
+QTMIN=5.15.1
+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="gles2-only semantic-desktop share v4l webengine"
+
+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/qtquickcontrols2-${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.20.0[ffmpeg,frei0r,kdenlive,melt,qt5,sdl,xml]
+ semantic-desktop? ( >=kde-frameworks/kfilemetadata-${KFMIN}:5 )
+ share? ( >=kde-frameworks/purpose-${KFMIN}:5 )
+ v4l? ( media-libs/libv4l )
+ webengine? ( >=dev-qt/qtwebengine-${QTMIN}:5 )
+"
+RDEPEND="${DEPEND}
+ >=dev-qt/qtquickcontrols-${QTMIN}:5
+ media-video/ffmpeg[encode,sdl,X]
+"
+
+RESTRICT+=" test" # segfaults, bug 684132
+
+PATCHES=( "${FILESDIR}/${PN}-20.08.3-webengine.patch" ) # pending upstream
+
+src_configure() {
+ local mycmakeargs=(
+ $(cmake_use_find_package semantic-desktop KF5FileMetaData)
+ $(cmake_use_find_package share KF5Purpose)
+ $(cmake_use_find_package v4l LibV4L2)
+ $(cmake_use_find_package webengine Qt5WebEngineWidgets)
+ )
+
+ 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 350073ec742..c8d8c36fc39 100644
--- a/kde-apps/kdenlive/metadata.xml
+++ b/kde-apps/kdenlive/metadata.xml
@@ -8,5 +8,6 @@
<use>
<flag name="freesound">Enable freesound.org credentials support via <pkg>dev-qt/qtwebkit</pkg> to download files</flag>
<flag name="share">Enable support for a share menu using <pkg>kde-frameworks/purpose</pkg></flag>
+ <flag name="webengine">Enable freesound.org credentials support via <pkg>dev-qt/qtwebengine</pkg> to download files</flag>
</use>
</pkgmetadata>
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: kde-apps/kdenlive/files/, kde-apps/kdenlive/
@ 2024-06-20 20:18 Andreas Sturmlechner
0 siblings, 0 replies; 4+ messages in thread
From: Andreas Sturmlechner @ 2024-06-20 20:18 UTC (permalink / raw
To: gentoo-commits
commit: f4c730e054052f2572f6d6bb5f2790f3368b59f7
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Thu Jun 20 19:23:45 2024 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Thu Jun 20 20:18:05 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f4c730e0
kde-apps/kdenlive: Fix timeline duration
See also:
https://mail.kde.org/pipermail/distributions/2024-June/001510.html
KDE-bug: https://bugs.kde.org/show_bug.cgi?id=488689
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
.../files/kdenlive-24.05.1-timeline-freeze.patch | 29 ++++++++
kde-apps/kdenlive/kdenlive-24.05.1-r1.ebuild | 77 ++++++++++++++++++++++
2 files changed, 106 insertions(+)
diff --git a/kde-apps/kdenlive/files/kdenlive-24.05.1-timeline-freeze.patch b/kde-apps/kdenlive/files/kdenlive-24.05.1-timeline-freeze.patch
new file mode 100644
index 000000000000..fd896dd19dd9
--- /dev/null
+++ b/kde-apps/kdenlive/files/kdenlive-24.05.1-timeline-freeze.patch
@@ -0,0 +1,29 @@
+From 8be0e826471332bb739344ebe1859298c46e9e0f Mon Sep 17 00:00:00 2001
+From: Jean-Baptiste Mardelle <jb@kdenlive.org>
+Date: Tue, 18 Jun 2024 10:50:24 +0200
+Subject: [PATCH] Fix timeline duration not correctly updated, resulting in
+ audio/video freeze in timeline after 5 min Related to #1885
+
+---
+ src/timeline2/model/timelinemodel.cpp | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/src/timeline2/model/timelinemodel.cpp b/src/timeline2/model/timelinemodel.cpp
+index 0bb8cb89ae..342324c77f 100644
+--- a/src/timeline2/model/timelinemodel.cpp
++++ b/src/timeline2/model/timelinemodel.cpp
+@@ -5111,9 +5111,9 @@ void TimelineModel::updateDuration()
+ }
+ if (duration != current) {
+ // update black track length
+- m_blackClip->block();
++ m_blackClip->lock();
+ m_blackClip->set("out", duration + TimelineModel::seekDuration);
+- m_blackClip->unblock();
++ m_blackClip->unlock();
+ Q_EMIT durationUpdated(m_uuid);
+ if (m_masterStack) {
+ Q_EMIT m_masterStack->dataChanged(QModelIndex(), QModelIndex(), {});
+--
+GitLab
+
diff --git a/kde-apps/kdenlive/kdenlive-24.05.1-r1.ebuild b/kde-apps/kdenlive/kdenlive-24.05.1-r1.ebuild
new file mode 100644
index 000000000000..87265362a737
--- /dev/null
+++ b/kde-apps/kdenlive/kdenlive-24.05.1-r1.ebuild
@@ -0,0 +1,77 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+ECM_DESIGNERPLUGIN="true"
+ECM_HANDBOOK="optional"
+ECM_QTHELP="true"
+ECM_TEST="true"
+KFMIN=6.3.0
+QTMIN=6.6.2
+inherit ecm gear.kde.org optfeature
+
+DESCRIPTION="Non-linear video editing suite by KDE"
+HOMEPAGE="https://kdenlive.org/en/"
+
+LICENSE="GPL-3"
+SLOT="6"
+KEYWORDS="~amd64"
+IUSE="gles2-only semantic-desktop v4l"
+
+RESTRICT="test" # segfaults, bug 684132
+
+DEPEND="
+ >=dev-qt/qtbase-${QTMIN}:6[concurrent,dbus,gles2-only=,gui,network,widgets,xml]
+ >=dev-qt/qtdeclarative-${QTMIN}:6[widgets]
+ >=dev-qt/qtmultimedia-${QTMIN}:6
+ >=dev-qt/qtnetworkauth-${QTMIN}:6
+ >=dev-qt/qtsvg-${QTMIN}:6
+ >=kde-frameworks/karchive-${KFMIN}:6
+ >=kde-frameworks/kbookmarks-${KFMIN}:6
+ >=kde-frameworks/kcodecs-${KFMIN}:6
+ >=kde-frameworks/kcompletion-${KFMIN}:6
+ >=kde-frameworks/kconfig-${KFMIN}:6
+ >=kde-frameworks/kconfigwidgets-${KFMIN}:6
+ >=kde-frameworks/kcoreaddons-${KFMIN}:6
+ >=kde-frameworks/kcrash-${KFMIN}:6
+ >=kde-frameworks/kdbusaddons-${KFMIN}:6
+ >=kde-frameworks/kfilemetadata-${KFMIN}:6
+ >=kde-frameworks/kguiaddons-${KFMIN}:6
+ >=kde-frameworks/ki18n-${KFMIN}:6
+ >=kde-frameworks/kiconthemes-${KFMIN}:6
+ >=kde-frameworks/kio-${KFMIN}:6
+ >=kde-frameworks/kitemviews-${KFMIN}:6
+ >=kde-frameworks/kjobwidgets-${KFMIN}:6
+ >=kde-frameworks/knewstuff-${KFMIN}:6
+ >=kde-frameworks/knotifications-${KFMIN}:6
+ >=kde-frameworks/knotifyconfig-${KFMIN}:6
+ >=kde-frameworks/kservice-${KFMIN}:6
+ >=kde-frameworks/ktextwidgets-${KFMIN}:6
+ >=kde-frameworks/kwidgetsaddons-${KFMIN}:6
+ >=kde-frameworks/kxmlgui-${KFMIN}:6
+ >=kde-frameworks/purpose-${KFMIN}:6
+ >=kde-frameworks/solid-${KFMIN}:6
+ >=media-libs/mlt-7.22.0-r1[ffmpeg,frei0r,qt6,sdl,xml]
+ v4l? ( media-libs/libv4l )
+"
+RDEPEND="${DEPEND}
+ >=kde-frameworks/qqc2-desktop-style-${KFMIN}:6
+ media-video/ffmpeg[encode,libass,sdl,X]
+ media-video/mediainfo
+"
+BDEPEND="sys-devel/gettext"
+
+PATCHES=( "${FILESDIR}/${P}-timeline-freeze.patch" ) # KDE-bug 488689
+
+src_configure() {
+ local mycmakeargs=(
+ $(cmake_use_find_package v4l LibV4L2)
+ )
+ ecm_src_configure
+}
+
+pkg_postinst() {
+ ecm_pkg_postinst
+ optfeature "VP8 and VP9 codec support" "media-video/ffmpeg[vpx]"
+}
^ permalink raw reply related [flat|nested] 4+ messages in thread
end of thread, other threads:[~2024-06-20 20:18 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2020-10-26 17:12 [gentoo-commits] repo/gentoo:master commit in: kde-apps/kdenlive/files/, kde-apps/kdenlive/ Andreas Sturmlechner
-- strict thread matches above, loose matches on Subject: below --
2024-06-20 20:18 Andreas Sturmlechner
2020-01-15 19:09 Andreas Sturmlechner
2017-01-18 11:09 Michael Palimaka
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox