From e00ef89292bd2935c0c5ac352f1f6b46cfef31c7 Mon Sep 17 00:00:00 2001
From: Cappy Ishihara <cappy@cappuchino.xyz>
Date: Tue, 9 Jul 2024 13:24:02 +0700
Subject: [PATCH] Don't inline patches, update them

---
 .../gnome-shell-glthread-disable.patch        | 11 ------
 anda/lib/terra-mesa/mesa-28923.patch          | 39 -------------------
 anda/lib/terra-mesa/terra-mesa.spec           | 10 ++---
 3 files changed, 5 insertions(+), 55 deletions(-)
 delete mode 100644 anda/lib/terra-mesa/gnome-shell-glthread-disable.patch
 delete mode 100644 anda/lib/terra-mesa/mesa-28923.patch

diff --git a/anda/lib/terra-mesa/gnome-shell-glthread-disable.patch b/anda/lib/terra-mesa/gnome-shell-glthread-disable.patch
deleted file mode 100644
index b2caeb8df5..0000000000
--- a/anda/lib/terra-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/terra-mesa/mesa-28923.patch b/anda/lib/terra-mesa/mesa-28923.patch
deleted file mode 100644
index 315b045e31..0000000000
--- a/anda/lib/terra-mesa/mesa-28923.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-From 8561958ccfd9b3a742a8742cc5931e9a6f6a7814 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Jos=C3=A9=20Exp=C3=B3sito?= <jexposit@redhat.com>
-Date: Thu, 25 Apr 2024 11:47:31 +0200
-Subject: [PATCH] meson: Disable proc_macro2 unestable features
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-proc-macro2 >= 1.0.80 uses proc_macro_byte_character [1] and
-proc_macro_c_str_literals [2].
-Disable them until they are available.
-
-[1] https://github.com/rust-lang/rust/issues/115268
-[2] https://github.com/rust-lang/rust/issues/119750
-Signed-off-by: José Expósito <jexposit@redhat.com>
----
- subprojects/packagefiles/proc-macro2/meson.build | 6 ++++++
- 1 file changed, 6 insertions(+)
-
-diff --git a/subprojects/packagefiles/proc-macro2/meson.build b/subprojects/packagefiles/proc-macro2/meson.build
-index b39d76e80c825..5bd635c80a389 100644
---- a/subprojects/packagefiles/proc-macro2/meson.build
-+++ b/subprojects/packagefiles/proc-macro2/meson.build
-@@ -41,6 +41,12 @@ endif
- if rc.version().version_compare('< 1.57')
-   rust_args += ['--cfg', 'no_is_available']
- endif
-+if rc.version().version_compare('< 1.79')
-+  rust_args += [
-+    '--cfg', 'no_literal_byte_character',
-+    '--cfg', 'no_literal_c_string',
-+    ]
-+endif
- 
- u_ind = subproject('unicode-ident').get_variable('lib')
- 
--- 
-GitLab
-
diff --git a/anda/lib/terra-mesa/terra-mesa.spec b/anda/lib/terra-mesa/terra-mesa.spec
index 5d2f33e327..6335b0637d 100644
--- a/anda/lib/terra-mesa/terra-mesa.spec
+++ b/anda/lib/terra-mesa/terra-mesa.spec
@@ -86,11 +86,11 @@ Source0:        https://archive.mesa3d.org/%{srcname}-%{ver}.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
-# Work around for the meson bug until an upstream fix lands
-# https://bugzilla.redhat.com/show_bug.cgi?id=2277018
-# https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/28923
-Patch11:        mesa-28923.patch
+Patch10:        https://src.fedoraproject.org/rpms/mesa/raw/e89544b7a4d811a64ca23b402add29524cc6f704/f/gnome-shell-glthread-disable.patch
+Patch11:        https://src.fedoraproject.org/rpms/mesa/raw/e89544b7a4d811a64ca23b402add29524cc6f704/f/0001-llvmpipe-Init-eglQueryDmaBufModifiersEXT-num_modifie.patch
+Patch12:        https://src.fedoraproject.org/rpms/mesa/raw/e89544b7a4d811a64ca23b402add29524cc6f704/f/0001-Revert-ac-radeonsi-remove-has_syncobj-has_fence_to_h.patch
+# s390x: fix build
+Patch100:       https://src.fedoraproject.org/rpms/mesa/raw/e89544b7a4d811a64ca23b402add29524cc6f704/f/fix-egl-on-s390x.patch
 
 BuildRequires:  meson >= 1.3.0
 BuildRequires:  gcc