From owner-svn-ports-head@freebsd.org Fri Jun 12 07:49:27 2020 Return-Path: Delivered-To: svn-ports-head@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 67061332702; Fri, 12 Jun 2020 07:49:27 +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 49jtCq25T6z46F7; Fri, 12 Jun 2020 07:49:27 +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 4323826381; Fri, 12 Jun 2020 07:49:27 +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 05C7nR77063134; Fri, 12 Jun 2020 07:49:27 GMT (envelope-from jbeich@FreeBSD.org) Received: (from jbeich@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 05C7nRDm063133; Fri, 12 Jun 2020 07:49:27 GMT (envelope-from jbeich@FreeBSD.org) Message-Id: <202006120749.05C7nRDm063133@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: jbeich set sender to jbeich@FreeBSD.org using -f From: Jan Beich Date: Fri, 12 Jun 2020 07:49:27 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r538568 - head/graphics/mesa-devel/files X-SVN-Group: ports-head X-SVN-Commit-Author: jbeich X-SVN-Commit-Paths: head/graphics/mesa-devel/files X-SVN-Commit-Revision: 538568 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.33 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 12 Jun 2020 07:49:27 -0000 Author: jbeich Date: Fri Jun 12 07:49:26 2020 New Revision: 538568 URL: https://svnweb.freebsd.org/changeset/ports/538568 Log: graphics/mesa-devel: don't override libGL if built without X11 Modified: head/graphics/mesa-devel/files/libmap.conf.in (contents, props changed) Modified: head/graphics/mesa-devel/files/libmap.conf.in ============================================================================== --- head/graphics/mesa-devel/files/libmap.conf.in Fri Jun 12 07:45:04 2020 (r538567) +++ head/graphics/mesa-devel/files/libmap.conf.in Fri Jun 12 07:49:26 2020 (r538568) @@ -1,16 +1,16 @@ # EGL/GLX built with -Dglvnd=false libEGL.so.1 libEGL%%SUFFIX%%.so.1 -libGL.so.1 libGL%%SUFFIX%%.so.1 +%%X11%%libGL.so.1 libGL%%SUFFIX%%.so.1 libGLESv1_CM.so.1 libGLESv1_CM%%SUFFIX%%.so.1 libGLESv2.so.2 libGLESv2%%SUFFIX%%.so.2 # EGL/GLX built with -Dglvnd=true # Xorg sets GLX_EXT_libglvnd to "mesa" by default libEGL_mesa.so.0 libEGL_mesa%%SUFFIX%%.so.0 -libGLX_mesa.so.0 libGLX_mesa%%SUFFIX%%.so.0 +%%X11%%libGLX_mesa.so.0 libGLX_mesa%%SUFFIX%%.so.0 -# Fallback if GLX_EXT_libglvnd is missing or vendor library doesn't exist -libGLX_indirect.so.0 libGLX_mesa%%SUFFIX%%.so.0 +%%X11%%# Fallback if GLX_EXT_libglvnd is missing or vendor library doesn't exist +%%X11%%libGLX_indirect.so.0 libGLX_mesa%%SUFFIX%%.so.0 # GBM clients like eglkms and wlroots fail otherwise libgbm.so.1 libgbm%%SUFFIX%%.so.1