diff options
| -rw-r--r-- | meta/recipes-graphics/mesa/files/0001-Revert-meson-do-not-pull-in-clc-for-clover.patch | 13 | ||||
| -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.inc | 2 | ||||
| -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 @@ | |||
| 1 | From fe4600de549549fbb3033fc1b37904ba6b3fe2af Mon Sep 17 00:00:00 2001 | 1 | From 051f41beda540f0ae77b341db01a6de83c9e938a Mon Sep 17 00:00:00 2001 |
| 2 | From: Markus Volk <f_l_k@t-online.de> | 2 | From: Markus Volk <f_l_k@t-online.de> |
| 3 | Date: Fri, 8 Mar 2024 15:53:11 +0100 | 3 | Date: Fri, 8 Mar 2024 15:53:11 +0100 |
| 4 | Subject: [PATCH] Revert "meson: do not pull in clc for clover" | 4 | Subject: [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 | ||
| 20 | diff --git a/meson.build b/meson.build | 20 | diff --git a/meson.build b/meson.build |
| 21 | index 25e92ea5f95..3956e19c08f 100644 | 21 | index 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 | ||
| 41 | diff --git a/src/compiler/meson.build b/src/compiler/meson.build | 41 | diff --git a/src/compiler/meson.build b/src/compiler/meson.build |
| 42 | index 8d73544c6d8..1dae56d1b2b 100644 | 42 | index 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 | -- | ||
| 55 | 2.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 | ||
| 25 | SRC_URI[sha256sum] = "94e28a8edad06d8ed2b83eb53f253b9eb5aa62c3080f939702e1b3039b56c9e8" | 25 | SRC_URI[sha256sum] = "77aec9a2a37b7d3596ea1640b3cc53d0b5d9b3b52abed89de07e3717e91bfdbe" |
| 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.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 | |||
