MesaLib: try to fix vulkan PKG_OPTION

[Tobias Nygren <tnn%NetBSD.org@localhost>]

Module Name:	pkgsrc-wip
Committed By:	Tobias Nygren <tnn%NetBSD.org@localhost>
Pushed By:	tnn
Date:		Thu Jul 22 13:27:56 2021 +0200
Changeset:	4c02a6b26b902dc7f1270ed8f76f9e4bc7a82fe7

Modified Files:
	MesaLib/Makefile
	MesaLib/PLIST
	MesaLib/options.mk

Log Message:
MesaLib: try to fix vulkan PKG_OPTION

To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=4c02a6b26b902dc7f1270ed8f76f9e4bc7a82fe7

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

diffstat:
 MesaLib/Makefile   | 12 ++++++------
 MesaLib/PLIST      | 10 ++++++++++
 MesaLib/options.mk | 15 ++++++++++++---
 3 files changed, 28 insertions(+), 9 deletions(-)

diffs:
diff --git a/MesaLib/Makefile b/MesaLib/Makefile
index 9a7f95235c..7dc2241d33 100644
--- a/MesaLib/Makefile
+++ b/MesaLib/Makefile
@@ -34,15 +34,16 @@ MESA_PLATFORMS=		#
 .include "options.mk"
 
 PLIST_SUBST+=	GLVER="1.2.0"
+PLIST_SUBST+=	MACHINE_ARCH=${MACHINE_ARCH}
 
 # classic DRI drivers
-PLIST_VARS+=		i915 i965 r100 r200 nouveau_dri arm
+PLIST_VARS+=		i915 i965 r100 r200 nouveau_dri
 
 # Gallium drivers
 PLIST_VARS+=		r300 svga nouveau
 
 # other features
-PLIST_VARS+=		kms vaapi
+PLIST_VARS+=		arm kms vaapi
 
 .if ${MESALIB_SUPPORTS_DRI} == "yes"
 BUILDLINK_API_DEPENDS.libdrm+=  libdrm>=2.4.100
@@ -52,14 +53,13 @@ BUILDLINK_API_DEPENDS.libdrm+=  libdrm>=2.4.100
 .  endif
 MESON_ARGS+=		-Degl=true
 MESON_ARGS+=		-Dgbm=true
-MESON_ARGS+=		-Dgallium-xa=true
+MESON_ARGS+=		-Dgallium-xa=enabled
 .  if ${X11_TYPE} == "native" && !exists(${X11BASE}/include/xcb/dri3.h)
 MESON_ARGS+=		-Ddri3=false
 .  endif
 PLIST.kms=		yes
 .  if !empty(MACHINE_ARCH:M*arm*) || \
       ${MACHINE_CPU} == "aarch64"
-# not yet
 GALLIUM_DRIVERS+=	freedreno vc4 etnaviv tegra panfrost lima
 PLIST.arm=		yes
 .  endif
@@ -96,11 +96,11 @@ PLIST.r300=		yes
 .  if ${VAAPI_AVAILABLE} == "yes" && \
       !(empty(GALLIUM_DRIVERS:Mr600) && empty(GALLIUM_DRIVERS:Mradeonsi) && \
         empty(GALLIUM_DRIVERS:Mnouveau))
-MESON_ARGS+=		-Dgallium-va=true
+MESON_ARGS+=		-Dgallium-va=enabled
 PLIST.vaapi=		yes
 .    include "../../multimedia/libva/buildlink3.mk"
 .  else
-MESON_ARGS+=		-Dgallium-va=false
+MESON_ARGS+=		-Dgallium-va=disabled
 .  endif
 .else
 MESON_ARGS+=		-Degl=false
diff --git a/MesaLib/PLIST b/MesaLib/PLIST
index cd196b7f74..b28e23cb16 100644
--- a/MesaLib/PLIST
+++ b/MesaLib/PLIST
@@ -91,6 +91,11 @@ ${PLIST.kms}lib/libgbm.so.1.0.0
 lib/libglapi.so
 lib/libglapi.so.0
 lib/libglapi.so.0.0.0
+${PLIST.vulkan}${PLIST.arm}lib/libvulkan_broadcom.so
+${PLIST.vulkan}${PLIST.arm}lib/libvulkan_freedreno.so
+${PLIST.vulkan_intel}lib/libvulkan_intel.so
+${PLIST.vulkan}lib/libvulkan_lvp.so
+${PLIST.vulkan}lib/libvulkan_radeon.so
 ${PLIST.kms}lib/libxatracker.so
 ${PLIST.kms}lib/libxatracker.so.2
 ${PLIST.kms}lib/libxatracker.so.2.5.0
@@ -119,3 +124,8 @@ ${PLIST.radeonsi}${PLIST.vdpau}lib/vdpau/libvdpau_radeonsi.so.1
 ${PLIST.radeonsi}${PLIST.vdpau}lib/vdpau/libvdpau_radeonsi.so.1.0
 ${PLIST.radeonsi}${PLIST.vdpau}lib/vdpau/libvdpau_radeonsi.so.1.0.0
 share/examples/mesa/00-mesa-defaults.conf
+${PLIST.vulkan}${PLIST.arm}share/vulkan/icd.d/broadcom_icd.${MACHINE_ARCH}.json
+${PLIST.vulkan}${PLIST.arm}share/vulkan/icd.d/freedreno_icd.${MACHINE_ARCH}.json
+${PLIST.vulkan_intel}share/vulkan/icd.d/intel_icd.${MACHINE_ARCH}.json
+${PLIST.vulkan}share/vulkan/icd.d/lvp_icd.${MACHINE_ARCH}.json
+${PLIST.vulkan}share/vulkan/icd.d/radeon_icd.${MACHINE_ARCH}.json
diff --git a/MesaLib/options.mk b/MesaLib/options.mk
index 86645255d6..90d9e2e699 100644
--- a/MesaLib/options.mk
+++ b/MesaLib/options.mk
@@ -83,10 +83,19 @@ MESON_ARGS+=		-Dllvm=disabled
 #
 # Vulkan support - experimental
 #
+PLIST_VARS+=		 vulkan vulkan_intel
 .if !empty(PKG_OPTIONS:Mvulkan)
-MESON_ARGS+=		-Dvulkan-drivers="auto"
-.else
-MESON_ARGS+=		-Dvulkan-drivers=""
+VULKAN_DRIVERS+=	amd
+VULKAN_DRIVERS+=	swrast
+PLIST.vulkan=		yes
+.  if ${MACHINE_ARCH} == "x86_64"
+VULKAN_DRIVERS+=	intel
+PLIST.vulkan_intel=	yes
+.  endif
+.  if ${MACHINE_ARCH} == "aarch64"
+VULKAN_DRIVERS+=	broadcom
+VULKAN_DRIVERS+=	freedreno
+.  endif
 .endif
 
 #