From 8df7085a8a67d2bdd00f10c37f5685b4f7bfc4a8 Mon Sep 17 00:00:00 2001
From: Janne Grunau <j@jannau.net>
Date: Jun 23 2024 06:32:38 +0000
Subject: [PATCH 1/2] Disable rusticl instead of opencl to preserve mesa-libOpenCL


Leaving outdated packagea from previous versions behind causes issues
for package updates.

---

diff --git a/mesa.spec b/mesa.spec
index d0a1a55..e07916a 100644
--- a/mesa.spec
+++ b/mesa.spec
@@ -6,9 +6,10 @@
 %if !0%{?rhel}
 %global with_nine 1
 %global with_omx 1
-%endif
-%if (0%{?fedora} && 0%{?fedora} >= 40)
 %global with_opencl 1
+%if (0%{?fedora} && 0%{?fedora} >= 40)
+%global with_rusticl 1
+%endif
 %endif
 %global base_vulkan %{?with_vulkan_hw:,amd}
 %endif
@@ -72,7 +73,7 @@
 Name:           mesa
 Summary:        Mesa graphics libraries
 Version:        %{lua:ver = string.gsub(rpm.expand("%{ver}"), "-", "~"); print(ver)}
-Release:        %autorelease -b 2
+Release:        %autorelease -b 3
 License:        MIT
 URL:            http://www.mesa3d.org
 
@@ -144,11 +145,11 @@ BuildRequires:  pkgconfig(libelf)
 BuildRequires:  pkgconfig(libglvnd) >= 1.3.2
 BuildRequires:  llvm-devel >= 7.0.0
 BuildRequires:  clang-devel
-%if 0%{?with_opencl}
+%if 0%{?with_rusticl}
 BuildRequires:  bindgen
 BuildRequires:  rust-packaging
 %endif
-%if 0%{?with_opencl} || 0%{?with_asahi}
+%if 0%{?with_opencl} || 0%{?with_rusticl} || 0%{?with_asahi}
 BuildRequires:  pkgconfig(libclc)
 BuildRequires:  pkgconfig(SPIRV-Tools)
 BuildRequires:  pkgconfig(LLVMSPIRVLib)
@@ -400,7 +401,7 @@ export RUSTFLAGS="%build_rustflags"
   -Dgallium-xa=%{?with_xa:enabled}%{!?with_xa:disabled} \
   -Dgallium-nine=%{?with_nine:true}%{!?with_nine:false} \
   -Dgallium-opencl=%{?with_opencl:icd}%{!?with_opencl:disabled} \
-%if 0%{?with_opencl}
+%if 0%{?with_rusticl}
   -Dgallium-rusticl=true \
 %endif
   -Dvulkan-drivers=%{?vulkan_drivers} \
@@ -526,13 +527,19 @@ popd
 %if 0%{?with_opencl}
 %files libOpenCL
 %{_libdir}/libMesaOpenCL.so.*
+%if 0%{?with_rusticl}
 %{_libdir}/libRusticlOpenCL.so.*
+%endif
 %{_sysconfdir}/OpenCL/vendors/mesa.icd
+%if 0%{?with_rusticl}
 %{_sysconfdir}/OpenCL/vendors/rusticl.icd
+%endif
 %files libOpenCL-devel
 %{_libdir}/libMesaOpenCL.so
+%if 0%{?with_rusticl}
 %{_libdir}/libRusticlOpenCL.so
 %endif
+%endif
 
 %if 0%{?with_nine}
 %files libd3d

From 3baaf086d1a79058a144d85863c2e80c337a0b86 Mon Sep 17 00:00:00 2001
From: Janne Grunau <j@jannau.net>
Date: Jul 02 2024 07:35:59 +0000
Subject: [PATCH 2/2] Update sources to mesa-asahi-20240527


---

diff --git a/rpkg.conf b/rpkg.conf
index 808a2c0..4075722 100644
--- a/rpkg.conf
+++ b/rpkg.conf
@@ -1,2 +1,2 @@
 [lookaside]
-download_url = https://gitlab.freedesktop.org/asahi/mesa/-/archive/asahi-20240228/%(filename)s
+download_url = https://gitlab.freedesktop.org/asahi/mesa/-/archive/asahi-20240527/%(filename)s
diff --git a/sources b/sources
index ac21299..d4c3318 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (mesa-asahi-20240228.tar.gz) = 7c0125e67ad34b283a4aebf2236d709c3d783583f7d851b725c8fd50767ca29c10337794953e291f6aa87eac2432856e00a90e363b820edd45e500e0891f78bb
+SHA512 (mesa-asahi-20240527.tar.gz) = 2cd7d61a3b35ecb9349da22ea513c89395993f13620c85c997e2a12a4646a69185ab3b2367d8a4e4d4c92a822ae4800cbc45ee9f248376caabd5598bfac97ff7