git: 410b991a19d4 - main - graphics/mesa-devel: drop Clover leftovers after 7393723ec0ee

From: Jan Beich <jbeich_at_FreeBSD.org>
Date: Tue, 12 Nov 2024 00:18:05 UTC
The branch main has been updated by jbeich:

URL: https://cgit.FreeBSD.org/ports/commit/?id=410b991a19d485d02da9996eb2262b0f358e196f

commit 410b991a19d485d02da9996eb2262b0f358e196f
Author:     Jan Beich <jbeich@FreeBSD.org>
AuthorDate: 2024-11-10 13:22:06 +0000
Commit:     Jan Beich <jbeich@FreeBSD.org>
CommitDate: 2024-11-12 00:07:32 +0000

    graphics/mesa-devel: drop Clover leftovers after 7393723ec0ee
---
 graphics/mesa-devel/Makefile             |  2 --
 graphics/mesa-devel/files/libmap.conf.in |  2 --
 graphics/mesa-devel/files/patch-suffix   | 20 --------------------
 3 files changed, 24 deletions(-)

diff --git a/graphics/mesa-devel/Makefile b/graphics/mesa-devel/Makefile
index cd950435d0e3..fdefa34db11a 100644
--- a/graphics/mesa-devel/Makefile
+++ b/graphics/mesa-devel/Makefile
@@ -151,8 +151,6 @@ post-patch:
 		${WRKSRC}/bin/git_sha1_gen.py
 
 post-patch-COINST-on:
-	@${MV} ${WRKSRC}/src/gallium/targets/opencl/MesaOpenCL.def.in \
-		${WRKSRC}/src/gallium/targets/opencl/MesaOpenCL${PKGNAMESUFFIX}.def.in
 	@${MV} ${WRKSRC}/src/util/00-${PORTNAME}-defaults.conf \
 		${WRKSRC}/src/util/00-${PKGBASE}-defaults.conf
 	@${MV} ${WRKSRC}/src/util/00-radv-defaults.conf \
diff --git a/graphics/mesa-devel/files/libmap.conf.in b/graphics/mesa-devel/files/libmap.conf.in
index 70839fa6a0b6..319d4562dc1a 100644
--- a/graphics/mesa-devel/files/libmap.conf.in
+++ b/graphics/mesa-devel/files/libmap.conf.in
@@ -9,8 +9,6 @@ libEGL_mesa.so.0 libEGL_mesa%%SUFFIX%%.so.0
 libgbm.so.1 libgbm%%SUFFIX%%.so.1
 %%PREFIX%%/lib/gbm/dri_gbm.so %%PREFIX%%/lib/gbm/dri%%SUFFIX%%_gbm.so
 
-%%OPENCL%%libMesaOpenCL.so.1 libMesaOpenCL%%SUFFIX%%.so.1
-
 %%anv%%%%PREFIX%%/lib/libvulkan_intel.so libvulkan_intel%%SUFFIX%%.so
 %%hasvk%%%%PREFIX%%/lib/libvulkan_intel_hasvk.so libvulkan_intel_hasvk%%SUFFIX%%.so
 %%radv%%%%PREFIX%%/lib/libvulkan_radeon.so libvulkan_radeon%%SUFFIX%%.so
diff --git a/graphics/mesa-devel/files/patch-suffix b/graphics/mesa-devel/files/patch-suffix
index e64ac28dbf42..d20ed6558b4c 100644
--- a/graphics/mesa-devel/files/patch-suffix
+++ b/graphics/mesa-devel/files/patch-suffix
@@ -84,26 +84,6 @@ Library selection is handled by libglvnd and/or libmap.conf.
    files('dri_target.c'),
    include_directories : [
      inc_include, inc_src, inc_mapi, inc_mesa, inc_gallium, inc_gallium_aux, inc_util, inc_gallium_drivers,
---- src/gallium/targets/opencl/meson.build.orig	2023-02-01 23:53:26 UTC
-+++ src/gallium/targets/opencl/meson.build
-@@ -30,7 +30,7 @@ llvm_libdir = dep_llvm.get_variable(cmake : 'LLVM_LIBR
- endif
- 
- llvm_libdir = dep_llvm.get_variable(cmake : 'LLVM_LIBRARY_DIR', configtool: 'libdir')
--opencl_libname = with_opencl_icd ? 'MesaOpenCL' : 'OpenCL'
-+opencl_libname = with_opencl_icd ? 'MesaOpenCL' + get_option('egl-lib-suffix') : 'OpenCL'
- 
- polly_dep = null_dep
- polly_isl_dep = null_dep
-@@ -117,7 +117,7 @@ if with_opencl_icd
- 
- if with_opencl_icd
-   _config = configuration_data()
--  _config.set('OPENCL_LIBNAME', 'MesaOpenCL')
-+  _config.set('OPENCL_LIBNAME', 'MesaOpenCL' + get_option('egl-lib-suffix'))
-   _config.set('OPENCL_VERSION', opencl_version)
-   configure_file(
-     configuration : _config,
 --- src/gallium/targets/pipe-loader/meson.build.orig	2023-02-01 23:53:26 UTC
 +++ src/gallium/targets/pipe-loader/meson.build
 @@ -44,7 +44,7 @@ endif