Message ID | 1711413292-3025-17-git-send-email-wangmy@fujitsu.com |
---|---|
State | New |
Headers | show |
Series | [01/34] adwaita-icon-theme: upgrade 45.0 -> 46.0 | expand |
Don't forget the mesa-gl recipe in those updates. Alex On Tue, 26 Mar 2024 at 01:37, wangmy via lists.openembedded.org <wangmy=fujitsu.com@lists.openembedded.org> wrote: > > From: Wang Mingyu <wangmy@fujitsu.com> > > 0001-Revert-meson-do-not-pull-in-clc-for-clover.patch > refreshed for 24.0.3 > > Signed-off-by: Wang Mingyu <wangmy@fujitsu.com> > --- > ...Revert-meson-do-not-pull-in-clc-for-clover.patch | 13 +++++-------- > meta/recipes-graphics/mesa/mesa.inc | 2 +- > .../mesa/{mesa_24.0.2.bb => mesa_24.0.3.bb} | 0 > 3 files changed, 6 insertions(+), 9 deletions(-) > rename meta/recipes-graphics/mesa/{mesa_24.0.2.bb => mesa_24.0.3.bb} (100%) > > 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 @@ > -From fe4600de549549fbb3033fc1b37904ba6b3fe2af Mon Sep 17 00:00:00 2001 > +From 051f41beda540f0ae77b341db01a6de83c9e938a Mon Sep 17 00:00:00 2001 > From: Markus Volk <f_l_k@t-online.de> > Date: Fri, 8 Mar 2024 15:53:11 +0100 > 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> > 2 files changed, 3 insertions(+), 2 deletions(-) > > diff --git a/meson.build b/meson.build > -index 25e92ea5f95..3956e19c08f 100644 > +index 2db6185..741b5d1 100644 > --- a/meson.build > +++ b/meson.build > -@@ -818,6 +818,7 @@ if _opencl != 'disabled' > +@@ -813,6 +813,7 @@ if _opencl != 'disabled' > error('The Clover OpenCL state tracker requires rtti') > endif > > @@ -29,7 +29,7 @@ index 25e92ea5f95..3956e19c08f 100644 > with_gallium_opencl = true > with_opencl_icd = _opencl == 'icd' > else > -@@ -842,7 +843,7 @@ if with_gallium_rusticl > +@@ -837,7 +838,7 @@ if with_gallium_rusticl > endif > > dep_clc = null_dep > @@ -39,7 +39,7 @@ index 25e92ea5f95..3956e19c08f 100644 > endif > > diff --git a/src/compiler/meson.build b/src/compiler/meson.build > -index 8d73544c6d8..1dae56d1b2b 100644 > +index 8d73544..1dae56d 100644 > --- a/src/compiler/meson.build > +++ b/src/compiler/meson.build > @@ -79,7 +79,7 @@ subdir('nir') > @@ -51,6 +51,3 @@ index 8d73544c6d8..1dae56d1b2b 100644 > subdir('clc') > endif > if with_gallium > --- > -2.44.0 > - > diff --git a/meta/recipes-graphics/mesa/mesa.inc b/meta/recipes-graphics/mesa/mesa.inc > index a8088e6fb6..b08ec873a0 100644 > --- a/meta/recipes-graphics/mesa/mesa.inc > +++ b/meta/recipes-graphics/mesa/mesa.inc > @@ -23,7 +23,7 @@ SRC_URI = "https://mesa.freedesktop.org/archive/mesa-${PV}.tar.xz \ > file://0001-Revert-meson-do-not-pull-in-clc-for-clover.patch \ > " > > -SRC_URI[sha256sum] = "94e28a8edad06d8ed2b83eb53f253b9eb5aa62c3080f939702e1b3039b56c9e8" > +SRC_URI[sha256sum] = "77aec9a2a37b7d3596ea1640b3cc53d0b5d9b3b52abed89de07e3717e91bfdbe" > > UPSTREAM_CHECK_GITTAGREGEX = "mesa-(?P<pver>\d+(\.\d+)+)" > > diff --git a/meta/recipes-graphics/mesa/mesa_24.0.2.bb b/meta/recipes-graphics/mesa/mesa_24.0.3.bb > similarity index 100% > rename from meta/recipes-graphics/mesa/mesa_24.0.2.bb > rename to meta/recipes-graphics/mesa/mesa_24.0.3.bb > -- > 2.34.1 > > > -=-=-=-=-=-=-=-=-=-=-=- > Links: You receive all messages sent to this group. > View/Reply Online (#197506): https://lists.openembedded.org/g/openembedded-core/message/197506 > Mute This Topic: https://lists.openembedded.org/mt/105150531/1686489 > Group Owner: openembedded-core+owner@lists.openembedded.org > Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [alex.kanavin@gmail.com] > -=-=-=-=-=-=-=-=-=-=-=- >
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 @@ -From fe4600de549549fbb3033fc1b37904ba6b3fe2af Mon Sep 17 00:00:00 2001 +From 051f41beda540f0ae77b341db01a6de83c9e938a Mon Sep 17 00:00:00 2001 From: Markus Volk <f_l_k@t-online.de> Date: Fri, 8 Mar 2024 15:53:11 +0100 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> 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/meson.build b/meson.build -index 25e92ea5f95..3956e19c08f 100644 +index 2db6185..741b5d1 100644 --- a/meson.build +++ b/meson.build -@@ -818,6 +818,7 @@ if _opencl != 'disabled' +@@ -813,6 +813,7 @@ if _opencl != 'disabled' error('The Clover OpenCL state tracker requires rtti') endif @@ -29,7 +29,7 @@ index 25e92ea5f95..3956e19c08f 100644 with_gallium_opencl = true with_opencl_icd = _opencl == 'icd' else -@@ -842,7 +843,7 @@ if with_gallium_rusticl +@@ -837,7 +838,7 @@ if with_gallium_rusticl endif dep_clc = null_dep @@ -39,7 +39,7 @@ index 25e92ea5f95..3956e19c08f 100644 endif diff --git a/src/compiler/meson.build b/src/compiler/meson.build -index 8d73544c6d8..1dae56d1b2b 100644 +index 8d73544..1dae56d 100644 --- a/src/compiler/meson.build +++ b/src/compiler/meson.build @@ -79,7 +79,7 @@ subdir('nir') @@ -51,6 +51,3 @@ index 8d73544c6d8..1dae56d1b2b 100644 subdir('clc') endif if with_gallium --- -2.44.0 - diff --git a/meta/recipes-graphics/mesa/mesa.inc b/meta/recipes-graphics/mesa/mesa.inc index a8088e6fb6..b08ec873a0 100644 --- a/meta/recipes-graphics/mesa/mesa.inc +++ b/meta/recipes-graphics/mesa/mesa.inc @@ -23,7 +23,7 @@ SRC_URI = "https://mesa.freedesktop.org/archive/mesa-${PV}.tar.xz \ file://0001-Revert-meson-do-not-pull-in-clc-for-clover.patch \ " -SRC_URI[sha256sum] = "94e28a8edad06d8ed2b83eb53f253b9eb5aa62c3080f939702e1b3039b56c9e8" +SRC_URI[sha256sum] = "77aec9a2a37b7d3596ea1640b3cc53d0b5d9b3b52abed89de07e3717e91bfdbe" UPSTREAM_CHECK_GITTAGREGEX = "mesa-(?P<pver>\d+(\.\d+)+)" diff --git a/meta/recipes-graphics/mesa/mesa_24.0.2.bb b/meta/recipes-graphics/mesa/mesa_24.0.3.bb similarity index 100% rename from meta/recipes-graphics/mesa/mesa_24.0.2.bb rename to meta/recipes-graphics/mesa/mesa_24.0.3.bb