From e06b7828aeea8d07b6f4d63eb386f85bccddaa47 Mon Sep 17 00:00:00 2001 From: Markus Volk Date: Mon, 24 Oct 2022 17:06:08 +0200 Subject: mesa: update 22.2.0 -> 22.2.2 - add a PACKAGECONFIG for perfetto support (From OE-Core rev: cbcaff0b4cc349706b9847f4262746b43adba209) Signed-off-by: Markus Volk Signed-off-by: Alexandre Belloni Signed-off-by: Richard Purdie --- meta/recipes-graphics/mesa/mesa-gl_22.2.0.bb | 13 ------------- meta/recipes-graphics/mesa/mesa-gl_22.2.2.bb | 13 +++++++++++++ meta/recipes-graphics/mesa/mesa.inc | 4 +++- meta/recipes-graphics/mesa/mesa_22.2.0.bb | 2 -- meta/recipes-graphics/mesa/mesa_22.2.2.bb | 2 ++ 5 files changed, 18 insertions(+), 16 deletions(-) delete mode 100644 meta/recipes-graphics/mesa/mesa-gl_22.2.0.bb create mode 100644 meta/recipes-graphics/mesa/mesa-gl_22.2.2.bb delete mode 100644 meta/recipes-graphics/mesa/mesa_22.2.0.bb create mode 100644 meta/recipes-graphics/mesa/mesa_22.2.2.bb (limited to 'meta/recipes-graphics/mesa') diff --git a/meta/recipes-graphics/mesa/mesa-gl_22.2.0.bb b/meta/recipes-graphics/mesa/mesa-gl_22.2.0.bb deleted file mode 100644 index f2bc8f6b5b..0000000000 --- a/meta/recipes-graphics/mesa/mesa-gl_22.2.0.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.2.bb b/meta/recipes-graphics/mesa/mesa-gl_22.2.2.bb new file mode 100644 index 0000000000..f2bc8f6b5b --- /dev/null +++ b/meta/recipes-graphics/mesa/mesa-gl_22.2.2.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 04d78a6aa5..7dbca5876a 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] = "b1f9c8fd08f2cae3adf83355bef4d2398e8025f44947332880f2d0066bdafa8c" +SRC_URI[sha256sum] = "2de11fb74fc5cc671b818e49fe203cea0cd1d8b69756e97cdb06a2f4e78948f9" UPSTREAM_CHECK_GITTAGREGEX = "mesa-(?P\d+(\.\d+)+)" @@ -182,6 +182,8 @@ PACKAGECONFIG[vulkan-beta] = "-Dvulkan-beta=true,-Dvulkan-beta=false" PACKAGECONFIG[osmesa] = "-Dosmesa=true,-Dosmesa=false" +PACKAGECONFIG[perfetto] = "-Dperfetto=true,-Dperfetto=false,libperfetto" + PACKAGECONFIG[unwind] = "-Dlibunwind=enabled,-Dlibunwind=disabled,libunwind" PACKAGECONFIG[lmsensors] = "-Dlmsensors=enabled,-Dlmsensors=disabled,lmsensors" diff --git a/meta/recipes-graphics/mesa/mesa_22.2.0.bb b/meta/recipes-graphics/mesa/mesa_22.2.0.bb deleted file mode 100644 index 96e8aa38d6..0000000000 --- a/meta/recipes-graphics/mesa/mesa_22.2.0.bb +++ /dev/null @@ -1,2 +0,0 @@ -require ${BPN}.inc - diff --git a/meta/recipes-graphics/mesa/mesa_22.2.2.bb b/meta/recipes-graphics/mesa/mesa_22.2.2.bb new file mode 100644 index 0000000000..96e8aa38d6 --- /dev/null +++ b/meta/recipes-graphics/mesa/mesa_22.2.2.bb @@ -0,0 +1,2 @@ +require ${BPN}.inc + -- cgit v1.2.3-54-g00ecf