git: 9cce689a80ce - main - graphics/mesa-dri: Make zink unconditional

The branch main has been updated by arrowd:

URL: https://cgit.FreeBSD.org/ports/commit/?id=9cce689a80ce2ba27a005ab5b6adfe8beaffa1aa

commit 9cce689a80ce2ba27a005ab5b6adfe8beaffa1aa
Author:     Gleb Popov <arrowd@FreeBSD.org>
AuthorDate: 2026-06-21 09:53:03 +0000
Commit:     Gleb Popov <arrowd@FreeBSD.org>
CommitDate: 2026-06-21 09:55:13 +0000

    graphics/mesa-dri: Make zink unconditional
    
    This driver is enabled by default upstream for everything but Darwin. Enabling
    it adds a miniscule of build time, but simplifies packaging.
    
    PR:             296084
---
 graphics/mesa-dri/Makefile  | 7 ++++---
 graphics/mesa-dri/pkg-plist | 2 +-
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/graphics/mesa-dri/Makefile b/graphics/mesa-dri/Makefile
index 8c0e2c9f9de5..0a609a5af596 100644
--- a/graphics/mesa-dri/Makefile
+++ b/graphics/mesa-dri/Makefile
@@ -13,6 +13,8 @@ LIB_DEPENDS+=	libgallium-${MESAVERSION}.so:graphics/mesa-libs \
 
 USES+=		llvm:lib,noexport
 
+GALLIUM_DRIVERS=	zink
+
 OPTIONS_DEFINE=		ZSTD
 OPTIONS_GROUP=		GALLIUM PLATFORM VULKAN
 OPTIONS_DEFAULT=	WAYLAND X11 ZSTD
@@ -28,7 +30,7 @@ WAYLAND_DESC=		Enable Wayland support for GBM/EGL and Vulkan
 WAYLAND_BUILD_DEPENDS=	wayland-protocols>=1.8:graphics/wayland-protocols
 WAYLAND_LIB_DEPENDS=	libwayland-client.so:graphics/wayland
 
-OPTIONS_GROUP_GALLIUM=	crocus i915 iris llvmpipe panfrost r300 r600 radeonsi svga zink
+OPTIONS_GROUP_GALLIUM=	crocus i915 iris llvmpipe panfrost r300 r600 radeonsi svga
 GALLIUM_DESC=		Unified OpenGL drivers
 crocus_DESC=		Intel GPU Gen4 (Broadwater) to Gen7 (Haswell)
 crocus_BUILD_DEPENDS=	libclc-${LLVM_PORT:T}>0:devel/libclc@${LLVM_PORT:T}
@@ -47,9 +49,8 @@ r300_DESC=		AMD/ATI R300, R400 and R500
 r600_DESC=		AMD/ATI R600, R700, Evergreen, Northern Islands
 radeonsi_DESC=		AMD/ATI Southern Islands and newer
 svga_DESC=		VMWare Virtual GPU
-zink_DESC=		OpenGL on top of Khronos’ Vulkan API
 
-OPTIONS_EXCLUDE+=	${ARCH:Marmv7:C/.+/crocus i915 iris panfrost r300 r600 radeonsi svga zink/}
+OPTIONS_EXCLUDE+=	${ARCH:Marmv7:C/.+/crocus i915 iris panfrost r300 r600 radeonsi svga/}
 OPTIONS_EXCLUDE+=	${ARCH:Naarch64:C/.+/panfrost/}
 OPTIONS_EXCLUDE+=	${ARCH:Namd64:Ni386:Nx86_64:C/.+/crocus i915 iris svga/}
 MESON_ARGS+=		-Dgallium-drivers=${GALLIUM_DRIVERS:ts,}
diff --git a/graphics/mesa-dri/pkg-plist b/graphics/mesa-dri/pkg-plist
index 49db8c12716e..0e374f2f9a33 100644
--- a/graphics/mesa-dri/pkg-plist
+++ b/graphics/mesa-dri/pkg-plist
@@ -47,7 +47,7 @@ lib/dri/sun4i-drm_dri.so
 lib/dri/udl_dri.so
 lib/dri/vkms_dri.so
 %%svga%%lib/dri/vmwgfx_dri.so
-%%zink%%lib/dri/zink_dri.so
+lib/dri/zink_dri.so
 lib/dri/zynqmp-dpsub_dri.so
 @comment lib/gbm/dri_gbm.so
 @comment lib/libEGL.so