[gentoo-commits] repo/gentoo:master commit in: kde-plasma/kwin/files/, kde-plasma/kwin/

["Andreas Sturmlechner" <asturm@gentoo.org>]

commit:     cc89b7121c0c5bc2c0eede16f1a7f3a18c9e2232
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Mon Apr 21 20:39:30 2025 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Mon Apr 21 20:48:41 2025 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cc89b712

kde-plasma/kwin: Fix OpenGL context crash during GPU reset

See also:
https://invent.kde.org/plasma/kwin/-/merge_requests/7525

Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>

 .../files/kwin-6.3.4-0006-gpu-reset-crash.patch    |  39 +++++
 kde-plasma/kwin/kwin-6.3.4-r2.ebuild               | 159 +++++++++++++++++++++
 2 files changed, 198 insertions(+)

diff --git a/kde-plasma/kwin/files/kwin-6.3.4-0006-gpu-reset-crash.patch b/kde-plasma/kwin/files/kwin-6.3.4-0006-gpu-reset-crash.patch
new file mode 100644
index 000000000000..057f7a61d6a1
--- /dev/null
+++ b/kde-plasma/kwin/files/kwin-6.3.4-0006-gpu-reset-crash.patch
@@ -0,0 +1,39 @@
+https://invent.kde.org/plasma/kwin/-/merge_requests/7525
+
+From 87fa6e16c7b744f3e92856eb0dbb3f20943403ff Mon Sep 17 00:00:00 2001
+From: Xaver Hugl <xaver.hugl@gmail.com>
+Date: Thu, 17 Apr 2025 13:17:09 +0000
+Subject: [PATCH] opengl/eglcontext: only delete the vao if the context is
+ current
+
+Making the context can fail during a GPU reset, and then we'd crash trying
+to access the OpenGL function.
+
+This fixes https://crash-reports.kde.org/share/issue/425cb2a56d6d4cdeadfc9e985726a7e8/
+
+
+(cherry picked from commit 8dbfdb9420c227b8be729dfa6265f6212359ca45)
+
+Co-authored-by: Xaver Hugl <xaver.hugl@gmail.com>
+---
+ src/opengl/eglcontext.cpp | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/src/opengl/eglcontext.cpp b/src/opengl/eglcontext.cpp
+index 48017391281..f1f9a4e3fa6 100644
+--- a/src/opengl/eglcontext.cpp
++++ b/src/opengl/eglcontext.cpp
+@@ -71,8 +71,8 @@ EglContext::EglContext(EglDisplay *display, EGLConfig config, ::EGLContext conte
+ 
+ EglContext::~EglContext()
+ {
+-    makeCurrent();
+-    if (m_vao) {
++    const bool current = makeCurrent();
++    if (m_vao && current) {
+         glDeleteVertexArrays(1, &m_vao);
+     }
+     m_shaderManager.reset();
+-- 
+GitLab
+

diff --git a/kde-plasma/kwin/kwin-6.3.4-r2.ebuild b/kde-plasma/kwin/kwin-6.3.4-r2.ebuild
new file mode 100644
index 000000000000..c66972a685b5
--- /dev/null
+++ b/kde-plasma/kwin/kwin-6.3.4-r2.ebuild
@@ -0,0 +1,159 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+ECM_HANDBOOK="optional"
+ECM_TEST="true"
+KFMIN=6.10.0
+QTMIN=6.8.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 ~loong ~ppc64 ~riscv ~x86"
+IUSE="accessibility gles2-only lock screencast +shortcuts systemd"
+
+RESTRICT="test"
+
+# qtbase slot op: GuiPrivate use in tabbox
+# qtbase[X]: private/qtx11extras_p.h in src/helpers/killer
+COMMON_DEPEND="
+	dev-libs/libei
+	>=dev-libs/libinput-1.27:=
+	>=dev-libs/wayland-1.23.0
+	>=dev-qt/qt5compat-${QTMIN}:6[qml]
+	>=dev-qt/qtbase-${QTMIN}:6=[accessibility=,gles2-only=,gui,libinput,opengl,widgets,X]
+	>=dev-qt/qtdeclarative-${QTMIN}:6
+	>=dev-qt/qtsensors-${QTMIN}:6
+	>=dev-qt/qtshadertools-${QTMIN}:6
+	>=dev-qt/qtsvg-${QTMIN}:6
+	>=dev-qt/qtwayland-${QTMIN}:6
+	>=kde-frameworks/kauth-${KFMIN}:6
+	>=kde-frameworks/kcmutils-${KFMIN}:6
+	>=kde-frameworks/kcolorscheme-${KFMIN}:6
+	>=kde-frameworks/kconfig-${KFMIN}:6[qml]
+	>=kde-frameworks/kconfigwidgets-${KFMIN}:6
+	>=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=[X(+)]
+	>=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,X]
+	>=kde-frameworks/kxmlgui-${KFMIN}:6
+	>=kde-plasma/breeze-${KDE_CATV}:6
+	>=kde-plasma/kdecoration-${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,X]
+	virtual/libudev:=
+	x11-libs/libX11
+	x11-libs/libXi
+	>=x11-libs/libdrm-2.4.116
+	>=x11-libs/libxcb-1.10:=
+	>=x11-libs/libxcvt-0.1.1
+	>=x11-libs/libxkbcommon-1.5.0
+	x11-libs/xcb-util-cursor
+	x11-libs/xcb-util-keysyms
+	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 )
+"
+RDEPEND="${COMMON_DEPEND}
+	!kde-plasma/kdeplasma-addons:5
+	>=dev-qt/qtmultimedia-${QTMIN}:6[qml]
+	|| (
+		dev-qt/qtmultimedia:6[ffmpeg]
+		(
+			dev-qt/qtmultimedia:6[gstreamer]
+			media-plugins/gst-plugins-soup:1.0
+		)
+	)
+	>=kde-frameworks/kirigami-${KFMIN}:6
+	>=kde-frameworks/kitemmodels-${KFMIN}:6
+	>=kde-plasma/aurorae-${KDE_CATV}:6
+	>=kde-plasma/libplasma-${KDE_CATV}:6[wayland(+)]
+	sys-apps/hwdata
+	>=x11-base/xwayland-23.1.0[libei]
+"
+DEPEND="${COMMON_DEPEND}
+	>=dev-libs/plasma-wayland-protocols-1.16.0
+	>=dev-libs/wayland-protocols-1.38
+	>=dev-qt/qttools-${QTMIN}:6[widgets]
+	>=dev-qt/qtbase-${QTMIN}:6[concurrent]
+	x11-base/xorg-proto
+	x11-libs/xcb-util-image
+	test? ( screencast? ( >=kde-plasma/kpipewire-${KDE_CATV}:6 ) )
+"
+BDEPEND="
+	>=dev-qt/qtwayland-${QTMIN}:6
+	dev-util/wayland-scanner
+	>=kde-frameworks/kcmutils-${KFMIN}: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}-0001-drm-crash.patch
+	"${FILESDIR}"/${P}-0002-layer-shell.patch
+	"${FILESDIR}"/${P}-0003-renderloop-crash.patch
+	"${FILESDIR}"/${P}-0004-xwayland.patch
+	"${FILESDIR}"/${P}-0005-x11-crash.patch
+	"${FILESDIR}"/${P}-0006-gpu-reset-crash.patch
+)
+
+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
+
+	cmake_run_in src/plugins cmake_comment_add_subdirectory kdecorations
+}
+
+src_configure() {
+	local mycmakeargs=(
+		# TODO: KWIN_BUILD_X11=$(usex xwayland) KWIN_BUILD_X11_BACKEND=$(usex X)
+		# KWIN_BUILD_NOTIFICATIONS exists, but kdeclarative still hard-depends on it
+		$(cmake_use_find_package accessibility QAccessibilityClient6)
+		-DCMAKE_DISABLE_FIND_PACKAGE_Libcap=ON
+		-DKWIN_BUILD_SCREENLOCKER=$(usex lock)
+		-DKWIN_BUILD_GLOBALSHORTCUTS=$(usex shortcuts)
+	)
+
+	ecm_src_configure
+}
+
+pkg_postinst() {
+	xdg_pkg_postinst
+	fcaps_pkg_postinst
+}