[gentoo-commits] repo/gentoo:master commit in: gui-libs/egl-wayland/, gui-libs/egl-wayland/files/

[Ionen Wolkens]

commit:     ac6473a8db862b387072ebc9bb12447e12daffcb
Author:     Ionen Wolkens <ionen <AT> gentoo <DOT> org>
AuthorDate: Thu Sep  1 06:07:29 2022 +0000
Commit:     Ionen Wolkens <ionen <AT> gentoo <DOT> org>
CommitDate: Thu Sep  1 06:46:57 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ac6473a8

gui-libs/egl-wayland: drop 1.1.10-r1

Signed-off-by: Ionen Wolkens <ionen <AT> gentoo.org>

 gui-libs/egl-wayland/Manifest                      |  1 -
 gui-libs/egl-wayland/egl-wayland-1.1.10-r1.ebuild  | 44 ----------
 .../egl-wayland-1.1.10-revert-defer-resizes.patch  | 96 ----------------------
 3 files changed, 141 deletions(-)

diff --git a/gui-libs/egl-wayland/Manifest b/gui-libs/egl-wayland/Manifest
index ce969c6ed6b9..93cb058a71af 100644
--- a/gui-libs/egl-wayland/Manifest
+++ b/gui-libs/egl-wayland/Manifest
@@ -1,4 +1,3 @@
-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.7.tar.gz 48681 BLAKE2B eebbd0e36045c50b39ef70292156f5cd137a51af2169b56a35d318d90ade3d4a5b94206d86246d52fda0c6c093ff25e389b1a3ccbe60595dc9661d199e30f33b SHA512 edc81d9f2c617587044d5f9d35b3e355db8544e8fa1d861c1b92a5a11bc1af7d994ca8abd49ce6f462a1971f20296b4c757bdf1df0d2bfc981cdafaa839f12af
 DIST egl-wayland-1.1.9_p20211123.tar.gz 58900 BLAKE2B a5a08df06e302b573f1036264495e7b29ec4d3def9be0e9b8037206a42aab5c18d78b79cc3f3ffeede9708916e644f8090fadf34318429cf0040c3623da28ce1 SHA512 8de18c8c0c38ca672688a5197be20534cc90b0fecae9ea2f3d3bc851d5b50d3f148a4ce97b835a9576251c8273ea21f82f2c9694cf2b7bba28fa3b53850c43b2

diff --git a/gui-libs/egl-wayland/egl-wayland-1.1.10-r1.ebuild b/gui-libs/egl-wayland/egl-wayland-1.1.10-r1.ebuild
deleted file mode 100644
index d3d107c293bf..000000000000
--- a/gui-libs/egl-wayland/egl-wayland-1.1.10-r1.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit meson
-
-DESCRIPTION="EGLStream-based Wayland external platform"
-HOMEPAGE="https://github.com/NVIDIA/egl-wayland"
-SRC_URI="https://github.com/NVIDIA/egl-wayland/archive/refs/tags/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64"
-
-RDEPEND="
-	dev-libs/wayland
-	!<x11-drivers/nvidia-drivers-470.57.02[wayland(-)]"
-DEPEND="
-	${RDEPEND}
-	dev-libs/wayland-protocols
-	gui-libs/eglexternalplatform
-	>=media-libs/libglvnd-1.3.4
-	x11-libs/libdrm"
-BDEPEND="dev-util/wayland-scanner"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-1.1.6-remove-werror.patch
-	"${FILESDIR}"/${P}-revert-defer-resizes.patch
-)
-
-src_install() {
-	meson_src_install
-
-	insinto /usr/share/egl/egl_external_platform.d
-	doins "${FILESDIR}"/10_nvidia_wayland.json
-}
-
-pkg_postinst() {
-	if has_version "<x11-drivers/nvidia-drivers-391"; then
-		ewarn "<=nvidia-drivers-390.xx may not work properly with this version of"
-		ewarn "egl-wayland, it is recommended to use nouveau drivers for wayland."
-	fi
-}

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