3 files changed, 88 insertions, 71 deletions

diff --git a/graphics/mesa-devel/Makefile b/graphics/mesa-devel/Makefile
index 0afdd7757ff3..4632d13117b2 100644
--- a/graphics/mesa-devel/Makefile
+++ b/graphics/mesa-devel/Makefile
@@ -55,20 +55,17 @@ MESON_ARGS=	-Dgallium-omx=disabled \
 		-Dgallium-xa=disabled \
 		-Dgallium-xvmc=disabled \
 		-Dplatforms=${PLATFORMS:ts,} \
-		${PKGNAMESUFFIX:S/^/-Degl-lib-suffix=/} \
 		${BINARY_ALIAS:D--native-file=binary_alias.ini} \
 		${NULL}
-SUB_FILES=	libmap.conf
-SUB_LIST=	SUFFIX=${PKGNAMESUFFIX}
-PLIST_SUB=	ARCH=${ARCH:S/amd/x86_/} SUFFIX=${PKGNAMESUFFIX}
+PLIST_SUB=	ARCH=${ARCH:S/amd/x86_/}
 
 .if exists(/usr/bin/ld.lld) && ${/usr/bin/ld:L:tA} != /usr/bin/ld.lld
 # --build-id isn't supported by old GNU ld.bfd in base
 LDFLAGS+=	-fuse-ld=lld
 .endif
 
-OPTIONS_DEFINE=		${OPTIONS_MULTI} LIBUNWIND LLVM NLS VAAPI VDPAU WAYLAND X11 ZSTD
-OPTIONS_DEFAULT=	${OPTIONS_MULTI} LIBUNWIND LLVM VAAPI VDPAU WAYLAND X11 ZSTD
+OPTIONS_DEFINE=		${OPTIONS_MULTI} GLVND LIBUNWIND LLVM NLS VAAPI VDPAU WAYLAND X11 ZSTD
+OPTIONS_DEFAULT=	${OPTIONS_MULTI} GLVND LIBUNWIND LLVM VAAPI VDPAU WAYLAND X11 ZSTD
 OPTIONS_MULTI=		DRI GALLIUM VULKAN
 OPTIONS_MULTI_DRI=	i965
 OPTIONS_MULTI_GALLIUM=	iris r600 radeonsi
@@ -76,6 +73,10 @@ OPTIONS_MULTI_VULKAN=	anv radv
 OPTIONS_EXCLUDE_DragonFly=	LIBUNWIND anv
 OPTIONS_EXCLUDE+=	${ARCH:Namd64:Ni386:C/.+/anv i965 iris/}
 OPTIONS_EXCLUDE+=	${ARCH:Naarch64:Namd64:Ni386:C/.+/LIBUNWIND/}
+OPTIONS_EXCLUDE+=	${"${GL_DEFAULT:S/,/ /g:[-1]}"==${.CURDIR:T}:?COINST:}
+OPTIONS_EXCLUDE+=	${"${GL_DEFAULT:S/,/ /g:[1]}"!=libglvnd:?GLVND:}
+OPTIONS_SLAVE+=		${"${GL_DEFAULT:S/,/ /g:[-1]}"!=${.CURDIR:T}:?COINST:}
+OPTIONS_SLAVE+=		${"${GL_DEFAULT:S/,/ /g:[1]}"==libglvnd:?GLVND:}
 OPTIONS_SUB=		yes
 
 # Convert options to -D<type>-drivers=<driver1,driver2,etc>
@@ -95,6 +96,17 @@ iris_DESC=		Broadwell and newer
 r600_DESC=		R600, R700, Evergreen, Northern Islands
 radeonsi_DESC=		Southern Islands and newer
 
+COINST_DESC=		Allow co-installation with another Mesa port
+COINST_MESON_ON=	-Degl-lib-suffix=${PKGNAMESUFFIX}
+COINST_PLIST_SUB=	SUFFIX=${PKGNAMESUFFIX}
+COINST_SUB_FILES=	libmap.conf
+COINST_SUB_LIST=	SUFFIX=${PKGNAMESUFFIX}
+COINST_PLIST_SUB_OFF=	SUFFIX=
+
+GLVND_DESC=		GL Vendor-Neutral Dispatch support
+GLVND_BUILD_DEPENDS=	libglvnd>0:graphics/libglvnd
+GLVND_MESON_TRUE=	glvnd
+
 LIBUNWIND_DESC=		Use libunwind for stacktraces
 LIBUNWIND_LIB_DEPENDS=	libunwind.so:devel/libunwind
 LIBUNWIND_MESON_ENABLED=	libunwind
@@ -145,19 +157,17 @@ post-patch:
 # Extract (snapshot) version from the port instead of empty string
 	@${REINPLACE_CMD} '/MESA_GIT_SHA1/s/""/" (git-${DISTVERSIONSUFFIX:C/.*-g//})"/' \
 		${WRKSRC}/bin/git_sha1_gen.py
-.if defined(PKGNAMESUFFIX)
+
+post-patch-COINST-on:
 	@${MV} ${WRKSRC}/src/util/00-${PORTNAME}-defaults.conf \
 		${WRKSRC}/src/util/00-${PKGBASE}-defaults.conf
-.endif
 
 pre-build-NLS-on:
 # Meson doesn't automatically generate translations
 	@${DO_MAKE_BUILD} -C ${BUILD_WRKSRC} xmlpool-gmo
 
-post-install:
-.if defined(PKGNAMESUFFIX)
+post-install-COINST-on:
 	@${INSTALL_DATA} ${WRKDIR}/libmap.conf \
 		${STAGEDIR}${PREFIX}/etc/libmap.d/${PKGBASE}.conf.sample
-.endif
 
 .include <bsd.port.mk>
diff --git a/graphics/mesa-devel/files/libmap.conf.in b/graphics/mesa-devel/files/libmap.conf.in
index 256c4fbec5af..559e58aa5895 100644
--- a/graphics/mesa-devel/files/libmap.conf.in
+++ b/graphics/mesa-devel/files/libmap.conf.in
@@ -1,16 +1,16 @@
-# EGL/GLX built with -Dglvnd=false
-libEGL.so.1 libEGL%%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
+%%NO_GLVND%%# EGL/GLX built with -Dglvnd=false
+%%NO_GLVND%%libEGL.so.1 libEGL%%SUFFIX%%.so.1
+%%NO_GLVND%%%%X11%%libGL.so.1 libGL%%SUFFIX%%.so.1
+%%NO_GLVND%%libGLESv1_CM.so.1 libGLESv1_CM%%SUFFIX%%.so.1
+%%NO_GLVND%%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
-%%X11%%libGLX_mesa.so.0 libGLX_mesa%%SUFFIX%%.so.0
+%%GLVND%%# EGL/GLX built with -Dglvnd=true
+%%GLVND%%# Xorg sets GLX_EXT_libglvnd to "mesa" by default
+%%GLVND%%libEGL_mesa.so.0 libEGL_mesa%%SUFFIX%%.so.0
+%%GLVND%%%%X11%%libGLX_mesa.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
+%%GLVND%%%%X11%%# Fallback if GLX_EXT_libglvnd is missing or vendor library doesn't exist
+%%GLVND%%%%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
diff --git a/graphics/mesa-devel/pkg-plist b/graphics/mesa-devel/pkg-plist
index cff084e11c46..a3d870e71195 100644
--- a/graphics/mesa-devel/pkg-plist
+++ b/graphics/mesa-devel/pkg-plist
@@ -1,55 +1,61 @@
 %%VULKAN%%bin/mesa-overlay-control.py
-@sample etc/libmap.d/mesa%%SUFFIX%%.conf.sample
-@comment include/EGL/egl.h
-@comment include/EGL/eglext.h
-@comment include/EGL/eglextchromium.h
-@comment include/EGL/eglmesaext.h
-@comment include/EGL/eglplatform.h
-@comment include/GL/gl.h
-@comment include/GL/glcorearb.h
-@comment include/GL/glext.h
-@comment include/GL/glx.h
-@comment include/GL/glxext.h
-@comment include/GL/internal/dri_interface.h
-@comment include/GLES/egl.h
-@comment include/GLES/gl.h
-@comment include/GLES/glext.h
-@comment include/GLES/glplatform.h
-@comment include/GLES2/gl2.h
-@comment include/GLES2/gl2ext.h
-@comment include/GLES2/gl2platform.h
-@comment include/GLES3/gl3.h
-@comment include/GLES3/gl31.h
-@comment include/GLES3/gl32.h
-@comment include/GLES3/gl3ext.h
-@comment include/GLES3/gl3platform.h
-@comment include/KHR/khrplatform.h
-@comment include/gbm.h
-%%anv%%@comment include/vulkan/vulkan_intel.h
+%%COINST%%@sample etc/libmap.d/mesa%%SUFFIX%%.conf.sample
+%%NO_GLVND%%%%NO_COINST%%include/EGL/egl.h
+%%NO_GLVND%%%%NO_COINST%%include/EGL/eglext.h
+%%NO_COINST%%include/EGL/eglextchromium.h
+%%NO_COINST%%include/EGL/eglmesaext.h
+%%NO_GLVND%%%%NO_COINST%%include/EGL/eglplatform.h
+%%NO_GLVND%%%%NO_COINST%%include/GL/gl.h
+%%NO_GLVND%%%%NO_COINST%%include/GL/glcorearb.h
+%%NO_GLVND%%%%NO_COINST%%include/GL/glext.h
+%%NO_GLVND%%%%NO_COINST%%include/GL/glx.h
+%%NO_GLVND%%%%NO_COINST%%include/GL/glxext.h
+%%NO_COINST%%include/GL/internal/dri_interface.h
+%%NO_GLVND%%%%NO_COINST%%include/GLES/egl.h
+%%NO_GLVND%%%%NO_COINST%%include/GLES/gl.h
+%%NO_GLVND%%%%NO_COINST%%include/GLES/glext.h
+%%NO_GLVND%%%%NO_COINST%%include/GLES/glplatform.h
+%%NO_GLVND%%%%NO_COINST%%include/GLES2/gl2.h
+%%NO_GLVND%%%%NO_COINST%%include/GLES2/gl2ext.h
+%%NO_GLVND%%%%NO_COINST%%include/GLES2/gl2platform.h
+%%NO_GLVND%%%%NO_COINST%%include/GLES3/gl3.h
+%%NO_GLVND%%%%NO_COINST%%include/GLES3/gl31.h
+%%NO_GLVND%%%%NO_COINST%%include/GLES3/gl32.h
+%%NO_GLVND%%%%NO_COINST%%include/GLES3/gl3ext.h
+%%NO_GLVND%%%%NO_COINST%%include/GLES3/gl3platform.h
+%%NO_GLVND%%%%NO_COINST%%include/KHR/khrplatform.h
+%%NO_COINST%%include/gbm.h
+%%anv%%%%NO_COINST%%include/vulkan/vulkan_intel.h
 %%i965%%lib/dri%%SUFFIX%%/i965_dri.so
 %%iris%%lib/dri%%SUFFIX%%/iris_dri.so
 %%r600%%lib/dri%%SUFFIX%%/r600_dri.so
 %%radeonsi%%lib/dri%%SUFFIX%%/radeonsi_dri.so
 %%VAAPI%%%%r600%%lib/dri%%SUFFIX%%/r600_drv_video.so
 %%VAAPI%%%%radeonsi%%lib/dri%%SUFFIX%%/radeonsi_drv_video.so
-@comment lib/libEGL%%SUFFIX%%.so
-lib/libEGL%%SUFFIX%%.so.1
-lib/libEGL%%SUFFIX%%.so.1.0.0
-%%X11%%@comment lib/libGL%%SUFFIX%%.so
-%%X11%%lib/libGL%%SUFFIX%%.so.1
-%%X11%%lib/libGL%%SUFFIX%%.so.1.2.0
-@comment lib/libGLESv1_CM%%SUFFIX%%.so
-lib/libGLESv1_CM%%SUFFIX%%.so.1
-lib/libGLESv1_CM%%SUFFIX%%.so.1.1.0
-@comment lib/libGLESv2%%SUFFIX%%.so
-lib/libGLESv2%%SUFFIX%%.so.2
-lib/libGLESv2%%SUFFIX%%.so.2.0.0
+%%NO_GLVND%%%%NO_COINST%%lib/libEGL%%SUFFIX%%.so
+%%NO_GLVND%%lib/libEGL%%SUFFIX%%.so.1
+%%NO_GLVND%%lib/libEGL%%SUFFIX%%.so.1.0.0
+%%GLVND%%%%NO_COINST%%lib/libEGL_mesa%%SUFFIX%%.so
+%%GLVND%%lib/libEGL_mesa%%SUFFIX%%.so.0
+%%GLVND%%lib/libEGL_mesa%%SUFFIX%%.so.0.0.0
+%%NO_GLVND%%%%X11%%%%NO_COINST%%lib/libGL%%SUFFIX%%.so
+%%NO_GLVND%%%%X11%%lib/libGL%%SUFFIX%%.so.1
+%%NO_GLVND%%%%X11%%lib/libGL%%SUFFIX%%.so.1.2.0
+%%NO_GLVND%%%%NO_COINST%%lib/libGLESv1_CM%%SUFFIX%%.so
+%%NO_GLVND%%lib/libGLESv1_CM%%SUFFIX%%.so.1
+%%NO_GLVND%%lib/libGLESv1_CM%%SUFFIX%%.so.1.1.0
+%%NO_GLVND%%%%NO_COINST%%lib/libGLESv2%%SUFFIX%%.so
+%%NO_GLVND%%lib/libGLESv2%%SUFFIX%%.so.2
+%%NO_GLVND%%lib/libGLESv2%%SUFFIX%%.so.2.0.0
+%%GLVND%%%%X11%%%%NO_COINST%%lib/libGLX_mesa%%SUFFIX%%.so
+%%GLVND%%%%X11%%lib/libGLX_mesa%%SUFFIX%%.so.0
+%%GLVND%%%%X11%%lib/libGLX_mesa%%SUFFIX%%.so.0.0.0
 %%VULKAN%%lib/libVkLayer_MESA_device_select.so
 %%VULKAN%%lib/libVkLayer_MESA_overlay.so
-@comment lib/libgbm%%SUFFIX%%.so
+%%NO_COINST%%lib/libgbm%%SUFFIX%%.so
 lib/libgbm%%SUFFIX%%.so.1
 lib/libgbm%%SUFFIX%%.so.1.0.0
-@comment lib/libglapi%%SUFFIX%%.so
+%%NO_COINST%%lib/libglapi%%SUFFIX%%.so
 lib/libglapi%%SUFFIX%%.so.0
 lib/libglapi%%SUFFIX%%.so.0.0.0
 %%anv%%lib/libvulkan_intel%%SUFFIX%%.so
@@ -62,14 +68,15 @@ lib/libglapi%%SUFFIX%%.so.0.0.0
 %%VDPAU%%%%radeonsi%%lib/vdpau%%SUFFIX%%/libvdpau_radeonsi.so.1
 %%VDPAU%%%%radeonsi%%lib/vdpau%%SUFFIX%%/libvdpau_radeonsi.so.1.0
 %%VDPAU%%%%radeonsi%%lib/vdpau%%SUFFIX%%/libvdpau_radeonsi.so.1.0.0
-@comment libdata/pkgconfig/dri.pc
-@comment libdata/pkgconfig/egl.pc
-@comment libdata/pkgconfig/gbm.pc
-@comment libdata/pkgconfig/gl.pc
-@comment libdata/pkgconfig/glesv1_cm.pc
-@comment libdata/pkgconfig/glesv2.pc
+%%NO_COINST%%libdata/pkgconfig/dri.pc
+%%NO_GLVND%%%%NO_COINST%%libdata/pkgconfig/egl.pc
+%%NO_COINST%%libdata/pkgconfig/gbm.pc
+%%NO_GLVND%%%%NO_COINST%%libdata/pkgconfig/gl.pc
+%%NO_GLVND%%%%NO_COINST%%libdata/pkgconfig/glesv1_cm.pc
+%%NO_GLVND%%%%NO_COINST%%libdata/pkgconfig/glesv2.pc
 share/drirc.d/00-mesa%%SUFFIX%%-defaults.conf
+%%GLVND%%%%NO_COINST%%share/glvnd/egl_vendor.d/50_mesa.json
 %%VULKAN%%share/vulkan/explicit_layer.d/VkLayer_MESA_overlay.json
-%%anv%%@comment share/vulkan/icd.d/intel_icd.%%ARCH%%.json
-%%radv%%@comment share/vulkan/icd.d/radeon_icd.%%ARCH%%.json
+%%anv%%%%NO_COINST%%share/vulkan/icd.d/intel_icd.%%ARCH%%.json
+%%radv%%%%NO_COINST%%share/vulkan/icd.d/radeon_icd.%%ARCH%%.json
 %%VULKAN%%share/vulkan/implicit_layer.d/VkLayer_MESA_device_select.json