git: 277dfdc8d586 - main - graphics/mesa: Update to 24.1.5

From: Emmanuel Vadot <manu_at_FreeBSD.org>
Date: Tue, 20 Aug 2024 07:44:06 UTC
The branch main has been updated by manu:

URL: https://cgit.FreeBSD.org/ports/commit/?id=277dfdc8d586432b358ede366e4dcc61dfa1ed1b

commit 277dfdc8d586432b358ede366e4dcc61dfa1ed1b
Author:     Emmanuel Vadot <manu@FreeBSD.org>
AuthorDate: 2024-08-05 09:30:21 +0000
Commit:     Emmanuel Vadot <manu@FreeBSD.org>
CommitDate: 2024-08-20 07:43:39 +0000

    graphics/mesa: Update to 24.1.5
    
    Release notes:  https://lists.freedesktop.org/archives/mesa-dev/2024-May/226222.html
    Release notes:  https://lists.freedesktop.org/archives/mesa-dev/2024-June/226223.html
    Release notes:  https://lists.freedesktop.org/archives/mesa-dev/2024-June/226249.html
    Release notes:  https://lists.freedesktop.org/archives/mesa-dev/2024-July/226272.html
    Release notes:  https://lists.freedesktop.org/archives/mesa-dev/2024-July/226279.html
    Release notes:  https://lists.freedesktop.org/archives/mesa-dev/2024-July/226289.html
    
    Sponsored by:           Beckhoff Automation GmbH & Co. KG
    Differential Revision:  https://reviews.freebsd.org/D46229
---
 graphics/libosmesa/Makefile          |  2 +-
 graphics/mesa-dri/Makefile           | 19 +++++++++++++++++--
 graphics/mesa-dri/Makefile.common    |  3 +--
 graphics/mesa-dri/distinfo           |  6 +++---
 graphics/mesa-gallium-va/Makefile    |  1 +
 graphics/mesa-gallium-vdpau/Makefile |  1 +
 graphics/mesa-gallium-xa/Makefile    |  1 +
 graphics/mesa-libs/Makefile          |  3 +--
 lang/clover/Makefile                 |  1 +
 9 files changed, 27 insertions(+), 10 deletions(-)

diff --git a/graphics/libosmesa/Makefile b/graphics/libosmesa/Makefile
index 2c3d7c7dc9b7..6b1f54b3efc0 100644
--- a/graphics/libosmesa/Makefile
+++ b/graphics/libosmesa/Makefile
@@ -1,6 +1,5 @@
 PORTNAME=	libosmesa
 PORTVERSION=	${MESAVERSION}
-PORTREVISION=	1
 CATEGORIES=	graphics
 
 COMMENT=	Off-Screen Mesa implementation of the OpenGL API
@@ -31,6 +30,7 @@ MESON_ARGS+=	-Dgallium-drivers="swrast" \
 		-Dgallium-nine=false \
 		-Dgles1=disabled \
 		-Dgles2=disabled \
+		-Dglvnd=disabled \
 		-Dlmsensors=disabled \
 		-Dmicrosoft-clc=disabled \
 		-Dopengl=true \
diff --git a/graphics/mesa-dri/Makefile b/graphics/mesa-dri/Makefile
index 4e939ca8be67..415780f9d683 100644
--- a/graphics/mesa-dri/Makefile
+++ b/graphics/mesa-dri/Makefile
@@ -1,11 +1,12 @@
 PORTNAME=	mesa-dri
 PORTVERSION=	${MESAVERSION}
-PORTREVISION=	2
 CATEGORIES=	graphics
 
 COMMENT=	OpenGL hardware acceleration drivers for DRI2+
 WWW=		https://www.mesa3d.org/
 
+BUILD_DEPENDS+=	${PYTHON_PKGNAMEPREFIX}ply>0:devel/py-ply@${PY_FLAVOR}
+
 LIB_DEPENDS+=	libglapi.so:graphics/mesa-libs
 
 USES+=		llvm:lib,noexport
@@ -30,6 +31,13 @@ GALLIUM_DESC=		Unified OpenGL drivers
 crocus_DESC=		Intel GPU Gen4 (Broadwater) to Gen7 (Haswell)
 i915_DESC=		Intel GPU Gen3 (Grantsdale to Pineview)
 iris_DESC=		Intel GPU Gen8 (Broadwell) and newer
+iris_BUILD_DEPENDS=	libclc>0:devel/libclc \
+			spirv-tools>0:graphics/spirv-tools \
+			spirv-llvm-translator-${LLVM_PORT:T}>0:devel/spirv-llvm-translator@${LLVM_PORT:T}
+iris_RUN_DEPENDS=	spirv-tools>0:graphics/spirv-tools \
+			spirv-llvm-translator-${LLVM_PORT:T}>0:devel/spirv-llvm-translator@${LLVM_PORT:T}
+iris_CONFIGURE_ENV=	PKG_CONFIG_PATH="${LLVM_PREFIX}/libdata/pkgconfig"
+iris_IMPLIES=		SPIRV
 panfrost_DESC=		ARM Midgard and Bifrost
 r300_DESC=		AMD/ATI R300, R400 and R500
 r600_DESC=		AMD/ATI R600, R700, Evergreen, Northern Islands
@@ -50,7 +58,13 @@ ${_gd}_VARS+=		GALLIUM_DRIVERS+=${_gd}
 OPTIONS_GROUP_VULKAN=	anv radv swrast_vk
 VULKAN_DESC=		Vulkan drivers
 anv_DESC=		Intel GPU Gen9 and newer Vulkan support
-anv_BUILD_DEPENDS=	glslangValidator:graphics/glslang
+anv_BUILD_DEPENDS=	glslangValidator:graphics/glslang \
+			libclc>0:devel/libclc \
+			spirv-tools>0:graphics/spirv-tools \
+			spirv-llvm-translator-${LLVM_PORT:T}>0:devel/spirv-llvm-translator@${LLVM_PORT:T}
+anv_RUN_DEPENDS=	spirv-tools>0:graphics/spirv-tools \
+			spirv-llvm-translator-${LLVM_PORT:T}>0:devel/spirv-llvm-translator@${LLVM_PORT:T}
+anv_CONFIGURE_ENV=	PKG_CONFIG_PATH="${LLVM_PREFIX}/libdata/pkgconfig"
 radv_DESC=		AMD/ATI Southern Islands and newer Vulkan support
 radv_BUILD_DEPENDS=	glslangValidator:graphics/glslang
 swrast_vk_DESC=		Software Rasterizer Vulkan support
@@ -91,6 +105,7 @@ MESON_ARGS+=	-Dandroid-libbacktrace=disabled \
 		-Dgallium-va=disabled \
 		-Dgles1=enabled \
 		-Dgles2=enabled \
+		-Dglvnd=disabled \
 		-Dglx=disabled \
 		-Degl=enabled \
 		-Dlmsensors=disabled \
diff --git a/graphics/mesa-dri/Makefile.common b/graphics/mesa-dri/Makefile.common
index 66dde6177702..3f8550e81337 100644
--- a/graphics/mesa-dri/Makefile.common
+++ b/graphics/mesa-dri/Makefile.common
@@ -9,7 +9,7 @@
 #    - graphics/mesa-libs
 #    - lang/clover
 
-MESAVERSION=	24.0.9
+MESAVERSION=	24.1.5
 
 MASTER_SITES=	https://mesa.freedesktop.org/archive/
 
@@ -17,7 +17,6 @@ DISTFILES=	mesa-${MESAVERSION}${EXTRACT_SUFX}
 
 PATCH_SITES=	https://gitlab.freedesktop.org/mesa/mesa/-/commit/
 PATCHFILES+=	4a253aae7ca437201d2a31d2a11a1a5434fe41f1.patch:-p1 # https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/26284
-PATCHFILES+=	7c565db35d39bdbf4e4f867ea19f78b97c8c126f.patch:-p1 # https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/27184
 
 MAINTAINER=	x11@FreeBSD.org
 
diff --git a/graphics/mesa-dri/distinfo b/graphics/mesa-dri/distinfo
index 547e5edf6235..d5b68d5bc285 100644
--- a/graphics/mesa-dri/distinfo
+++ b/graphics/mesa-dri/distinfo
@@ -1,6 +1,6 @@
-TIMESTAMP = 1718001082
-SHA256 (mesa-24.0.9.tar.xz) = 51aa686ca4060e38711a9e8f60c8f1efaa516baf411946ed7f2c265cd582ca4c
-SIZE (mesa-24.0.9.tar.xz) = 20197892
+TIMESTAMP = 1722846243
+SHA256 (mesa-24.1.5.tar.xz) = 02761ffd965dd64b95421ebfca1191d73724aba00f30034009237564f34cf976
+SIZE (mesa-24.1.5.tar.xz) = 29140156
 SHA256 (4a253aae7ca437201d2a31d2a11a1a5434fe41f1.patch) = 84f18f14788bd8f387e2fc754b945bf30f84b517dd917785ed5d8ef1d594e24a
 SIZE (4a253aae7ca437201d2a31d2a11a1a5434fe41f1.patch) = 1626
 SHA256 (7c565db35d39bdbf4e4f867ea19f78b97c8c126f.patch) = 5af88a22abfadb91f6626c9244ed2a365e2bb283e0a42399082d1e909136d5f3
diff --git a/graphics/mesa-gallium-va/Makefile b/graphics/mesa-gallium-va/Makefile
index d9cca9b9cc55..af651b16f606 100644
--- a/graphics/mesa-gallium-va/Makefile
+++ b/graphics/mesa-gallium-va/Makefile
@@ -37,6 +37,7 @@ MESON_ARGS+=	-Dvideo-codecs="vc1dec,h264dec,h264enc,h265dec,h265enc,av1dec,av1en
 		-Dgbm=disabled \
 		-Dgles1=disabled \
 		-Dgles2=disabled \
+		-Dglvnd=disabled \
 		-Dlmsensors=disabled \
 		-Dmicrosoft-clc=disabled \
 		-Dosmesa=false \
diff --git a/graphics/mesa-gallium-vdpau/Makefile b/graphics/mesa-gallium-vdpau/Makefile
index 43727c18f358..fd7b0930a1d0 100644
--- a/graphics/mesa-gallium-vdpau/Makefile
+++ b/graphics/mesa-gallium-vdpau/Makefile
@@ -36,6 +36,7 @@ MESON_ARGS+=	-Dgallium-drivers="r600,radeonsi" \
 		-Dgbm=disabled \
 		-Dgles1=disabled \
 		-Dgles2=disabled \
+		-Dglvnd=disabled \
 		-Dlmsensors=disabled \
 		-Dmicrosoft-clc=disabled \
 		-Dosmesa=false \
diff --git a/graphics/mesa-gallium-xa/Makefile b/graphics/mesa-gallium-xa/Makefile
index 60c582ff6270..59c61d00add7 100644
--- a/graphics/mesa-gallium-xa/Makefile
+++ b/graphics/mesa-gallium-xa/Makefile
@@ -37,6 +37,7 @@ MESON_ARGS+=	-Dgallium-drivers="svga" \
 		-Dshared-glapi=disabled \
 		-Dosmesa=false \
 		-Dvalgrind=disabled \
+		-Dglvnd=disabled \
 		-Dxlib-lease=disabled
 
 LDFLAGS_i386=		-Wl,-znotext
diff --git a/graphics/mesa-libs/Makefile b/graphics/mesa-libs/Makefile
index e2d8f3f8e860..79d721335f8f 100644
--- a/graphics/mesa-libs/Makefile
+++ b/graphics/mesa-libs/Makefile
@@ -1,6 +1,5 @@
 PORTNAME=	mesa-libs
 PORTVERSION=	${MESAVERSION}
-PORTREVISION=	1
 CATEGORIES=	graphics
 
 COMMENT=	OpenGL libraries that support GLX and EGL clients
@@ -47,7 +46,7 @@ MESON_ARGS+=	-Dandroid-libbacktrace=disabled \
 		-Degl=enabled \
 		-Dgbm=enabled \
 		-Dvulkan-drivers="" \
-		-Dglvnd=true
+		-Dglvnd=enabled
 # Building EGL and GBM requires a driver so add r300
 MESON_ARGS+=	-Dgallium-drivers="r300"
 
diff --git a/lang/clover/Makefile b/lang/clover/Makefile
index 580b8b1f41a1..ac29c174dbed 100644
--- a/lang/clover/Makefile
+++ b/lang/clover/Makefile
@@ -36,6 +36,7 @@ MESON_ARGS+=	-Dplatforms="" \
 		-Dgallium-xa=disabled \
 		-Dgles1=disabled \
 		-Dgles2=disabled \
+		-Dglvnd=disabled \
 		-Dmicrosoft-clc=disabled \
 		-Dopengl=false \
 		-Dglx=disabled \