kpriv/freebsd-ports
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

x11-servers/xwayland-devel: simplify r536952

Browse source
This commit is contained in:
Jan Beich 2020-05-29 10:14:51 +00:00
parent 2f19aa57df
commit 8772438207
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=536962
2 changed files with 5 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
x11-servers/xwayland-devel/Makefile
View file

@ -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

11
x11-servers/xwayland-devel/files/patch-hw_xwayland_xwayland-glx.c
View file

@ -2,24 +2,21 @@ 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,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;