Date: Fri, 29 May 2020 10:40:39 +0000 (UTC) From: Jan Beich <jbeich@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r536963 - in head/x11-servers/xwayland-devel: . files Message-ID: <202005291040.04TAedxS070688@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: jbeich Date: Fri May 29 10:40:38 2020 New Revision: 536963 URL: https://svnweb.freebsd.org/changeset/ports/536963 Log: x11-servers/xwayland-devel: simplify r536952 again 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:14:51 2020 (r536962) +++ head/x11-servers/xwayland-devel/Makefile Fri May 29 10:40:38 2020 (r536963) @@ -4,7 +4,7 @@ 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 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:14:51 2020 (r536962) +++ head/x11-servers/xwayland-devel/files/patch-hw_xwayland_xwayland-glx.c Fri May 29 10:40:38 2020 (r536963) @@ -2,21 +2,16 @@ 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,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);
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202005291040.04TAedxS070688>