graphics/mesa-devel: split VKLAYERS from VULKAN after r566607

VULKAN was overloaded to include Vulkan drivers and layers. However,
building layers requires at least one Vulkan driver.

$ make showconfig
[...]
     VULKAN=on: Vulkan layers: device-select,overlay
[...]
====> Vulkan layers: device-select,overlay
     anv=on: Haswell and newer
     radv=on: Southern Islands and newer (implies LLVM)

$ make clean all WIHOUT="anv radv"
[...]
===> Checking for items in pkg-plist which are not in STAGEDIR
Error: Missing: bin/mesa-overlay-control.py
Error: Missing: lib/libVkLayer_MESA_device_select.so
Error: Missing: lib/libVkLayer_MESA_overlay.so
Error: Missing: share/vulkan/explicit_layer.d/VkLayer_MESA_overlay.json
Error: Missing: share/vulkan/implicit_layer.d/VkLayer_MESA_device_select.json
===> Error: Plist issues found.
*** Error code 1

PR:		253741

3 files changed, 15 insertions, 13 deletions

diff --git a/graphics/mesa-devel/Makefile b/graphics/mesa-devel/Makefile
index 31803bee1cc4..ea251998768f 100644
--- a/graphics/mesa-devel/Makefile
+++ b/graphics/mesa-devel/Makefile
@@ -56,8 +56,8 @@ PLIST_SUB=	ARCH=${ARCH:S/amd/x86_/}
 LDFLAGS+=	-fuse-ld=lld
 .endif
 
-OPTIONS_DEFINE=		LIBUNWIND LLVM LTO VAAPI VDPAU VULKAN WAYLAND X11 ZSTD
-OPTIONS_DEFAULT=	LIBUNWIND LLVM LTO VAAPI VDPAU VULKAN WAYLAND X11 ZSTD
+OPTIONS_DEFINE=		LIBUNWIND LLVM LTO VAAPI VDPAU VKLAYERS WAYLAND X11 ZSTD
+OPTIONS_DEFAULT=	LIBUNWIND LLVM LTO VAAPI VDPAU VKLAYERS WAYLAND X11 ZSTD
 OPTIONS_GROUP=		DRI GALLIUM VULKAN
 OPTIONS_GROUP_DRI=	i965
 OPTIONS_GROUP_GALLIUM=	iris r600 radeonsi
@@ -90,6 +90,10 @@ iris_DESC=		Broadwell and newer
 r600_DESC=		R600, R700, Evergreen, Northern Islands (implies LLVM)
 radeonsi_DESC=		Southern Islands and newer (implies LLVM)
 
+VULKAN_DESC=		Vulkan drivers
+anv_DESC=		Haswell and newer
+radv_DESC=		Southern Islands and newer (implies LLVM)
+
 COINST_DESC=		Allow co-installation with another Mesa port
 COINST_VARS=		LLVM_DEFAULT=10 # chase mesa-dri
 COINST_MESON_ON=	-Degl-lib-suffix=${PKGNAMESUFFIX}
@@ -125,11 +129,10 @@ VDPAU_BUILD_DEPENDS=	libvdpau>0:multimedia/libvdpau
 VDPAU_MESON_ENABLED=	gallium-vdpau
 VDPAU_IMPLIES=		X11
 
-VULKAN_DESC=		Vulkan layers: ${VULKAN_MESON_TRUE:S/vulkan-//:S/-layer//:ts,}
-VULKAN_BUILD_DEPENDS=	glslangValidator:graphics/glslang
-VULKAN_MESON_TRUE=	vulkan-device-select-layer vulkan-overlay-layer
-anv_DESC=		Haswell and newer
-radv_DESC=		Southern Islands and newer (implies LLVM)
+VKLAYERS_DESC=		Vulkan layers: ${VKLAYERS_MESON_TRUE:S/vulkan-//:S/-layer//:ts,} (implies ${VKLAYERS_IMPLIES})
+VKLAYERS_BUILD_DEPENDS=	glslangValidator:graphics/glslang
+VKLAYERS_MESON_TRUE=	vulkan-device-select-layer vulkan-overlay-layer
+VKLAYERS_IMPLIES=	${"${PORT_OPTIONS:Mradv}":?radv:anv} # any from OPTIONS_GROUP_VULKAN
 
 WAYLAND_BUILD_DEPENDS=	wayland-protocols>0:graphics/wayland-protocols
 WAYLAND_LIB_DEPENDS=	libwayland-server.so:graphics/wayland
diff --git a/graphics/mesa-devel/files/libmap.conf.in b/graphics/mesa-devel/files/libmap.conf.in
index 559e58aa5895..97623e35bcab 100644
--- a/graphics/mesa-devel/files/libmap.conf.in
+++ b/graphics/mesa-devel/files/libmap.conf.in
@@ -15,7 +15,6 @@
 # GBM clients like eglkms and wlroots fail otherwise
 libgbm.so.1 libgbm%%SUFFIX%%.so.1
 
-%%VULKAN%%# Avoid different versions of the same driver showing up as multiple GPUs
 %%anv%%%%PREFIX%%/lib/libvulkan_intel.so libvulkan_intel%%SUFFIX%%.so
 %%radv%%%%PREFIX%%/lib/libvulkan_radeon.so libvulkan_radeon%%SUFFIX%%.so
 
diff --git a/graphics/mesa-devel/pkg-plist b/graphics/mesa-devel/pkg-plist
index f4344b5fb10d..706f0fc9f3b5 100644
--- a/graphics/mesa-devel/pkg-plist
+++ b/graphics/mesa-devel/pkg-plist
@@ -1,4 +1,4 @@
-%%VULKAN%%bin/mesa-overlay-control.py
+%%VKLAYERS%%bin/mesa-overlay-control.py
 %%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
@@ -50,8 +50,8 @@
 %%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
+%%VKLAYERS%%lib/libVkLayer_MESA_device_select.so
+%%VKLAYERS%%lib/libVkLayer_MESA_overlay.so
 %%NO_COINST%%lib/libgbm%%SUFFIX%%.so
 lib/libgbm%%SUFFIX%%.so.1
 lib/libgbm%%SUFFIX%%.so.1.0.0
@@ -76,7 +76,7 @@ lib/libglapi%%SUFFIX%%.so.0.0.0
 %%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
+%%VKLAYERS%%share/vulkan/explicit_layer.d/VkLayer_MESA_overlay.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
+%%VKLAYERS%%share/vulkan/implicit_layer.d/VkLayer_MESA_device_select.json