summaryrefslogtreecommitdiffstats
path: root/meta/recipes-graphics
diff options
context:
space:
mode:
authorWang Mingyu <wangmy@fujitsu.com>2024-03-27 11:20:54 +0800
committerRichard Purdie <richard.purdie@linuxfoundation.org>2024-04-16 08:07:02 +0100
commit13b4c46ddf2b903e704a7931cf47ff876b0ece9a (patch)
treed0e2073e6490cfd8cb615e79ba05b0e29d07103c /meta/recipes-graphics
parenta9293d9c4bf1f7cb7ef8286ea2e48cee3e90c3f8 (diff)
downloadpoky-13b4c46ddf2b903e704a7931cf47ff876b0ece9a.tar.gz
mesa: upgrade 24.0.2 -> 24.0.3
0001-Revert-meson-do-not-pull-in-clc-for-clover.patch refreshed for 24.0.3 (From OE-Core rev: 43240c8b2c5507fe6147ba04ec98528602c694e1) Signed-off-by: Wang Mingyu <wangmy@fujitsu.com> Signed-off-by: Alexandre Belloni <alexandre.belloni@bootlin.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-Revert-meson-do-not-pull-in-clc-for-clover.patch13
-rw-r--r--meta/recipes-graphics/mesa/mesa-gl_24.0.3.bb (renamed from meta/recipes-graphics/mesa/mesa-gl_24.0.2.bb)0
-rw-r--r--meta/recipes-graphics/mesa/mesa.inc2
-rw-r--r--meta/recipes-graphics/mesa/mesa_24.0.3.bb (renamed from meta/recipes-graphics/mesa/mesa_24.0.2.bb)0
4 files changed, 6 insertions, 9 deletions
diff --git a/meta/recipes-graphics/mesa/files/0001-Revert-meson-do-not-pull-in-clc-for-clover.patch b/meta/recipes-graphics/mesa/files/0001-Revert-meson-do-not-pull-in-clc-for-clover.patch
index f6d95c8982..1711e22585 100644
--- a/meta/recipes-graphics/mesa/files/0001-Revert-meson-do-not-pull-in-clc-for-clover.patch
+++ b/meta/recipes-graphics/mesa/files/0001-Revert-meson-do-not-pull-in-clc-for-clover.patch
@@ -1,4 +1,4 @@
1From fe4600de549549fbb3033fc1b37904ba6b3fe2af Mon Sep 17 00:00:00 2001 1From 051f41beda540f0ae77b341db01a6de83c9e938a Mon Sep 17 00:00:00 2001
2From: Markus Volk <f_l_k@t-online.de> 2From: Markus Volk <f_l_k@t-online.de>
3Date: Fri, 8 Mar 2024 15:53:11 +0100 3Date: Fri, 8 Mar 2024 15:53:11 +0100
4Subject: [PATCH] Revert "meson: do not pull in clc for clover" 4Subject: [PATCH] Revert "meson: do not pull in clc for clover"
@@ -18,10 +18,10 @@ Signed-off-by: Markus Volk <f_l_k@t-online.de>
18 2 files changed, 3 insertions(+), 2 deletions(-) 18 2 files changed, 3 insertions(+), 2 deletions(-)
19 19
20diff --git a/meson.build b/meson.build 20diff --git a/meson.build b/meson.build
21index 25e92ea5f95..3956e19c08f 100644 21index 2db6185..741b5d1 100644
22--- a/meson.build 22--- a/meson.build
23+++ b/meson.build 23+++ b/meson.build
24@@ -818,6 +818,7 @@ if _opencl != 'disabled' 24@@ -813,6 +813,7 @@ if _opencl != 'disabled'
25 error('The Clover OpenCL state tracker requires rtti') 25 error('The Clover OpenCL state tracker requires rtti')
26 endif 26 endif
27 27
@@ -29,7 +29,7 @@ index 25e92ea5f95..3956e19c08f 100644
29 with_gallium_opencl = true 29 with_gallium_opencl = true
30 with_opencl_icd = _opencl == 'icd' 30 with_opencl_icd = _opencl == 'icd'
31 else 31 else
32@@ -842,7 +843,7 @@ if with_gallium_rusticl 32@@ -837,7 +838,7 @@ if with_gallium_rusticl
33 endif 33 endif
34 34
35 dep_clc = null_dep 35 dep_clc = null_dep
@@ -39,7 +39,7 @@ index 25e92ea5f95..3956e19c08f 100644
39 endif 39 endif
40 40
41diff --git a/src/compiler/meson.build b/src/compiler/meson.build 41diff --git a/src/compiler/meson.build b/src/compiler/meson.build
42index 8d73544c6d8..1dae56d1b2b 100644 42index 8d73544..1dae56d 100644
43--- a/src/compiler/meson.build 43--- a/src/compiler/meson.build
44+++ b/src/compiler/meson.build 44+++ b/src/compiler/meson.build
45@@ -79,7 +79,7 @@ subdir('nir') 45@@ -79,7 +79,7 @@ subdir('nir')
@@ -51,6 +51,3 @@ index 8d73544c6d8..1dae56d1b2b 100644
51 subdir('clc') 51 subdir('clc')
52 endif 52 endif
53 if with_gallium 53 if with_gallium
54--
552.44.0
56
diff --git a/meta/recipes-graphics/mesa/mesa-gl_24.0.2.bb b/meta/recipes-graphics/mesa/mesa-gl_24.0.3.bb
index ca160f1bfc..ca160f1bfc 100644
--- a/meta/recipes-graphics/mesa/mesa-gl_24.0.2.bb
+++ b/meta/recipes-graphics/mesa/mesa-gl_24.0.3.bb
diff --git a/meta/recipes-graphics/mesa/mesa.inc b/meta/recipes-graphics/mesa/mesa.inc
index 6e96190084..1c9fa66c72 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://0001-Revert-meson-do-not-pull-in-clc-for-clover.patch \ 22 file://0001-Revert-meson-do-not-pull-in-clc-for-clover.patch \
23" 23"
24 24
25SRC_URI[sha256sum] = "94e28a8edad06d8ed2b83eb53f253b9eb5aa62c3080f939702e1b3039b56c9e8" 25SRC_URI[sha256sum] = "77aec9a2a37b7d3596ea1640b3cc53d0b5d9b3b52abed89de07e3717e91bfdbe"
26 26
27UPSTREAM_CHECK_GITTAGREGEX = "mesa-(?P<pver>\d+(\.\d+)+)" 27UPSTREAM_CHECK_GITTAGREGEX = "mesa-(?P<pver>\d+(\.\d+)+)"
28 28
diff --git a/meta/recipes-graphics/mesa/mesa_24.0.2.bb b/meta/recipes-graphics/mesa/mesa_24.0.3.bb
index 96e8aa38d6..96e8aa38d6 100644
--- a/meta/recipes-graphics/mesa/mesa_24.0.2.bb
+++ b/meta/recipes-graphics/mesa/mesa_24.0.3.bb