From 2140ca72b9dc9aa225b224b8dc14fd9423609413 Mon Sep 17 00:00:00 2001 From: Wang Mingyu Date: Sun, 13 Nov 2022 10:59:53 +0800 Subject: mesa: upgrade 22.2.2 -> 22.2.3 (From OE-Core rev: d7037207e5c7d93031311b3ad88e4548ce8bb47a) Signed-off-by: Wang Mingyu Signed-off-by: Alexandre Belloni Signed-off-by: Richard Purdie --- meta/recipes-graphics/mesa/mesa-gl_22.2.2.bb | 13 ------------- meta/recipes-graphics/mesa/mesa-gl_22.2.3.bb | 13 +++++++++++++ meta/recipes-graphics/mesa/mesa.inc | 2 +- meta/recipes-graphics/mesa/mesa_22.2.2.bb | 2 -- meta/recipes-graphics/mesa/mesa_22.2.3.bb | 2 ++ 5 files changed, 16 insertions(+), 16 deletions(-) delete mode 100644 meta/recipes-graphics/mesa/mesa-gl_22.2.2.bb create mode 100644 meta/recipes-graphics/mesa/mesa-gl_22.2.3.bb delete mode 100644 meta/recipes-graphics/mesa/mesa_22.2.2.bb create mode 100644 meta/recipes-graphics/mesa/mesa_22.2.3.bb (limited to 'meta/recipes-graphics/mesa') diff --git a/meta/recipes-graphics/mesa/mesa-gl_22.2.2.bb b/meta/recipes-graphics/mesa/mesa-gl_22.2.2.bb deleted file mode 100644 index f2bc8f6b5b..0000000000 --- a/meta/recipes-graphics/mesa/mesa-gl_22.2.2.bb +++ /dev/null @@ -1,13 +0,0 @@ -require mesa.inc - -SUMMARY += " (OpenGL only, no EGL/GLES)" - -PROVIDES = "virtual/libgl virtual/mesa" - -S = "${WORKDIR}/mesa-${PV}" - -# At least one DRI rendering engine is required to build mesa. -# When no X11 is available, use osmesa for the rendering engine. -PACKAGECONFIG ??= "opengl ${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'x11', 'osmesa gallium', d)}" -PACKAGECONFIG:class-target = "opengl ${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'x11', 'osmesa gallium', d)}" - diff --git a/meta/recipes-graphics/mesa/mesa-gl_22.2.3.bb b/meta/recipes-graphics/mesa/mesa-gl_22.2.3.bb new file mode 100644 index 0000000000..f2bc8f6b5b --- /dev/null +++ b/meta/recipes-graphics/mesa/mesa-gl_22.2.3.bb @@ -0,0 +1,13 @@ +require mesa.inc + +SUMMARY += " (OpenGL only, no EGL/GLES)" + +PROVIDES = "virtual/libgl virtual/mesa" + +S = "${WORKDIR}/mesa-${PV}" + +# At least one DRI rendering engine is required to build mesa. +# When no X11 is available, use osmesa for the rendering engine. +PACKAGECONFIG ??= "opengl ${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'x11', 'osmesa gallium', d)}" +PACKAGECONFIG:class-target = "opengl ${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'x11', 'osmesa gallium', d)}" + diff --git a/meta/recipes-graphics/mesa/mesa.inc b/meta/recipes-graphics/mesa/mesa.inc index 7dbca5876a..6246b723cf 100644 --- a/meta/recipes-graphics/mesa/mesa.inc +++ b/meta/recipes-graphics/mesa/mesa.inc @@ -25,7 +25,7 @@ NATIVE_PATCHES ?= "" # required by mesa-native on Ubuntu 18.04 with gcc 7.5 when DEBUG_BUILD enabled NATIVE_PATCHES:class-native = "file://0001-nir-nir_opt_move-fix-ALWAYS_INLINE-compiler-error.patch" -SRC_URI[sha256sum] = "2de11fb74fc5cc671b818e49fe203cea0cd1d8b69756e97cdb06a2f4e78948f9" +SRC_URI[sha256sum] = "ee7d026f7b1991dbae0861d359b671145c3a86f2a731353b885d2ea2d5c098d6" UPSTREAM_CHECK_GITTAGREGEX = "mesa-(?P\d+(\.\d+)+)" diff --git a/meta/recipes-graphics/mesa/mesa_22.2.2.bb b/meta/recipes-graphics/mesa/mesa_22.2.2.bb deleted file mode 100644 index 96e8aa38d6..0000000000 --- a/meta/recipes-graphics/mesa/mesa_22.2.2.bb +++ /dev/null @@ -1,2 +0,0 @@ -require ${BPN}.inc - diff --git a/meta/recipes-graphics/mesa/mesa_22.2.3.bb b/meta/recipes-graphics/mesa/mesa_22.2.3.bb new file mode 100644 index 0000000000..96e8aa38d6 --- /dev/null +++ b/meta/recipes-graphics/mesa/mesa_22.2.3.bb @@ -0,0 +1,2 @@ +require ${BPN}.inc + -- cgit v1.2.3-54-g00ecf