summaryrefslogtreecommitdiffstats
path: root/meta/recipes-graphics
diff options
context:
space:
mode:
authorKhem Raj <raj.khem@gmail.com>2024-03-29 09:07:46 -0700
committerRichard Purdie <richard.purdie@linuxfoundation.org>2024-03-30 22:25:43 +0000
commit8203f61959d3edb95cd4be10c02a5494d5762830 (patch)
tree0fd50141b63a4ed3b8e7fd37aff6b6dc31518715 /meta/recipes-graphics
parentc152a1e25c45cbfd54325ad59c771fbd645820ac (diff)
downloadpoky-8203f61959d3edb95cd4be10c02a5494d5762830.tar.gz
mesa: Drop LLVM-17 patch
This patch is no longer needed with llvm/clang 18+ (From OE-Core rev: 22174e5b64cc46e3e5b9f45d0b7796e92f20a48c) Signed-off-by: Khem Raj <raj.khem@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-graphics')
-rw-r--r--meta/recipes-graphics/mesa/files/0001-gallium-Fix-build-with-llvm-17.patch40
-rw-r--r--meta/recipes-graphics/mesa/mesa.inc1
2 files changed, 0 insertions, 41 deletions
diff --git a/meta/recipes-graphics/mesa/files/0001-gallium-Fix-build-with-llvm-17.patch b/meta/recipes-graphics/mesa/files/0001-gallium-Fix-build-with-llvm-17.patch
deleted file mode 100644
index ceb0153f8d..0000000000
--- a/meta/recipes-graphics/mesa/files/0001-gallium-Fix-build-with-llvm-17.patch
+++ /dev/null
@@ -1,40 +0,0 @@
1From 3e1e5c475b52651657c906e6b03ee13567cccdd7 Mon Sep 17 00:00:00 2001
2From: Khem Raj <raj.khem@gmail.com>
3Date: Fri, 23 Jun 2023 01:20:38 -0700
4Subject: [PATCH] gallium: Fix build with llvm 17
5
6These headers are not available for C files in llvm 17+
7and they seem to be not needed to compile after all with llvm 17
8so add conditions to exclude them for llvm >= 17
9
10Upstream-Status: Submitted [https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/23827]
11Signed-off-by: Khem Raj <raj.khem@gmail.com>
12---
13 src/gallium/auxiliary/gallivm/lp_bld_init.c | 6 +++++-
14 1 file changed, 5 insertions(+), 1 deletion(-)
15
16diff --git a/src/gallium/auxiliary/gallivm/lp_bld_init.c b/src/gallium/auxiliary/gallivm/lp_bld_init.c
17index cd2108f..b1a4d03 100644
18--- a/src/gallium/auxiliary/gallivm/lp_bld_init.c
19+++ b/src/gallium/auxiliary/gallivm/lp_bld_init.c
20@@ -46,15 +46,19 @@
21 #if GALLIVM_USE_NEW_PASS == 1
22 #include <llvm-c/Transforms/PassBuilder.h>
23 #elif GALLIVM_HAVE_CORO == 1
24+#if LLVM_VERSION_MAJOR < 17
25 #include <llvm-c/Transforms/Scalar.h>
26-#if LLVM_VERSION_MAJOR >= 7
27+#endif
28+#if LLVM_VERSION_MAJOR >= 7 && LLVM_VERSION_MAJOR < 17
29 #include <llvm-c/Transforms/Utils.h>
30 #endif
31 #if LLVM_VERSION_MAJOR <= 8 && (DETECT_ARCH_AARCH64 || DETECT_ARCH_ARM || DETECT_ARCH_S390 || DETECT_ARCH_MIPS64)
32 #include <llvm-c/Transforms/IPO.h>
33 #endif
34+#if LLVM_VERSION_MAJOR < 17
35 #include <llvm-c/Transforms/Coroutines.h>
36 #endif
37+#endif
38
39 unsigned gallivm_perf = 0;
40
diff --git a/meta/recipes-graphics/mesa/mesa.inc b/meta/recipes-graphics/mesa/mesa.inc
index a8088e6fb6..6e96190084 100644
--- a/meta/recipes-graphics/mesa/mesa.inc
+++ b/meta/recipes-graphics/mesa/mesa.inc
@@ -17,7 +17,6 @@ PE = "2"
17SRC_URI = "https://mesa.freedesktop.org/archive/mesa-${PV}.tar.xz \ 17SRC_URI = "https://mesa.freedesktop.org/archive/mesa-${PV}.tar.xz \
18 file://0001-meson.build-check-for-all-linux-host_os-combinations.patch \ 18 file://0001-meson.build-check-for-all-linux-host_os-combinations.patch \
19 file://0001-meson-misdetects-64bit-atomics-on-mips-clang.patch \ 19 file://0001-meson-misdetects-64bit-atomics-on-mips-clang.patch \
20 file://0001-gallium-Fix-build-with-llvm-17.patch \
21 file://0001-drisw-fix-build-without-dri3.patch \ 20 file://0001-drisw-fix-build-without-dri3.patch \
22 file://0002-glxext-don-t-try-zink-if-not-enabled-in-mesa.patch \ 21 file://0002-glxext-don-t-try-zink-if-not-enabled-in-mesa.patch \
23 file://0001-Revert-meson-do-not-pull-in-clc-for-clover.patch \ 22 file://0001-Revert-meson-do-not-pull-in-clc-for-clover.patch \