commit: 7be20e7f427f7bb1ca56e132057a30d24c672e93 Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> AuthorDate: Thu Oct 30 13:46:56 2025 +0000 Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> CommitDate: Thu Oct 30 13:48:13 2025 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7be20e7f
kde-plasma/kwin: Fix black screen on wayland for some dual-GPU configs KDE-bug: https://bugs.kde.org/show_bug.cgi?id=511216 Closes: https://bugs.gentoo.org/965183 Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org> ...-6.5.1-drm-fix-implicit-modifier-fallback.patch | 37 ++++++ kde-plasma/kwin/kwin-6.5.1-r1.ebuild | 145 +++++++++++++++++++++ 2 files changed, 182 insertions(+) diff --git a/kde-plasma/kwin/files/kwin-6.5.1-drm-fix-implicit-modifier-fallback.patch b/kde-plasma/kwin/files/kwin-6.5.1-drm-fix-implicit-modifier-fallback.patch new file mode 100644 index 000000000000..e86b0d792a63 --- /dev/null +++ b/kde-plasma/kwin/files/kwin-6.5.1-drm-fix-implicit-modifier-fallback.patch @@ -0,0 +1,37 @@ +From a33cc222f53a7c8a9b5716ab48f236f5dfc7e5b0 Mon Sep 17 00:00:00 2001 +From: Xaver Hugl <[email protected]> +Date: Wed, 29 Oct 2025 20:46:51 +0100 +Subject: [PATCH] backends/drm: fix implicit modifier fallback + +The per-plane format list only contains explicit modifiers, so this basically +forced explicit modifiers in all cases. + +BUG: 511216 +--- + src/backends/drm/drm_plane.cpp | 10 +++------- + 1 file changed, 3 insertions(+), 7 deletions(-) + +diff --git a/src/backends/drm/drm_plane.cpp b/src/backends/drm/drm_plane.cpp +index fc265c238d5..ef0994ec04a 100644 +--- a/src/backends/drm/drm_plane.cpp ++++ b/src/backends/drm/drm_plane.cpp +@@ -142,13 +142,9 @@ bool DrmPlane::updateProperties() + for (auto it = m_supportedFormats.begin(); it != m_supportedFormats.end(); it++) { + const auto info = FormatInfo::get(it.key()); + if (info && info->bitsPerPixel <= 32) { +- if (it.value().contains(DRM_FORMAT_MOD_INVALID)) { +- // Mesa usually picks the modifier with lowest bandwidth requirements, +- // so prefer implicit modifiers for low bandwidth if supported +- m_lowBandwidthFormats.insert(it.key(), {DRM_FORMAT_MOD_INVALID}); +- } else { +- m_lowBandwidthFormats.insert(it.key(), it.value()); +- } ++ // Mesa usually picks the modifier with lowest bandwidth requirements, ++ // so prefer implicit modifiers for low bandwidth if supported ++ m_lowBandwidthFormats.insert(it.key(), {DRM_FORMAT_MOD_INVALID}); + } + } + +-- +GitLab + diff --git a/kde-plasma/kwin/kwin-6.5.1-r1.ebuild b/kde-plasma/kwin/kwin-6.5.1-r1.ebuild new file mode 100644 index 000000000000..d44b9b9afad7 --- /dev/null +++ b/kde-plasma/kwin/kwin-6.5.1-r1.ebuild @@ -0,0 +1,145 @@ +# Copyright 1999-2025 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +ECM_HANDBOOK="optional" +# TODO: ECMGenerateQDoc +ECM_TEST="true" +KFMIN=6.18.0 +QTMIN=6.9.1 +inherit ecm fcaps plasma.kde.org xdg + +DESCRIPTION="Flexible, composited Window Manager for windowing systems on Linux" + +LICENSE="GPL-2+" +SLOT="6" +KEYWORDS="~amd64 ~arm64" +IUSE="accessibility gles2-only lock screencast +shortcuts systemd X" + +RESTRICT="test" + +# qtbase slot op: GuiPrivate use in tabbox, Qt6WaylandClientPrivate for xx-pip-v1 +# qtbase[X]: private/qtx11extras_p.h in src/helpers/killer +COMMON_DEPEND=" + dev-libs/libei + >=dev-libs/libinput-1.27:= + >=dev-libs/wayland-1.24.0 + >=dev-qt/qt5compat-${QTMIN}:6[qml] + >=dev-qt/qtbase-${QTMIN}:6=[accessibility=,gles2-only=,gui,libinput,opengl,wayland,widgets,X] + >=dev-qt/qtdeclarative-${QTMIN}:6 + >=dev-qt/qtsensors-${QTMIN}:6 + >=dev-qt/qtshadertools-${QTMIN}:6 + >=dev-qt/qtsvg-${QTMIN}:6 + >=dev-qt/qttools-${QTMIN}:6[widgets] + >=kde-frameworks/kauth-${KFMIN}:6 + >=kde-frameworks/kcmutils-${KFMIN}:6 + >=kde-frameworks/kcolorscheme-${KFMIN}:6 + >=kde-frameworks/kconfig-${KFMIN}:6[qml] + >=kde-frameworks/kcoreaddons-${KFMIN}:6 + >=kde-frameworks/kcrash-${KFMIN}:6 + >=kde-frameworks/kdbusaddons-${KFMIN}:6 + >=kde-frameworks/kdeclarative-${KFMIN}:6 + >=kde-frameworks/kglobalaccel-${KFMIN}:6 + >=kde-frameworks/kguiaddons-${KFMIN}:6[wayland] + >=kde-frameworks/ki18n-${KFMIN}:6 + >=kde-frameworks/kidletime-${KFMIN}:6=[wayland] + >=kde-frameworks/knewstuff-${KFMIN}:6 + >=kde-frameworks/knotifications-${KFMIN}:6 + >=kde-frameworks/kpackage-${KFMIN}:6 + >=kde-frameworks/kservice-${KFMIN}:6 + >=kde-frameworks/ksvg-${KFMIN}:6 + >=kde-frameworks/kwidgetsaddons-${KFMIN}:6 + >=kde-frameworks/kwindowsystem-${KFMIN}:6=[wayland] + >=kde-frameworks/kxmlgui-${KFMIN}:6 + >=kde-plasma/kdecoration-${KDE_CATV}:6 + >=kde-plasma/knighttime-${KDE_CATV}:6 + >=kde-plasma/kwayland-${KDE_CATV}:6 + >=kde-plasma/plasma-activities-${KDE_CATV}:6= + media-libs/fontconfig + media-libs/freetype + media-libs/lcms:2 + media-libs/libcanberra + >=media-libs/libdisplay-info-0.2.0:= + media-libs/libepoxy + media-libs/libglvnd + >=media-libs/mesa-24.1.0_rc1[opengl,wayland] + virtual/libudev:= + >=x11-libs/libdrm-2.4.118 + >=x11-libs/libxcb-1.10:= + >=x11-libs/libxcvt-0.1.1 + >=x11-libs/libxkbcommon-1.5.0 + x11-libs/xcb-util-wm + accessibility? ( media-libs/libqaccessibilityclient:6 ) + lock? ( >=kde-plasma/kscreenlocker-${KDE_CATV}:6 ) + screencast? ( >=media-video/pipewire-1.2.0:= ) + shortcuts? ( >=kde-plasma/kglobalacceld-${KDE_CATV}:6 ) + X? ( + x11-libs/libX11 + x11-libs/libXi + x11-libs/libXres + x11-libs/xcb-util-keysyms + ) +" +RDEPEND="${COMMON_DEPEND} + !kde-plasma/kdeplasma-addons:5 + >=kde-frameworks/kirigami-${KFMIN}:6 + >=kde-frameworks/kitemmodels-${KFMIN}:6 + >=kde-plasma/aurorae-${KDE_CATV}:6 + >=kde-plasma/breeze-${KDE_CATV}:6 + >=kde-plasma/libplasma-${KDE_CATV}:6 + sys-apps/hwdata + X? ( >=x11-base/xwayland-23.1.0[libei] ) +" +RDEPEND+=" || ( >=dev-qt/qtbase-6.10:6[wayland] <dev-qt/qtwayland-6.10:6 )" +DEPEND="${COMMON_DEPEND} + >=dev-libs/plasma-wayland-protocols-1.19.0 + >=dev-libs/wayland-protocols-1.45 + >=dev-qt/qtbase-${QTMIN}:6[concurrent] + test? ( screencast? ( >=kde-plasma/kpipewire-${KDE_CATV}:6 ) ) + X? ( x11-base/xorg-proto ) +" +BDEPEND=" + >=dev-qt/qtbase-${QTMIN}:6[wayland] + dev-util/wayland-scanner + >=kde-frameworks/kcmutils-${KFMIN}:6 +" +BDEPEND+=" || ( >=dev-qt/qtbase-6.10:6[wayland] <dev-qt/qtwayland-6.10:6 )" + +# https://bugs.gentoo.org/941628 +# -m 0755 to avoid suid with USE="-filecaps" +FILECAPS=( -m 0755 cap_sys_nice=ep usr/bin/kwin_wayland ) + +PATCHES=( "${FILESDIR}/${P}-drm-fix-implicit-modifier-fallback.patch" ) # KDE-bug #511216 + +src_prepare() { + ecm_src_prepare + + # TODO: try to get a build switch upstreamed + if ! use screencast; then + sed -e "s/^pkg_check_modules.*PipeWire/#&/" -i CMakeLists.txt || die + fi + + # TODO: try to get a build switch upstreamed + if ! use systemd; then + sed -e "s/^pkg_check_modules.*libsystemd/#&/" -i CMakeLists.txt || die + fi +} + +src_configure() { + local mycmakeargs=( + # KWIN_BUILD_DECORATIONS exists, drops aurorae, breeze + # KWIN_BUILD_NOTIFICATIONS exists, but kdeclarative still hard-depends on it + $(cmake_use_find_package accessibility QAccessibilityClient6) + -DKWIN_BUILD_SCREENLOCKER=$(usex lock) + -DKWIN_BUILD_GLOBALSHORTCUTS=$(usex shortcuts) + -DKWIN_BUILD_X11=$(usex X) + ) + + ecm_src_configure +} + +pkg_postinst() { + xdg_pkg_postinst + fcaps_pkg_postinst +}
