git: 54cf7a36879a - main - graphics/mesa-devel: update to 25.2.b.3042

From: Jan Beich <jbeich_at_FreeBSD.org>
Date: Thu, 11 Sep 2025 00:25:20 UTC
The branch main has been updated by jbeich:

URL: https://cgit.FreeBSD.org/ports/commit/?id=54cf7a36879a89fe117d18c9b189c98c0cca42d1

commit 54cf7a36879a89fe117d18c9b189c98c0cca42d1
Author:     Jan Beich <jbeich@FreeBSD.org>
AuthorDate: 2025-09-10 18:18:42 +0000
Commit:     Jan Beich <jbeich@FreeBSD.org>
CommitDate: 2025-09-11 00:24:49 +0000

    graphics/mesa-devel: update to 25.2.b.3042
    
    Changes:        https://gitlab.freedesktop.org/mesa/mesa/-/compare/29fb897c0a0...a9ea4630d47
---
 graphics/mesa-devel/Makefile             | 13 ++++---------
 graphics/mesa-devel/distinfo             |  6 +++---
 graphics/mesa-devel/files/libmap.conf.in |  2 --
 graphics/mesa-devel/files/patch-suffix   |  9 ---------
 graphics/mesa-devel/pkg-plist            |  8 --------
 5 files changed, 7 insertions(+), 31 deletions(-)

diff --git a/graphics/mesa-devel/Makefile b/graphics/mesa-devel/Makefile
index 0df78bdbaf29..eb4b35af364c 100644
--- a/graphics/mesa-devel/Makefile
+++ b/graphics/mesa-devel/Makefile
@@ -1,6 +1,6 @@
 PORTNAME=	mesa
-DISTVERSION=	25.2-branchpoint-2843
-DISTVERSIONSUFFIX=	-g29fb897c0a0
+DISTVERSION=	25.2-branchpoint-3042
+DISTVERSIONSUFFIX=	-ga9ea4630d47
 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=		DRM LLVM LTO OPENCL VAAPI VDPAU VKLAYERS WAYLAND X11 ZSTD
-OPTIONS_DEFAULT=	DRM LLVM LTO OPENCL VAAPI VDPAU VKLAYERS WAYLAND X11 ZSTD
+OPTIONS_DEFINE=		DRM LLVM LTO OPENCL VAAPI VKLAYERS WAYLAND X11 ZSTD
+OPTIONS_DEFAULT=	DRM LLVM LTO OPENCL VAAPI VKLAYERS WAYLAND X11 ZSTD
 OPTIONS_GROUP=		GALLIUM VULKAN
 OPTIONS_GROUP_GALLIUM=	crocus iris panfrost r600 radeonsi
 OPTIONS_GROUP_VULKAN=	anv hasvk radv
@@ -125,11 +125,6 @@ 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
diff --git a/graphics/mesa-devel/distinfo b/graphics/mesa-devel/distinfo
index 5d5c6db73f30..31291d67ace2 100644
--- a/graphics/mesa-devel/distinfo
+++ b/graphics/mesa-devel/distinfo
@@ -1,6 +1,6 @@
-TIMESTAMP = 1757116992
-SHA256 (mesa-25.2-branchpoint-2843-g29fb897c0a0.tar.bz2) = b8966418b84424137736187ed8884dac3dfcd0ce4e845f889bde4b784f16835a
-SIZE (mesa-25.2-branchpoint-2843-g29fb897c0a0.tar.bz2) = 58741659
+TIMESTAMP = 1757543113
+SHA256 (mesa-25.2-branchpoint-3042-ga9ea4630d47.tar.bz2) = c52e28e9a3e8b2c92944948502eadb8e66e001e59870ce3c033c780c41ca0f4d
+SIZE (mesa-25.2-branchpoint-3042-ga9ea4630d47.tar.bz2) = 58607198
 SHA256 (700efacda59c.patch) = 0d567fe737ad1404e1f12d7cd018826d9095c23835f1ed5aaa1c81cb58d3d008
 SIZE (700efacda59c.patch) = 983
 SHA256 (de5cf0a44b50.patch) = c9e02e5eb1fb4e3aa2bc7a7e0a70f28f3ee609835ff0b59e827893a821983851
diff --git a/graphics/mesa-devel/files/libmap.conf.in b/graphics/mesa-devel/files/libmap.conf.in
index 319d4562dc1a..ff4183bda0ad 100644
--- a/graphics/mesa-devel/files/libmap.conf.in
+++ b/graphics/mesa-devel/files/libmap.conf.in
@@ -15,5 +15,3 @@ libgbm.so.1 libgbm%%SUFFIX%%.so.1
 
 %%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 8783f8460a0a..040b62dc5a09 100644
--- a/graphics/mesa-devel/files/patch-suffix
+++ b/graphics/mesa-devel/files/patch-suffix
@@ -22,15 +22,6 @@ Library selection is handled by libglvnd and/or libmap.conf.
  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')
diff --git a/graphics/mesa-devel/pkg-plist b/graphics/mesa-devel/pkg-plist
index 71eaba960928..673ba22aef62 100644
--- a/graphics/mesa-devel/pkg-plist
+++ b/graphics/mesa-devel/pkg-plist
@@ -38,14 +38,6 @@ lib/libgbm%%SUFFIX%%.so.1.0.0
 %%anv%%lib/libvulkan_intel%%SUFFIX%%.so
 %%hasvk%%lib/libvulkan_intel_hasvk%%SUFFIX%%.so
 %%radv%%lib/libvulkan_radeon%%SUFFIX%%.so
-%%VDPAU%%%%r600%%lib/vdpau%%SUFFIX%%/libvdpau_r600.so
-%%VDPAU%%%%r600%%lib/vdpau%%SUFFIX%%/libvdpau_r600.so.1
-%%VDPAU%%%%r600%%lib/vdpau%%SUFFIX%%/libvdpau_r600.so.1.0
-%%VDPAU%%%%r600%%lib/vdpau%%SUFFIX%%/libvdpau_r600.so.1.0.0
-%%VDPAU%%%%radeonsi%%lib/vdpau%%SUFFIX%%/libvdpau_radeonsi.so
-%%VDPAU%%%%radeonsi%%lib/vdpau%%SUFFIX%%/libvdpau_radeonsi.so.1
-%%VDPAU%%%%radeonsi%%lib/vdpau%%SUFFIX%%/libvdpau_radeonsi.so.1.0
-%%VDPAU%%%%radeonsi%%lib/vdpau%%SUFFIX%%/libvdpau_radeonsi.so.1.0.0
 %%NO_COINST%%libdata/pkgconfig/dri.pc
 %%NO_COINST%%libdata/pkgconfig/gbm.pc
 share/drirc.d/00-mesa%%SUFFIX%%-defaults.conf