From a89ed8ce30a5830a0ac90aa633ec466b4e3a0ba1 Mon Sep 17 00:00:00 2001 From: wangmy Date: Thu, 29 Apr 2021 09:58:13 +0800 Subject: mesa: upgrade 21.0.2 -> 21.0.3 Signed-off-by: Wang Mingyu Signed-off-by: Richard Purdie --- meta/recipes-graphics/mesa/mesa-gl_21.0.2.bb | 16 ---------------- meta/recipes-graphics/mesa/mesa-gl_21.0.3.bb | 16 ++++++++++++++++ meta/recipes-graphics/mesa/mesa.inc | 2 +- meta/recipes-graphics/mesa/mesa_21.0.2.bb | 4 ---- meta/recipes-graphics/mesa/mesa_21.0.3.bb | 4 ++++ 5 files changed, 21 insertions(+), 21 deletions(-) delete mode 100644 meta/recipes-graphics/mesa/mesa-gl_21.0.2.bb create mode 100644 meta/recipes-graphics/mesa/mesa-gl_21.0.3.bb delete mode 100644 meta/recipes-graphics/mesa/mesa_21.0.2.bb create mode 100644 meta/recipes-graphics/mesa/mesa_21.0.3.bb (limited to 'meta/recipes-graphics/mesa') diff --git a/meta/recipes-graphics/mesa/mesa-gl_21.0.2.bb b/meta/recipes-graphics/mesa/mesa-gl_21.0.2.bb deleted file mode 100644 index dff79f0be0..0000000000 --- a/meta/recipes-graphics/mesa/mesa-gl_21.0.2.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.3.bb b/meta/recipes-graphics/mesa/mesa-gl_21.0.3.bb new file mode 100644 index 0000000000..dff79f0be0 --- /dev/null +++ b/meta/recipes-graphics/mesa/mesa-gl_21.0.3.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 5705ae0f08..a85f94c75e 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] = "46c1dc5bb54a372dee43ec3c067229c299187d5bdadf1402756bbf66a6df5b88" +SRC_URI[sha256sum] = "565c6f4bd2d5747b919454fc1d439963024fc78ca56fd05158c3b2cde2f6912b" UPSTREAM_CHECK_GITTAGREGEX = "mesa-(?P\d+(\.\d+)+)" diff --git a/meta/recipes-graphics/mesa/mesa_21.0.2.bb b/meta/recipes-graphics/mesa/mesa_21.0.2.bb deleted file mode 100644 index 8c584d8e9f..0000000000 --- a/meta/recipes-graphics/mesa/mesa_21.0.2.bb +++ /dev/null @@ -1,4 +0,0 @@ -require ${BPN}.inc - -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.3.bb b/meta/recipes-graphics/mesa/mesa_21.0.3.bb new file mode 100644 index 0000000000..8c584d8e9f --- /dev/null +++ b/meta/recipes-graphics/mesa/mesa_21.0.3.bb @@ -0,0 +1,4 @@ +require ${BPN}.inc + +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