From 13b4c46ddf2b903e704a7931cf47ff876b0ece9a Mon Sep 17 00:00:00 2001 From: Wang Mingyu Date: Wed, 27 Mar 2024 11:20:54 +0800 Subject: 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 Signed-off-by: Alexandre Belloni Signed-off-by: Richard Purdie --- .../0001-Revert-meson-do-not-pull-in-clc-for-clover.patch | 13 +++++-------- meta/recipes-graphics/mesa/mesa-gl_24.0.2.bb | 15 --------------- meta/recipes-graphics/mesa/mesa-gl_24.0.3.bb | 15 +++++++++++++++ meta/recipes-graphics/mesa/mesa.inc | 2 +- meta/recipes-graphics/mesa/mesa_24.0.2.bb | 2 -- meta/recipes-graphics/mesa/mesa_24.0.3.bb | 2 ++ 6 files changed, 23 insertions(+), 26 deletions(-) delete mode 100644 meta/recipes-graphics/mesa/mesa-gl_24.0.2.bb create mode 100644 meta/recipes-graphics/mesa/mesa-gl_24.0.3.bb delete mode 100644 meta/recipes-graphics/mesa/mesa_24.0.2.bb create mode 100644 meta/recipes-graphics/mesa/mesa_24.0.3.bb 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 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 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-gl_24.0.2.bb b/meta/recipes-graphics/mesa/mesa-gl_24.0.2.bb deleted file mode 100644 index ca160f1bfc..0000000000 --- a/meta/recipes-graphics/mesa/mesa-gl_24.0.2.bb +++ /dev/null @@ -1,15 +0,0 @@ -require mesa.inc - -SUMMARY += " (OpenGL only, no EGL/GLES)" - -PROVIDES = "virtual/libgl virtual/mesa" - -S = "${WORKDIR}/mesa-${PV}" - -TARGET_CFLAGS = "-I${STAGING_INCDIR}/drm" - -# At least one DRI rendering engine is required to build mesa. -# When no X11 is available, use osmesa for the rendering engine. -PACKAGECONFIG ??= "opengl gallium ${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'x11', 'osmesa', d)}" -PACKAGECONFIG:class-target = "opengl gallium ${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'x11', 'osmesa', d)}" - diff --git a/meta/recipes-graphics/mesa/mesa-gl_24.0.3.bb b/meta/recipes-graphics/mesa/mesa-gl_24.0.3.bb new file mode 100644 index 0000000000..ca160f1bfc --- /dev/null +++ b/meta/recipes-graphics/mesa/mesa-gl_24.0.3.bb @@ -0,0 +1,15 @@ +require mesa.inc + +SUMMARY += " (OpenGL only, no EGL/GLES)" + +PROVIDES = "virtual/libgl virtual/mesa" + +S = "${WORKDIR}/mesa-${PV}" + +TARGET_CFLAGS = "-I${STAGING_INCDIR}/drm" + +# At least one DRI rendering engine is required to build mesa. +# When no X11 is available, use osmesa for the rendering engine. +PACKAGECONFIG ??= "opengl gallium ${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'x11', 'osmesa', d)}" +PACKAGECONFIG:class-target = "opengl gallium ${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'x11', 'osmesa', d)}" + 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 \ 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\d+(\.\d+)+)" diff --git a/meta/recipes-graphics/mesa/mesa_24.0.2.bb b/meta/recipes-graphics/mesa/mesa_24.0.2.bb deleted file mode 100644 index 96e8aa38d6..0000000000 --- a/meta/recipes-graphics/mesa/mesa_24.0.2.bb +++ /dev/null @@ -1,2 +0,0 @@ -require ${BPN}.inc - diff --git a/meta/recipes-graphics/mesa/mesa_24.0.3.bb b/meta/recipes-graphics/mesa/mesa_24.0.3.bb new file mode 100644 index 0000000000..96e8aa38d6 --- /dev/null +++ b/meta/recipes-graphics/mesa/mesa_24.0.3.bb @@ -0,0 +1,2 @@ +require ${BPN}.inc + -- cgit v1.2.3-54-g00ecf