git: 1b31e75ea55e - main - graphics/mesa-devel: simplify bc572c0c0eda

From: Jan Beich <jbeich_at_FreeBSD.org>
Date: Mon, 06 Feb 2023 15:41:45 UTC
The branch main has been updated by jbeich:

URL: https://cgit.FreeBSD.org/ports/commit/?id=1b31e75ea55e57d139a2039cdd441132862a6bf3

commit 1b31e75ea55e57d139a2039cdd441132862a6bf3
Author:     Jan Beich <jbeich@FreeBSD.org>
AuthorDate: 2023-02-06 15:38:50 +0000
Commit:     Jan Beich <jbeich@FreeBSD.org>
CommitDate: 2023-02-06 15:39:07 +0000

    graphics/mesa-devel: simplify bc572c0c0eda
    
    ICD for EGL is part of mesa-libs but ICD for Vulkan is part of mesa-dri.
    Instead of trying to track which package provides which file just specify
    package names this one is designed to override.
---
 graphics/mesa-devel/Makefile | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/graphics/mesa-devel/Makefile b/graphics/mesa-devel/Makefile
index 815ffa05c644..6ebedca86fbd 100644
--- a/graphics/mesa-devel/Makefile
+++ b/graphics/mesa-devel/Makefile
@@ -84,7 +84,7 @@ radv_BUILD_DEPENDS=	glslangValidator:graphics/glslang
 
 COINST_DESC=		Allow co-installation with another Mesa port
 COINST_MESON_ON=	-Degl-lib-suffix=${PKGNAMESUFFIX}
-COINST_RUN_DEPENDS=	${LOCALBASE}/share/glvnd/egl_vendor.d/50_${PORTNAME}.json:graphics/mesa-dri
+COINST_RUN_DEPENDS=	mesa-dri>0:graphics/mesa-dri # ICD
 COINST_PLIST_SUB=	SUFFIX=${PKGNAMESUFFIX}
 COINST_SUB_FILES=	libmap.conf
 COINST_SUB_LIST=	SUFFIX=${PKGNAMESUFFIX}
@@ -117,7 +117,7 @@ OPENCL_MESON_TRUE=	gallium-rusticl
 OPENCL_MESON_ON=	-Dgallium-opencl=icd
 OPENCL_VARS=		LLVM_USES=llvm:15,lib # chase libclc + rust (LTO)
 .if ${MACHINE_ARCH} != aarch64 # XXX missing in ONLY_FOR_ARCHS
-OPENCL_VARS+=		COINST_RUN_DEPENDS+=${LOCALBASE}/etc/OpenCL/vendors/${PORTNAME}.icd:lang/clover
+OPENCL_VARS+=		COINST_RUN_DEPENDS+=clover>0:lang/clover # ICD
 .endif
 OPENCL_IMPLIES=		LLVM ${"${PORT_OPTIONS:Miris}":?iris:radeonsi} # any from OPTIONS_GROUP_GALLIUM