From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 8390315800F for ; Sun, 29 Jan 2023 00:12:24 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id B6068E092E; Sun, 29 Jan 2023 00:12:23 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 9BCD5E092F for ; Sun, 29 Jan 2023 00:12:23 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id B7BF0340EA8 for ; Sun, 29 Jan 2023 00:12:22 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 1050B891 for ; Sun, 29 Jan 2023 00:12:21 +0000 (UTC) From: "Andreas Sturmlechner" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Andreas Sturmlechner" Message-ID: <1674951134.edec91eb45321a028ed914292879eb240edae7e7.asturm@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: kde-frameworks/plasma/, kde-frameworks/plasma/files/ X-VCS-Repository: repo/gentoo X-VCS-Files: kde-frameworks/plasma/files/plasma-5.102.0-fix-flicker-on-fade-animation.patch kde-frameworks/plasma/plasma-5.102.0-r2.ebuild X-VCS-Directories: kde-frameworks/plasma/ kde-frameworks/plasma/files/ X-VCS-Committer: asturm X-VCS-Committer-Name: Andreas Sturmlechner X-VCS-Revision: edec91eb45321a028ed914292879eb240edae7e7 X-VCS-Branch: master Date: Sun, 29 Jan 2023 00:12:21 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 278a6c47-5382-4105-a524-debc2dcb2d08 X-Archives-Hash: 3ca84fc0ddb66f229e22074b2a84ff9c commit: edec91eb45321a028ed914292879eb240edae7e7 Author: Andreas Sturmlechner gentoo org> AuthorDate: Sat Jan 28 23:59:16 2023 +0000 Commit: Andreas Sturmlechner gentoo org> CommitDate: Sun Jan 29 00:12:14 2023 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=edec91eb kde-frameworks/plasma: Adjust fade animation to not flicker as much Upstream commit 3fcd43a6ed03d0aff188dfc190cc464c34302a1f KDE-bug: https://bugs.kde.org/show_bug.cgi?id=463061 KDE-bug: https://bugs.kde.org/show_bug.cgi?id=463685 Signed-off-by: Andreas Sturmlechner gentoo.org> ...sma-5.102.0-fix-flicker-on-fade-animation.patch | 44 +++++++++++++ kde-frameworks/plasma/plasma-5.102.0-r2.ebuild | 72 ++++++++++++++++++++++ 2 files changed, 116 insertions(+) diff --git a/kde-frameworks/plasma/files/plasma-5.102.0-fix-flicker-on-fade-animation.patch b/kde-frameworks/plasma/files/plasma-5.102.0-fix-flicker-on-fade-animation.patch new file mode 100644 index 000000000000..1c6ddab618aa --- /dev/null +++ b/kde-frameworks/plasma/files/plasma-5.102.0-fix-flicker-on-fade-animation.patch @@ -0,0 +1,44 @@ +From 3fcd43a6ed03d0aff188dfc190cc464c34302a1f Mon Sep 17 00:00:00 2001 +From: Arjen Hiemstra +Date: Tue, 10 Jan 2023 12:46:20 +0100 +Subject: [PATCH] iconitem: Adjust fade animation to not flicker as much + +As it turns out, mix(old texture, new texture, animation value) does +actually result in a different visual from simply blending the two +textures on top of each other, because the old texture first gets +blended with the underlying color. This results in some of the +underlying color bleeding through, which can cause flickering if the two +textures are almost the same. To avoid this, change the animation +slightly so that rather than crossfading, we first fade in the new +texture then fade out the old texture. This doesn't cause a whole lot of +visual difference for two completely different textures, but removes the +flickering when they are very similar. + +BUG: 463061 +BUG: 463685 +--- + src/declarativeimports/core/iconitem.cpp | 8 ++++++-- + 1 file changed, 6 insertions(+), 2 deletions(-) + +diff --git a/src/declarativeimports/core/iconitem.cpp b/src/declarativeimports/core/iconitem.cpp +index de1f56c69..a474a72f9 100644 +--- a/src/declarativeimports/core/iconitem.cpp ++++ b/src/declarativeimports/core/iconitem.cpp +@@ -645,8 +645,12 @@ QSGNode *IconItem::updatePaintNode(QSGNode *oldNode, UpdatePaintNodeData *update + m_textureChanged = true; + } + +- updateSubtree(oldNode->firstChild(), 1.0 - m_animValue); +- updateSubtree(oldNode->lastChild(), m_animValue); ++ // Rather than doing a perfect crossfade, first fade in the new texture ++ // then fade out the old texture. This is done to avoid the underlying ++ // color bleeding through when both textures are at ~0.5 opacity, which ++ // causes flickering if the two textures are very similar. ++ updateSubtree(oldNode->firstChild(), 2.0 - m_animValue * 2.0); ++ updateSubtree(oldNode->lastChild(), m_animValue * 2.0); + } else { + if (oldNode->childCount() == 0) { + oldNode->appendChildNode(createSubtree(1.0)); +-- +GitLab + diff --git a/kde-frameworks/plasma/plasma-5.102.0-r2.ebuild b/kde-frameworks/plasma/plasma-5.102.0-r2.ebuild new file mode 100644 index 000000000000..19a29410133d --- /dev/null +++ b/kde-frameworks/plasma/plasma-5.102.0-r2.ebuild @@ -0,0 +1,72 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +KDE_ORG_NAME="${PN}-framework" +PVCUT=$(ver_cut 1-2) +QTMIN=5.15.5 +VIRTUALX_REQUIRED="test" +inherit ecm frameworks.kde.org + +DESCRIPTION="Plasma framework" + +LICENSE="LGPL-2+" +KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86" +IUSE="gles2-only man wayland" + +RESTRICT="test" + +# kde-frameworks/kwindowsystem[X]: Unconditional use of KX11Extras +RDEPEND=" + >=dev-qt/qtdbus-${QTMIN}:5 + >=dev-qt/qtdeclarative-${QTMIN}:5 + >=dev-qt/qtgui-${QTMIN}:5[gles2-only=,X] + >=dev-qt/qtquickcontrols-${QTMIN}:5 + >=dev-qt/qtsql-${QTMIN}:5 + >=dev-qt/qtsvg-${QTMIN}:5 + >=dev-qt/qtwidgets-${QTMIN}:5 + >=dev-qt/qtx11extras-${QTMIN}:5 + =kde-frameworks/kactivities-${PVCUT}*:5 + =kde-frameworks/karchive-${PVCUT}*:5 + =kde-frameworks/kconfig-${PVCUT}*:5[qml] + =kde-frameworks/kconfigwidgets-${PVCUT}*:5 + =kde-frameworks/kcoreaddons-${PVCUT}*:5 + =kde-frameworks/kdeclarative-${PVCUT}*:5 + =kde-frameworks/kglobalaccel-${PVCUT}*:5 + =kde-frameworks/kguiaddons-${PVCUT}*:5 + =kde-frameworks/ki18n-${PVCUT}*:5 + =kde-frameworks/kiconthemes-${PVCUT}*:5 + =kde-frameworks/kio-${PVCUT}*:5 + =kde-frameworks/kirigami-${PVCUT}*:5 + =kde-frameworks/knotifications-${PVCUT}*:5 + =kde-frameworks/kpackage-${PVCUT}*:5 + =kde-frameworks/kservice-${PVCUT}*:5 + =kde-frameworks/kwidgetsaddons-${PVCUT}*:5 + =kde-frameworks/kwindowsystem-${PVCUT}*:5[X] + =kde-frameworks/kxmlgui-${PVCUT}*:5 + x11-libs/libX11 + x11-libs/libxcb + !gles2-only? ( media-libs/libglvnd[X] ) + wayland? ( + =kde-frameworks/kwayland-${PVCUT}*:5 + media-libs/libglvnd + ) +" +DEPEND="${RDEPEND} + x11-base/xorg-proto +" +BDEPEND="man? ( >=kde-frameworks/kdoctools-${PVCUT}:5 )" + +PATCHES=( "${FILESDIR}/${P}-fix-flicker-on-fade-animation.patch" ) # KDE-bug 463061, 463685 + +src_configure() { + local mycmakeargs=( + $(cmake_use_find_package !gles2-only OpenGL) + $(cmake_use_find_package man KF5DocTools) + $(cmake_use_find_package wayland EGL) + $(cmake_use_find_package wayland KF5Wayland) + ) + + ecm_src_configure +}