From 382f5b4526dcdb9594eda307198eae51e3f7b554 Mon Sep 17 00:00:00 2001
From: Raboneko <119771935+raboneko@users.noreply.github.com>
Date: Wed, 11 Feb 2026 18:20:40 -0800
Subject: [PATCH] feat: Update mesa to 26.0.0 (#9806) (#9819)
---
.../mesa/gnome-shell-glthread-disable.patch | 11 -------
anda/lib/mesa/mesa-38532.patch | 27 ----------------
anda/lib/mesa/mesa.spec | 31 +++++++------------
3 files changed, 11 insertions(+), 58 deletions(-)
delete mode 100644 anda/lib/mesa/gnome-shell-glthread-disable.patch
delete mode 100644 anda/lib/mesa/mesa-38532.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.
-
-
-
-+
-
-
-
diff --git a/anda/lib/mesa/mesa-38532.patch b/anda/lib/mesa/mesa-38532.patch
deleted file mode 100644
index d7ad01f798..0000000000
--- a/anda/lib/mesa/mesa-38532.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-From 087ef6401515d7260eafbffe423f39afc2af985c Mon Sep 17 00:00:00 2001
-From: Tomeu Vizoso
-Date: Tue, 18 Nov 2025 11:36:43 +0100
-Subject: [PATCH] dril: don't build a rocket_dri.so
-
-As Teflon doesn't dynamically load drivers (yet?).
----
- src/gallium/targets/dril/meson.build | 3 +--
- 1 file changed, 1 insertion(+), 2 deletions(-)
-
-diff --git a/src/gallium/targets/dril/meson.build b/src/gallium/targets/dril/meson.build
-index 140022f077da9..62a816f44a625 100644
---- a/src/gallium/targets/dril/meson.build
-+++ b/src/gallium/targets/dril/meson.build
-@@ -124,8 +124,7 @@ foreach d : [[with_gallium_kmsro, [
- [with_gallium_lima, 'lima_dri.so'],
- [with_gallium_d3d12, 'd3d12_dri.so'],
- [with_gallium_zink, 'zink_dri.so'],
-- [with_gallium_asahi, 'asahi_dri.so'],
-- [with_gallium_rocket, 'rocket_dri.so']]
-+ [with_gallium_asahi, 'asahi_dri.so']]
- if d[0]
- dril_drivers += d[1]
- endif
---
-GitLab
-
diff --git a/anda/lib/mesa/mesa.spec b/anda/lib/mesa/mesa.spec
index b5581037d9..57cefa6a1c 100644
--- a/anda/lib/mesa/mesa.spec
+++ b/anda/lib/mesa/mesa.spec
@@ -84,13 +84,13 @@
Name: %{srcname}
Summary: Mesa graphics libraries
-%global ver 25.3.4
+%global ver 26.0.0
Epoch: 1
Version: %{lua:ver = string.gsub(rpm.expand("%{ver}"), "-", "~"); print(ver)}
Release: 1
Packager: Kyle Gospodnetich
License: MIT AND BSD-3-Clause AND SGI-B-2.0
-URL: http://www.mesa3d.org
+URL: https://mesa3d.org
Source0: https://archive.mesa3d.org/%{srcname}-%{version}.tar.xz
# src/gallium/auxiliary/postprocess/pp_mlaa* have an ... interestingly worded license.
@@ -115,9 +115,6 @@ Source13: https://crates.io/api/v1/crates/syn/%{rust_syn_ver}/download#/sy
Source14: https://crates.io/api/v1/crates/unicode-ident/%{rust_unicode_ident_ver}/download#/unicode-ident-%{rust_unicode_ident_ver}.tar.gz
Source15: https://crates.io/api/v1/crates/rustc-hash/%{rustc_hash_ver}/download#/rustc-hash-%{rustc_hash_ver}.tar.gz
-# Teflon: https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/38532
-Patch12: mesa-38532.patch
-
# Open Gaming Collective Patches
Patch30: https://raw.githubusercontent.com/OpenGamingCollective/mesa/refs/tags/%{ver}/limiter.patch
Patch31: https://raw.githubusercontent.com/OpenGamingCollective/mesa/refs/tags/%{ver}/radv-defaults.patch
@@ -240,8 +237,8 @@ Obsoletes: %{name}-libOSMesa < %{?epoch:%{epoch}:}25.1.0~rc2-1
Summary: Mesa libGL development package
Requires: (%{name}-libGL%{?_isa} = %{?epoch:%{epoch}:}%{version}-%{release} if %{name}-libGL%{?_isa})
Requires: libglvnd-devel%{?_isa} >= 1:1.3.2
-Provides: libGL-devel
-Provides: libGL-devel%{?_isa}
+Provides: libGL-devel = %{?epoch:%{epoch}:}%{version}-%{release}
+Provides: libGL-devel%{?_isa} = %{?epoch:%{epoch}:}%{version}-%{release}
Recommends: gl-manpages
Obsoletes: %{name}-libOSMesa-devel < %{?epoch:%{epoch}:}25.1.0~rc2-1
@@ -262,8 +259,8 @@ Summary: Mesa libEGL development package
Requires: (%{name}-libEGL%{?_isa} = %{?epoch:%{epoch}:}%{version}-%{release} if %{name}-libEGL%{?_isa})
Requires: libglvnd-devel%{?_isa} >= 1:1.3.2
Requires: %{name}-khr-devel%{?_isa}
-Provides: libEGL-devel
-Provides: libEGL-devel%{?_isa}
+Provides: libEGL-devel = %{?epoch:%{epoch}:}%{version}-%{release}
+Provides: libEGL-devel%{?_isa} = %{?epoch:%{epoch}:}%{version}-%{release}
%description libEGL-devel
%{summary}.
@@ -292,8 +289,8 @@ Obsoletes: %{name}-vaapi-drivers < %{?epoch:%{epoch}:}22.2.0-5
%package libgbm
Summary: Mesa gbm runtime library
-Provides: libgbm
-Provides: libgbm%{?_isa}
+Provides: libgbm = %{?epoch:%{epoch}:}%{version}-%{release}
+Provides: libgbm%{?_isa} = %{?epoch:%{epoch}:}%{version}-%{release}
Recommends: %{name}-dri-drivers%{?_isa} = %{?epoch:%{epoch}:}%{version}-%{release}
# If mesa-dri-drivers are installed, they must match in version. This is here to prevent using
# older mesa-dri-drivers together with a newer mesa-libgbm and its dependants.
@@ -306,8 +303,8 @@ Requires: (%{name}-dri-drivers%{?_isa} = %{?epoch:%{epoch}:}%{version}-%{r
%package libgbm-devel
Summary: Mesa libgbm development package
Requires: %{name}-libgbm%{?_isa} = %{?epoch:%{epoch}:}%{version}-%{release}
-Provides: libgbm-devel
-Provides: libgbm-devel%{?_isa}
+Provides: libgbm-devel = %{?epoch:%{epoch}:}%{version}-%{release}
+Provides: libgbm-devel%{?_isa} = %{?epoch:%{epoch}:}%{version}-%{release}
%description libgbm-devel
%{summary}.
@@ -355,6 +352,7 @@ Summary: Mesa Vulkan drivers
Requires: vulkan%{_isa}
Requires: %{name}-filesystem%{?_isa} = %{?epoch:%{epoch}:}%{version}-%{release}
Obsoletes: mesa-vulkan-devel < %{?epoch:%{epoch}:}%{version}-%{release}
+Obsoletes: VK_hdr_layer < 1
%description vulkan-drivers
The drivers with support for the Vulkan API.
@@ -515,13 +513,6 @@ rm -vf %{buildroot}%{_libdir}/dri/apple_dri.so
# determine the vendor
ln -s %{_libdir}/libGLX_mesa.so.0 %{buildroot}%{_libdir}/libGLX_system.so.0
-# this keeps breaking, check it early. note that the exit from eu-ftr is odd.
-pushd %{buildroot}%{_libdir}
-for i in libGL.so ; do
- eu-findtextrel $i && exit 1
-done
-popd
-
%files filesystem
%doc docs/Mesa-MLAA-License-Clarification-Email.txt
%dir %{_libdir}/dri