From owner-svn-ports-all@freebsd.org Fri May 29 08:40:02 2020 Return-Path: Delivered-To: svn-ports-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 2D080332CF9; Fri, 29 May 2020 08:40:02 +0000 (UTC) (envelope-from jbeich@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 49YJ0f06dHz4JZq; Fri, 29 May 2020 08:40:02 +0000 (UTC) (envelope-from jbeich@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id F35B915131; Fri, 29 May 2020 08:40:01 +0000 (UTC) (envelope-from jbeich@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 04T8e1jS096139; Fri, 29 May 2020 08:40:01 GMT (envelope-from jbeich@FreeBSD.org) Received: (from jbeich@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 04T8e1Ux096137; Fri, 29 May 2020 08:40:01 GMT (envelope-from jbeich@FreeBSD.org) Message-Id: <202005290840.04T8e1Ux096137@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: jbeich set sender to jbeich@FreeBSD.org using -f From: Jan Beich Date: Fri, 29 May 2020 08:40:01 +0000 (UTC) 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 X-SVN-Group: ports-head X-SVN-Commit-Author: jbeich X-SVN-Commit-Paths: in head/x11-servers/xwayland-devel: . files X-SVN-Commit-Revision: 536952 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.33 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 29 May 2020 08:40:02 -0000 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; +