gentoo auto-resync : 01:09:2022 - 19:24:10

3 files changed, 2 insertions, 100 deletions

diff --git a/gui-libs/egl-wayland/Manifest b/gui-libs/egl-wayland/Manifest
index 5bb79bfe2120..59b3fbd7c091 100644
--- a/gui-libs/egl-wayland/Manifest
+++ b/gui-libs/egl-wayland/Manifest
@@ -1,12 +1,11 @@
 AUX 10_nvidia_wayland.json 115 BLAKE2B b10206c742e8966d1192b9b0604137e6b296d2be74a437841c63844c0716343578b11565a34fb4c534d5908c0b5775305581b68039a6ff9ed7421c9d385a2b7a SHA512 1a611ac0fc2762d94661efc28fa58d57a821185afa7589158d1b8d503bd7361ba1b5029302550134ed1787c2bf90e2ea8afbf3bdefbfe268d8cf13d2f340fb47
-AUX egl-wayland-1.1.10-revert-defer-resizes.patch 3050 BLAKE2B 5efb52754bffb5d1498cb193fedc41d452c3ac01ff8fb07eb0b368f579d52b0e4fc8bb2a290d1e3a87baaa90bbadecbf4ece40a5fc7110d670fc8d68032f3595 SHA512 58fdfca16e2acc535ba2c16c5a04b72111db339ee15879b7780eb79a2b29d36a3808754c92b290fe50930fcf3b55526d1317f071d28721db86d2a5a4847c6fe4
 AUX egl-wayland-1.1.6-remove-werror.patch 251 BLAKE2B 12a14b185f9b1cb3a42226708642f5b57c2b0eb64d81c96438ee24ac45b950ba588591194648fc8e64e3aa8d2fda9ba2dba63a2f78fc22c00a14d56403bf6839 SHA512 c6c3c4d4f776f44d642d51ab2eed44a0388558b43f2c4c894b6d19bdef40b8a646be43b6b356a3ffa0297e36a48122ef057265db68a8717020abe30906bc8f28
-DIST egl-wayland-1.1.10.tar.gz 60058 BLAKE2B c24cc0d6e45e43868140d4e16ad5092a951bebb71fa0d65e11ef8d4273d85589a435e6d29b73b665630b5a7e28fdbd8e1e02e5eb43eed7d06862caabae7146e9 SHA512 163ee1ae1e629c5d32ffdf335b35ba309d35c009f93a8391e78dcb710a86f64e017a37c1e77325c6f4782c8a5fe048ae44ad1456bd3a20ea651b4192c9102e3c
 DIST egl-wayland-1.1.10_p20220805.tar.gz 60283 BLAKE2B 14c272e4cc084892cc9eb822b85168e420c7cfd5472c9f24fd9aa6cc6a5aef2c75411c8c06e148c48e45c6ee4aa3179784b9e432905f41753840bf1ef576e634 SHA512 ce7aa6cc738dc392dfa9a6cf2c24253968404e011b4e921c6e3bf723fd4bc0eae63ef2050bef025a0726601e5ce2a08987293fd1674fb6c6b6c207969fd15bcb
+DIST egl-wayland-1.1.11.tar.gz 60459 BLAKE2B 3b9bb4da117da2494bc07667fcab56dba8fafc32b6a4f68ad85ffefd37087f67372852d8320d3a47dc83c9cb85173774d77d53873e4a016a138cd6ca68a1ffb9 SHA512 a9bb3e284cf1c90358ec7569cc7a9d01509b640e1313033116d0f10c18f9cbc5eb9d7f8aadfc3613beaa0c1d7c074ba32721f1f85f3e103c2dd1e3be7bf97f72
 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.10-r1.ebuild 1091 BLAKE2B 54979a22bd5605c8ac937b8a02a7d8db474790d33ba46072212532b83e84203f50d2d83ff2a8e88ef0f299ea973efd308b7fd7396578528531ebe30f0343067f SHA512 6e94d4f34073a8f5429205cbd8843b6d6af755512b440d1c430ea1b6ffc7f5fdb421729ab0cf999b7f1a3c530e0e5a687141bcfdc1d7a6a92c87f70f098e40c6
 EBUILD egl-wayland-1.1.10_p20220805.ebuild 1147 BLAKE2B 01a86a22b2f2c9dd6202c38f8c8d349f10bc4aa691cb3436c5c9c007e951d2c56ddf0e057815ef0ee62f10df5c6f1532ff1174328e0b2ef76233e0e221c0e863 SHA512 e15f55a0b3860a88134a31e9c45770a48982d56f39d959a81425cf3aaecf9956107dc0ea12c4f855d9a4ee93ce26c2fc12dddff2d98858f8964c77789191a262
+EBUILD egl-wayland-1.1.11.ebuild 1044 BLAKE2B 8b1f0bd3dc9c36bd92cd42b485a48d8d74cfb1e10bc1f27e28105e19620ac351b8b151399758edf6f1b007fab2670a889c5fe069fbfe3bf3a3f2b6c63ccef069 SHA512 46c9901ad62210b3e2d6587fe51e611286057d507e3aade87100ef37df76bd0e038a091b9eddb63d9955649a354c3119ad04c5c39fe7790b18c8a6ecc538860c
 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.10-r1.ebuild b/gui-libs/egl-wayland/egl-wayland-1.1.11.ebuild
index d3d107c293bf..15f3bab74424 100644
--- a/gui-libs/egl-wayland/egl-wayland-1.1.10-r1.ebuild
+++ b/gui-libs/egl-wayland/egl-wayland-1.1.11.ebuild
@@ -26,7 +26,6 @@ BDEPEND="dev-util/wayland-scanner"
 
 PATCHES=(
 	"${FILESDIR}"/${PN}-1.1.6-remove-werror.patch
-	"${FILESDIR}"/${P}-revert-defer-resizes.patch
 )
 
 src_install() {
diff --git a/gui-libs/egl-wayland/files/egl-wayland-1.1.10-revert-defer-resizes.patch b/gui-libs/egl-wayland/files/egl-wayland-1.1.10-revert-defer-resizes.patch
deleted file mode 100644
index bb54ad8d1a0c..000000000000
--- a/gui-libs/egl-wayland/files/egl-wayland-1.1.10-revert-defer-resizes.patch
+++ /dev/null
@@ -1,96 +0,0 @@
-1.1.10 is needed for >=515.57 for working vulkan on wayland but
-carries a major regression that can make applications half-displayed
-and unusable after a resize.
-
-Official drivers seem to do something similar, they ship a modified
-1.1.9 with vulkan fixes rather than 1.1.10.
-
-https://github.com/NVIDIA/egl-wayland/issues/57
-Revert of https://github.com/NVIDIA/egl-wayland/commit/ddaa272
---- a/src/wayland-eglsurface.c
-+++ b/src/wayland-eglsurface.c
-@@ -1612,17 +1612,30 @@
- }
- 
--void
--wlEglResizeSurfaceIfRequired(WlEglDisplay *display, WlEglPlatformData *pData, WlEglSurface *surface)
-+static void
-+resize_callback(struct wl_egl_window *window, void *data)
- {
-+    WlEglDisplay      *display = NULL;
-+    WlEglPlatformData *pData   = NULL;
-+    WlEglSurface      *surface = (WlEglSurface *)data;
-     EGLint             err     = EGL_SUCCESS;
- 
--    if (!surface) {
-+    if (!window || !surface) {
-+        return;
-+    }
-+
-+    display = surface->wlEglDpy;
-+    if (!wlEglIsWaylandDisplay(display->nativeDpy) ||
-+        !wlEglIsWaylandWindowValid(surface->wlEglWin)) {
-         return;
-     }
-+    pData = display->data;
- 
-     pthread_mutex_lock(&surface->mutexLock);
- 
-     /* Resize stream only if window geometry has changed */
--    if (surface->isResized) {
-+    if ((surface->width != window->width) ||
-+        (surface->height != window->height) ||
-+        (surface->dx != window->dx) ||
-+        (surface->dy != window->dy)) {
-         // If a damage thread is in use, wait for it to finish processing all
-         //   pending frames
-@@ -1630,5 +1643,4 @@
- 
-         discard_surface_context(surface);
--        surface->isResized = EGL_FALSE;
-         surface->ctx.wlStreamResource = NULL;
-         surface->ctx.isAttached = EGL_FALSE;
-@@ -1655,34 +1667,4 @@
-     pthread_mutex_unlock(&surface->mutexLock);
- }
--
--static void
--resize_callback(struct wl_egl_window *window, void *data)
--{
--    WlEglDisplay      *display = NULL;
--    WlEglSurface      *surface = (WlEglSurface *)data;
--
--    if (!window || !surface) {
--        return;
--    }
--
--    display = surface->wlEglDpy;
--    if (!wlEglIsWaylandDisplay(display->nativeDpy) ||
--        !wlEglIsWaylandWindowValid(surface->wlEglWin)) {
--        return;
--    }
--
--    pthread_mutex_lock(&surface->mutexLock);
--
--    /* Resize stream only if window geometry has changed */
--    if ((surface->width != window->width) ||
--        (surface->height != window->height) ||
--        (surface->dx != window->dx) ||
--        (surface->dy != window->dy)) {
--            surface->isResized = EGL_TRUE;
--            wl_surface_commit(surface->wlSurface);
--    }
--    
--    pthread_mutex_unlock(&surface->mutexLock);
--}
- 
- static EGLBoolean validateSurfaceAttrib(EGLAttrib attrib, EGLAttrib value)
---- a/src/wayland-eglswap.c
-+++ b/src/wayland-eglswap.c
-@@ -65,6 +65,4 @@
-     surface = eglSurface;
- 
--    wlEglResizeSurfaceIfRequired(display, data, surface);
--
-     if (surface->pendingSwapIntervalUpdate == EGL_TRUE) {
-         /* Send request from client to override swapinterval value based on