From 0efc1cf7e533ddcf5028555a65a26c7cf6ed9d43226efd5f2b187046f9892202 Mon Sep 17 00:00:00 2001
From: Stefan Dirsch <sndirsch@suse.com>
Date: Thu, 17 Oct 2024 11:53:08 +0000
Subject: [PATCH] - Update to release 24.2.5   -->
 https://docs.mesa3d.org/relnotes/24.2.5 - drop u_fix-llvm19-build.patch  
 included in upstream

OBS-URL: https://build.opensuse.org/package/show/X11:XOrg/Mesa?expand=0&rev=1337
---
 Mesa.changes             |   8 ++++++++
 Mesa.spec                |   6 ++----
 mesa-24.2.4.tar.xz       |   3 ---
 mesa-24.2.4.tar.xz.sig   | Bin 310 -> 0 bytes
 mesa-24.2.5.tar.xz       |   3 +++
 mesa-24.2.5.tar.xz.sig   | Bin 0 -> 310 bytes
 u_fix-llvm19-build.patch |  17 -----------------
 7 files changed, 13 insertions(+), 24 deletions(-)
 delete mode 100644 mesa-24.2.4.tar.xz
 delete mode 100644 mesa-24.2.4.tar.xz.sig
 create mode 100644 mesa-24.2.5.tar.xz
 create mode 100644 mesa-24.2.5.tar.xz.sig
 delete mode 100644 u_fix-llvm19-build.patch

diff --git a/Mesa.changes b/Mesa.changes
index 13a10ff..c01f201 100644
--- a/Mesa.changes
+++ b/Mesa.changes
@@ -1,3 +1,11 @@
+-------------------------------------------------------------------
+Thu Oct 17 10:16:01 UTC 2024 - Marcus Rueckert <mrueckert@suse.de>
+
+- Update to release 24.2.5
+  --> https://docs.mesa3d.org/relnotes/24.2.5
+- drop u_fix-llvm19-build.patch
+  included in upstream
+
 -------------------------------------------------------------------
 Thu Oct  3 19:00:29 UTC 2024 - Marcus Rueckert <mrueckert@suse.de>
 
diff --git a/Mesa.spec b/Mesa.spec
index b0198ee..3c127c9 100644
--- a/Mesa.spec
+++ b/Mesa.spec
@@ -42,7 +42,7 @@
 
 %define glamor 1
 %define _name_archive mesa
-%define _version 24.2.4
+%define _version 24.2.5
 %define with_opencl 0
 %define with_rusticl 0
 %define with_vulkan 0
@@ -145,7 +145,7 @@
 %global _paste_crate_ver 1.0.14
 
 Name:           Mesa%{psuffix}
-Version:        24.2.4
+Version:        24.2.5
 Release:        0
 Summary:        System for rendering 3-D graphics
 License:        MIT
@@ -178,7 +178,6 @@ Patch11:        u_0001-intel-genxml-Drop-from-__future__-import-annotations.patc
 Patch12:        u_0002-intel-genxml-Add-a-untyped-OrderedDict-fallback-for-.patch
 Patch13:        python36-buildfix1.patch
 Patch14:        python36-buildfix2.patch
-Patch16:        u_fix-llvm19-build.patch
 Patch17:        tlsdesc_test.patch
 # never to be upstreamed
 Patch54:        n_drirc-disable-rgb10-for-chromium-on-amd.patch
@@ -844,7 +843,6 @@ cp %{SOURCE6} subprojects/packagecache/
 %if 0%{?suse_version} < 1550
 %patch -P 14 -p1
 %endif
-%patch -P 16 -p1
 %patch -P 17 -p1
 # no longer needed since gstreamer-plugins-vaapi 1.18.4
 %if 0%{?suse_version} < 1550
diff --git a/mesa-24.2.4.tar.xz b/mesa-24.2.4.tar.xz
deleted file mode 100644
index 66a574f..0000000
--- a/mesa-24.2.4.tar.xz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:5ea42a8bb6d58aec9754c9f553b1e413f67c09403741f8e2786c3f9e63d3461a
-size 29510040
diff --git a/mesa-24.2.4.tar.xz.sig b/mesa-24.2.4.tar.xz.sig
deleted file mode 100644
index bbf652607e332f73bbbadb35b161305d12663dede2c4e4df6fef3cb819dc464a..0000000000000000000000000000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 310
zcmV-60m=S}0W$;u0SEvc79j*zRUP45mXBjW!btXwjxn#pBq*i@0%rcb695Vc5RHy8
zufrrLrbJ%{`U0&4;BH8*k8|H77cS7&h%$GR3~dn+{_|0<-4*n4^r5by7NuCVVV_u7
zuZZ9lv7x9a_E?RZ>?83S*?V^Ow$`)`fpbA^w|6=n71DV07cCG`(EVDyN%cW)|G(m8
zm+Zd}aRt)*XZkl2VxmhQ3}26BkTyHJ2Q*jK!&c&(Uw}_YZ3^YM)&>MbhN%eaX|Mi{
z!c?M4{3af~00JvffC%Si!ka2$r@WGkV+IHe)bF23$zKAAB5e(3Cvf^!V0*`^-<!qD
zp(jD$s{3^Y7)(Mp#7d`1+!vITCf^>Wi4b2dzB_<DR5<9?jSy5vwBmSNQwc)ObF(6+
IAAV2x<KC={;Q#;t

diff --git a/mesa-24.2.5.tar.xz b/mesa-24.2.5.tar.xz
new file mode 100644
index 0000000..a8956cd
--- /dev/null
+++ b/mesa-24.2.5.tar.xz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:733d0bea242ed6a5bb5c806fe836792ce7f092d45a2f115b7b7e15897c9dd96f
+size 29534380
diff --git a/mesa-24.2.5.tar.xz.sig b/mesa-24.2.5.tar.xz.sig
new file mode 100644
index 0000000000000000000000000000000000000000000000000000000000000000..4b97ae1bce40b214b18ca529bb526d0feebe67aec3a32819b27c22e9c2834851
GIT binary patch
literal 310
zcmV-60m=S}0W$;u0SEvc79j*zRUP45mXBjW!btXwjxn#pBq*i@0%s5Qd;kgw5RHy8
zufrrLrnV&q|9ubj0I%9ApmV?sfsA7|rUtEByPK%la%WDHco5tJ_i+f<=zhlks5F<_
z;wGPdBm2Rb-%1~<{Hlysjbjwv{Ug#m4mdv9KAEq?TAJ^WM2Z77v6{!uxt)WLReQ=U
zST+o`m%{N1M_Li#-gLt<xHUl^*hNb|yO{EAYP@BsdS<`^F2p>ZQlWfRUKC40VPBll
z55-&Rk`a-#HKQS@TglF)g~%2p&+W71lFLhN8ma|czOOg7Dj?MRJlpQINFus;K_N=p
z-j4CG76ss;3Cs-gp=!ci4_TTO?p~57wH%gXk?`t!sPl<*xUh8Ro9Mh9NmySvus;=J
Iam?hF{p)*_i~s-t

literal 0
HcmV?d00001

diff --git a/u_fix-llvm19-build.patch b/u_fix-llvm19-build.patch
deleted file mode 100644
index 7fcdae0..0000000
--- a/u_fix-llvm19-build.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-diff --git a/src/gallium/auxiliary/gallivm/lp_bld_misc.cpp b/src/gallium/auxiliary/gallivm/lp_bld_misc.cpp
-index e5f4dfc829f..72e78e00ba4 100644
---- a/src/gallium/auxiliary/gallivm/lp_bld_misc.cpp
-+++ b/src/gallium/auxiliary/gallivm/lp_bld_misc.cpp
-@@ -329,8 +329,12 @@ lp_build_fill_mattrs(std::vector<std::string> &MAttrs)
-     * which allows us to enable/disable code generation based
-     * on the results of cpuid on these architectures.
-     */
-+#if LLVM_VERSION_MAJOR >= 19
-+   llvm::StringMap<bool> features = llvm::sys::getHostCPUFeatures();
-+#else
-    llvm::StringMap<bool> features;
-    llvm::sys::getHostCPUFeatures(features);
-+#endif
- 
-    for (llvm::StringMapIterator<bool> f = features.begin();
-         f != features.end();