gentoo auto-resync : 03:03:2024 - 05:42:20

7 files changed, 46 insertions, 4 deletions

diff --git a/gui-wm/Manifest.gz b/gui-wm/Manifest.gz
index 0c87ff95d92b..0fa7cdda0418 100644
--- a/gui-wm/Manifest.gz
+++ b/gui-wm/Manifest.gz
diff --git a/gui-wm/hyprland/Manifest b/gui-wm/hyprland/Manifest
index 8f78f3e01336..b5ec6ab0db88 100644
--- a/gui-wm/hyprland/Manifest
+++ b/gui-wm/hyprland/Manifest
@@ -1,9 +1,10 @@
 AUX gcc14.patch 1300 BLAKE2B c737318ca98ca4a3782353c74656b4f13abd675fcd61c4ccd8b80f72161b11b601f4fc07774c6c174ee141e215f99d8949cf2eb4f617a445f4502f890767c7ac SHA512 aa7e4bfadf12c8bf6e26b4e0751d7906a8fcf9171587d4f5561e2af22ee28b62100bc9e7759b760a92414d6004fecdda00fe2d140264738d0cb1eec86ff00172
+AUX legacy-renderer-fix.patch 1286 BLAKE2B 9cb692fa6df1b149af165090e08840d13bc190ae3d7c551962f9998676623b004fd794541ed0d4a88b36adc3186c6cd4f9f3f3ab9929fbd102bed1f8ef836e92 SHA512 5030e9a8051b8845ec6a1089955faca15efe17cc455cbd7bce0726bc2a3b6fd8842b6182de42064035be94b71b0eb07ade62657b4da2494fc9b33ed42ce8c28e
 DIST hyprland-0.34.0.gh.tar.gz 14128415 BLAKE2B 059fc8b849daeb71b08d7114fd8aea1264c0e9967f471df66b27aca46b95fd499d2929730ba66981bb7d6c423479533b280839db7839ca1df007825f72fb9bf8 SHA512 35cce0668a13d7e7fd220d62efd965a069ff0213996bfa47ca0852c6258881bc070020d4831364b325b71d8ce7373d1793a89006a4341088dcbaf01914920f1a
 DIST hyprland-0.35.0.gh.tar.gz 54200453 BLAKE2B f5a8a5ed5f5ca28e5fc5a329d5191abce458b9bf0b99bee970aaa4be40671bfe945dabe2b3ff34ca753beeb35ec7fe016e6a54669dbe1ee4f25e2c128c3e390d SHA512 5afe7c340b994f2542982d8c8fa837b2a43ef9e487810fec0b33e4a5cc9188b71e41a0be22839191cf15e9c1fdfd964d0751def51f93db438e4a45649077c8a7
 DIST hyprland-0.36.0.gh.tar.gz 54632144 BLAKE2B 8f27044702d50fd5b937cab096c340ed7b7c86fda65e2b15fd4704038f2f4a62eb5a75cf00cc721da66dd7aaf820052ba02d8457bef928ad0ecc8622d4e151c1 SHA512 964f60baf08d9e5cc978853f24d3fca8cb5115eab3dd5e9c6542db2bbb0b5b73fa61a863077e12bcfc9ed70c6af75f380928e21246e42af0870ee3a6475df5cc
 EBUILD hyprland-0.34.0.ebuild 3732 BLAKE2B 931c743c8bf05fe46179ec7fd4968439899b1dcd6e9afc23b01ab86372a666342b9fe7b27b49dca10d08e1c6eb667dae823e0acdfccdbdb05ceed7856a80a8e0 SHA512 dada8e515fb9eaae7bca023b5e5442f78c19ff9483a0a7f30b148fad7fc1cf6222d739bf35ad41a494f10dba59faa0f0c416c06064b139b166b9ff8a6e1c2533
-EBUILD hyprland-0.35.0-r1.ebuild 3669 BLAKE2B 8d9558c003d134a30e0dddcbab4656adef342446542931b245ba11396836d7bd021b0aa6df21d78a518978ce19693a1b85809014e6a2d68600a3f856c25c0697 SHA512 48cd123d85feaa75447f3284343ad92276d90307e4ffa87cea2be66e171c77b3e2fa65fa3819503b9e14c26a321fa932be7dc2bf79d04844f2b5c68d532605e0
-EBUILD hyprland-0.36.0.ebuild 3695 BLAKE2B 701d2fbf0a16269a35d0fae70aff4be76bc657e66a408be96bf49d50408e58da6601ad9d40351ecad7b178ea0517764a95840ed2a0f4fa08f2d8f4198700cfea SHA512 227c89c5bb29fa929fe101bb8864b788f9e2a2664ae456d6feca1537294879ade2317f06f4ac2e6cc430b8060c462f7aac88f9f5fac1b2b33f7c8cdd279f1c9f
+EBUILD hyprland-0.35.0-r2.ebuild 3723 BLAKE2B 6e18553b83f0085af157e2e8c4787553bd2ce3d75bc7fe06768d0114f966a9c96f0b99ddd78559fe21b3c347903e4b84be962e949423fa44f3b06ecb0d478144 SHA512 fd8b1f4d7a070165ea2831749a06bf76735344e00208fc8f53d14c0a9fb1d068286558984fc6e5d34f1ed67c8058d225eb8fd5a735deadc119c9ceed8cf6426c
+EBUILD hyprland-0.36.0-r1.ebuild 3749 BLAKE2B f26f7ffc00a8b4f99b22bf3b00d18f29b18e5f559d74cbd78e4675d07ef396e93b9fe272b8273a25ffa83023cb7df457231cf4ac89d4abf0bbb966c3422d56a0 SHA512 d66e32743df7a2a076fe07b5f22cc0a13017382b592c59be1d4230eaf7a08c197e95f86d370def8df147bdc8415eb473f6ca3bf3db5aa258067eded73d83b6d7
 EBUILD hyprland-9999.ebuild 3688 BLAKE2B 0807116ff1b4bcdff900c0d86984ffb3bd149f7418115aa54e7a5545454caf5e5c766f5069b204a1f35819afeeb5aa7f03cb11959b24a74b277e07fff17d8dc4 SHA512 16ed656c75a06df000d6e0a5e184606b4fbc57fc8568e54d5cc7eeffdd1d4ce7a405b39e9351b61ad5221544d91564e8207f185e712cfac36742bb92121e4ef4
 MISC metadata.xml 716 BLAKE2B fc5248c809b9b5bf1002e3d82ff80f595b8e613d09e5541f1a0151c3ea2c117376d25fa5a40c85d254533708d9eff5339bd329b42118e87ca49e22e55c0c5d7b SHA512 31252ced2546f3686f17259aabfe9273af14f7efaf3fa0bfb446c65c6d9478be3a23c531e0ac463f27fe1d50842f6f126f32e47a8a03a345306297e182952e98
diff --git a/gui-wm/hyprland/files/legacy-renderer-fix.patch b/gui-wm/hyprland/files/legacy-renderer-fix.patch
new file mode 100644
index 000000000000..a1ecbbd7ec5a
--- /dev/null
+++ b/gui-wm/hyprland/files/legacy-renderer-fix.patch
@@ -0,0 +1,33 @@
+# https://github.com/hyprwm/Hyprland/pull/4928
+# https://bugs.gentoo.org/925912
+diff --git a/src/render/OpenGL.cpp b/src/render/OpenGL.cpp
+index 64f582f2..a6f2dc03 100644
+--- a/src/render/OpenGL.cpp
++++ b/src/render/OpenGL.cpp
+@@ -353,7 +353,11 @@ void CHyprOpenGLImpl::end() {
+     // check for gl errors
+     const GLenum ERR = glGetError();
+ 
++#ifdef GLES2
++    if (ERR == GL_CONTEXT_LOST_KHR) /* We don't have infra to recover from this */
++#else
+     if (ERR == GL_CONTEXT_LOST) /* We don't have infra to recover from this */
++#endif
+         RASSERT(false, "glGetError at Opengl::end() returned GL_CONTEXT_LOST. Cannot continue until proper GPU reset handling is implemented.");
+ }
+ 
+@@ -2057,7 +2061,13 @@ void CHyprOpenGLImpl::createBGTextureForMonitor(CMonitor* pMonitor) {
+     tex.m_vSize = IMAGESIZE * scale;
+ 
+     // copy the data to an OpenGL texture we have
+-    const GLint glIFormat = CAIROFORMAT == CAIRO_FORMAT_RGB96F ? GL_RGB32F : GL_RGBA;
++    const GLint glIFormat = CAIROFORMAT == CAIRO_FORMAT_RGB96F ?
++#ifdef GLES2
++	  GL_RGB32F_EXT :
++#else
++	  GL_RGB32F :
++#endif
++	  GL_RGBA;
+     const GLint glFormat  = CAIROFORMAT == CAIRO_FORMAT_RGB96F ? GL_RGB : GL_RGBA;
+     const GLint glType    = CAIROFORMAT == CAIRO_FORMAT_RGB96F ? GL_FLOAT : GL_UNSIGNED_BYTE;
+ 
diff --git a/gui-wm/hyprland/hyprland-0.35.0-r1.ebuild b/gui-wm/hyprland/hyprland-0.35.0-r2.ebuild
index bd70e22a7247..81c8b1bbcb99 100644
--- a/gui-wm/hyprland/hyprland-0.35.0-r1.ebuild
+++ b/gui-wm/hyprland/hyprland-0.35.0-r2.ebuild
@@ -93,6 +93,10 @@ BDEPEND="
 	virtual/pkgconfig
 "
 
+PATCHES=(
+	"${FILESDIR}/legacy-renderer-fix.patch"
+)
+
 pkg_setup() {
 	[[ ${MERGE_TYPE} == binary ]] && return
 
diff --git a/gui-wm/hyprland/hyprland-0.36.0.ebuild b/gui-wm/hyprland/hyprland-0.36.0-r1.ebuild
index cecf622b3be8..972fe7b33988 100644
--- a/gui-wm/hyprland/hyprland-0.36.0.ebuild
+++ b/gui-wm/hyprland/hyprland-0.36.0-r1.ebuild
@@ -94,6 +94,10 @@ BDEPEND="
 	virtual/pkgconfig
 "
 
+PATCHES=(
+	"${FILESDIR}/legacy-renderer-fix.patch"
+)
+
 pkg_setup() {
 	[[ ${MERGE_TYPE} == binary ]] && return
 
diff --git a/gui-wm/sway/Manifest b/gui-wm/sway/Manifest
index ac3b1b59b975..97bbb42c805d 100644
--- a/gui-wm/sway/Manifest
+++ b/gui-wm/sway/Manifest
@@ -1,7 +1,7 @@
 AUX sway-portals.conf 216 BLAKE2B d30b62bb142802e5067c2829d69faba87b07c8a36661f43473b0a107fd57d020b3dcc5e7a1967a1fca13b7a5e9140063b7285c44b766f67002213521d676b1ab SHA512 790741df028822bf4d83170dea57e1c63f7d7938cf31969e4cd347b0fc07330322b603c9ec0091b7a3f425132bed9dee6f261074cc273555120858beaaaf5da1
 DIST sway-1.8.1.tar.gz 5577483 BLAKE2B 0e21c3a113b6bbb4a535ef77e347304ead98a424b65c176299f3d86fd52c35abf88d4e88fff0a8ecdb48494e8275110c79ea35fafd2902653db03fd938ee0323 SHA512 1f9909cb0402a99926d0ff1cefb98c40930e61678067413b6f195b036e6018a4f85bb3a6649d8bb743c93f0476b103791617a94d7c8c11a2c021f40131b65563
 DIST sway-1.9.tar.gz 5581281 BLAKE2B 11d90866e3d12a76880f41e006be5ae7f3a3b1e6cbeb2412d30b673be91be7f60523dcce2892579e1da76de1d0498e0669138aa953bf1f595b97123720812e06 SHA512 7ec0a29078eb7e0fb1b6af97613c263adec78ddb03a63cb75fb5e44c7241ed144687fd094ee2eb70f4397832ca9bdffc88bc32dee7683bf0e515417c7a05d4c4
-EBUILD sway-1.8.1-r2.ebuild 2778 BLAKE2B 3b4c9f334df8814193a68cf2feee6308eb0b9fbc728a0c963385cad35c370c74a7ed1416513ef16c0c0685afad2a8180096f76c40b6953f59b12025b2460e1aa SHA512 9057720db0e61d05fc62d966cd4df6525eeaec3a25a6de1b12aa70112589239a08ca8b9379fb16136150d2473b18e4af56a86345eefcca0c79982ea6a1fb2e21
+EBUILD sway-1.8.1-r2.ebuild 2777 BLAKE2B d3eca9d01c78701eb34d24f0b17bccb6749c82b7cc51ceb90dbeccb3f8a9e72f01c53bb61bd7d18707b729597cb1e254215a42fba73b0bf6ee0fce70bd6dd06c SHA512 508c773652ca63d6ba5c018d0fea2d7c626f68711e60d3cbd5053ee197245fa22bd32a8ae7af8e7b4d94be8d1704e32dd478d13b1ff2f6a759cd5074f9b156cf
 EBUILD sway-1.8.1.ebuild 2698 BLAKE2B df1f17e70b9424c8553efcd353b206c89e4e5d08a895e2346ece8e1f6766ac41b322451e0afe6a584cebc65d8466e7f4879154f6e1326fae6c04db66514d9a92 SHA512 247e84b485036f0cfb37da95f587cba2733740769b33c4e3bf456d52d01ada64cad70e061a95029a8a1c5dd056c63212f6e796e2b217ac3669c2c7df107f1bfe
 EBUILD sway-1.9.ebuild 2693 BLAKE2B 9f8bb9be70b0e00432fb1d36a2d281c780658c34f8775191860798091ad89fe088301b16c59b06fbfd8789658f967cc2e26cde7cd8681b001287f676cb62c4df SHA512 f0555473ae327b5694b9fd6b6da8eb7b2841d6eee824d63d54c4620937f6b914485d0d3dc685dda3537cd54dd9318d736f9d37437b45c976771ab959202e86ba
 EBUILD sway-9999.ebuild 2693 BLAKE2B 9f8bb9be70b0e00432fb1d36a2d281c780658c34f8775191860798091ad89fe088301b16c59b06fbfd8789658f967cc2e26cde7cd8681b001287f676cb62c4df SHA512 f0555473ae327b5694b9fd6b6da8eb7b2841d6eee824d63d54c4620937f6b914485d0d3dc685dda3537cd54dd9318d736f9d37437b45c976771ab959202e86ba
diff --git a/gui-wm/sway/sway-1.8.1-r2.ebuild b/gui-wm/sway/sway-1.8.1-r2.ebuild
index 386132c3082e..5b4365fc1617 100644
--- a/gui-wm/sway/sway-1.8.1-r2.ebuild
+++ b/gui-wm/sway/sway-1.8.1-r2.ebuild
@@ -14,7 +14,7 @@ if [[ ${PV} == 9999 ]]; then
 else
 	MY_PV=${PV/_rc/-rc}
 	SRC_URI="https://github.com/swaywm/${PN}/archive/${MY_PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="amd64 ~arm64 ~loong ~ppc64 ~riscv x86"
+	KEYWORDS="amd64 arm64 ~loong ~ppc64 ~riscv x86"
 	S="${WORKDIR}/${PN}-${MY_PV}"
 fi