From bed3b604e16fc6075e29f1af8d47507a07035bd3 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Fri, 21 Jun 2024 00:11:18 +0100 Subject: gentoo auto-resync : 21:06:2024 - 00:11:18 --- kde-apps/Manifest.gz | Bin 35398 -> 35406 bytes kde-apps/kdenlive/Manifest | 3 +- .../files/kdenlive-24.05.1-timeline-freeze.patch | 29 ++++++++ kde-apps/kdenlive/kdenlive-24.05.1-r1.ebuild | 77 +++++++++++++++++++++ kde-apps/kdenlive/kdenlive-24.05.1.ebuild | 75 -------------------- 5 files changed, 108 insertions(+), 76 deletions(-) create mode 100644 kde-apps/kdenlive/files/kdenlive-24.05.1-timeline-freeze.patch create mode 100644 kde-apps/kdenlive/kdenlive-24.05.1-r1.ebuild delete mode 100644 kde-apps/kdenlive/kdenlive-24.05.1.ebuild (limited to 'kde-apps') diff --git a/kde-apps/Manifest.gz b/kde-apps/Manifest.gz index a643bd6749a0..c65b1e0392d5 100644 Binary files a/kde-apps/Manifest.gz and b/kde-apps/Manifest.gz differ diff --git a/kde-apps/kdenlive/Manifest b/kde-apps/kdenlive/Manifest index 1fc8c0d4b80d..8c18cea13ca8 100644 --- a/kde-apps/kdenlive/Manifest +++ b/kde-apps/kdenlive/Manifest @@ -1,5 +1,6 @@ +AUX kdenlive-24.05.1-timeline-freeze.patch 1111 BLAKE2B d4ea9168eec0f113f9f0339d95201e867ea7eb9579315ec3917906410f38e24af8d5412c74be02071417a35f1b2f7800a5fe747dfe78c37e6a830f6b73fb19ee SHA512 47eaa6a884738c5a706b7ef367869094a0285461b3556eb15f94a917a5954fb0ece2ace5c43a5addb9b00eaea4b3e67e46df2a6947b04863fd9161734549237d DIST kdenlive-23.08.5.tar.xz 12728000 BLAKE2B f2232bd5b3fbb36183018346f65eb2f590ea560a9aa10a198274709f34b0ff178922df9ab5b00d9577fc1a864b03ebd232f6e1a45bba7c9862ef9b60937d72a7 SHA512 1fbd11e1f6a42c668b9d22d74179b25fdd6e66dd903a5779f16ecad324850beaa5492859d9edb566ac94b162499ffdf4eb30be28adb1027d50de54369c96f2ac DIST kdenlive-24.05.1.tar.xz 12908936 BLAKE2B 74979a6f974f41520c808ba7ce6130b999e28b8987bd9e77346401fe85b3a5ca75bab4e302f66bf27be278509d05448eb716c4866d0b9d86c06aed70599db483 SHA512 79f7f357ee83e7e00e1e795d67acd91406a6e2fb66e572f3381745faf6b59a29e43e3ff107b40db4fbd6dfc8e6da99b94a6cff8872c72ccb27118f071177e42a EBUILD kdenlive-23.08.5.ebuild 2344 BLAKE2B 77b1c8ecd91a28ffd014632f2ba99c49e0fa749275eb4430fa74902cd00c6c1fdb306ff8380459265eec5f2768f741cdee1986918a474ed39b8e4771837982b1 SHA512 ca6e50bb7c53ad1685c2e3e38a4d3031d3a265577f62f16f2aec06962351ef04b0ac9e5129e26347c84a32f0254dbb6510fb3e7bf9683de930f86d1d30f821f5 -EBUILD kdenlive-24.05.1.ebuild 2142 BLAKE2B 9d55480adc2487aff18693cdd3cd8514dc7014a5ba3c043511e04a40a02a220cda6e368e1c8484706beab0a8a9498fb848081c0b0cf28f20cdfe9297b2213bd3 SHA512 bb0f627a3b34776839953a546e3f62122fb77e8e4552bbe4f04ac01ef41f66d1a10f36a6895284ca0276fd401572710171bef87f567013a9832fec5f5d464068 +EBUILD kdenlive-24.05.1-r1.ebuild 2213 BLAKE2B 9e37af1b93ecfa00ce734f15bb28053eebbeead60fd5bee0cec3498a8933a0dd6e0eafa11b7ba39cceb89ab6f13fa201d9b11c722bb11506ab2adec52efb9b6b SHA512 1ab3d90c577cc51dfc8da8d52c56583e285f4da275dd8200cbd754d1c3949673245b6a36a266008c9c3a0ab201fb000afc68782d5faeb321b6a72e3b15dd51c8 MISC metadata.xml 409 BLAKE2B efa27a2a8769a56200077d2d606e930a14fe7b8dad531386da39675c501ea7298939b6c197b668379430840b002c0a5ff34da592fcb2af18734649cb5d527f6c SHA512 0966b96a06e7315574724c75c6c3c680b6ea7da71278885ae65d214ca6a18a4b2d11b101221caa89ef5682d91f7a4cc7c2108f9741072cb12f97e95af0bcb09b 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 +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]" +} diff --git a/kde-apps/kdenlive/kdenlive-24.05.1.ebuild b/kde-apps/kdenlive/kdenlive-24.05.1.ebuild deleted file mode 100644 index 5294d3a61e2e..000000000000 --- a/kde-apps/kdenlive/kdenlive-24.05.1.ebuild +++ /dev/null @@ -1,75 +0,0 @@ -# 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" - -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]" -} -- cgit v1.2.3