From fd72958ca003046bbe10d8f50c7f3830311be520 Mon Sep 17 00:00:00 2001 From: Markus Volk Date: Tue, 12 Sep 2023 13:02:18 +0200 Subject: mesa: upgrade 23.1.3 -> 23.1.7 (From OE-Core rev: 335b7a7f4e9d67e724a6ff541b4117ece772e0ab) Signed-off-by: Markus Volk Signed-off-by: Alexandre Belloni Signed-off-by: Richard Purdie --- meta/recipes-graphics/mesa/mesa-gl_23.1.3.bb | 15 --------------- meta/recipes-graphics/mesa/mesa-gl_23.1.7.bb | 15 +++++++++++++++ meta/recipes-graphics/mesa/mesa.inc | 2 +- meta/recipes-graphics/mesa/mesa_23.1.3.bb | 2 -- meta/recipes-graphics/mesa/mesa_23.1.7.bb | 2 ++ 5 files changed, 18 insertions(+), 18 deletions(-) delete mode 100644 meta/recipes-graphics/mesa/mesa-gl_23.1.3.bb create mode 100644 meta/recipes-graphics/mesa/mesa-gl_23.1.7.bb delete mode 100644 meta/recipes-graphics/mesa/mesa_23.1.3.bb create mode 100644 meta/recipes-graphics/mesa/mesa_23.1.7.bb (limited to 'meta/recipes-graphics/mesa') diff --git a/meta/recipes-graphics/mesa/mesa-gl_23.1.3.bb b/meta/recipes-graphics/mesa/mesa-gl_23.1.3.bb deleted file mode 100644 index ca160f1bfc..0000000000 --- a/meta/recipes-graphics/mesa/mesa-gl_23.1.3.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.7.bb b/meta/recipes-graphics/mesa/mesa-gl_23.1.7.bb new file mode 100644 index 0000000000..ca160f1bfc --- /dev/null +++ b/meta/recipes-graphics/mesa/mesa-gl_23.1.7.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 83535eb472..a451d06ce9 100644 --- a/meta/recipes-graphics/mesa/mesa.inc +++ b/meta/recipes-graphics/mesa/mesa.inc @@ -21,7 +21,7 @@ SRC_URI = "https://mesa.freedesktop.org/archive/mesa-${PV}.tar.xz \ file://0001-intel-Allow-using-intel_clc-from-the-system.patch \ " -SRC_URI[sha256sum] = "2f6d7381bc10fbd2d6263ad1022785b8b511046c1a904162f8f7da18eea8aed9" +SRC_URI[sha256sum] = "409641eadf0ed1c7794797a6f5a0b0195b5580b282166e5ec5629c6bcda6acd3" UPSTREAM_CHECK_GITTAGREGEX = "mesa-(?P\d+(\.\d+)+)" diff --git a/meta/recipes-graphics/mesa/mesa_23.1.3.bb b/meta/recipes-graphics/mesa/mesa_23.1.3.bb deleted file mode 100644 index 96e8aa38d6..0000000000 --- a/meta/recipes-graphics/mesa/mesa_23.1.3.bb +++ /dev/null @@ -1,2 +0,0 @@ -require ${BPN}.inc - diff --git a/meta/recipes-graphics/mesa/mesa_23.1.7.bb b/meta/recipes-graphics/mesa/mesa_23.1.7.bb new file mode 100644 index 0000000000..96e8aa38d6 --- /dev/null +++ b/meta/recipes-graphics/mesa/mesa_23.1.7.bb @@ -0,0 +1,2 @@ +require ${BPN}.inc + -- cgit v1.2.3-54-g00ecf