diff options
author | Alexander Kanavin <alex.kanavin@gmail.com> | 2024-03-06 07:42:17 -0800 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2024-03-07 17:25:02 +0000 |
commit | 9c0294320887002d26c9108a90e0e8397874d382 (patch) | |
tree | f1a28ffe5878b392770868596d9edd8a8b96a018 /meta/recipes-graphics | |
parent | 6e342a0c76adbab316d7b49e2f6c7a3bae1a50c4 (diff) | |
download | poky-9c0294320887002d26c9108a90e0e8397874d382.tar.gz |
mesa: upgrade 24.0.1 -> 24.0.2
(From OE-Core rev: 7d7ed81a77a5ea852451951f0a302d18c225c725)
Signed-off-by: Alexander Kanavin <alex@linutronix.de>
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.patch | 3 | ||||
-rw-r--r-- | meta/recipes-graphics/mesa/files/0001-meson-misdetects-64bit-atomics-on-mips-clang.patch | 3 | ||||
-rw-r--r-- | meta/recipes-graphics/mesa/files/0001-meson.build-check-for-all-linux-host_os-combinations.patch | 9 | ||||
-rw-r--r-- | meta/recipes-graphics/mesa/mesa-gl_24.0.2.bb (renamed from meta/recipes-graphics/mesa/mesa-gl_24.0.1.bb) | 0 | ||||
-rw-r--r-- | meta/recipes-graphics/mesa/mesa.inc | 2 | ||||
-rw-r--r-- | meta/recipes-graphics/mesa/mesa_24.0.2.bb (renamed from meta/recipes-graphics/mesa/mesa_24.0.1.bb) | 0 |
6 files changed, 7 insertions, 10 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 index 237f940f0b..ceb0153f8d 100644 --- 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 | |||
@@ -1,4 +1,4 @@ | |||
1 | From 6d07f6aa7f92f40d78a2db645f16f0f3e7d3c2e8 Mon Sep 17 00:00:00 2001 | 1 | From 3e1e5c475b52651657c906e6b03ee13567cccdd7 Mon Sep 17 00:00:00 2001 |
2 | From: Khem Raj <raj.khem@gmail.com> | 2 | From: Khem Raj <raj.khem@gmail.com> |
3 | Date: Fri, 23 Jun 2023 01:20:38 -0700 | 3 | Date: Fri, 23 Jun 2023 01:20:38 -0700 |
4 | Subject: [PATCH] gallium: Fix build with llvm 17 | 4 | Subject: [PATCH] gallium: Fix build with llvm 17 |
@@ -9,7 +9,6 @@ so add conditions to exclude them for llvm >= 17 | |||
9 | 9 | ||
10 | Upstream-Status: Submitted [https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/23827] | 10 | Upstream-Status: Submitted [https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/23827] |
11 | Signed-off-by: Khem Raj <raj.khem@gmail.com> | 11 | Signed-off-by: Khem Raj <raj.khem@gmail.com> |
12 | |||
13 | --- | 12 | --- |
14 | src/gallium/auxiliary/gallivm/lp_bld_init.c | 6 +++++- | 13 | src/gallium/auxiliary/gallivm/lp_bld_init.c | 6 +++++- |
15 | 1 file changed, 5 insertions(+), 1 deletion(-) | 14 | 1 file changed, 5 insertions(+), 1 deletion(-) |
diff --git a/meta/recipes-graphics/mesa/files/0001-meson-misdetects-64bit-atomics-on-mips-clang.patch b/meta/recipes-graphics/mesa/files/0001-meson-misdetects-64bit-atomics-on-mips-clang.patch index 9cd9bee2d2..baa98a0d46 100644 --- a/meta/recipes-graphics/mesa/files/0001-meson-misdetects-64bit-atomics-on-mips-clang.patch +++ b/meta/recipes-graphics/mesa/files/0001-meson-misdetects-64bit-atomics-on-mips-clang.patch | |||
@@ -1,11 +1,10 @@ | |||
1 | From 3ef37c63f03ad6f2af407de350486fdd25e9132a Mon Sep 17 00:00:00 2001 | 1 | From 02cc21800fe29f566add525e63f619c0536d6e7b Mon Sep 17 00:00:00 2001 |
2 | From: Khem Raj <raj.khem@gmail.com> | 2 | From: Khem Raj <raj.khem@gmail.com> |
3 | Date: Mon, 13 Jan 2020 15:23:47 -0800 | 3 | Date: Mon, 13 Jan 2020 15:23:47 -0800 |
4 | Subject: [PATCH] meson misdetects 64bit atomics on mips/clang | 4 | Subject: [PATCH] meson misdetects 64bit atomics on mips/clang |
5 | 5 | ||
6 | Upstream-Status: Pending | 6 | Upstream-Status: Pending |
7 | Signed-off-by: Khem Raj <raj.khem@gmail.com> | 7 | Signed-off-by: Khem Raj <raj.khem@gmail.com> |
8 | |||
9 | --- | 8 | --- |
10 | src/util/u_atomic.c | 2 +- | 9 | src/util/u_atomic.c | 2 +- |
11 | 1 file changed, 1 insertion(+), 1 deletion(-) | 10 | 1 file changed, 1 insertion(+), 1 deletion(-) |
diff --git a/meta/recipes-graphics/mesa/files/0001-meson.build-check-for-all-linux-host_os-combinations.patch b/meta/recipes-graphics/mesa/files/0001-meson.build-check-for-all-linux-host_os-combinations.patch index b0be8d0feb..7be7d81eeb 100644 --- a/meta/recipes-graphics/mesa/files/0001-meson.build-check-for-all-linux-host_os-combinations.patch +++ b/meta/recipes-graphics/mesa/files/0001-meson.build-check-for-all-linux-host_os-combinations.patch | |||
@@ -1,4 +1,4 @@ | |||
1 | From f2fe76d506f356de055b8eca83a7c9d0744a40af Mon Sep 17 00:00:00 2001 | 1 | From e8ec6b1cc5e401ba719095722d8b317d755ae613 Mon Sep 17 00:00:00 2001 |
2 | From: Alistair Francis <alistair@alistair23.me> | 2 | From: Alistair Francis <alistair@alistair23.me> |
3 | Date: Thu, 14 Nov 2019 13:04:49 -0800 | 3 | Date: Thu, 14 Nov 2019 13:04:49 -0800 |
4 | Subject: [PATCH] meson.build: check for all linux host_os combinations | 4 | Subject: [PATCH] meson.build: check for all linux host_os combinations |
@@ -14,16 +14,15 @@ Signed-off-by: Anuj Mittal <anuj.mittal@intel.com> | |||
14 | Signed-off-by: Fabio Berton <fabio.berton@ossystems.com.br> | 14 | Signed-off-by: Fabio Berton <fabio.berton@ossystems.com.br> |
15 | Signed-off-by: Otavio Salvador <otavio@ossystems.com.br> | 15 | Signed-off-by: Otavio Salvador <otavio@ossystems.com.br> |
16 | Signed-off-by: Alistair Francis <alistair@alistair23.me> | 16 | Signed-off-by: Alistair Francis <alistair@alistair23.me> |
17 | |||
18 | --- | 17 | --- |
19 | meson.build | 4 ++-- | 18 | meson.build | 4 ++-- |
20 | 1 file changed, 2 insertions(+), 2 deletions(-) | 19 | 1 file changed, 2 insertions(+), 2 deletions(-) |
21 | 20 | ||
22 | diff --git a/meson.build b/meson.build | 21 | diff --git a/meson.build b/meson.build |
23 | index 35cc5f1..9a49c0d 100644 | 22 | index 133fd9a..817861e 100644 |
24 | --- a/meson.build | 23 | --- a/meson.build |
25 | +++ b/meson.build | 24 | +++ b/meson.build |
26 | @@ -128,7 +128,7 @@ | 25 | @@ -128,7 +128,7 @@ with_any_opengl = with_opengl or with_gles1 or with_gles2 |
27 | # Only build shared_glapi if at least one OpenGL API is enabled | 26 | # Only build shared_glapi if at least one OpenGL API is enabled |
28 | with_shared_glapi = with_shared_glapi and with_any_opengl | 27 | with_shared_glapi = with_shared_glapi and with_any_opengl |
29 | 28 | ||
@@ -32,7 +31,7 @@ index 35cc5f1..9a49c0d 100644 | |||
32 | 31 | ||
33 | gallium_drivers = get_option('gallium-drivers') | 32 | gallium_drivers = get_option('gallium-drivers') |
34 | if gallium_drivers.contains('auto') | 33 | if gallium_drivers.contains('auto') |
35 | @@ -998,7 +998,7 @@ | 34 | @@ -997,7 +997,7 @@ if cc.has_function('fmemopen') |
36 | endif | 35 | endif |
37 | 36 | ||
38 | # TODO: this is very incomplete | 37 | # TODO: this is very incomplete |
diff --git a/meta/recipes-graphics/mesa/mesa-gl_24.0.1.bb b/meta/recipes-graphics/mesa/mesa-gl_24.0.2.bb index ca160f1bfc..ca160f1bfc 100644 --- a/meta/recipes-graphics/mesa/mesa-gl_24.0.1.bb +++ b/meta/recipes-graphics/mesa/mesa-gl_24.0.2.bb | |||
diff --git a/meta/recipes-graphics/mesa/mesa.inc b/meta/recipes-graphics/mesa/mesa.inc index e5fa0a76d2..12d7a18eb8 100644 --- a/meta/recipes-graphics/mesa/mesa.inc +++ b/meta/recipes-graphics/mesa/mesa.inc | |||
@@ -22,7 +22,7 @@ SRC_URI = "https://mesa.freedesktop.org/archive/mesa-${PV}.tar.xz \ | |||
22 | file://0002-glxext-don-t-try-zink-if-not-enabled-in-mesa.patch \ | 22 | file://0002-glxext-don-t-try-zink-if-not-enabled-in-mesa.patch \ |
23 | " | 23 | " |
24 | 24 | ||
25 | SRC_URI[sha256sum] = "f387192b08c471c545590dd12230a2a343244804b5fe866fec6aea02eab57613" | 25 | SRC_URI[sha256sum] = "94e28a8edad06d8ed2b83eb53f253b9eb5aa62c3080f939702e1b3039b56c9e8" |
26 | 26 | ||
27 | UPSTREAM_CHECK_GITTAGREGEX = "mesa-(?P<pver>\d+(\.\d+)+)" | 27 | UPSTREAM_CHECK_GITTAGREGEX = "mesa-(?P<pver>\d+(\.\d+)+)" |
28 | 28 | ||
diff --git a/meta/recipes-graphics/mesa/mesa_24.0.1.bb b/meta/recipes-graphics/mesa/mesa_24.0.2.bb index 96e8aa38d6..96e8aa38d6 100644 --- a/meta/recipes-graphics/mesa/mesa_24.0.1.bb +++ b/meta/recipes-graphics/mesa/mesa_24.0.2.bb | |||