4 files changed, 22 insertions, 15 deletions
diff --git a/graphics/mesa-devel/Makefile b/graphics/mesa-devel/Makefile
index 0324cbd7b567..bb07bd95ea7d 100644
--- a/graphics/mesa-devel/Makefile
+++ b/graphics/mesa-devel/Makefile
@@ -1,6 +1,6 @@
 PORTNAME=	mesa
-DISTVERSION=	25.1-branchpoint-4146
-DISTVERSIONSUFFIX=	-ga3a53b7cee4
+DISTVERSION=	25.2-branchpoint-1286
+DISTVERSIONSUFFIX=	-gc58b3fa3a4e
 CATEGORIES=	graphics
 PKGNAMESUFFIX=	-devel
 
@@ -46,8 +46,8 @@ MESON_ARGS=	-Dgallium-mediafoundation=disabled \
 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_DEFINE=		DRM LLVM LTO OPENCL VAAPI VDPAU VKLAYERS WAYLAND X11 ZSTD
+OPTIONS_DEFAULT=	DRM 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
@@ -81,7 +81,7 @@ 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_MESON_ON=		${"${ARCH:Naarch64:Namd64}":?-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
@@ -95,6 +95,11 @@ COINST_SUB_FILES=	libmap.conf
 COINST_SUB_LIST=	SUFFIX=${PKGNAMESUFFIX}
 COINST_PLIST_SUB_OFF=	SUFFIX=
 
+DRM_DESC=		KMS console support for Vulkan (KHR_display)
+DRM_LIB_DEPENDS=	libudev.so:devel/libudev-devd \
+			libdisplay-info.so:sysutils/libdisplay-info
+DRM_MESON_ENABLED=	display-info
+
 LLVM_DESC=		Build with LLVM support (see implies)
 LLVM_USES=		llvm:min=18,lib,noexport
 LLVM_CONFIGURE_ENV=	LLVM_CONFIG=${LLVM_CONFIG}
@@ -128,7 +133,7 @@ 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,vram-report-limit
+VKLAYERS_MESON_ON=	-Dvulkan-layers=anti-lag,device-select,overlay,screenshot,vram-report-limit
 VKLAYERS_IMPLIES=	${"${PORT_OPTIONS:Manv}":?anv:radv} # any from OPTIONS_GROUP_VULKAN
 
 WAYLAND_BUILD_DEPENDS=	wayland-protocols>0:graphics/wayland-protocols
diff --git a/graphics/mesa-devel/distinfo b/graphics/mesa-devel/distinfo
index 29370da9910e..440deeedc9d8 100644
--- a/graphics/mesa-devel/distinfo
+++ b/graphics/mesa-devel/distinfo
@@ -1,6 +1,6 @@
-TIMESTAMP = 1752271520
-SHA256 (mesa-25.1-branchpoint-4146-ga3a53b7cee4.tar.bz2) = 3f198c05a6f7578d74419138723d7f07434ad041ffeee431a5006580e344bed3
-SIZE (mesa-25.1-branchpoint-4146-ga3a53b7cee4.tar.bz2) = 58297488
+TIMESTAMP = 1754699068
+SHA256 (mesa-25.2-branchpoint-1286-gc58b3fa3a4e.tar.bz2) = f078301a1b6d518906f07c1b2fd61a1b3bd78e23238008c1ad489320daa7c8d4
+SIZE (mesa-25.2-branchpoint-1286-gc58b3fa3a4e.tar.bz2) = 58493690
 SHA256 (700efacda59c.patch) = 0d567fe737ad1404e1f12d7cd018826d9095c23835f1ed5aaa1c81cb58d3d008
 SIZE (700efacda59c.patch) = 983
 SHA256 (2930dcbb3329.patch) = f90ab77950ba1a56d165f0bc8a3cbd9c5f624bb5c67d1c7f337316027e8295e8
diff --git a/graphics/mesa-devel/files/patch-suffix b/graphics/mesa-devel/files/patch-suffix
index eacfcc31f2fc..8783f8460a0a 100644
--- a/graphics/mesa-devel/files/patch-suffix
+++ b/graphics/mesa-devel/files/patch-suffix
@@ -132,8 +132,8 @@ Library selection is handled by libglvnd and/or libmap.conf.
    [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	2025-03-28 23:07:17 UTC
-+++ src/mapi/es1api/meson.build
+--- src/mesa/glapi/es1api/meson.build.orig	2025-08-06 21:21:09 UTC
++++ src/mesa/glapi/es1api/meson.build
 @@ -23,7 +23,7 @@ libglesv1_cm = shared_library(
  )
  
@@ -143,8 +143,8 @@ Library selection is handled by libglvnd and/or libmap.conf.
    ['libgles1_public.c', es1_glapi_mapi_tmp_h],
    vs_module_defs : gles1_def,
    c_args : [
---- src/mapi/es2api/meson.build.orig	2025-03-28 23:07:17 UTC
-+++ src/mapi/es2api/meson.build
+--- src/mesa/glapi/es2api/meson.build.orig	2025-08-06 21:21:09 UTC
++++ src/mesa/glapi/es2api/meson.build
 @@ -23,7 +23,7 @@ libgles2 = shared_library(
  )
  
@@ -154,8 +154,8 @@ Library selection is handled by libglvnd and/or libmap.conf.
    ['libgles2_public.c', es2_glapi_mapi_tmp_h],
    vs_module_defs : gles2_def,
    c_args : [
---- src/mapi/shared-glapi/meson.build.orig	2025-03-28 23:07:17 UTC
-+++ src/mapi/shared-glapi/meson.build
+--- src/mesa/glapi/shared-glapi/meson.build.orig	2025-08-06 21:21:09 UTC
++++ src/mesa/glapi/shared-glapi/meson.build
 @@ -11,7 +11,7 @@ libglapi = static_library(
  )
  
diff --git a/graphics/mesa-devel/pkg-plist b/graphics/mesa-devel/pkg-plist
index a825e5bd2183..71eaba960928 100644
--- a/graphics/mesa-devel/pkg-plist
+++ b/graphics/mesa-devel/pkg-plist
@@ -26,6 +26,7 @@ lib/libEGL_mesa%%SUFFIX%%.so.0.0.0
 %%OPENCL%%lib/libRusticlOpenCL.so
 %%OPENCL%%lib/libRusticlOpenCL.so.1
 %%OPENCL%%lib/libRusticlOpenCL.so.1.0.0
+%%VKLAYERS%%lib/libVkLayer_MESA_anti_lag.so
 %%VKLAYERS%%lib/libVkLayer_MESA_device_select.so
 %%VKLAYERS%%lib/libVkLayer_MESA_overlay.so
 %%VKLAYERS%%lib/libVkLayer_MESA_screenshot.so
@@ -56,4 +57,5 @@ share/drirc.d/00-mesa%%SUFFIX%%-defaults.conf
 %%anv%%%%NO_COINST%%share/vulkan/icd.d/intel_icd.%%ARCH%%.json
 %%hasvk%%share/vulkan/icd.d/intel_hasvk_icd.%%ARCH%%.json
 %%radv%%%%NO_COINST%%share/vulkan/icd.d/radeon_icd.%%ARCH%%.json
+%%VKLAYERS%%share/vulkan/implicit_layer.d/VkLayer_MESA_anti_lag.json
 %%VKLAYERS%%share/vulkan/implicit_layer.d/VkLayer_MESA_device_select.json