commit f65b17258fd1cce03eb9a8da0b3457df0dac320f
Author: Thorsten Leemhuis <linux(a)leemhuis.info>
Date: Sun Sep 29 08:29:22 2024 +0200
add 0001-gallium-Don-t-pass-avx512er-and-avx512pf-features-on.patch
add 0001-gallium-Don-t-pass-avx512er-and-avx512pf-features-on.patch
add 0001-gallium-Don-t-pass-avx512er-and-avx512pf-features-on.patch
Signed-off-by: Thorsten Leemhuis <linux(a)leemhuis.info>
...-t-pass-avx512er-and-avx512pf-features-on.patch | 36 ++++++++++++++++++++++
mesa-freeworld.spec | 8 ++++-
2 files changed, 43 insertions(+), 1 deletion(-)
---
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
new file mode 100644
index 0000000..a8540c4
--- /dev/null
+++ b/0001-gallium-Don-t-pass-avx512er-and-avx512pf-features-on.patch
@@ -0,0 +1,36 @@
+From f117df06090622f7e1aad2cac818aaef6325f4d3 Mon Sep 17 00:00:00 2001
+From: Nikita Popov <npopov(a)redhat.com>
+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<std::string> &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-freeworld.spec b/mesa-freeworld.spec
index 6356d85..76ace15 100644
--- a/mesa-freeworld.spec
+++ b/mesa-freeworld.spec
@@ -73,7 +73,7 @@ Name: %{srcname}-freeworld
Summary: Mesa graphics libraries
%global ver 24.2.3
Version: %{lua:ver = string.gsub(rpm.expand("%{ver}"), "-",
"~"); print(ver)}
-Release: 3%{?dist}
+Release: 4%{?dist}
License: MIT AND BSD-3-Clause AND SGI-B-2.0
URL:
http://www.mesa3d.org
@@ -85,6 +85,9 @@ Source1: Mesa-MLAA-License-Clarification-Email.txt
Source2: org.mesa3d.vaapi.freeworld.metainfo.xml
Source3: org.mesa3d.vdpau.freeworld.metainfo.xml
+# 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++
@@ -353,6 +356,9 @@ rm -fr
%{buildroot}%{_libdir}{,/dri-freeworld}/libVkLayer_MESA_device_select.so
%endif
%changelog
+* Sun Sep 29 2024 Thorsten Leemhuis <fedora(a)leemhuis.info> - 24.2.3-4
+- add 0001-gallium-Don-t-pass-avx512er-and-avx512pf-features-on.patch
+
* Wed Sep 25 2024 Thorsten Leemhuis <fedora(a)leemhuis.info> - 24.2.3-3
- temporarily require llvm 19 for Fedora 41 and up