From 6209684ca67e8d683d096e07c6cf0543928fe138 Mon Sep 17 00:00:00 2001
From: Otavio Salvador <otavio.salvador@gmail.com>
Date: Fri, 31 Dec 2021 16:38:42 -0300
Subject: mesa: 21.3.1 -> 21.3.3

Upgrade to 21.3.3 stable release. It includes bugfixes and minor
improvements, for more detailed information about the included changes
refer to the specific release notes:

 - 21.3.2: https://docs.mesa3d.org/relnotes/21.3.2.html
 - 21.3.3: https://docs.mesa3d.org/relnotes/21.3.3.html

(From OE-Core rev: 6982e2d66bd8296a3f67c72636ce015d328377d0)

Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
---
 meta/recipes-graphics/mesa/mesa-gl_21.3.1.bb | 16 ----------------
 meta/recipes-graphics/mesa/mesa-gl_21.3.3.bb | 16 ++++++++++++++++
 meta/recipes-graphics/mesa/mesa.inc          |  2 +-
 meta/recipes-graphics/mesa/mesa_21.3.1.bb    |  5 -----
 meta/recipes-graphics/mesa/mesa_21.3.3.bb    |  5 +++++
 5 files changed, 22 insertions(+), 22 deletions(-)
 delete mode 100644 meta/recipes-graphics/mesa/mesa-gl_21.3.1.bb
 create mode 100644 meta/recipes-graphics/mesa/mesa-gl_21.3.3.bb
 delete mode 100644 meta/recipes-graphics/mesa/mesa_21.3.1.bb
 create mode 100644 meta/recipes-graphics/mesa/mesa_21.3.3.bb

(limited to 'meta/recipes-graphics')

diff --git a/meta/recipes-graphics/mesa/mesa-gl_21.3.1.bb b/meta/recipes-graphics/mesa/mesa-gl_21.3.1.bb
deleted file mode 100644
index 142bb743b1..0000000000
--- a/meta/recipes-graphics/mesa/mesa-gl_21.3.1.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.3.3.bb b/meta/recipes-graphics/mesa/mesa-gl_21.3.3.bb
new file mode 100644
index 0000000000..142bb743b1
--- /dev/null
+++ b/meta/recipes-graphics/mesa/mesa-gl_21.3.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 64702f8168..7f47f18591 100644
--- a/meta/recipes-graphics/mesa/mesa.inc
+++ b/meta/recipes-graphics/mesa/mesa.inc
@@ -23,7 +23,7 @@ SRC_URI = "https://mesa.freedesktop.org/archive/mesa-${PV}.tar.xz \
            file://0001-v3dv-account-for-64bit-time_t-on-32bit-arches.patch \
            "
 
-SRC_URI[sha256sum] = "2b0dc2540cb192525741d00f706dbc4586349185dafc65729c7fda0800cc474d"
+SRC_URI[sha256sum] = "ad7f4613ea7c5d08d9fcb5025270199e6ceb9aa99fd72ee572b70342240a8121"
 
 UPSTREAM_CHECK_GITTAGREGEX = "mesa-(?P<pver>\d+(\.\d+)+)"
 
diff --git a/meta/recipes-graphics/mesa/mesa_21.3.1.bb b/meta/recipes-graphics/mesa/mesa_21.3.1.bb
deleted file mode 100644
index 4cb7e80eb5..0000000000
--- a/meta/recipes-graphics/mesa/mesa_21.3.1.bb
+++ /dev/null
@@ -1,5 +0,0 @@
-require ${BPN}.inc
-DRIDRIVERS ??= ""
-DRIDRIVERS:append:x86:class-target = ",r100,r200,nouveau,i965"
-DRIDRIVERS:append:x86-64:class-target = ",r100,r200,nouveau,i965"
-
diff --git a/meta/recipes-graphics/mesa/mesa_21.3.3.bb b/meta/recipes-graphics/mesa/mesa_21.3.3.bb
new file mode 100644
index 0000000000..4cb7e80eb5
--- /dev/null
+++ b/meta/recipes-graphics/mesa/mesa_21.3.3.bb
@@ -0,0 +1,5 @@
+require ${BPN}.inc
+DRIDRIVERS ??= ""
+DRIDRIVERS:append:x86:class-target = ",r100,r200,nouveau,i965"
+DRIDRIVERS:append:x86-64:class-target = ",r100,r200,nouveau,i965"
+
-- 
cgit v1.2.3-54-g00ecf