Index: head/x11-servers/xwayland-devel/Makefile
===================================================================
--- head/x11-servers/xwayland-devel/Makefile	(revision 536962)
+++ head/x11-servers/xwayland-devel/Makefile	(revision 536963)
@@ -1,75 +1,75 @@
 # $FreeBSD$
 
 PORTNAME=	xwayland
 DISTVERSIONPREFIX=	xorg-server-
 DISTVERSION=	1.20.0-655
 DISTVERSIONSUFFIX=	-g${GL_COMMIT:C/(.{12}).*/\1/}
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	x11-servers
 PKGNAMESUFFIX=	-devel
 
 PATCH_SITES=	${GL_SITE}/${GL_ACCOUNT}/${GL_PROJECT}/-/commit/
 PATCHFILES+=	f2cf236da8e8.diff:-p1 # https://gitlab.freedesktop.org/xorg/xserver/-/merge_requests/393
 PATCHFILES+=	be731e0bdc7d.diff:-p1 # https://gitlab.freedesktop.org/xorg/xserver/-/merge_requests/393
 PATCHFILES+=	b5b529799a20.diff:-p1 # https://gitlab.freedesktop.org/xorg/xserver/-/merge_requests/393
 PATCHFILES+=	9e0086f99b39.diff:-p1 # https://gitlab.freedesktop.org/xorg/xserver/-/merge_requests/432
 PATCHFILES+=	30ea6cb622e9.diff:-p1 # https://gitlab.freedesktop.org/xorg/xserver/-/merge_requests/432
 
 MAINTAINER=	jbeich@FreeBSD.org
 COMMENT=	X11 server as Wayland client (development snapshot)
 
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 BUILD_DEPENDS=	evdev-proto>0:devel/evdev-proto \
 		${LOCALBASE}/include/GL/internal/dri_interface.h:graphics/mesa-dri \
 		wayland-protocols>=1.18:graphics/wayland-protocols
 LIB_DEPENDS=	libdrm.so:graphics/libdrm \
 		libepoxy.so:graphics/libepoxy \
 		libwayland-client.so:graphics/wayland
 RUN_DEPENDS=	xkbcomp:x11/xkbcomp \
 		xkeyboard-config>0:x11/xkeyboard-config
 
 CONFLICTS_INSTALL=	${PORTNAME}
 
 USES=		compiler:c11 gl meson pkgconfig xorg
 USE_GITLAB=	yes
 USE_GL=		gbm gl
 USE_XORG=	pixman xau xdmcp xfont2 xkbfile xshmfence xtrans
 GL_SITE=	https://gitlab.freedesktop.org
 GL_ACCOUNT=	xorg
 GL_PROJECT=	xserver
 GL_COMMIT=	4195e8035645007be313ade79032b8d561ceec6c
 MESON_ARGS=	-Dxwayland=true \
 		-Dxorg=false \
 		-Dxnest=false \
 		-Dxvfb=false \
 		-Dudev=false \
 		-Dudev_kms=false \
 		-Ddefault_font_path="${DEFAULT_FONTPATH_LIST:ts,}"
 PLIST_FILES=	bin/Xwayland
 
 # Keep in sync with xorg-server
 FONTPATH_ROOT?=	${LOCALBASE}/share/fonts
 FONTPATHD?=	${PREFIX}/etc/X11/fontpath.d
 DEFAULT_FONTPATH_LIST= \
 	${FONTPATH_ROOT}/misc/	\
 	${FONTPATH_ROOT}/TTF/ \
 	${FONTPATH_ROOT}/OTF/ \
 	${FONTPATH_ROOT}/Type1/ \
 	${FONTPATH_ROOT}/100dpi/ \
 	${FONTPATH_ROOT}/75dpi/ \
 	catalogue:${FONTPATHD}
 
 OPTIONS_DEFINE=	NVIDIA
 
 NVIDIA_DESC=		EGLStream support for glamor on Xwayland
 NVIDIA_BUILD_DEPENDS=	egl-wayland>0:graphics/egl-wayland
 NVIDIA_MESON_TRUE=	xwayland_eglstream
 
 do-install:
 # Wayland compositors only use the binary
 	${INSTALL_PROGRAM} ${BUILD_WRKSRC}/hw/xwayland/Xwayland \
 		${STAGEDIR}${PREFIX}/bin
 
 .include <bsd.port.mk>
Index: head/x11-servers/xwayland-devel/files/patch-hw_xwayland_xwayland-glx.c
===================================================================
--- head/x11-servers/xwayland-devel/files/patch-hw_xwayland_xwayland-glx.c	(revision 536962)
+++ head/x11-servers/xwayland-devel/files/patch-hw_xwayland_xwayland-glx.c	(revision 536963)
@@ -1,22 +1,17 @@
 https://gitlab.freedesktop.org/xorg/xserver/-/issues/1032
 
 --- hw/xwayland/xwayland-glx.c.orig	2020-05-20 07:13:28 UTC
 +++ hw/xwayland/xwayland-glx.c
-@@ -343,6 +343,9 @@ egl_screen_probe(ScreenPtr pScreen)
-     struct xwl_screen *xwl_screen = xwl_screen_get(pScreen);
-     __GLXscreen *base;
- 
-+    if (xwl_screen->egl_backend == &xwl_screen->eglstream_backend)
-+        return NULL;
-+
-     if (enableIndirectGLX)
-         return NULL; /* not implemented */
- 
-@@ -353,6 +356,7 @@ egl_screen_probe(ScreenPtr pScreen)
-     base->destroy = egl_screen_destroy;
+@@ -354,6 +354,12 @@ egl_screen_probe(ScreenPtr pScreen)
      base->createDrawable = egl_create_glx_drawable;
      /* base.swapInterval = NULL; */
-+    base->glvnd = strdup("mesa");
  
++    /* GlxVendorLibrary is queried in DRI2, so assume Mesa for now */
++    if (xwl_screen->egl_backend == &xwl_screen->eglstream_backend)
++        base->glvnd = strdup("nvidia");
++    else
++        base->glvnd = strdup("mesa");
++
      screen->display = xwl_screen->glamor_ctx->display;
  
+     __glXInitExtensionEnableBits(screen->base.glx_enable_bits);