From e72dc396f0e147b078160fae0ac43861eb60e76f Mon Sep 17 00:00:00 2001 From: Alexander Kanavin Date: Fri, 2 Apr 2021 22:46:23 +0200 Subject: mesa: update 21.0.0 -> 21.0.1 Signed-off-by: Alexander Kanavin Signed-off-by: Richard Purdie --- meta/recipes-graphics/mesa/mesa-gl_21.0.0.bb | 16 ---------------- meta/recipes-graphics/mesa/mesa-gl_21.0.1.bb | 16 ++++++++++++++++ meta/recipes-graphics/mesa/mesa.inc | 2 +- meta/recipes-graphics/mesa/mesa_21.0.0.bb | 6 ------ meta/recipes-graphics/mesa/mesa_21.0.1.bb | 6 ++++++ 5 files changed, 23 insertions(+), 23 deletions(-) delete mode 100644 meta/recipes-graphics/mesa/mesa-gl_21.0.0.bb create mode 100644 meta/recipes-graphics/mesa/mesa-gl_21.0.1.bb delete mode 100644 meta/recipes-graphics/mesa/mesa_21.0.0.bb create mode 100644 meta/recipes-graphics/mesa/mesa_21.0.1.bb (limited to 'meta/recipes-graphics') diff --git a/meta/recipes-graphics/mesa/mesa-gl_21.0.0.bb b/meta/recipes-graphics/mesa/mesa-gl_21.0.0.bb deleted file mode 100644 index dff79f0be0..0000000000 --- a/meta/recipes-graphics/mesa/mesa-gl_21.0.0.bb +++ /dev/null @@ -1,16 +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 dri ${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'x11', 'osmesa gallium', d)}" -PACKAGECONFIG_class-target = "opengl dri ${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'x11', 'osmesa gallium', d)}" - -# 21.0.0 version fails to build when any driver is enabled in DRIDRIVERS -# ./mesa-21.0.0/meson.build:519:4: ERROR: Problem encountered: building dri drivers require at least one windowing system -DRIDRIVERS ?= "" diff --git a/meta/recipes-graphics/mesa/mesa-gl_21.0.1.bb b/meta/recipes-graphics/mesa/mesa-gl_21.0.1.bb new file mode 100644 index 0000000000..dff79f0be0 --- /dev/null +++ b/meta/recipes-graphics/mesa/mesa-gl_21.0.1.bb @@ -0,0 +1,16 @@ +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 dri ${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'x11', 'osmesa gallium', d)}" +PACKAGECONFIG_class-target = "opengl dri ${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'x11', 'osmesa gallium', d)}" + +# 21.0.0 version fails to build when any driver is enabled in DRIDRIVERS +# ./mesa-21.0.0/meson.build:519:4: ERROR: Problem encountered: building dri drivers require at least one windowing system +DRIDRIVERS ?= "" diff --git a/meta/recipes-graphics/mesa/mesa.inc b/meta/recipes-graphics/mesa/mesa.inc index 67b0835d9f..862e4fa9b8 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-futex.h-Define-__NR_futex-if-it-does-not-exist.patch \ " -SRC_URI[sha256sum] = "e6204e98e6a8d77cf9dc5d34f99dd8e3ef7144f3601c808ca0dd26ba522e0d84" +SRC_URI[sha256sum] = "379fc984459394f2ab2d84049efdc3a659869dc1328ce72ef0598506611712bb" UPSTREAM_CHECK_GITTAGREGEX = "mesa-(?P\d+(\.\d+)+)" diff --git a/meta/recipes-graphics/mesa/mesa_21.0.0.bb b/meta/recipes-graphics/mesa/mesa_21.0.0.bb deleted file mode 100644 index d578c75e39..0000000000 --- a/meta/recipes-graphics/mesa/mesa_21.0.0.bb +++ /dev/null @@ -1,6 +0,0 @@ -require ${BPN}.inc - -DRIDRIVERS_class-native = "nouveau" -DRIDRIVERS_class-nativesdk = "nouveau" -DRIDRIVERS_append_x86_class-target = ",r100,r200,nouveau,i965,i915" -DRIDRIVERS_append_x86-64_class-target = ",r100,r200,nouveau,i965,i915" diff --git a/meta/recipes-graphics/mesa/mesa_21.0.1.bb b/meta/recipes-graphics/mesa/mesa_21.0.1.bb new file mode 100644 index 0000000000..d578c75e39 --- /dev/null +++ b/meta/recipes-graphics/mesa/mesa_21.0.1.bb @@ -0,0 +1,6 @@ +require ${BPN}.inc + +DRIDRIVERS_class-native = "nouveau" +DRIDRIVERS_class-nativesdk = "nouveau" +DRIDRIVERS_append_x86_class-target = ",r100,r200,nouveau,i965,i915" +DRIDRIVERS_append_x86-64_class-target = ",r100,r200,nouveau,i965,i915" -- cgit 1.2.3-korg