git: 7393723ec0ee - main - graphics/mesa-devel: drop Clover from OPENCL option

The branch main has been updated by jbeich:

URL: https://cgit.FreeBSD.org/ports/commit/?id=7393723ec0eeab8665e058831f790a103b16562a

commit 7393723ec0eeab8665e058831f790a103b16562a
Author:     Jan Beich <jbeich@FreeBSD.org>
AuthorDate: 2024-11-09 01:25:43 +0000
Commit:     Jan Beich <jbeich@FreeBSD.org>
CommitDate: 2024-11-09 22:16:34 +0000

    graphics/mesa-devel: drop Clover from OPENCL option
    
    Pending https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/19385
    but after https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/27783
    is no longer supported on Intel GPUs. Instead of continuing blindly simply
    drop the feature. This port is limited to dogfood-ready features, anyway.
---
 graphics/mesa-devel/Makefile  | 7 ++-----
 graphics/mesa-devel/pkg-plist | 8 --------
 2 files changed, 2 insertions(+), 13 deletions(-)

diff --git a/graphics/mesa-devel/Makefile b/graphics/mesa-devel/Makefile
index 22fb276d76a3..af331d886efd 100644
--- a/graphics/mesa-devel/Makefile
+++ b/graphics/mesa-devel/Makefile
@@ -1,7 +1,7 @@
 PORTNAME=	mesa
 DISTVERSION=	24.2-branchpoint-5103
 DISTVERSIONSUFFIX=	-gc108dfc930f
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	graphics
 PKGNAMESUFFIX=	-devel
 
@@ -115,10 +115,7 @@ OPENCL_LIB_DEPENDS=	libLLVMSPIRVLib.so.${OPENCL_SOVERSION}:devel/spirv-llvm-tran
 OPENCL_RUN_DEPENDS=	libclc-${LLVM_PORT:T}>0:devel/libclc@${LLVM_PORT:T}
 OPENCL_SOVERSION=	${LLVM_VERSION}${${LLVM_VERSION}>=18:?.1:}
 OPENCL_CONFIGURE_ENV=	PKG_CONFIG_PATH="${LLVM_PREFIX}/libdata/pkgconfig"
-OPENCL_MESON_TRUE=	gallium-rusticl opencl-spirv
-OPENCL_MESON_ON=	-Dgallium-opencl=icd
-OPENCL_MESON_OFF=	-Dgallium-opencl=disabled
-OPENCL_VARS+=		COINST_RUN_DEPENDS+=clover>0:lang/clover # ICD
+OPENCL_MESON_TRUE=	gallium-rusticl
 OPENCL_IMPLIES=		LLVM ${"${PORT_OPTIONS:Miris}":?iris:radeonsi} # any from OPTIONS_GROUP_GALLIUM
 
 VAAPI_DESC=		Hardware encoding/decoding (only r600, radeonsi)
diff --git a/graphics/mesa-devel/pkg-plist b/graphics/mesa-devel/pkg-plist
index 3a64fd337ef2..b0eb73d983f4 100644
--- a/graphics/mesa-devel/pkg-plist
+++ b/graphics/mesa-devel/pkg-plist
@@ -1,6 +1,5 @@
 %%VKLAYERS%%bin/mesa-overlay-control.py
 %%VKLAYERS%%bin/mesa-screenshot-control.py
-%%NO_COINST%%%%OPENCL%%etc/OpenCL/vendors/mesa.icd
 %%OPENCL%%etc/OpenCL/vendors/rusticl.icd
 %%COINST%%etc/libmap.d/mesa%%SUFFIX%%.conf
 %%NO_COINST%%include/EGL/eglext_angle.h
@@ -16,10 +15,6 @@
 %%panfrost%%lib/dri%%SUFFIX%%/rockchip_dri.so
 %%VAAPI%%%%r600%%lib/dri%%SUFFIX%%/r600_drv_video.so
 %%VAAPI%%%%radeonsi%%lib/dri%%SUFFIX%%/radeonsi_drv_video.so
-%%OPENCL%%%%crocus%%lib/gallium-pipe%%SUFFIX%%/pipe_crocus.so
-%%OPENCL%%%%iris%%lib/gallium-pipe%%SUFFIX%%/pipe_iris.so
-%%OPENCL%%%%r600%%lib/gallium-pipe%%SUFFIX%%/pipe_r600.so
-%%OPENCL%%%%radeonsi%%lib/gallium-pipe%%SUFFIX%%/pipe_radeonsi.so
 lib/gbm/dri%%SUFFIX%%_gbm.so
 %%NO_COINST%%lib/libEGL_mesa%%SUFFIX%%.so
 lib/libEGL_mesa%%SUFFIX%%.so.0
@@ -27,9 +22,6 @@ lib/libEGL_mesa%%SUFFIX%%.so.0.0.0
 %%X11%%%%NO_COINST%%lib/libGLX_mesa%%SUFFIX%%.so
 %%X11%%lib/libGLX_mesa%%SUFFIX%%.so.0
 %%X11%%lib/libGLX_mesa%%SUFFIX%%.so.0.0.0
-%%OPENCL%%%%NO_COINST%%lib/libMesaOpenCL%%SUFFIX%%.so
-%%OPENCL%%lib/libMesaOpenCL%%SUFFIX%%.so.1
-%%OPENCL%%lib/libMesaOpenCL%%SUFFIX%%.so.1.0.0
 %%OPENCL%%lib/libRusticlOpenCL.so
 %%OPENCL%%lib/libRusticlOpenCL.so.1
 %%OPENCL%%lib/libRusticlOpenCL.so.1.0.0