summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndreas Sturmlechner <asturm@gentoo.org>2023-01-14 13:19:58 +0100
committerAndreas Sturmlechner <asturm@gentoo.org>2023-01-15 00:32:12 +0100
commit44aa16ce26f1be6e0fe352a8a21f4a9d6c7f3c55 (patch)
tree6f7d4f6fcdffb1bf4f4e4c1c1f662e080a9a0ce2 /kde-apps/kdenlive
parentdev-qt/qtnetwork: update SRC_URI (diff)
downloadgentoo-44aa16ce26f1be6e0fe352a8a21f4a9d6c7f3c55.tar.gz
gentoo-44aa16ce26f1be6e0fe352a8a21f4a9d6c7f3c55.tar.bz2
gentoo-44aa16ce26f1be6e0fe352a8a21f4a9d6c7f3c55.zip
kde-apps/kdenlive: Fix Clip and project monitor broken with Qt 5.15.8
KDE-bug: https://bugs.kde.org/show_bug.cgi?id=464027 Bug: https://bugs.gentoo.org/888946 Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>
Diffstat (limited to 'kde-apps/kdenlive')
-rw-r--r--kde-apps/kdenlive/files/kdenlive-22.08.3-qt-5.15.8.patch34
-rw-r--r--kde-apps/kdenlive/kdenlive-22.08.3-r1.ebuild85
-rw-r--r--kde-apps/kdenlive/kdenlive-22.12.1-r1.ebuild86
3 files changed, 205 insertions, 0 deletions
diff --git a/kde-apps/kdenlive/files/kdenlive-22.08.3-qt-5.15.8.patch b/kde-apps/kdenlive/files/kdenlive-22.08.3-qt-5.15.8.patch
new file mode 100644
index 000000000000..0aa4114a890e
--- /dev/null
+++ b/kde-apps/kdenlive/files/kdenlive-22.08.3-qt-5.15.8.patch
@@ -0,0 +1,34 @@
+From 2c6eeac036f8243363df6da9314f3fa0b8ee0834 Mon Sep 17 00:00:00 2001
+From: Jean-Baptiste Mardelle <jb@kdenlive.org>
+Date: Fri, 13 Jan 2023 13:21:03 +0100
+Subject: [PATCH] Fix monitor qml overlay painting corruption with Qt 5.15.8
+ CCBUG: 464027
+
+---
+ src/monitor/glwidget.cpp | 5 ++---
+ 1 file changed, 2 insertions(+), 3 deletions(-)
+
+diff --git a/src/monitor/glwidget.cpp b/src/monitor/glwidget.cpp
+index b221e0f8e..36a4cc6f9 100644
+--- a/src/monitor/glwidget.cpp
++++ b/src/monitor/glwidget.cpp
+@@ -587,14 +587,13 @@ void GLWidget::paintGL()
+ float width = this->width() * devicePixelRatioF();
+ float height = this->height() * devicePixelRatioF();
+
++ f->glClearColor(float(m_bgColor.redF()), float(m_bgColor.greenF()), float(m_bgColor.blueF()), 0);
++ f->glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT);
+ f->glDisable(GL_BLEND);
+ f->glDisable(GL_DEPTH_TEST);
+ f->glDepthMask(GL_FALSE);
+ f->glViewport(0, qRound(m_displayRulerHeight * devicePixelRatioF() * 0.5), int(width), int(height));
+ check_error(f);
+- f->glClearColor(float(m_bgColor.redF()), float(m_bgColor.greenF()), float(m_bgColor.blueF()), 0);
+- f->glClear(GL_COLOR_BUFFER_BIT);
+- check_error(f);
+
+ if (!acquireSharedFrameTextures()) return;
+
+--
+GitLab
+
diff --git a/kde-apps/kdenlive/kdenlive-22.08.3-r1.ebuild b/kde-apps/kdenlive/kdenlive-22.08.3-r1.ebuild
new file mode 100644
index 000000000000..e03b7f33fdd8
--- /dev/null
+++ b/kde-apps/kdenlive/kdenlive-22.08.3-r1.ebuild
@@ -0,0 +1,85 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+ECM_HANDBOOK="optional"
+ECM_QTHELP="true"
+ECM_TEST="true"
+KFMIN=5.96.0
+QTMIN=5.15.5
+VIRTUALX_REQUIRED="test"
+inherit ecm gear.kde.org optfeature
+
+DESCRIPTION="Non-linear video editing suite by KDE"
+HOMEPAGE="https://kdenlive.org/en/"
+
+LICENSE="GPL-3"
+SLOT="5"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+IUSE="gles2-only semantic-desktop share v4l"
+
+RESTRICT="test" # segfaults, bug 684132
+
+DEPEND="
+ >=dev-qt/qtconcurrent-${QTMIN}:5
+ >=dev-qt/qtdbus-${QTMIN}:5
+ >=dev-qt/qtdeclarative-${QTMIN}:5[widgets]
+ >=dev-qt/qtgui-${QTMIN}:5[gles2-only=]
+ >=dev-qt/qtmultimedia-${QTMIN}:5
+ >=dev-qt/qtnetwork-${QTMIN}:5
+ >=dev-qt/qtnetworkauth-${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-7.8.0[ffmpeg,frei0r,qt5,sdl,xml]
+ semantic-desktop? ( >=kde-frameworks/kfilemetadata-${KFMIN}:5 )
+ share? ( >=kde-frameworks/purpose-${KFMIN}:5 )
+ v4l? ( media-libs/libv4l )
+"
+RDEPEND="${DEPEND}
+ >=dev-qt/qtquickcontrols-${QTMIN}:5
+ media-video/ffmpeg[encode,libass,sdl,X]
+ media-video/mediainfo
+"
+BDEPEND="sys-devel/gettext"
+
+PATCHES=( "${FILESDIR}/${P}-qt-5.15.8.patch" ) # KDE-bug 464027, 22.12 branch
+
+src_configure() {
+ local mycmakeargs=(
+ $(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
+ optfeature "VP8 and VP9 codec support" "media-video/ffmpeg[vpx]"
+}
diff --git a/kde-apps/kdenlive/kdenlive-22.12.1-r1.ebuild b/kde-apps/kdenlive/kdenlive-22.12.1-r1.ebuild
new file mode 100644
index 000000000000..1694a4866a01
--- /dev/null
+++ b/kde-apps/kdenlive/kdenlive-22.12.1-r1.ebuild
@@ -0,0 +1,86 @@
+# Copyright 1999-2023 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=5.101.0
+QTMIN=5.15.5
+VIRTUALX_REQUIRED="test"
+inherit ecm gear.kde.org optfeature
+
+DESCRIPTION="Non-linear video editing suite by KDE"
+HOMEPAGE="https://kdenlive.org/en/"
+
+LICENSE="GPL-3"
+SLOT="5"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+IUSE="gles2-only semantic-desktop share v4l"
+
+RESTRICT="test" # segfaults, bug 684132
+
+DEPEND="
+ >=dev-qt/qtconcurrent-${QTMIN}:5
+ >=dev-qt/qtdbus-${QTMIN}:5
+ >=dev-qt/qtdeclarative-${QTMIN}:5[widgets]
+ >=dev-qt/qtgui-${QTMIN}:5[gles2-only=]
+ >=dev-qt/qtmultimedia-${QTMIN}:5
+ >=dev-qt/qtnetwork-${QTMIN}:5
+ >=dev-qt/qtnetworkauth-${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/kcodecs-${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/kfilemetadata-${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-7.10.0[ffmpeg,frei0r,qt5,sdl,xml]
+ share? ( >=kde-frameworks/purpose-${KFMIN}:5 )
+ v4l? ( media-libs/libv4l )
+"
+RDEPEND="${DEPEND}
+ >=dev-qt/qtquickcontrols-${QTMIN}:5
+ media-video/ffmpeg[encode,libass,sdl,X]
+ media-video/mediainfo
+"
+BDEPEND="sys-devel/gettext"
+
+PATCHES=( "${FILESDIR}/${PN}-22.08.3-qt-5.15.8.patch" ) # KDE-bug 464027
+
+src_configure() {
+ local mycmakeargs=(
+ $(cmake_use_find_package share KF5Purpose)
+ $(cmake_use_find_package v4l LibV4L2)
+ )
+ ecm_src_configure
+}
+
+pkg_postinst() {
+ ecm_pkg_postinst
+ optfeature "VP8 and VP9 codec support" "media-video/ffmpeg[vpx]"
+}