gentoo auto-resync : 14:02:2024 - 17:36:28

3 files changed, 84 insertions, 0 deletions

diff --git a/dev-qt/qtwayland/Manifest b/dev-qt/qtwayland/Manifest
index c469d7ee8c10..2f9cc804d761 100644
--- a/dev-qt/qtwayland/Manifest
+++ b/dev-qt/qtwayland/Manifest
@@ -1,9 +1,12 @@
+AUX qtwayland-6.6.2-nvidia-threaded-gl.patch 1402 BLAKE2B 6cdff13bf4b6ef14d3aed6001691ab7893d0b1d1b1c0549ad9a2c7984d6aab41fe6e30c3b6782c3250a78b1ba4ded278f3b3e81dee35c5826d8ec9858bfb621b SHA512 1bdf6d1168be4c05118aad817cd4a07630cd2992eddc8593b56c05cf1c64bdb89941be9da8efd4492b2fd3e196dc93e4f4667c25902ed2d0543ce3125317ac46
 DIST qtwayland-5.15.12-gentoo-kde-1.tar.xz 48548 BLAKE2B 706547b35251116550b7d838df489f770a58140b2ece34e22cf5cd13929fa801d9a057a38f66a34c47321e1c0958049774928a68f859082ad3664acee0f1bb73 SHA512 756edb0657580c3d65d6e4bb74e3ab31c326f2f25bf501c2761e8b3e538287792955c91c0e57e32d8a04c31577546481673bdd14f1abdc2aa28513edba3a670e
 DIST qtwayland-everywhere-opensource-src-5.15.12.tar.xz 569180 BLAKE2B 456b02d061ef6c57237463dd7b8387e4c6353648af0475a6ff6036ab2438417ecd3c60a8f3429aa52a98e9d213c0097fa3189602657611ae3657a2a520eb8c71 SHA512 acd78018665db3d0d77a84bb80ce7dbb65a33e0e813c3308e09a27195df204029b5e580f353eae2536e6fdde249aa34411e37f4f1663f7645448d96c9df67a66
 DIST qtwayland-everywhere-src-6.6.1.tar.xz 1127148 BLAKE2B 8eb11f5f7f200a6d548577089732a533318d6120a7498dcb258183b5e0fd444541e03b59e730018cab15a612f8a31dd7b51275899271d62173eb1962a70198d3 SHA512 7f6533754daad7a2804ddddcd5139608c2b8f1ef92ae8a238c1ed4fc41c8a3ee532da0b2e57266d07d4d39d1ec6c83eca487c73788a108af30035b0dae262c76
+DIST qtwayland-everywhere-src-6.6.2.tar.xz 1118996 BLAKE2B db54b7708f01a7e4e59561eb209d9c0cd79400ec477603d826061f3c2cf6683dccbbb48e73dc7b5ebe674ef7c5b438fd75eccbd4bab9191219598f526e6b395f SHA512 ed5539ac9515ba93822ee1dfdedd3ece46a51c50b23efd0fb90ead2728b651c41bec42a6e2e2caf72bda0f274940e9f00049bae42c1315e0226e4a42c708f664
 EBUILD qtwayland-5.15.12-r1.ebuild 1219 BLAKE2B 6498b4ebb7ecaef01dbd44bc0f0433049f69a8022c42d648f958b51d7fb3c984c0684f39ee44b1b101cf1488125f17ccfb4e7f4aabe45b1f94ab89fc8fbe3dbb SHA512 7f6cdf7895b2dd9084315d5c3e2eaafe053ac4a01efc7d1da467f8ec8c220ad9a6d2d998d813861722c216ff4a8085f0ab1e2d8673b20e0f8ea1412ba168305d
 EBUILD qtwayland-5.15.12.ebuild 1209 BLAKE2B 3aaca329c62f7f1636c4d6129a342b691ee8d15c509bc4515aef3dfc0d90a57c6a5cca1fbea1a12a942d244d19bd48efea89a6cd19fdaa1690213c71a37252e5 SHA512 b37a8c24734da053f013a6be33d8502bac1e31a1005e4118101b65ad81d050bf2731159462d9c4d565ce945257b1ab5d3b670e1b96bef2f7524a37e4632bcbaa
 EBUILD qtwayland-6.6.1.ebuild 992 BLAKE2B c982eed008a1789a4a3ecffa98559e0bc93a1cbcb1d83bcd648b786c1a7f3b6ca46e4e9d0d7a1aec326bc52b0e585db841e34daa72ec5b4ab6b31c3d53a54310 SHA512 b852d6388af5d83bdc6f8f8fa139200f89c854dbc7fc55d6c292052e1c5e14b9bc055cebd71e7ea1bccc6ef7d73e28461c4fcbd8acc89829a57408876759085c
+EBUILD qtwayland-6.6.2.ebuild 1051 BLAKE2B 28d48019a0e05d0402a74d08a32a6e9f185191b9a49a072560f0b08d5d9685dde4d95e86084727b35e227427d10e0cf95e3d92e4c5e92dca687a4ccba2d959ee SHA512 a8299661b952c46b5a26ca3cb0d6305e08bfddfd080e1dd611cd85103d4a5010bd422439e921773ab2037b0dd8f680397b2c235c34576db9ed66d2c90abce4a3
 EBUILD qtwayland-6.6.9999.ebuild 993 BLAKE2B 191010fad490a0eaef31456cddcec7fa50e91edea0b1655e0605e8d260026bad17d95b22fbde64c42444e2959c8cdaa7916647714f97ff6d21af5f59c9b4e26b SHA512 177204c0e4502111d726a3ebc3ca0f8ac0086a5e8f7fe5dcaa99202de5ea5f1144b0c1e18b69a0fa68ba5b833fc314b9f3e56a222e1c4637bd62e9ec5c46b46e
 EBUILD qtwayland-6.7.9999.ebuild 1001 BLAKE2B 0242dec3ed07a9d690b02adbc694165495e342728813b292893486f29b3ac805aceb9b59da5575fac1e81631c1ab5c0ac315d4732e1b85fde5d77852c608b3ea SHA512 dca00dd26a1f99efc6b6ed42aa29b79021b4c9b8187af1352d2b241be922448f5a1de085e92c8395f3f7548cb51bd295ba1ee5b76c3260e7ce044d6bcbda9579
 EBUILD qtwayland-6.9999.ebuild 1001 BLAKE2B 0242dec3ed07a9d690b02adbc694165495e342728813b292893486f29b3ac805aceb9b59da5575fac1e81631c1ab5c0ac315d4732e1b85fde5d77852c608b3ea SHA512 dca00dd26a1f99efc6b6ed42aa29b79021b4c9b8187af1352d2b241be922448f5a1de085e92c8395f3f7548cb51bd295ba1ee5b76c3260e7ce044d6bcbda9579
diff --git a/dev-qt/qtwayland/files/qtwayland-6.6.2-nvidia-threaded-gl.patch b/dev-qt/qtwayland/files/qtwayland-6.6.2-nvidia-threaded-gl.patch
new file mode 100644
index 000000000000..f7f7607024c5
--- /dev/null
+++ b/dev-qt/qtwayland/files/qtwayland-6.6.2-nvidia-threaded-gl.patch
@@ -0,0 +1,30 @@
+Backport from 6.6 branch which failed to make it in 6.6.2.
+
+https://bugreports.qt.io/browse/QTBUG-95817
+https://codereview.qt-project.org/c/qt/qtwayland/+/536732
+https://github.com/qt/qtwayland/commit/e4156bad6398dcbe8740041148d95ee9ed437d8b
+From: David Redondo <qt@david-redondo.de>
+Date: Wed, 31 Jan 2024 09:01:48 +0100
+Subject: [PATCH] client: Disable threaded GL on desktop NVIDIA
+
+Otherwise QtQuick windows freeze when resized.
+In order to still use threaded rendering on
+embedded platforms where resizing is not required
+we check if XDG_CURRENT_DESKTOP which should be
+set by  desktop environments.
+--- a/src/hardwareintegration/client/wayland-egl/qwaylandeglclientbufferintegration.cpp
++++ b/src/hardwareintegration/client/wayland-egl/qwaylandeglclientbufferintegration.cpp
+@@ -92,6 +92,13 @@ void QWaylandEglClientBufferIntegration::initialize(QWaylandDisplay *display)
+             break;
+         }
+     }
++
++    // On desktop NVIDIA resizing QtQuick freezes them when using threaded rendering QTBUG-95817
++    // In order to support threaded rendering on embedded platforms where resizing is not needed
++    // we check if XDG_CURRENT_DESKTOP is set which desktop environments should set
++    if (qstrcmp(vendor, "NVIDIA") == 0 && qEnvironmentVariableIsSet("XDG_CURRENT_DESKTOP")) {
++        m_supportsThreading = false;
++    }
+ }
+ 
+ bool QWaylandEglClientBufferIntegration::isValid() const
diff --git a/dev-qt/qtwayland/qtwayland-6.6.2.ebuild b/dev-qt/qtwayland/qtwayland-6.6.2.ebuild
new file mode 100644
index 000000000000..26be2cc76c6e
--- /dev/null
+++ b/dev-qt/qtwayland/qtwayland-6.6.2.ebuild
@@ -0,0 +1,51 @@
+# Copyright 2021-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit qt6-build
+
+DESCRIPTION="Wayland platform plugin for Qt"
+
+if [[ ${QT6_BUILD_TYPE} == release ]]; then
+	KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86"
+fi
+
+IUSE="compositor qml vulkan"
+
+RDEPEND="
+	dev-libs/wayland
+	~dev-qt/qtbase-${PV}:6[gui,opengl,vulkan=]
+	media-libs/libglvnd
+	x11-libs/libxkbcommon
+	compositor? (
+		qml? ( ~dev-qt/qtdeclarative-${PV}:6 )
+	)
+"
+DEPEND="
+	${RDEPEND}
+	vulkan? ( dev-util/vulkan-headers )
+"
+BDEPEND="dev-util/wayland-scanner"
+
+CMAKE_SKIP_TESTS=(
+	# segfaults for not-looked-into reasons, but not considered
+	# an issue given >=seatv5 exists since wayland-1.10 (2016)
+	tst_seatv4
+	# needs a compositor/opengl, skip the extra trouble
+	tst_surface
+	tst_xdgdecorationv1
+)
+
+PATCHES=(
+	"${FILESDIR}"/${P}-nvidia-threaded-gl.patch
+)
+
+src_configure() {
+	local mycmakeargs=(
+		$(cmake_use_find_package qml Qt6Quick)
+		$(qt_feature compositor wayland_server)
+	)
+
+	qt6-build_src_configure
+}