From befbfee2db63348a7060bb4a4e8bad4f12048926 Mon Sep 17 00:00:00 2001 From: Kyle Gospodnetich Date: Fri, 25 Oct 2024 10:55:28 -0700 Subject: [PATCH] Revert "chore: Downgrade mesa to 24.2.3" This reverts commit 87d3b43a744e92baead09985b6b7376a9c67fd09. --- ...ss-avx512er-and-avx512pf-features-on.patch | 35 ------------------- spec_files/mesa/mesa.spec | 5 +-- 2 files changed, 1 insertion(+), 39 deletions(-) delete mode 100644 spec_files/mesa/0001-gallium-Don-t-pass-avx512er-and-avx512pf-features-on.patch diff --git a/spec_files/mesa/0001-gallium-Don-t-pass-avx512er-and-avx512pf-features-on.patch b/spec_files/mesa/0001-gallium-Don-t-pass-avx512er-and-avx512pf-features-on.patch deleted file mode 100644 index 79ecbe87..00000000 --- a/spec_files/mesa/0001-gallium-Don-t-pass-avx512er-and-avx512pf-features-on.patch +++ /dev/null @@ -1,35 +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/spec_files/mesa/mesa.spec b/spec_files/mesa/mesa.spec index e268f6ed..9dbb4ec4 100644 --- a/spec_files/mesa/mesa.spec +++ b/spec_files/mesa/mesa.spec @@ -69,7 +69,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)} Epoch: 1 %global orig_release 1%{?dist} @@ -85,9 +85,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 - # https://gitlab.com/evlaV/mesa/ Patch20: valve.patch