graphics/mesa: update to 23.1.8

While here:
- Remove some unneeded dep in gallium-vdpau
- Disable libelf from devel/elfutils (we will fallback on base libelf), PR 273803
- Always disable libunwind, if you want stacktrace you will need to compile from
upstream PR: 250306
- enable vulkan haswell driver

Co-authored-by: manu, vishwin
PR: 273703, 273803, 250306

graphics/libosmesa/Makefile

@@ -8,21 +8,20 @@ WWW=		https://www.mesa3d.org/
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/docs/license.rst
 
-LIB_DEPENDS+=	libLLVM-${LLVM_DEFAULT}.so:devel/llvm${LLVM_DEFAULT} \
-		libglapi.so:graphics/mesa-libs
+LIB_DEPENDS+=	libglapi.so:graphics/mesa-libs
 
-USES=		xorg
+USES=		llvm:lib,noexport xorg
 USE_XORG=	xorgproto
 USE_LDCONFIG=	yes
 
 .include <bsd.port.options.mk>
 .include "${.CURDIR:H:H}/graphics/mesa-dri/Makefile.common"
 
 # Disable some options
-MESON_ARGS+=	-Ddri-drivers="" \
-		-Dgallium-drivers="swrast" \
+MESON_ARGS+=	-Dgallium-drivers="swrast" \
 		-Dvulkan-drivers="" \
 		-Dplatforms="" \
+		-Dandroid-libbacktrace=disabled \
 		-Dgallium-vdpau=disabled \
 		-Dgallium-omx=disabled \
 		-Dgallium-va=disabled \
@@ -31,12 +30,15 @@ MESON_ARGS+=	-Ddri-drivers="" \
 		-Dgallium-nine=false \
 		-Dgles1=disabled \
 		-Dgles2=disabled \
+		-Dlmsensors=disabled \
 		-Dmicrosoft-clc=disabled \
 		-Dopengl=true \
 		-Dglx=disabled \
 		-Degl=disabled \
 		-Dgbm=disabled \
 		-Dtools="" \
+		-Dvalgrind=disabled \
+		-Dxlib-lease=disabled \
 		-Dzstd=disabled
 LDFLAGS_i386=		-Wl,-znotext
 

graphics/mesa-dri/Makefile

@@ -1,13 +1,13 @@
 PORTNAME=	mesa-dri
 PORTVERSION=	${MESAVERSION}
-PORTREVISION=	3
 CATEGORIES=	graphics
 
 COMMENT=	OpenGL hardware acceleration drivers for DRI2+
 WWW=		https://www.mesa3d.org/
 
-LIB_DEPENDS+=	libLLVM-${LLVM_DEFAULT}.so:devel/llvm${LLVM_DEFAULT} \
-		libglapi.so:graphics/mesa-libs
+LIB_DEPENDS+=	libglapi.so:graphics/mesa-libs
+
+USES+=		llvm:lib,noexport
 
 OPTIONS_GROUP=			PLATFORM
 OPTIONS_GROUP_PLATFORM=		PLATFORM_X11 PLATFORM_WAYLAND
@@ -33,7 +33,7 @@ ZSTD_MESON_ENABLED=	zstd
 
 ALL_GALLIUM_DRIVERS=	CROCUS I915 IRIS PANFROST R300 R600 RADEONSI SVGA \
 			SWRAST ZINK
-ALL_VULKAN_DRIVERS=	INTEL AMD SWRAST
+ALL_VULKAN_DRIVERS=	INTEL INTEL_HASVK AMD SWRAST
 
 GALLIUM_DRIVERS+=	SWRAST \
 			ZINK
@@ -51,7 +51,7 @@ BUILD_DEPENDS+=		glslangValidator:graphics/glslang
 .endif
 .if ${ARCH} == amd64 || ${ARCH} == i386
 GALLIUM_DRIVERS+=	CROCUS I915 IRIS SVGA
-VULKAN_DRIVERS+=	INTEL
+VULKAN_DRIVERS+=	INTEL INTEL_HASVK
 .endif
 
 LDFLAGS_i386=		-Wl,-znotext
@@ -73,14 +73,18 @@ MESON_ARGS+=	-Dgallium-drivers="${GALLIUM_DRIVERS:ts,:tl}" \
 		-Dplatforms="${MESA_PLATFORMS:ts,:tl}"
 
 # Disable some options
-MESON_ARGS+=	-Dgallium-xa=disabled \
+MESON_ARGS+=	-Dandroid-libbacktrace=disabled \
+		-Dgallium-xa=disabled \
 		-Dgallium-vdpau=disabled \
 		-Dgallium-va=disabled \
-		-Dgles1=disabled \
-		-Dgles2=disabled \
+		-Dgles1=enabled \
+		-Dgles2=enabled \
 		-Dglx=disabled \
+		-Degl=enabled \
+		-Dlmsensors=disabled \
 		-Dmicrosoft-clc=disabled \
-		-Dosmesa=false
+		-Dosmesa=false \
+		-Dvalgrind=disabled
 
 .for _gd in ${ALL_GALLIUM_DRIVERS}
 . if defined(GALLIUM_DRIVERS) && ${GALLIUM_DRIVERS:M${_gd}}

graphics/mesa-dri/Makefile.common

@@ -12,7 +12,7 @@
 MESAVERSION=	${MESABASEVERSION}${MESASUBVERSION:C/^(.)/.\1/}
 MESADISTVERSION=${MESABASEVERSION}${MESASUBVERSION:C/^(.)/-\1/}
 
-MESABASEVERSION=	22.3.7
+MESABASEVERSION=	23.1.8
 # if there is a subversion, don't include the '-' between 7.11-rc2.
 MESASUBVERSION=
 
@@ -23,6 +23,10 @@ MASTER_SITES=	https://mesa.freedesktop.org/archive/ \
 
 DISTFILES=	mesa-${MESADISTVERSION}${EXTRACT_SUFX}
 
+PATCH_SITES=	https://gitlab.freedesktop.org/mesa/mesa/-/commit/
+PATCHFILES+=	9ba416cdc67073cdda9a73fe9d37304b82bdd526.patch:-p1 # https://gitlab.freedesktop.org/mesa/mesa/-/issues/8671
+PATCHFILES+=	4a253aae7ca437201d2a31d2a11a1a5434fe41f1.patch:-p1 # https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/26284
+
 MAINTAINER=	x11@FreeBSD.org
 
 LICENSE=	MIT
@@ -40,14 +44,8 @@ USES+=	xorg
 .if ${COMPONENT} != osmesa
 LIB_DEPENDS+=	libdrm.so:graphics/libdrm
 .endif
-.if ${ARCH} == aarch64 || ${ARCH} == amd64 || ${ARCH} == armv7 || ${ARCH} == i386 || ${ARCH} == powerpc || ${ARCH} == powerpc64 || ${ARCH} == powerpc64le
-LIB_DEPENDS+=	libunwind.so:devel/libunwind
-.endif
-.if ${OPSYS} == DragonFly
-LIB_DEPENDS+=	libelf.so:devel/libelf
-.endif
 
-USES+=		compiler:c++11-lib bison meson pathfix pkgconfig \
+USES+=		compiler:c++11-lib bison llvm:noexport meson pathfix pkgconfig \
 		python:build shebangfix tar:xz
 
 .if ${/usr/bin/ld:L:tA} != /usr/bin/ld.lld
@@ -82,14 +80,9 @@ PKGDEINSTALL=	${.CURDIR}/pkg-deinstall
 
 BINARY_ALIAS+=	python3=${PYTHON_VERSION}
 
-LLVM_DEFAULT=	15
-BUILD_DEPENDS+=	llvm-config${LLVM_DEFAULT}:devel/llvm${LLVM_DEFAULT}
-CONFIGURE_ENV+=	LLVM_CONFIG=llvm-config${LLVM_DEFAULT}
-
-LDFLAGS+=	-Wl,-rpath=${LOCALBASE}/llvm${LLVM_DEFAULT}/lib
-MESON_ARGS+=	-Dllvm=enabled
+CONFIGURE_ENV+=	LLVM_CONFIG=${LLVM_CONFIG}
 
-# Some symbols in mesa's linker version scripts are not always defined,
-# depending on configuration options. Suppress errors with lld >= 17 due to
-# these undefined symbols.
-LDFLAGS+=	-Wl,--undefined-version
+LDFLAGS+=	-Wl,-rpath=${LOCALBASE}/llvm${LLVM_VERSION}/lib
+MESON_ARGS+=	-Dllvm=enabled \
+		-Dlibunwind=disabled \
+		-Dlibelf=disabled

graphics/mesa-dri/distinfo

@@ -1,3 +1,7 @@
-TIMESTAMP = 1678348804
-SHA256 (mesa-22.3.7.tar.xz) = 894ce2f4a1c2e76177cdd2284620192d0da3066b243eec2fbb1d7cf37f13042c
-SIZE (mesa-22.3.7.tar.xz) = 17136476
+TIMESTAMP = 1700484156
+SHA256 (mesa-23.1.8.tar.xz) = 45434ff91a709844130a3174d9c0ef39c6b50725b2bb0c13e736f36134db14ad
+SIZE (mesa-23.1.8.tar.xz) = 18566724
+SHA256 (9ba416cdc67073cdda9a73fe9d37304b82bdd526.patch) = aac0f0bc9454d177729109103e4e851ee4bc894ba7cc28ea1712ed87b4660e85
+SIZE (9ba416cdc67073cdda9a73fe9d37304b82bdd526.patch) = 1511
+SHA256 (4a253aae7ca437201d2a31d2a11a1a5434fe41f1.patch) = 84f18f14788bd8f387e2fc754b945bf30f84b517dd917785ed5d8ef1d594e24a
+SIZE (4a253aae7ca437201d2a31d2a11a1a5434fe41f1.patch) = 1626