diff options
| author | Jan Beich <jbeich@FreeBSD.org> | 2020-05-29 08:40:01 +0000 |
|---|---|---|
| committer | Jan Beich <jbeich@FreeBSD.org> | 2020-05-29 08:40:01 +0000 |
| commit | 1c76ca5124d2bb3537d8b04cab02fd8833090b71 (patch) | |
| tree | a4fcd8f5db9838c1aefef957f9f62747bb2a0d7a /x11-servers | |
| parent | Mark BROKEN: fails to build (diff) | |
x11-servers/xwayland-devel: work around missing GLX_EXT_libglvnd
$ pkg install nvidia-driver
$ glxinfo
name of display: :0
X Error of failed request: BadValue (integer parameter out of range for operation)
Major opcode of failed request: 150 (GLX)
Minor opcode of failed request: 24 (X_GLXCreateNewContext)
Value in failed request: 0x0
Serial number of failed request: 39
Current serial number in output stream: 40
Notes
Notes:
svn path=/head/; revision=536952
Diffstat (limited to 'x11-servers')
| -rw-r--r-- | x11-servers/xwayland-devel/Makefile | 1 | ||||
| -rw-r--r-- | x11-servers/xwayland-devel/files/patch-hw_xwayland_xwayland-glx.c | 25 |
2 files changed, 26 insertions, 0 deletions
diff --git a/x11-servers/xwayland-devel/Makefile b/x11-servers/xwayland-devel/Makefile index cd8a1a084deb..49a542fb6edd 100644 --- a/x11-servers/xwayland-devel/Makefile +++ b/x11-servers/xwayland-devel/Makefile @@ -4,6 +4,7 @@ PORTNAME= xwayland DISTVERSIONPREFIX= xorg-server- DISTVERSION= 1.20.0-655 DISTVERSIONSUFFIX= -g${GL_COMMIT:C/(.{12}).*/\1/} +PORTREVISION= 1 CATEGORIES= x11-servers PKGNAMESUFFIX= -devel diff --git a/x11-servers/xwayland-devel/files/patch-hw_xwayland_xwayland-glx.c b/x11-servers/xwayland-devel/files/patch-hw_xwayland_xwayland-glx.c new file mode 100644 index 000000000000..30b6b529dd3d --- /dev/null +++ b/x11-servers/xwayland-devel/files/patch-hw_xwayland_xwayland-glx.c @@ -0,0 +1,25 @@ +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) + struct xwl_screen *xwl_screen = xwl_screen_get(pScreen); + __GLXscreen *base; + ++#ifdef XWL_HAS_EGLSTREAM ++ return NULL; ++#endif ++ + if (enableIndirectGLX) + return NULL; /* not implemented */ + +@@ -353,6 +357,9 @@ 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; + |