From owner-svn-ports-all@freebsd.org Fri May 29 10:40:39 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 94CCD335966; Fri, 29 May 2020 10:40:39 +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 49YLgq3SJ0z4VQl; Fri, 29 May 2020 10:40:39 +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 71E8216622; Fri, 29 May 2020 10:40:39 +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 04TAedm8070689; Fri, 29 May 2020 10:40:39 GMT (envelope-from jbeich@FreeBSD.org) Received: (from jbeich@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 04TAedxS070688; Fri, 29 May 2020 10:40:39 GMT (envelope-from jbeich@FreeBSD.org) Message-Id: <202005291040.04TAedxS070688@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 10:40:39 +0000 (UTC) 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 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: 536963 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 10:40:39 -0000 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);