@@ -1,4 +1,4 @@
-From 6d07f6aa7f92f40d78a2db645f16f0f3e7d3c2e8 Mon Sep 17 00:00:00 2001
+From 3e1e5c475b52651657c906e6b03ee13567cccdd7 Mon Sep 17 00:00:00 2001
From: Khem Raj <raj.khem@gmail.com>
Date: Fri, 23 Jun 2023 01:20:38 -0700
Subject: [PATCH] gallium: Fix build with llvm 17
@@ -9,7 +9,6 @@ so add conditions to exclude them for llvm >= 17
Upstream-Status: Submitted [https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/23827]
Signed-off-by: Khem Raj <raj.khem@gmail.com>
-
---
src/gallium/auxiliary/gallivm/lp_bld_init.c | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
@@ -1,11 +1,10 @@
-From 3ef37c63f03ad6f2af407de350486fdd25e9132a Mon Sep 17 00:00:00 2001
+From 02cc21800fe29f566add525e63f619c0536d6e7b Mon Sep 17 00:00:00 2001
From: Khem Raj <raj.khem@gmail.com>
Date: Mon, 13 Jan 2020 15:23:47 -0800
Subject: [PATCH] meson misdetects 64bit atomics on mips/clang
Upstream-Status: Pending
Signed-off-by: Khem Raj <raj.khem@gmail.com>
-
---
src/util/u_atomic.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
@@ -1,4 +1,4 @@
-From f2fe76d506f356de055b8eca83a7c9d0744a40af Mon Sep 17 00:00:00 2001
+From e8ec6b1cc5e401ba719095722d8b317d755ae613 Mon Sep 17 00:00:00 2001
From: Alistair Francis <alistair@alistair23.me>
Date: Thu, 14 Nov 2019 13:04:49 -0800
Subject: [PATCH] meson.build: check for all linux host_os combinations
@@ -14,16 +14,15 @@ Signed-off-by: Anuj Mittal <anuj.mittal@intel.com>
Signed-off-by: Fabio Berton <fabio.berton@ossystems.com.br>
Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
Signed-off-by: Alistair Francis <alistair@alistair23.me>
-
---
meson.build | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/meson.build b/meson.build
-index 35cc5f1..9a49c0d 100644
+index 133fd9a..817861e 100644
--- a/meson.build
+++ b/meson.build
-@@ -128,7 +128,7 @@
+@@ -128,7 +128,7 @@ with_any_opengl = with_opengl or with_gles1 or with_gles2
# Only build shared_glapi if at least one OpenGL API is enabled
with_shared_glapi = with_shared_glapi and with_any_opengl
@@ -32,7 +31,7 @@ index 35cc5f1..9a49c0d 100644
gallium_drivers = get_option('gallium-drivers')
if gallium_drivers.contains('auto')
-@@ -998,7 +998,7 @@
+@@ -997,7 +997,7 @@ if cc.has_function('fmemopen')
endif
# TODO: this is very incomplete
similarity index 100%
rename from meta/recipes-graphics/mesa/mesa-gl_24.0.1.bb
rename to meta/recipes-graphics/mesa/mesa-gl_24.0.2.bb
@@ -22,7 +22,7 @@ SRC_URI = "https://mesa.freedesktop.org/archive/mesa-${PV}.tar.xz \
file://0002-glxext-don-t-try-zink-if-not-enabled-in-mesa.patch \
"
-SRC_URI[sha256sum] = "f387192b08c471c545590dd12230a2a343244804b5fe866fec6aea02eab57613"
+SRC_URI[sha256sum] = "94e28a8edad06d8ed2b83eb53f253b9eb5aa62c3080f939702e1b3039b56c9e8"
UPSTREAM_CHECK_GITTAGREGEX = "mesa-(?P<pver>\d+(\.\d+)+)"
similarity index 100%
rename from meta/recipes-graphics/mesa/mesa_24.0.1.bb
rename to meta/recipes-graphics/mesa/mesa_24.0.2.bb
Signed-off-by: Alexander Kanavin <alex@linutronix.de> --- .../mesa/files/0001-gallium-Fix-build-with-llvm-17.patch | 3 +-- ...01-meson-misdetects-64bit-atomics-on-mips-clang.patch | 3 +-- ....build-check-for-all-linux-host_os-combinations.patch | 9 ++++----- .../mesa/{mesa-gl_24.0.1.bb => mesa-gl_24.0.2.bb} | 0 meta/recipes-graphics/mesa/mesa.inc | 2 +- .../mesa/{mesa_24.0.1.bb => mesa_24.0.2.bb} | 0 6 files changed, 7 insertions(+), 10 deletions(-) rename meta/recipes-graphics/mesa/{mesa-gl_24.0.1.bb => mesa-gl_24.0.2.bb} (100%) rename meta/recipes-graphics/mesa/{mesa_24.0.1.bb => mesa_24.0.2.bb} (100%)