mesa: updated to 25.3.6

To: pkgsrc-wip-changes%NetBSD.org@localhost
Subject: mesa: updated to 25.3.6
From: Adam Ciarciński (via pkgsrc-wip) <commit-notify%pkgsrc.org@localhost>
Date: Wed, 2 Sep 2026 20:26:52 +0000
Module Name:	pkgsrc-wip
Committed By:	Adam Ciarciński <adam%defguard.net@localhost>
Pushed By:	adam
Date:		Wed Sep 2 22:26:47 2026 +0200
Changeset:	5e05d54539efac041793e198715c1808bcb716c7

Modified Files:
	mesa/Makefile
	mesa/distinfo
	mesa/options.mk
	mesa/patches/patch-src_util_os__file.c
Added Files:
	mesa/patches/patch-src_gallium_auxiliary_vl_vl__csc.c

Log Message:
mesa: updated to 25.3.6

To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=5e05d54539efac041793e198715c1808bcb716c7

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

diffstat:
 mesa/Makefile                                      |  5 +-
 mesa/distinfo                                      |  8 +-
 mesa/options.mk                                    | 17 +----
 .../patch-src_gallium_auxiliary_vl_vl__csc.c       | 86 ++++++++++++++++++++++
 mesa/patches/patch-src_util_os__file.c             | 21 ++----
 5 files changed, 101 insertions(+), 36 deletions(-)

diffs:
diff --git a/mesa/Makefile b/mesa/Makefile
index eaf7cce93e..cb6d5c57d5 100644
--- a/mesa/Makefile
+++ b/mesa/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: $
+# $NetBSD$
 
-DISTNAME=	mesa-25.2.7
+DISTNAME=	mesa-25.3.6
 CATEGORIES=	graphics
 MASTER_SITES=	https://mesa.freedesktop.org/archive/
 MASTER_SITES+=	https://mesa3d.org/archive/
@@ -155,7 +155,6 @@ CONF_FILES+=	${EGDIR}/00-mesa-defaults.conf ${PKG_SYSCONFDIR}/drirc
 INSTALLATION_DIRS+=	${EGDIR}
 
 PYTHON_FOR_BUILD_ONLY=		tool
-PYTHON_VERSIONS_INCOMPATIBLE=	27
 
 PKGCONFIG_OVERRIDE_STAGE=	pre-install
 PKGCONFIG_OVERRIDE+=		output/meson-private/glesv1_cm.pc
diff --git a/mesa/distinfo b/mesa/distinfo
index 0a8f751035..51a766d474 100644
--- a/mesa/distinfo
+++ b/mesa/distinfo
@@ -1,12 +1,12 @@
 $NetBSD: distinfo,v 1.166 2023/07/18 19:33:31 ryoon Exp $
 
-BLAKE2s (mesa-25.2.7.tar.xz) = 64701bc18f7a56835a99decae90e2dcf27fbd6b505c0184b92f6b728321345bc
-SHA512 (mesa-25.2.7.tar.xz) = 87dd815e0d11d6ec0eb969ee93d3f376103bb899d90599e0b7902394e41c58139384df79f89633e132ca969348d3320f55308a74651d409b454d51f1bcda27bc
-Size (mesa-25.2.7.tar.xz) = 43783492 bytes
+BLAKE2s (mesa-25.3.6.tar.xz) = 5c6ac9a27f693eb4baf9a2fbb0e7c205cf560ee3ad333b55978ee1f3157792d5
+SHA512 (mesa-25.3.6.tar.xz) = 73620003e1e67c6b5ad076afb19e0b250214cfb6ed830166fb70058173ec3b19a2a8f5b5a78d8cce7a70745f5e4fa439913d15d8b38ca0002455b238f5865d38
+Size (mesa-25.3.6.tar.xz) = 43485532 bytes
 SHA1 (patch-src_egl_drivers_dri2_platform__drm.c) = c982acaf2246858a06a52f548b6103800c0d7c45
 SHA1 (patch-src_gallium_auxiliary_pipe-loader_pipe__loader__drm.c) = c6958cf29da9154c673f8c64790ac2bb46ed74bd
 SHA1 (patch-src_gallium_drivers_r600_sfn_sfn__valuefactory.cpp) = 14a0bc9f0cb7d0f4bc7ba8de49cf162af4e27ddf
 SHA1 (patch-src_glx_glxclient.h) = 4812c1b17bfff6cb43192790aa5cfee5c6c3149d
 SHA1 (patch-src_glx_glxcurrent.c) = be95c084b834275ca65a38f446487c68889e1ab5
 SHA1 (patch-src_util_build__id.c) = 7a9547bbda9d2fb9f0018ccf27b70b59e497aa2c
-SHA1 (patch-src_util_os__file.c) = 6761051028c97f763075fd7526373e9fa131be08
+SHA1 (patch-src_util_os__file.c) = c80d88255a8f800d1e36fc199f3869ecdb61d203
diff --git a/mesa/options.mk b/mesa/options.mk
index 76b84f0430..4259a9558a 100644
--- a/mesa/options.mk
+++ b/mesa/options.mk
@@ -54,9 +54,6 @@ PLIST_VARS+=	r600 radeonsi
 # Windowing systems
 PLIST_VARS+=	glx
 
-# Misc. features
-PLIST_VARS+=	vdpau
-
 #
 # ELF TLS support
 #
@@ -71,11 +68,11 @@ PLIST_VARS+=	iris
 .if !empty(PKG_OPTIONS:Mllvm)
 MESON_ARGS+=		-Dllvm=enabled
 .  include "../../devel/libelf/buildlink3.mk"
+.  include "../../lang/clang/buildlink3.mk"
+.  include "../../lang/libclc/buildlink3.mk"
+.  include "../../lang/libunwind/buildlink3.mk"
 .  include "../../lang/llvm/buildlink3.mk"
-.  include "../../wip/libclc/buildlink3.mk"
 .  include "../../parallel/spirv-tools/buildlink3.mk"
-.  include "../../lang/libunwind/buildlink3.mk"
-.  include "../../lang/clang/buildlink3.mk"
 
 GALLIUM_DRIVERS+=		llvmpipe
 .  if ${OPSYS} != "Darwin" && ${OPSYS} != "Cygwin"
@@ -119,14 +116,6 @@ MESA_PLATFORMS+=	x11
 PLIST.glx=		yes
 .  if ${MESALIB_SUPPORTS_DRI} == "yes"
 MESON_ARGS+=		-Dglx=dri
-#.    include "../../multimedia/libvdpau/available.mk"
-#.    if ${VDPAU_AVAILABLE} == "yes"
-#MESON_ARGS+=		-Dgallium-vdpau=enabled
-#PLIST.vdpau=		yes
-#.      include "../../multimedia/libvdpau/buildlink3.mk"
-#.    else
-MESON_ARGS+=		-Dgallium-vdpau=disabled
-#.    endif
 .  endif
 .  include "../../x11/libX11/buildlink3.mk"
 .  include "../../x11/libXdamage/buildlink3.mk"
diff --git a/mesa/patches/patch-src_gallium_auxiliary_vl_vl__csc.c b/mesa/patches/patch-src_gallium_auxiliary_vl_vl__csc.c
new file mode 100644
index 0000000000..5bf67412f5
--- /dev/null
+++ b/mesa/patches/patch-src_gallium_auxiliary_vl_vl__csc.c
@@ -0,0 +1,86 @@
+$NetBSD$
+
+Fix error: macro "memcpy" passed 15 arguments, but takes just 3.
+
+--- src/gallium/auxiliary/vl/vl_csc.c.orig	2026-09-02 14:43:54.278607333 +0000
++++ src/gallium/auxiliary/vl/vl_csc.c
+@@ -192,20 +192,22 @@ void vl_csc_get_primaries_matrix(enum pipe_video_vpp_c
+    case PIPE_VIDEO_VPP_PRI_SMPTE240M:
+       switch (out_color_primaries) {
+       case PIPE_VIDEO_VPP_PRI_BT2020:
+-         memcpy(matrix, &(vl_csc_matrix){
++         vl_csc_matrix m1 = {
+             { 0.595254, 0.349314, 0.055432, 0.0 },
+             { 0.081244, 0.891503, 0.027253, 0.0 },
+             { 0.015512, 0.081912, 0.902576, 0.0 },
+-         }, sizeof(vl_csc_matrix));
++         };
++         memcpy(matrix, &m1, sizeof(vl_csc_matrix));
+          break;
+ 
+       case PIPE_VIDEO_VPP_PRI_BT709:
+       default:
+-         memcpy(matrix, &(vl_csc_matrix){
++         vl_csc_matrix m2 = {
+             {  0.939543,  0.050181, 0.010276, 0.0 },
+             {  0.017772,  0.965793, 0.016435, 0.0 },
+             { -0.001622, -0.004370, 1.005991, 0.0 },
+-         }, sizeof(vl_csc_matrix));
++         };
++         memcpy(matrix, &m2, sizeof(vl_csc_matrix));
+          break;
+       }
+       break;
+@@ -214,20 +216,22 @@ void vl_csc_get_primaries_matrix(enum pipe_video_vpp_c
+       switch (out_color_primaries) {
+       case PIPE_VIDEO_VPP_PRI_SMPTE170M:
+       case PIPE_VIDEO_VPP_PRI_SMPTE240M:
+-         memcpy(matrix, &(vl_csc_matrix){
++         vl_csc_matrix m3 = {
+             {  1.776133, -0.687820, -0.088313, 0.0 },
+             { -0.161375,  1.187315, -0.025940, 0.0 },
+             { -0.015881, -0.095931,  1.111812, 0.0 },
+-         }, sizeof(vl_csc_matrix));
++         };
++         memcpy(matrix, &m3, sizeof(vl_csc_matrix));
+          break;
+ 
+       case PIPE_VIDEO_VPP_PRI_BT709:
+       default:
+-         memcpy(matrix, &(vl_csc_matrix){
++         vl_csc_matrix m4 = {
+             {  1.660491, -0.587641, -0.072850, 0.0 },
+             { -0.124550,  1.132900, -0.008349, 0.0 },
+             { -0.018151, -0.100579,  1.118729, 0.0 },
+-         }, sizeof(vl_csc_matrix));
++         };
++         memcpy(matrix, &m4, sizeof(vl_csc_matrix));
+          break;
+       }
+       break;
+@@ -237,19 +241,21 @@ void vl_csc_get_primaries_matrix(enum pipe_video_vpp_c
+       switch (out_color_primaries) {
+       case PIPE_VIDEO_VPP_PRI_SMPTE170M:
+       case PIPE_VIDEO_VPP_PRI_SMPTE240M:
+-         memcpy(matrix, &(vl_csc_matrix){
++         vl_csc_matrix m5 = {
+             {  1.065379, -0.055401, -0.009978, 0.0 },
+             { -0.019633,  1.036363, -0.016731, 0.0 },
+             {  0.001632,  0.004412,  0.993956, 0.0 },
+-         }, sizeof(vl_csc_matrix));
++         };
++         memcpy(matrix, &m5, sizeof(vl_csc_matrix));
+          break;
+ 
+       case PIPE_VIDEO_VPP_PRI_BT2020:
+-         memcpy(matrix, &(vl_csc_matrix){
++         vl_csc_matrix m6 = {
+             { 0.627404, 0.329283, 0.043313, 0.0 },
+             { 0.069097, 0.919540, 0.011362, 0.0 },
+             { 0.016391, 0.088013, 0.895595, 0.0 },
+-         }, sizeof(vl_csc_matrix));
++         };
++         memcpy(matrix, &m6, sizeof(vl_csc_matrix));
+          break;
+ 
+       default:
diff --git a/mesa/patches/patch-src_util_os__file.c b/mesa/patches/patch-src_util_os__file.c
index dd63393f0d..d57183acd6 100644
--- a/mesa/patches/patch-src_util_os__file.c
+++ b/mesa/patches/patch-src_util_os__file.c
@@ -1,22 +1,13 @@
 $NetBSD$
 
---- src/util/os_file.c.orig	2025-01-22 18:12:23.000000000 +0000
+Support NetBSD.
+
+--- src/util/os_file.c.orig	2026-02-19 18:55:18.000000000 +0000
 +++ src/util/os_file.c
-@@ -224,6 +224,10 @@ typedef void *kvaddr_t;
- 
- #endif /* DETECT_OS_DRAGONFLY || DETECT_OS_FREEBSD */
- 
-+#if DETECT_OS_NETBSD
-+#include <sys/stat.h>
-+#endif
-+
- int
- os_same_file_description(int fd1, int fd2)
- {
-@@ -263,6 +267,19 @@ os_same_file_description(int fd1, int fd
-       return -1;
+@@ -320,6 +320,19 @@ error:
+    close(efd);
  
-    return (fd1_kfile < fd2_kfile) | ((fd1_kfile > fd2_kfile) << 1);
+    return r;
 +#elif DETECT_OS_NETBSD
 +   struct stat st1, st2;
 +
Prev by Date: libclc: sync with LLVM; spirv-llvm-translator added 22.1.6 to match LLVM from wip
Next by Date: rust198: updated to 1.98.1
Previous by Thread: libclc: sync with LLVM; spirv-llvm-translator added 22.1.6 to match LLVM from wip
Next by Thread: rust198: updated to 1.98.1
Indexes:
Home | Main Index | Thread Index | Old Index