git: 58c2c17aaa7f - main - graphics/mesa-devel: allow LLVM=off with AMD GPUs after 2ce6ce9f7525

The branch main has been updated by jbeich:

URL: https://cgit.FreeBSD.org/ports/commit/?id=58c2c17aaa7f5c1ce5a8b5987c0c1f9fc298ab77

commit 58c2c17aaa7f5c1ce5a8b5987c0c1f9fc298ab77
Author:     Jan Beich <jbeich@FreeBSD.org>
AuthorDate: 2024-06-05 22:31:04 +0000
Commit:     Jan Beich <jbeich@FreeBSD.org>
CommitDate: 2024-06-06 00:24:05 +0000

    graphics/mesa-devel: allow LLVM=off with AMD GPUs after 2ce6ce9f7525
    
    llvmpipe/lavapipe are not included in this port to avoid downgrade bugs,
    so no need to create a separate option.
    
    https://gitlab.freedesktop.org/mesa/mesa/-/commit/2aaa6ebba186
---
 graphics/mesa-devel/Makefile | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/graphics/mesa-devel/Makefile b/graphics/mesa-devel/Makefile
index 717c9c528bc2..7d5f1ac7cea5 100644
--- a/graphics/mesa-devel/Makefile
+++ b/graphics/mesa-devel/Makefile
@@ -73,7 +73,7 @@ iris_DESC=		Broadwell and newer (implies OPENCL)
 iris_IMPLIES=		OPENCL
 panfrost_DESC=		Midgard, Bifrost
 r600_DESC=		R600, R700, Evergreen, Northern Islands (implies LLVM)
-radeonsi_DESC=		Southern Islands and newer (implies LLVM)
+radeonsi_DESC=		Southern Islands and newer
 
 VULKAN_DESC=		Vulkan drivers
 anv_DESC=		Skylake and newer (implies OPENCL)
@@ -81,7 +81,7 @@ anv_BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}ply>0:devel/py-ply@${PY_FLAVOR}
 anv_MESON_ON=		${"${ARCH:Mamd64}":?:-Dintel-rt=disabled} # https://gitlab.freedesktop.org/mesa/mesa/-/issues/10629
 anv_IMPLIES=		OPENCL
 hasvk_DESC=		Ivy Bridge, Haswell, Broadwell
-radv_DESC=		Southern Islands and newer (implies LLVM)
+radv_DESC=		Southern Islands and newer
 radv_BUILD_DEPENDS=	glslangValidator:graphics/glslang
 
 COINST_DESC=		Allow co-installation with another Mesa port
@@ -100,7 +100,8 @@ LLVM_DESC=		Build with LLVM support (see implies)
 LLVM_USES=		llvm:min=15,lib,noexport
 LLVM_CONFIGURE_ENV=	LLVM_CONFIG=${LLVM_CONFIG}
 LLVM_MESON_ENABLED=	llvm
-.for i in r600 radeonsi radv
+LLVM_MESON_TRUE=	amd-use-llvm
+.for i in r600
 ${i}_IMPLIES+=		LLVM
 .endfor