From 32ec1ea33cd04e9587b9d4ab11448d2140a77948 Mon Sep 17 00:00:00 2001
From: Kyle Gospodnetich <me@kylegospodneti.ch>
Date: Sun, 2 Nov 2025 19:10:43 -0800
Subject: [PATCH] feat: Update Mesa to 25.2.6 (#7045)

* feat: Update Mesa to 25.2.6

Signed-off-by: Kyle Gospodnetich <me@kylegospodneti.ch>

* fix: Remove unneeded patch

Signed-off-by: Kyle Gospodnetich <me@kylegospodneti.ch>

* chore: Delete anda/lib/mesa/gnome-shell-glthread-disable.patch

Signed-off-by: Kyle Gospodnetich <me@kylegospodneti.ch>

---------

Signed-off-by: Kyle Gospodnetich <me@kylegospodneti.ch>
---
 .../mesa/gnome-shell-glthread-disable.patch   | 11 ------
 anda/lib/mesa/mesa.spec                       | 36 ++-----------------
 2 files changed, 2 insertions(+), 45 deletions(-)
 delete mode 100644 anda/lib/mesa/gnome-shell-glthread-disable.patch

diff --git a/anda/lib/mesa/gnome-shell-glthread-disable.patch b/anda/lib/mesa/gnome-shell-glthread-disable.patch
deleted file mode 100644
index b2caeb8df5..0000000000
--- a/anda/lib/mesa/gnome-shell-glthread-disable.patch
+++ /dev/null
@@ -1,11 +0,0 @@
-diff -up mesa-22.3.0-rc4/src/util/00-mesa-defaults.conf.dma mesa-22.3.0-rc4/src/util/00-mesa-defaults.conf
---- mesa-22.3.0-rc4/src/util/00-mesa-defaults.conf.dma	2022-11-25 10:32:32.175879868 +1000
-+++ mesa-22.3.0-rc4/src/util/00-mesa-defaults.conf	2022-11-25 10:32:43.743067470 +1000
-@@ -653,6 +653,7 @@ TODO: document the other workarounds.
-         <application name="gnome-shell" executable="gnome-shell">
-             <option name="adaptive_sync" value="false" />
-             <option name="v3d_nonmsaa_texture_size_limit" value="true" />
-+            <option name="mesa_glthread" value="false"/>
-         </application>
-         <application name="Desktop — Plasma" executable="plasmashell">
-             <option name="adaptive_sync" value="false" />
diff --git a/anda/lib/mesa/mesa.spec b/anda/lib/mesa/mesa.spec
index 4fa43801cc..4d3e8b7045 100644
--- a/anda/lib/mesa/mesa.spec
+++ b/anda/lib/mesa/mesa.spec
@@ -7,7 +7,6 @@
 %global with_radeonsi 1
 %global with_vmware 1
 %global with_vulkan_hw 1
-%global with_vdpau 1
 %global with_va 1
 %if !0%{?rhel}
 %global with_r300 1
@@ -79,7 +78,7 @@ Summary:        Mesa graphics libraries
 # This should not break anything by default as the Mesa stream is ***EXPLICITLY***
 # disabled by default, and has to be enabled manually. See `terra/release/terra-mesa.repo` for details.
 Epoch:          1
-Version:        25.2.4
+Version:        25.2.6
 Release:        2%?dist
 License:        MIT AND BSD-3-Clause AND SGI-B-2.0
 URL:            http://www.mesa3d.org
@@ -90,11 +89,8 @@ Source0:        https://archive.mesa3d.org/%{srcname}-%{version}.tar.xz
 # Fedora opts to ignore the optional part of clause 2 and treat that code as 2 clause BSD.
 Source1:        Mesa-MLAA-License-Clarification-Email.txt
 
-Patch10:        gnome-shell-glthread-disable.patch
-
 # https://github.com/bazzite-org/mesa
 Patch20:        bazzite.patch
-Patch21:        https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/37498.diff
 
 BuildRequires:  meson >= 1.3.0
 BuildRequires:  gcc
@@ -142,9 +138,6 @@ BuildRequires:  flex
 %if 0%{?with_lmsensors}
 BuildRequires:  lm_sensors-devel
 %endif
-%if 0%{?with_vdpau}
-BuildRequires:  pkgconfig(vdpau) >= 1.1
-%endif
 %if 0%{?with_va}
 BuildRequires:  pkgconfig(libva) >= 0.38.0
 %endif
@@ -266,15 +259,6 @@ Obsoletes:      %{name}-vaapi-drivers < %{?epoch:%{epoch}:}22.2.0-5
 %{summary}.
 %endif
 
-%if 0%{?with_vdpau}
-%package        vdpau-drivers
-Summary:        Mesa-based VDPAU drivers
-Requires:       %{name}-filesystem%{?_isa} = %{?epoch:%{epoch}:}%{version}-%{release}
-
-%description vdpau-drivers
-%{summary}.
-%endif
-
 %package libgbm
 Summary:        Mesa gbm runtime library
 Provides:       libgbm
@@ -378,7 +362,7 @@ export MESON_PACKAGE_CACHE_DIR="%{cargo_registry}/"
 %else
   -Dgallium-drivers=llvmpipe,virgl \
 %endif
-  -Dgallium-vdpau=%{?with_vdpau:enabled}%{!?with_vdpau:disabled} \
+  -Dgallium-vdpau=disabled \
   -Dgallium-va=%{?with_va:enabled}%{!?with_va:disabled} \
   -Dteflon=%{?with_teflon:true}%{!?with_teflon:false} \
 %if 0%{?with_opencl}
@@ -608,22 +592,6 @@ popd
 %{_libdir}/dri/virtio_gpu_drv_video.so
 %endif
 
-%if 0%{?with_vdpau}
-%files vdpau-drivers
-%dir %{_libdir}/vdpau
-%{_libdir}/vdpau/libvdpau_nouveau.so.1*
-%if 0%{?with_r600}
-%{_libdir}/vdpau/libvdpau_r600.so.1*
-%endif
-%if 0%{?with_radeonsi}
-%{_libdir}/vdpau/libvdpau_radeonsi.so.1*
-%endif
-%if 0%{?with_d3d12}
-%{_libdir}/vdpau/libvdpau_d3d12.so.1*
-%endif
-%{_libdir}/vdpau/libvdpau_virtio_gpu.so.1*
-%endif
-
 %if 0%{?with_d3d12}
 %files dxil-devel
 %{_bindir}/spirv2dxil