From a59bbc97bc6ec66ecc6909cd0129769c7ecda8f2 Mon Sep 17 00:00:00 2001 From: Alexander Kanavin Date: Fri, 19 Aug 2022 09:27:06 +0200 Subject: mesa: upgrade 22.1.5 -> 22.1.6 (From OE-Core rev: 9ebbd72d3e9f8b717c41196f50c51dc06dca92c5) Signed-off-by: Alexander Kanavin Signed-off-by: Alexandre Belloni Signed-off-by: Richard Purdie --- meta/recipes-graphics/mesa/mesa-gl_22.1.5.bb | 13 ------------- meta/recipes-graphics/mesa/mesa-gl_22.1.6.bb | 13 +++++++++++++ meta/recipes-graphics/mesa/mesa.inc | 2 +- meta/recipes-graphics/mesa/mesa_22.1.5.bb | 2 -- meta/recipes-graphics/mesa/mesa_22.1.6.bb | 2 ++ 5 files changed, 16 insertions(+), 16 deletions(-) delete mode 100644 meta/recipes-graphics/mesa/mesa-gl_22.1.5.bb create mode 100644 meta/recipes-graphics/mesa/mesa-gl_22.1.6.bb delete mode 100644 meta/recipes-graphics/mesa/mesa_22.1.5.bb create mode 100644 meta/recipes-graphics/mesa/mesa_22.1.6.bb diff --git a/meta/recipes-graphics/mesa/mesa-gl_22.1.5.bb b/meta/recipes-graphics/mesa/mesa-gl_22.1.5.bb deleted file mode 100644 index f2bc8f6b5b..0000000000 --- a/meta/recipes-graphics/mesa/mesa-gl_22.1.5.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.1.6.bb b/meta/recipes-graphics/mesa/mesa-gl_22.1.6.bb new file mode 100644 index 0000000000..f2bc8f6b5b --- /dev/null +++ b/meta/recipes-graphics/mesa/mesa-gl_22.1.6.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 fccf14a7d1..c4efc13438 100644 --- a/meta/recipes-graphics/mesa/mesa.inc +++ b/meta/recipes-graphics/mesa/mesa.inc @@ -25,7 +25,7 @@ SRC_URI = "https://mesa.freedesktop.org/archive/mesa-${PV}.tar.xz \ file://0001-nir-nir_opt_move-fix-ALWAYS_INLINE-compiler-error.patch \ " -SRC_URI[sha256sum] = "6fd60d38efdd25317948c61494b5117e01d42da695278728b1faef9f5f9a47ba" +SRC_URI[sha256sum] = "22ced061eb9adab8ea35368246c1995c09723f3f71653cd5050c5cec376e671a" UPSTREAM_CHECK_GITTAGREGEX = "mesa-(?P\d+(\.\d+)+)" diff --git a/meta/recipes-graphics/mesa/mesa_22.1.5.bb b/meta/recipes-graphics/mesa/mesa_22.1.5.bb deleted file mode 100644 index 96e8aa38d6..0000000000 --- a/meta/recipes-graphics/mesa/mesa_22.1.5.bb +++ /dev/null @@ -1,2 +0,0 @@ -require ${BPN}.inc - diff --git a/meta/recipes-graphics/mesa/mesa_22.1.6.bb b/meta/recipes-graphics/mesa/mesa_22.1.6.bb new file mode 100644 index 0000000000..96e8aa38d6 --- /dev/null +++ b/meta/recipes-graphics/mesa/mesa_22.1.6.bb @@ -0,0 +1,2 @@ +require ${BPN}.inc + -- cgit v1.2.3-54-g00ecf