Skip site navigation (1)Skip section navigation (2)
Date:      Fri, 29 May 2020 08:40:01 +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: r536952 - in head/x11-servers/xwayland-devel: . files
Message-ID:  <202005290840.04T8e1Ux096137@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: jbeich
Date: Fri May 29 08:40:01 2020
New Revision: 536952
URL: https://svnweb.freebsd.org/changeset/ports/536952

Log:
  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

Added:
  head/x11-servers/xwayland-devel/files/
  head/x11-servers/xwayland-devel/files/patch-hw_xwayland_xwayland-glx.c   (contents, props changed)
Modified:
  head/x11-servers/xwayland-devel/Makefile   (contents, props changed)

Modified: head/x11-servers/xwayland-devel/Makefile
==============================================================================
--- head/x11-servers/xwayland-devel/Makefile	Fri May 29 08:38:54 2020	(r536951)
+++ head/x11-servers/xwayland-devel/Makefile	Fri May 29 08:40:01 2020	(r536952)
@@ -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
 

Added: head/x11-servers/xwayland-devel/files/patch-hw_xwayland_xwayland-glx.c
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/x11-servers/xwayland-devel/files/patch-hw_xwayland_xwayland-glx.c	Fri May 29 08:40:01 2020	(r536952)
@@ -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;
+ 



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202005290840.04T8e1Ux096137>