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
@@ -1,165 +1,163 @@
 PORTNAME=	mesa
 DISTVERSION=	24.3-branchpoint-84-gae9d3656860
 DISTVERSIONSUFFIX=	-g7e0e4334820
 CATEGORIES=	graphics
 PKGNAMESUFFIX=	-devel
 
 PATCH_SITES=	https://github.com/mesa3d/${GL_PROJECT}/commit/:github
 PATCHFILES+=	700efacda59c.patch:-p1:github
 PATCH_SITES+=	${GL_SITE}/${GL_ACCOUNT}/${GL_PROJECT}/-/commit/
 PATCHFILES+=	2930dcbb3329.patch:-p1 # https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/22246
 PATCHFILES+=	11aaf934112c.patch:-p1 # https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/22941
 PATCHFILES+=	5d48fb19553c.patch:-p1 # https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/31931
 
 MAINTAINER=	jbeich@FreeBSD.org
 COMMENT=	Bleeding edge Mesa drivers (OpenCL, OpenGL, Vulkan)
 WWW=		https://www.mesa3d.org/
 
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/docs/license.rst
 
 ONLY_FOR_ARCHS=	aarch64 amd64 i386 powerpc64 powerpc64le
 ONLY_FOR_ARCHS_REASON=	Limited scope: no old drivers and no software rendering. \
 			See also https://mesamatrix.net/
 
 BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pyyaml>0:devel/py-pyyaml@${PY_FLAVOR} \
 		libglvnd>=1.3.2:graphics/libglvnd \
 		${PYTHON_PKGNAMEPREFIX}mako>0:textproc/py-mako@${PY_FLAVOR}
 LIB_DEPENDS=	libdrm.so:graphics/libdrm \
 		libexpat.so:textproc/expat2
 
 USES=		bison cpe compiler:c++11-lib meson pkgconfig python:build shebangfix
 CPE_VENDOR=	mesa3d
 USE_GITLAB=	yes
 USE_LDCONFIG=	yes
 GL_SITE=	https://gitlab.freedesktop.org
 BINARY_ALIAS=	python=${PYTHON_CMD}
 SHEBANG_FILES=	src/vulkan/*/*control.py
 MESON_ARGS=	-Dgallium-xa=disabled \
 		-Dandroid-libbacktrace=disabled \
 		-Dlibunwind=disabled \
 		-Dlmsensors=disabled \
 		-Dmicrosoft-clc=disabled \
 		-Dvalgrind=disabled \
 		-Dplatforms=${PLATFORMS:O:[-1..1]:ts,} \
 		-Dvideo-codecs=all \
 		-Dunversion-libgallium=true \
 		${NULL}
 LDFLAGS+=	-Wl,--undefined-version # https://gitlab.freedesktop.org/mesa/mesa/-/issues/8003
 PLIST_SUB=	ARCH=${ARCH:S/amd/x86_/}
 
 OPTIONS_DEFINE=		LLVM LTO OPENCL VAAPI VDPAU VKLAYERS WAYLAND X11 ZSTD
 OPTIONS_DEFAULT=	LLVM LTO OPENCL VAAPI VDPAU VKLAYERS WAYLAND X11 ZSTD
 OPTIONS_GROUP=		GALLIUM VULKAN
 OPTIONS_GROUP_GALLIUM=	crocus iris panfrost r600 radeonsi
 OPTIONS_GROUP_VULKAN=	anv hasvk radv
 OPTIONS_EXCLUDE_i386=	LTO # anv: vkcube fails on vkCreateSwapchainKHR
 OPTIONS_EXCLUDE+=	${ARCH:Naarch64:C/.+/panfrost/}
 OPTIONS_EXCLUDE+=	${ARCH:Namd64:Ni386:Nx86_64:C/.+/crocus hasvk/}
 OPTIONS_EXCLUDE+=	${ARCH:Naarch64:Namd64:Ni386:Nx86_64:Npowerpc64*:C/.+/anv iris/}
 OPTIONS_EXCLUDE+=	${"${GL_DEFAULT:S/,/ /g:[-1]}"==${.CURDIR:T}:?COINST:}
 OPTIONS_SLAVE+=		${"${GL_DEFAULT:S/,/ /g:[-1]}"!=${.CURDIR:T}:?COINST:}
 OPTIONS_SUB=		yes
 
 # Convert options to -D<type>-drivers=<driver1,driver2,etc>
 .for i in ${OPTIONS_GROUP}
 MESON_ARGS+=		-D${i:tl}-drivers=${${i}_DRIVERS:ts,}
 . for j in ${OPTIONS_GROUP_${i}}
 OPTIONS_DEFAULT+=	${j}
 ${j}_VARS+=		${i}_DRIVERS+=${j:S/anv/intel/:S/hasvk/intel_&/:S/radv/amd/}
 . endfor
 .endfor
 
 GALLIUM_DESC=		Unified OpenGL drivers
 crocus_DESC=		Broadwater, Eaglelake, Ironlake, Sandybridge, Ivybridge, Haswell
 iris_DESC=		Broadwell and newer (implies OPENCL)
 iris_IMPLIES=		OPENCL
 panfrost_DESC=		Midgard, Bifrost
 r600_DESC=		R600, R700, Evergreen, Northern Islands (implies LLVM)
 r600_IMPLIES=		LLVM
 radeonsi_DESC=		Southern Islands and newer
 
 VULKAN_DESC=		Vulkan drivers
 anv_DESC=		Skylake and newer (implies OPENCL)
 anv_BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}ply>0:devel/py-ply@${PY_FLAVOR} \
 			glslangValidator:graphics/glslang
 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
 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=	mesa-dri>0:graphics/mesa-dri # ICD
 COINST_PLIST_SUB=	SUFFIX=${PKGNAMESUFFIX}
 COINST_SUB_FILES=	libmap.conf
 COINST_SUB_LIST=	SUFFIX=${PKGNAMESUFFIX}
 COINST_PLIST_SUB_OFF=	SUFFIX=
 
 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
 LLVM_MESON_TRUE=	amd-use-llvm
 
 LTO_MESON_TRUE=		b_lto
 
 OPENCL_DESC=		Heterogeneous computing via OpenCL (implies LLVM)
 OPENCL_BUILD_DEPENDS=	bindgen:devel/rust-bindgen-cli \
 			libclc-${LLVM_PORT:T}>0:devel/libclc@${LLVM_PORT:T} \
 			spirv-tools>0:graphics/spirv-tools \
 			rustc:lang/${RUST_DEFAULT}
 OPENCL_LIB_DEPENDS=	libLLVMSPIRVLib.so.${OPENCL_SOVERSION}:devel/spirv-llvm-translator@${LLVM_PORT:T}
 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_IMPLIES=		LLVM ${"${PORT_OPTIONS:Miris}":?iris:radeonsi} # any from OPTIONS_GROUP_GALLIUM
 
 VAAPI_DESC=		Hardware encoding/decoding (only r600, radeonsi)
 VAAPI_BUILD_DEPENDS=	libva>0:multimedia/libva
 VAAPI_MESON_ENABLED=	gallium-va
 
 VDPAU_DESC=		Hardware decoding (only r600, radeonsi) (implies X11)
 VDPAU_BUILD_DEPENDS=	libvdpau>0:multimedia/libvdpau
 VDPAU_MESON_ENABLED=	gallium-vdpau
 VDPAU_IMPLIES=		X11
 
 VKLAYERS_DESC=		Vulkan layers: ${VKLAYERS_MESON_ON:C/.*=//} (implies ${VKLAYERS_IMPLIES})
 VKLAYERS_BUILD_DEPENDS=	glslangValidator:graphics/glslang
 VKLAYERS_LIB_DEPENDS=	libpng.so:graphics/png
 VKLAYERS_MESON_ON=	-Dvulkan-layers=device-select,overlay,screenshot
 VKLAYERS_IMPLIES=	${"${PORT_OPTIONS:Manv}":?anv:radv} # any from OPTIONS_GROUP_VULKAN
 
 WAYLAND_BUILD_DEPENDS=	wayland-protocols>0:graphics/wayland-protocols
 WAYLAND_LIB_DEPENDS=	libwayland-server.so:graphics/wayland
 WAYLAND_VARS=		PLATFORMS+=wayland
 
 X11_USES=		xorg
 X11_USE=		XORG=x11,xcb,xdamage,xext,xfixes,xorgproto,xrandr,xshmfence,xxf86vm
 X11_VARS=		PLATFORMS+=x11
 X11_MESON_OFF=		-Dglx=disabled -Dxlib-lease=disabled
 
 ZSTD_DESC=		Use ZSTD for shader cache
 ZSTD_LIB_DEPENDS=	libzstd.so:archivers/zstd
 ZSTD_MESON_ENABLED=	zstd
 
 post-patch:
 # Extract (snapshot) version from the port instead of empty string
 	@${REINPLACE_CMD} '/MESA_GIT_SHA1/s/""/" (git-${DISTVERSIONSUFFIX:C/.*-g//})"/' \
 		${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 \
 		${WRKSRC}/src/util/00-radv${PKGNAMESUFFIX}-defaults.conf
 
 post-install-COINST-on:
 	@${INSTALL_DATA} ${WRKDIR}/libmap.conf \
 		${STAGEDIR}${PREFIX}/etc/libmap.d/${PKGBASE}.conf
 
 .include <bsd.port.mk>
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
@@ -1,21 +1,19 @@
 # Xorg sets GLX_EXT_libglvnd to "mesa" by default
 libEGL_mesa.so.0 libEGL_mesa%%SUFFIX%%.so.0
 %%X11%%libGLX_mesa.so.0 libGLX_mesa%%SUFFIX%%.so.0
 
 %%X11%%# Fallback if GLX_EXT_libglvnd is missing or vendor library doesn't exist
 %%X11%%libGLX_indirect.so.0 libGLX_mesa%%SUFFIX%%.so.0
 
 # GBM clients like kmscube and wlroots fail otherwise
 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
 
 %%VAAPI%%%%r600%%%%PREFIX%%/lib/dri/r600_drv_video.so %%PREFIX%%/lib/dri%%SUFFIX%%/r600_drv_video.so
 %%VAAPI%%%%radeonsi%%%%PREFIX%%/lib/dri/radeonsi_drv_video.so %%PREFIX%%/lib/dri%%SUFFIX%%/radeonsi_drv_video.so
 %%VDPAU%%%%r600%%%%PREFIX%%/lib/vdpau/libvdpau_r600.so.1 %%PREFIX%%/lib/vdpau%%SUFFIX%%/libvdpau_r600.so.1
 %%VDPAU%%%%radeonsi%%%%PREFIX%%/lib/vdpau/libvdpau_radeonsi.so.1 %%PREFIX%%/lib/vdpau%%SUFFIX%%/libvdpau_radeonsi.so.1
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
@@ -1,224 +1,204 @@
 Add library suffix to avoid conflict with mesa-libs + mesa-dri.
 Library selection is handled by libglvnd and/or libmap.conf.
 
 --- meson.build.orig	2024-04-06 18:40:47 UTC
 +++ meson.build
 @@ -100,7 +100,7 @@ if dri_drivers_path == ''
  
  dri_drivers_path = get_option('dri-drivers-path')
  if dri_drivers_path == ''
 -  dri_drivers_path = join_paths(get_option('prefix'), get_option('libdir'), 'dri')
 +  dri_drivers_path = join_paths(get_option('prefix'), get_option('libdir'), 'dri' + get_option('egl-lib-suffix'))
  endif
  dri_search_path = get_option('dri-search-path')
  if dri_search_path == ''
 @@ -550,8 +550,7 @@ _glvnd = get_option('glvnd') \
             error_message: 'Cannot build glvnd support for GLX that is not DRI based.') \
    .require(with_glx != 'disabled' or with_egl,
             error_message: 'glvnd requires DRI based GLX and/or EGL') \
 -  .require(get_option('egl-lib-suffix') == '',
 -           error_message: '''EGL lib suffix can't be used with libglvnd''')
 +
  dep_glvnd = dependency('libglvnd', version : '>= 1.3.2', required : _glvnd)
  with_glvnd = dep_glvnd.found()
  if with_glvnd
 @@ -622,7 +621,7 @@ if vdpau_drivers_path == ''
  
  vdpau_drivers_path = get_option('vdpau-libs-path')
  if vdpau_drivers_path == ''
 -  vdpau_drivers_path = join_paths(get_option('libdir'), 'vdpau')
 +  vdpau_drivers_path = join_paths(get_option('libdir'), 'vdpau' + get_option('egl-lib-suffix'))
  endif
  
  prog_glslang = find_program('glslangValidator', native : true, required : with_vulkan_overlay_layer or with_aco_tests or with_amd_vk or with_intel_vk)
 @@ -739,7 +738,7 @@ if va_drivers_path == ''
  
  va_drivers_path = get_option('va-libs-path')
  if va_drivers_path == ''
 -  va_drivers_path = join_paths(get_option('libdir'), 'dri')
 +  va_drivers_path = join_paths(get_option('libdir'), 'dri' + get_option('egl-lib-suffix'))
  endif
  
  with_gallium_xa = get_option('gallium-xa') \
 --- src/amd/vulkan/meson.build.orig	2024-03-20 22:46:44 UTC
 +++ src/amd/vulkan/meson.build
 @@ -207,7 +207,7 @@ libvulkan_radeon = shared_library(
  endif
  
  libvulkan_radeon = shared_library(
 -  'vulkan_radeon',
 +  'vulkan_radeon' + get_option('egl-lib-suffix'),
    [libradv_files, radv_entrypoints, sha1_h, radix_sort_spv, bvh_spv, radv_annotate_layer],
    vs_module_defs : vulkan_api_def,
    include_directories : [
 --- src/egl/meson.build.orig	2020-12-03 22:36:27 UTC
 +++ src/egl/meson.build
 @@ -144,7 +144,7 @@ if not with_glvnd
    egl_lib_name = 'EGL' + get_option('egl-lib-suffix')
    egl_lib_version = '1.0.0'
  else
 -  egl_lib_name = 'EGL_@0@'.format(glvnd_vendor_name)
 +  egl_lib_name = 'EGL_@0@'.format(glvnd_vendor_name) + get_option('egl-lib-suffix')
    egl_lib_version = '0.0.0'
    deps_for_egl += dep_glvnd
    files_egl += [g_egldispatchstubs_h, g_egldispatchstubs_c]
 --- src/gallium/auxiliary/pipe-loader/meson.build.orig	2023-02-01 23:53:26 UTC
 +++ src/gallium/auxiliary/pipe-loader/meson.build
 @@ -58,7 +58,7 @@ libpipe_loader_dynamic = static_library(
    c_args : [
      libpipe_loader_defines,
      '-DPIPE_SEARCH_DIR="@0@"'.format(
 -      join_paths(get_option('prefix'), get_option('libdir'), 'gallium-pipe')
 +      join_paths(get_option('prefix'), get_option('libdir'), 'gallium-pipe' + get_option('egl-lib-suffix'))
      )
    ],
    gnu_symbol_visibility : 'hidden',
 --- src/gallium/targets/dri/meson.build.orig	2024-08-31 18:55:15 UTC
 +++ src/gallium/targets/dri/meson.build
 @@ -29,7 +29,7 @@ libgallium_dri = shared_library(
  endif
  
  libgallium_dri = shared_library(
 -  libgallium_name,
 +  libgallium_name + get_option('egl-lib-suffix'),
    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
    pipe_loader_link_deps += files('pipe.sym')
  endif
  
 -pipe_loader_install_dir = join_paths(get_option('libdir'), 'gallium-pipe')
 +pipe_loader_install_dir = join_paths(get_option('libdir'), 'gallium-pipe' + get_option('egl-lib-suffix'))
  
  _kmsro_targets = [
     driver_kmsro, driver_v3d, driver_vc4, driver_freedreno, driver_etnaviv,
 --- src/gbm/backends/dri/meson.build.orig	2024-09-20 11:03:50 UTC
 +++ src/gbm/backends/dri/meson.build
 @@ -9,7 +9,7 @@ libgbm_dri = shared_library(
  endif
  
  libgbm_dri = shared_library(
 -  'dri_gbm',
 +  'dri' + get_option('egl-lib-suffix') + '_gbm',
    files('gbm_dri.c', 'gbm_driint.h'),
    include_directories : [incs_gbm, incs_gbm_dri, inc_st_dri, inc_gallium_aux],
    link_args : [ld_args_gc_sections],
 --- src/gbm/meson.build.orig	2022-09-12 22:59:56 UTC
 +++ src/gbm/meson.build
 @@ -52,7 +52,7 @@ libgbm = shared_library(
  endif
  
  libgbm = shared_library(
 -  libgbm_name,
 +  libgbm_name + get_option('egl-lib-suffix'),
    files_gbm,
    include_directories : incs_gbm,
    c_args : [args_gbm],
 --- src/glx/meson.build.orig	2020-12-03 22:36:27 UTC
 +++ src/glx/meson.build
 @@ -108,10 +108,10 @@ elif with_dri_platform == 'windows'
  endif
  
  if not with_glvnd
 -  gl_lib_name = 'GL'
 +  gl_lib_name = 'GL' + get_option('egl-lib-suffix')
    gl_lib_version = '1.2.0'
  else
 -  gl_lib_name = 'GLX_@0@'.format(glvnd_vendor_name)
 +  gl_lib_name = 'GLX_@0@'.format(glvnd_vendor_name) + get_option('egl-lib-suffix')
    gl_lib_version = '0.0.0'
    files_libglx += files(
      'g_glxglvnddispatchfuncs.c',
 --- src/intel/vulkan/meson.build.orig	2021-02-06 23:04:35 UTC
 +++ src/intel/vulkan/meson.build
 @@ -170,7 +170,7 @@ libanv_common = static_library(
  )
  
  libvulkan_intel = shared_library(
 -  'vulkan_intel',
 +  'vulkan_intel' + get_option('egl-lib-suffix'),
    [files('anv_gem.c'), anv_entrypoints[0]],
    include_directories : [
      inc_include, inc_src, inc_mapi, inc_mesa, inc_gallium, inc_intel, inc_compiler, inc_vulkan_wsi,
 --- src/intel/vulkan_hasvk/meson.build.orig	2022-09-03 20:27:51 UTC
 +++ src/intel/vulkan_hasvk/meson.build
 @@ -181,7 +181,7 @@ libvulkan_intel_hasvk = shared_library(
  )
  
  libvulkan_intel_hasvk = shared_library(
 -  'vulkan_intel_hasvk',
 +  'vulkan_intel_hasvk' + get_option('egl-lib-suffix'),
    [files('anv_gem.c'), anv_hasvk_entrypoints[0]],
    include_directories : [
      inc_include, inc_src, inc_mapi, inc_mesa, inc_gallium, inc_intel, inc_compiler,
 --- src/mapi/es1api/meson.build.orig	2020-05-30 21:28:01 UTC
 +++ src/mapi/es1api/meson.build
 @@ -33,7 +33,7 @@ if with_platform_windows
  endif
  
  libglesv1_cm = shared_library(
 -  'GLESv1_CM' + get_option('gles-lib-suffix'),
 +  'GLESv1_CM' + get_option('egl-lib-suffix') + get_option('gles-lib-suffix'),
    ['../entry.c', es1_glapi_mapi_tmp_h],
    c_args : [
      c_msvc_compat_args,
 --- src/mapi/es2api/meson.build.orig	2020-05-30 21:28:01 UTC
 +++ src/mapi/es2api/meson.build
 @@ -33,7 +33,7 @@ if with_platform_windows
  endif
  
  libgles2 = shared_library(
 -  'GLESv2' + get_option('gles-lib-suffix'),
 +  'GLESv2' + get_option('egl-lib-suffix') + get_option('gles-lib-suffix'),
    ['../entry.c', es2_glapi_mapi_tmp_h],
    c_args : [
      c_msvc_compat_args,
 --- src/mapi/shared-glapi/meson.build.orig	2023-03-13 18:59:50 UTC
 +++ src/mapi/shared-glapi/meson.build
 @@ -46,7 +46,7 @@ libglapi = shared_library(
  endif
  
  libglapi = shared_library(
 -  'glapi',
 +  'glapi' + get_option('egl-lib-suffix'),
    [files_shared_glapi, shared_glapi_mapi_tmp_h],
    c_args : [
      _glapi_c_args,
 --- src/util/meson.build.orig	2022-12-03 14:41:29 UTC
 +++ src/util/meson.build
 @@ -170,10 +170,10 @@ files_mesa_util = files(
    'mesa_cache_db.h',
  )
  
 -files_drirc = files('00-mesa-defaults.conf')
 +files_drirc = files('00-mesa@0@-defaults.conf'.format(get_option('egl-lib-suffix')))
  
  if with_amd_vk
 -  files_drirc += files('00-radv-defaults.conf')
 +  files_drirc += files('00-radv@0@-defaults.conf'.format(get_option('egl-lib-suffix')))
  endif
  
  if with_tests