svn commit: r536962 - in head/x11-servers/xwayland-devel: . files
Jan Beich
jbeich at FreeBSD.org
Fri May 29 10:14:52 UTC 2020
Author: jbeich
Date: Fri May 29 10:14:51 2020
New Revision: 536962
URL: https://svnweb.freebsd.org/changeset/ports/536962
Log:
x11-servers/xwayland-devel: simplify r536952
Modified:
head/x11-servers/xwayland-devel/Makefile (contents, props changed)
head/x11-servers/xwayland-devel/files/patch-hw_xwayland_xwayland-glx.c (contents, props changed)
Modified: head/x11-servers/xwayland-devel/Makefile
==============================================================================
--- head/x11-servers/xwayland-devel/Makefile Fri May 29 10:00:38 2020 (r536961)
+++ head/x11-servers/xwayland-devel/Makefile Fri May 29 10:14:51 2020 (r536962)
@@ -4,7 +4,7 @@ PORTNAME= xwayland
DISTVERSIONPREFIX= xorg-server-
DISTVERSION= 1.20.0-655
DISTVERSIONSUFFIX= -g${GL_COMMIT:C/(.{12}).*/\1/}
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= x11-servers
PKGNAMESUFFIX= -devel
Modified: head/x11-servers/xwayland-devel/files/patch-hw_xwayland_xwayland-glx.c
==============================================================================
--- head/x11-servers/xwayland-devel/files/patch-hw_xwayland_xwayland-glx.c Fri May 29 10:00:38 2020 (r536961)
+++ head/x11-servers/xwayland-devel/files/patch-hw_xwayland_xwayland-glx.c Fri May 29 10:14:51 2020 (r536962)
@@ -2,24 +2,21 @@ https://gitlab.freedesktop.org/xorg/xserver/-/issues/1
--- hw/xwayland/xwayland-glx.c.orig 2020-05-20 07:13:28 UTC
+++ hw/xwayland/xwayland-glx.c
-@@ -343,6 +343,10 @@ egl_screen_probe(ScreenPtr pScreen)
+@@ -343,6 +343,9 @@ egl_screen_probe(ScreenPtr pScreen)
struct xwl_screen *xwl_screen = xwl_screen_get(pScreen);
__GLXscreen *base;
-+#ifdef XWL_HAS_EGLSTREAM
-+ return NULL;
-+#endif
++ if (xwl_screen->egl_backend == &xwl_screen->eglstream_backend)
++ return NULL;
+
if (enableIndirectGLX)
return NULL; /* not implemented */
-@@ -353,6 +357,9 @@ egl_screen_probe(ScreenPtr pScreen)
+@@ -353,6 +356,7 @@ egl_screen_probe(ScreenPtr pScreen)
base->destroy = egl_screen_destroy;
base->createDrawable = egl_create_glx_drawable;
/* base.swapInterval = NULL; */
-+#ifndef XWL_HAS_EGLSTREAM
+ base->glvnd = strdup("mesa");
-+#endif
screen->display = xwl_screen->glamor_ctx->display;
More information about the svn-ports-all
mailing list