Skip site navigation (1)Skip section navigation (2)
Date:      Fri, 12 Jun 2020 07:49:27 +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: r538568 - head/graphics/mesa-devel/files
Message-ID:  <202006120749.05C7nRDm063133@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
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



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