gentoo auto-resync : 11:04:2023 - 17:39:25

3 files changed, 35 insertions, 8 deletions

diff --git a/gui-libs/egl-wayland/Manifest b/gui-libs/egl-wayland/Manifest
index 8d823b8bc30f..2eaffff8083e 100644
--- a/gui-libs/egl-wayland/Manifest
+++ b/gui-libs/egl-wayland/Manifest
@@ -1,11 +1,11 @@
 AUX 10_nvidia_wayland.json 115 BLAKE2B b10206c742e8966d1192b9b0604137e6b296d2be74a437841c63844c0716343578b11565a34fb4c534d5908c0b5775305581b68039a6ff9ed7421c9d385a2b7a SHA512 1a611ac0fc2762d94661efc28fa58d57a821185afa7589158d1b8d503bd7361ba1b5029302550134ed1787c2bf90e2ea8afbf3bdefbfe268d8cf13d2f340fb47
+AUX egl-wayland-1.1.11_p20230202-destruction-order.patch 721 BLAKE2B 165d020b195f35c687446d45b29207f78fbd228e726f7cdbcb42f76ce066aaaa5060816e07b6da0230c1edbf785511ab34c241e93d06cab61eb1a7b5e38c5270 SHA512 fd195ffc46b2dd034d6e651ab53a7c7a30d8a5ef83862bc1a90e1dfb9169e17594ad9626d2aea87dac30c30a24bfc692cd706db1233e7f4ed4133278e742238d
 AUX egl-wayland-1.1.6-remove-werror.patch 251 BLAKE2B 12a14b185f9b1cb3a42226708642f5b57c2b0eb64d81c96438ee24ac45b950ba588591194648fc8e64e3aa8d2fda9ba2dba63a2f78fc22c00a14d56403bf6839 SHA512 c6c3c4d4f776f44d642d51ab2eed44a0388558b43f2c4c894b6d19bdef40b8a646be43b6b356a3ffa0297e36a48122ef057265db68a8717020abe30906bc8f28
 DIST egl-wayland-1.1.11-r1.tar.gz 60207 BLAKE2B de73d66bd09a0ae626cfb8fd8be8dde4ea8828fa19ec2a811f40ed01e8d3e17c6363394497bba9c8d0fea6549b7fc64df9b75755bb584cdbccbb516791ea1e3c SHA512 f9c618a505e6307d139d1e6bfd0ad206c041ee4dc7e74ce60d2b102114c5d7b21a74c5aaff3aa97de2fa3297600a4e5edbff07906cd6acef7dd468086598690f
 DIST egl-wayland-1.1.11_p20230202.tar.gz 67029 BLAKE2B 8261f33c885a5b9673a463d624e253c75ae5afac3364a4de7d7d51a3d0b57495fd62324e3924bd4e649475a0afd0eaab3b02b3b3fe86b689411ed123ec85e018 SHA512 ec505a76ab2b847b1e7f27969be82d86acd40fe573eaa90271971f84b0c4b6195f0fccc5ec184dc58f2b6fb5591e4a05eca1265494e0a3ce39841ae84e86fed2
 DIST egl-wayland-1.1.7.tar.gz 48681 BLAKE2B eebbd0e36045c50b39ef70292156f5cd137a51af2169b56a35d318d90ade3d4a5b94206d86246d52fda0c6c093ff25e389b1a3ccbe60595dc9661d199e30f33b SHA512 edc81d9f2c617587044d5f9d35b3e355db8544e8fa1d861c1b92a5a11bc1af7d994ca8abd49ce6f462a1971f20296b4c757bdf1df0d2bfc981cdafaa839f12af
-DIST egl-wayland-1.1.9_p20211123.tar.gz 58900 BLAKE2B a5a08df06e302b573f1036264495e7b29ec4d3def9be0e9b8037206a42aab5c18d78b79cc3f3ffeede9708916e644f8090fadf34318429cf0040c3623da28ce1 SHA512 8de18c8c0c38ca672688a5197be20534cc90b0fecae9ea2f3d3bc851d5b50d3f148a4ce97b835a9576251c8273ea21f82f2c9694cf2b7bba28fa3b53850c43b2
 EBUILD egl-wayland-1.1.11-r1.ebuild 1046 BLAKE2B aa6db37abd96507554df476c7b39ee1f2ebb0ed3d3d4ba3a8663864ddaf7fa7bfd70ed0a27d3e3af8953ef1a0b395ab8d16b125f75f27169e3dede16ec18b817 SHA512 eae66d9fd5eca40854dae25b7cf6cd1e6e17e35e1aaa289c3b2d83bca2a161be4078870d0d93651953ef2d25b0b39e990d73c63a39bfd63689b5b24acfc130b6
+EBUILD egl-wayland-1.1.11_p20230202-r1.ebuild 1181 BLAKE2B 09a1235cfb04201e2915ef807e04b74e73e46f714e8fecde3f2ba5182f42005e8ae30c9ce4234be77ddc91e7fd431c8b73982fdfb7599f4d031ea06db4558773 SHA512 16c393f02dcd7f017e89a2fe7b011c2c429ceab1a7f0346be2fc5b2f4bb0a6b9f669b1648a4e3fbc5822dd140cabfb64bd85cea3d6bc6fb0ab3e34581ccbcc5f
 EBUILD egl-wayland-1.1.11_p20230202.ebuild 1136 BLAKE2B 60c50fe2f7f6a5d47c8956239abe41c5f6cfba9435d2e2b802b646ee7ff94e4f406de5b73c48009229d9b4d7cef026504f97d24625e15ffb2dd607fc7b9dd85a SHA512 c93acda342833b6195f41f96cf7b2794c7d89ebf172224eaec73fed608aacf7e12b81a9c3c6a253ebdcdf2d106a03abf7fe92dc053046ed843b52a912f874694
 EBUILD egl-wayland-1.1.7-r1.ebuild 988 BLAKE2B ac030502297459062ff6bd939e83812e07e2edf812b5708d76a922083a2af418d098d4d1354cfdd0a022163b6c59f1012ade54ba88b9a33e19342b2db596fb2f SHA512 00180e53ac1efe51e5d50eeeec61e8d2a9cfbc743ed4600b8a68e34d5a957eed294f9c73d20d9f3269ee8c61c7b147c2ad758259f8d81998b50711fdfcda4d0e
-EBUILD egl-wayland-1.1.9_p20211123.ebuild 1129 BLAKE2B ca41e3227547992a663de981c78118b74415fa408f4b0dfb709c018ce5339519cea50ad4ca3520cdf093fecf3ab678394bc4bf5f8f4439942f3ca31ca5547879 SHA512 bab104e19b3f4dfda41631f4710a7fd544aec7a95fea23988bff407c5750ba4405197488f276612689254705127350353970aa925112d30287a7a5c08a597f1d
 MISC metadata.xml 329 BLAKE2B 9763d8fac09a9b4902a2a5d61f0f109659ad580117b52d7f844785e449623480752356d31507d86be1198b56a6e38fa6a6fa20aa2151421f79f3ce94f98865a5 SHA512 ae3d6edba2229abebf7f87b448a3f1eacd592d28f6ff3bf80e50e14d8718f15e5a67ec8496cdf03f86532f9525638c3dab5020ba9f62d2a9a4495a16a617d4d4
diff --git a/gui-libs/egl-wayland/egl-wayland-1.1.9_p20211123.ebuild b/gui-libs/egl-wayland/egl-wayland-1.1.11_p20230202-r1.ebuild
index 984ad1e0b540..a45f4637f69d 100644
--- a/gui-libs/egl-wayland/egl-wayland-1.1.9_p20211123.ebuild
+++ b/gui-libs/egl-wayland/egl-wayland-1.1.11_p20230202-r1.ebuild
@@ -1,20 +1,20 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
 
 inherit meson
 
-EGLWAYLAND_HASH="582b2d345abaa0e313cf16c902e602084ea59551"
+HASH_EGLWAYLAND=30c5a951a849f835acc9f11ea4ca4e1d3380b7eb
 
 DESCRIPTION="EGLStream-based Wayland external platform"
 HOMEPAGE="https://github.com/NVIDIA/egl-wayland"
-SRC_URI="https://github.com/NVIDIA/egl-wayland/archive/${EGLWAYLAND_HASH}.tar.gz -> ${P}.tar.gz"
-S="${WORKDIR}/${PN}-${EGLWAYLAND_HASH}"
+SRC_URI="https://github.com/NVIDIA/egl-wayland/archive/${HASH_EGLWAYLAND}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/${PN}-${HASH_EGLWAYLAND}"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 ~arm64"
+KEYWORDS="~amd64 ~arm64"
 
 RDEPEND="
 	dev-libs/wayland
@@ -23,11 +23,13 @@ DEPEND="
 	${RDEPEND}
 	dev-libs/wayland-protocols
 	gui-libs/eglexternalplatform
-	>=media-libs/libglvnd-1.3.4"
+	media-libs/libglvnd
+	x11-libs/libdrm"
 BDEPEND="dev-util/wayland-scanner"
 
 PATCHES=(
 	"${FILESDIR}"/${PN}-1.1.6-remove-werror.patch
+	"${FILESDIR}"/${P}-destruction-order.patch
 )
 
 src_install() {
diff --git a/gui-libs/egl-wayland/files/egl-wayland-1.1.11_p20230202-destruction-order.patch b/gui-libs/egl-wayland/files/egl-wayland-1.1.11_p20230202-destruction-order.patch
new file mode 100644
index 000000000000..9611ac7dc0da
--- /dev/null
+++ b/gui-libs/egl-wayland/files/egl-wayland-1.1.11_p20230202-destruction-order.patch
@@ -0,0 +1,25 @@
+https://bugs.gentoo.org/904072
+https://github.com/NVIDIA/egl-wayland/pull/79
+
+From 979200d803c5ed9cb08ac752ac828f28753fc445 Mon Sep 17 00:00:00 2001
+From: q234rty <q23456yuiop@gmail.com>
+Date: Fri, 7 Apr 2023 18:08:03 +0800
+Subject: [PATCH] Fix wrong destruction order for event queue
+--- a/src/wayland-egldisplay.c
++++ b/src/wayland-egldisplay.c
+@@ -704,12 +704,12 @@ static void getServerProtocolsInfo(struct wl_display *nativeDpy,
+         }
+     }
+ 
++    if (wlRegistry) {
++        wl_registry_destroy(wlRegistry);
++    }
+     if (queue) {
+         wl_event_queue_destroy(queue);
+     }
+-    if (wlRegistry) {
+-       wl_registry_destroy(wlRegistry);
+-    }
+ }
+ 
+ EGLDisplay wlEglGetPlatformDisplayExport(void *data,