From 13e7077a0a8f26671f7190a2825e55ccd3c90aea Mon Sep 17 00:00:00 2001 From: Peter Robinson Date: Fri, 4 Oct 2024 09:53:25 +0100 Subject: [PATCH] Update to 24.2.$ --- ...ss-avx512er-and-avx512pf-features-on.patch | 36 ------------------- mesa.spec | 5 +-- sources | 2 +- 3 files changed, 2 insertions(+), 41 deletions(-) delete mode 100644 0001-gallium-Don-t-pass-avx512er-and-avx512pf-features-on.patch diff --git a/0001-gallium-Don-t-pass-avx512er-and-avx512pf-features-on.patch b/0001-gallium-Don-t-pass-avx512er-and-avx512pf-features-on.patch deleted file mode 100644 index a8540c4..0000000 --- a/0001-gallium-Don-t-pass-avx512er-and-avx512pf-features-on.patch +++ /dev/null @@ -1,36 +0,0 @@ -From f117df06090622f7e1aad2cac818aaef6325f4d3 Mon Sep 17 00:00:00 2001 -From: Nikita Popov -Date: Mon, 23 Sep 2024 15:42:32 +0200 -Subject: [PATCH] gallium: Don't pass avx512er and avx512pf features on LLVM 19 - -These target features have been remove in LLVM 19, and cause -warnings like the following to be printed: - - '-avx512er' is not a recognized feature for this target (ignoring feature) - '-avx512pf' is not a recognized feature for this target (ignoring feature) - -Do not pass these target features on LLVM 19 and newer. - -Fixes #11870. ---- - src/gallium/auxiliary/gallivm/lp_bld_misc.cpp | 2 ++ - 1 file changed, 2 insertions(+) - -diff --git a/src/gallium/auxiliary/gallivm/lp_bld_misc.cpp b/src/gallium/auxiliary/gallivm/lp_bld_misc.cpp -index e5f4dfc829f..7975fcf1ac9 100644 ---- a/src/gallium/auxiliary/gallivm/lp_bld_misc.cpp -+++ b/src/gallium/auxiliary/gallivm/lp_bld_misc.cpp -@@ -370,8 +370,10 @@ lp_build_fill_mattrs(std::vector &MAttrs) - /* All avx512 have avx512f */ - MAttrs.push_back(util_get_cpu_caps()->has_avx512f ? "+avx512f" : "-avx512f"); - MAttrs.push_back(util_get_cpu_caps()->has_avx512cd ? "+avx512cd" : "-avx512cd"); -+#if LLVM_VERSION_MAJOR < 19 - MAttrs.push_back(util_get_cpu_caps()->has_avx512er ? "+avx512er" : "-avx512er"); - MAttrs.push_back(util_get_cpu_caps()->has_avx512pf ? "+avx512pf" : "-avx512pf"); -+#endif - MAttrs.push_back(util_get_cpu_caps()->has_avx512bw ? "+avx512bw" : "-avx512bw"); - MAttrs.push_back(util_get_cpu_caps()->has_avx512dq ? "+avx512dq" : "-avx512dq"); - MAttrs.push_back(util_get_cpu_caps()->has_avx512vl ? "+avx512vl" : "-avx512vl"); --- -2.46.0 - diff --git a/mesa.spec b/mesa.spec index 59060f6..f6e7e11 100644 --- a/mesa.spec +++ b/mesa.spec @@ -67,7 +67,7 @@ Name: mesa Summary: Mesa graphics libraries -%global ver 24.2.3 +%global ver 24.2.4 Version: %{lua:ver = string.gsub(rpm.expand("%{ver}"), "-", "~"); print(ver)} Release: %autorelease License: MIT AND BSD-3-Clause AND SGI-B-2.0 @@ -81,9 +81,6 @@ Source1: Mesa-MLAA-License-Clarification-Email.txt Patch10: gnome-shell-glthread-disable.patch -# Backport of https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/31321 for LLVM 19 compat. -Patch11: 0001-gallium-Don-t-pass-avx512er-and-avx512pf-features-on.patch - BuildRequires: meson >= 1.3.0 BuildRequires: gcc BuildRequires: gcc-c++ diff --git a/sources b/sources index 853f718..57a723f 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (mesa-24.2.3.tar.xz) = 7a1ace23568d1907b778a2859f97c8988a414ba74e02e1fb5af6f95f768e1b1a2dfdaf412b0d655678ed915d28273953fd1236ebcd87553a1880f1a7f3ea4d44 +SHA512 (mesa-24.2.4.tar.xz) = f0f1c23591cce85966efaf3988afdb14b64ceb7216b3994e8fc50e8ddc62c35a84b2013285c84080d963aec2afb94dac345f5f00e7ccf9ae7e9ab3f5b9ba0bcb