From 26e3579ccb25c3388a3e98a0968c8e577823198a Mon Sep 17 00:00:00 2001 From: Wang Mingyu Date: Tue, 27 Jun 2023 15:17:13 +0800 Subject: mesa: upgrade 23.1.1 -> 23.1.3 (From OE-Core rev: 5e720f05d308051d16d7fc6651bd978de47e012b) Signed-off-by: Wang Mingyu Signed-off-by: Richard Purdie --- meta/recipes-graphics/mesa/mesa-gl_23.1.1.bb | 15 --------------- meta/recipes-graphics/mesa/mesa-gl_23.1.3.bb | 15 +++++++++++++++ meta/recipes-graphics/mesa/mesa.inc | 2 +- meta/recipes-graphics/mesa/mesa_23.1.1.bb | 2 -- meta/recipes-graphics/mesa/mesa_23.1.3.bb | 2 ++ 5 files changed, 18 insertions(+), 18 deletions(-) delete mode 100644 meta/recipes-graphics/mesa/mesa-gl_23.1.1.bb create mode 100644 meta/recipes-graphics/mesa/mesa-gl_23.1.3.bb delete mode 100644 meta/recipes-graphics/mesa/mesa_23.1.1.bb create mode 100644 meta/recipes-graphics/mesa/mesa_23.1.3.bb (limited to 'meta/recipes-graphics') diff --git a/meta/recipes-graphics/mesa/mesa-gl_23.1.1.bb b/meta/recipes-graphics/mesa/mesa-gl_23.1.1.bb deleted file mode 100644 index ca160f1bfc..0000000000 --- a/meta/recipes-graphics/mesa/mesa-gl_23.1.1.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_23.1.3.bb b/meta/recipes-graphics/mesa/mesa-gl_23.1.3.bb new file mode 100644 index 0000000000..ca160f1bfc --- /dev/null +++ b/meta/recipes-graphics/mesa/mesa-gl_23.1.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 ac42a8dd4f..a944a7bdd5 100644 --- a/meta/recipes-graphics/mesa/mesa.inc +++ b/meta/recipes-graphics/mesa/mesa.inc @@ -19,7 +19,7 @@ SRC_URI = "https://mesa.freedesktop.org/archive/mesa-${PV}.tar.xz \ file://0001-meson-misdetects-64bit-atomics-on-mips-clang.patch \ " -SRC_URI[sha256sum] = "a2679031ed5b73b29c4f042ac64d96f83b0cfe4858617de32e2efc196c653a40" +SRC_URI[sha256sum] = "2f6d7381bc10fbd2d6263ad1022785b8b511046c1a904162f8f7da18eea8aed9" UPSTREAM_CHECK_GITTAGREGEX = "mesa-(?P\d+(\.\d+)+)" diff --git a/meta/recipes-graphics/mesa/mesa_23.1.1.bb b/meta/recipes-graphics/mesa/mesa_23.1.1.bb deleted file mode 100644 index 96e8aa38d6..0000000000 --- a/meta/recipes-graphics/mesa/mesa_23.1.1.bb +++ /dev/null @@ -1,2 +0,0 @@ -require ${BPN}.inc - diff --git a/meta/recipes-graphics/mesa/mesa_23.1.3.bb b/meta/recipes-graphics/mesa/mesa_23.1.3.bb new file mode 100644 index 0000000000..96e8aa38d6 --- /dev/null +++ b/meta/recipes-graphics/mesa/mesa_23.1.3.bb @@ -0,0 +1,2 @@ +require ${BPN}.inc + -- cgit v1.2.3-54-g00ecf