From 855905b23434a11022a914c5c78a58898b435e70 Mon Sep 17 00:00:00 2001
From: Janne Grunau <j@jannau.net>
Date: Sep 16 2023 21:59:02 +0000
Subject: [PATCH 1/2] Bump to asahi-20230904 pre-release tag


Drop upstream merged
0001-asahi-Fix-32-bit-x86-build-with-correct-data-type-fo.patch patch.

---

diff --git a/0001-asahi-Fix-32-bit-x86-build-with-correct-data-type-fo.patch b/0001-asahi-Fix-32-bit-x86-build-with-correct-data-type-fo.patch
deleted file mode 100644
index fbeff0e..0000000
--- a/0001-asahi-Fix-32-bit-x86-build-with-correct-data-type-fo.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-From f7c048bfb8e676f5250397ded2a0863c543eb2b8 Mon Sep 17 00:00:00 2001
-From: Neal Gompa <neal@gompa.dev>
-Date: Wed, 23 Aug 2023 11:56:30 -0400
-Subject: [PATCH] asahi: Fix 32-bit x86 build with correct data type for
- overflow error message
-
-Currently, when building on 32-bit x86, we get compilation errors
-due to data type mis-matches in the format string.
-
-This should fix the issue.
-
-Signed-off-by: Neal Gompa <neal@gompa.dev>
----
- src/asahi/lib/decode.c | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/src/asahi/lib/decode.c b/src/asahi/lib/decode.c
-index bd3b01d0593..2dab4d29879 100644
---- a/src/asahi/lib/decode.c
-+++ b/src/asahi/lib/decode.c
-@@ -229,8 +229,8 @@ __agxdecode_fetch_gpu_mem(const struct agx_bo *mem, uint64_t gpu_va,
-       fprintf(stderr,
-               "Overflowing to unknown memory %" PRIx64
-               " of size %zu (max size %zu) in %s:%d\n",
--              gpu_va, size, mem->size - (gpu_va - mem->ptr.gpu), filename,
--              line);
-+              gpu_va, size, (size_t)(mem->size - (gpu_va - mem->ptr.gpu)),
-+              filename, line);
-       fflush(agxdecode_dump_stream);
-       assert(0);
-    }
--- 
-2.41.0
-
diff --git a/mesa.spec b/mesa.spec
index f4ce045..12762cf 100644
--- a/mesa.spec
+++ b/mesa.spec
@@ -61,7 +61,7 @@
 
 %global vulkan_drivers swrast%{?base_vulkan}%{?intel_platform_vulkan}%{?extra_platform_vulkan}
 
-%global asahi_mesa_ver 20230821
+%global asahi_mesa_ver 20230904
 %global git_tag asahi-%{asahi_mesa_ver}
 %global basever 23.3.0
 %global pkgrelease 1
@@ -83,10 +83,6 @@ Source1:        Mesa-MLAA-License-Clarification-Email.txt
 
 Patch10:        gnome-shell-glthread-disable.patch
 
-# Patch proposed upstream
-# From: https://gitlab.freedesktop.org/asahi/mesa/-/merge_requests/171
-Patch0101:      0001-asahi-Fix-32-bit-x86-build-with-correct-data-type-fo.patch
-
 BuildRequires:  meson >= 1.2.0
 BuildRequires:  gcc
 BuildRequires:  gcc-c++
diff --git a/rpkg.conf b/rpkg.conf
index 62aa798..090f5f8 100644
--- a/rpkg.conf
+++ b/rpkg.conf
@@ -1,2 +1,2 @@
 [lookaside]
-download_url = https://gitlab.freedesktop.org/asahi/mesa/-/archive/asahi-20230821/%(filename)s
+download_url = https://gitlab.freedesktop.org/asahi/mesa/-/archive/asahi-20230904/%(filename)s
diff --git a/sources b/sources
index 698abab..b31755d 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (mesa-asahi-20230821.tar.gz) = 6f19dde3d76a1f676e4d2a2d228aced17b8e8f7f3d8a138b94410107ba7e0fc6a0313a5044a37ea4717a06007e2998c87dcc201b0cfd79770fd78cbed055ba6d
+SHA512 (mesa-asahi-20230904.tar.gz) = ca2a2afdd17b491c6f4b746cb426154d50caf45db8a01f449f295c90300d1036ea51ceac81a2036e63fe0ecee9c582e1313d5d924015688d6dee29eba3fab76e

From bcc997925b2a9d7b67c173faf83bb93571f1a64f Mon Sep 17 00:00:00 2001
From: Janne Grunau <j@jannau.net>
Date: Sep 16 2023 21:59:02 +0000
Subject: [PATCH 2/2] Modify VERSION so mesa reports the asahi tag


---

diff --git a/mesa.spec b/mesa.spec
index 12762cf..cb8e91e 100644
--- a/mesa.spec
+++ b/mesa.spec
@@ -368,6 +368,9 @@ The drivers with support for the Vulkan API.
 %autosetup -n %{name}-%{git_tag} -p1
 cp %{SOURCE1} docs/
 
+# patch VERSION to contain the asahi tag name
+sed -i "s/devel/asahi%{asahi_mesa_ver}/" VERSION
+
 %build
 # ensure standard Rust compiler flags are set
 export RUSTFLAGS="%build_rustflags"