From 8df779db3590087452a722a2412eb3020f0f00fd Mon Sep 17 00:00:00 2001
From: Emmanuel Vadot <manu@FreeBSD.org>
Date: Tue, 21 Nov 2023 19:16:55 +0100
Subject: [PATCH] graphics/mesa-dri: vulkan: Remove haswell driver

Haswell doesn't work so remove it.
While here fix plist, PR 275242

PR:	275242
Sponsored by:	Beckhoff Automation GmbH & Co. KG
---
 graphics/mesa-dri/Makefile  |  5 +++--
 graphics/mesa-dri/pkg-plist | 22 ++++++++++++++++++++--
 2 files changed, 23 insertions(+), 4 deletions(-)

diff --git a/graphics/mesa-dri/Makefile b/graphics/mesa-dri/Makefile
index 40d00e2cb805f..e309b1adf75f2 100644
--- a/graphics/mesa-dri/Makefile
+++ b/graphics/mesa-dri/Makefile
@@ -1,5 +1,6 @@
 PORTNAME=	mesa-dri
 PORTVERSION=	${MESAVERSION}
+PORTREVISION=	1
 CATEGORIES=	graphics
 
 COMMENT=	OpenGL hardware acceleration drivers for DRI2+
@@ -33,7 +34,7 @@ ZSTD_MESON_ENABLED=	zstd
 
 ALL_GALLIUM_DRIVERS=	CROCUS I915 IRIS PANFROST R300 R600 RADEONSI SVGA \
 			SWRAST ZINK
-ALL_VULKAN_DRIVERS=	INTEL INTEL_HASVK AMD SWRAST
+ALL_VULKAN_DRIVERS=	INTEL AMD SWRAST
 
 GALLIUM_DRIVERS+=	SWRAST \
 			ZINK
@@ -51,7 +52,7 @@ BUILD_DEPENDS+=		glslangValidator:graphics/glslang
 .endif
 .if ${ARCH} == amd64 || ${ARCH} == i386
 GALLIUM_DRIVERS+=	CROCUS I915 IRIS SVGA
-VULKAN_DRIVERS+=	INTEL INTEL_HASVK
+VULKAN_DRIVERS+=	INTEL
 .endif
 
 LDFLAGS_i386=		-Wl,-znotext
diff --git a/graphics/mesa-dri/pkg-plist b/graphics/mesa-dri/pkg-plist
index cd7f2d263fb1e..1dbaa3607221f 100644
--- a/graphics/mesa-dri/pkg-plist
+++ b/graphics/mesa-dri/pkg-plist
@@ -7,6 +7,18 @@ include/GL/internal/dri_interface.h
 @comment include/GL/gl.h
 @comment include/GL/glcorearb.h
 @comment include/GL/glext.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
 %%CROCUS_GDRIVER%%lib/dri/crocus_dri.so
@@ -30,17 +42,23 @@ include/GL/internal/dri_interface.h
 @comment lib/libglapi.so
 @comment lib/libglapi.so.0
 @comment lib/libglapi.so.0.0.0
+@comment lib/libGLESv1_CM.so
+@comment lib/libGLESv1_CM.so.1
+@comment lib/libGLESv1_CM.so.1.1.0
+@comment lib/libGLESv2.so
+@comment lib/libGLESv2.so.2
+@comment lib/libGLESv2.so.2.0.0
 %%INTEL_VDRIVER%%lib/libvulkan_intel.so
-%%INTEL_VDRIVER%%lib/libvulkan_intel_hasvk.so
 %%AMD_VDRIVER%%lib/libvulkan_radeon.so
 %%SWRAST_VDRIVER%%lib/libvulkan_lvp.so
 libdata/pkgconfig/dri.pc
 @comment libdata/pkgconfig/egl.pc
 @comment libdata/pkgconfig/gbm.pc
+@comment libdata/pkgconfig/glesv1_cm.pc
+@comment libdata/pkgconfig/glesv2.pc
 share/drirc.d/00-mesa-defaults.conf
 %%AMD_VDRIVER%%share/drirc.d/00-radv-defaults.conf
 share/drirc.d/01-freebsd.conf
 %%INTEL_VDRIVER%%share/vulkan/icd.d/intel_icd.%%ARCH%%.json
-%%INTEL_VDRIVER%%share/vulkan/icd.d/intel_hasvk_icd.%%ARCH%%.json
 %%AMD_VDRIVER%%share/vulkan/icd.d/radeon_icd.%%ARCH%%.json
 %%SWRAST_VDRIVER%%share/vulkan/icd.d/lvp_icd.%%ARCH%%.json