From 8713ed9c6645e5bc312ccfff02bcef6a486024d2 Mon Sep 17 00:00:00 2001
From: SupervisedThinking <supervisedthinking@gmail.com>
Date: Thu, 25 Mar 2021 02:28:51 +0100
Subject: [PATCH] mesa: updated to 21.0.1

- renamed backported lima patch https://github.com/mesa3d/mesa/commit/696b0ab2c923024c865fa0ffdf725b2d4b6328d0
---
 packages/graphics/mesa/package.mk                          | 6 +++---
 ....01-lima-always-set-stride-in-texture-descriptor.patch} | 7 +++----
 2 files changed, 6 insertions(+), 7 deletions(-)
 rename packages/graphics/mesa/patches/{0001-lima-always-set-stride-in-texture-descriptor.patch => mesa-999.01-lima-always-set-stride-in-texture-descriptor.patch} (86%)

diff --git a/packages/graphics/mesa/package.mk b/packages/graphics/mesa/package.mk
index dd450d5c8b..348bfded3e 100644
--- a/packages/graphics/mesa/package.mk
+++ b/packages/graphics/mesa/package.mk
@@ -3,8 +3,8 @@
 # Copyright (C) 2018-present Team LibreELEC (https://libreelec.tv)
 
 PKG_NAME="mesa"
-PKG_VERSION="20.3.4"
-PKG_SHA256="dc21a987ec1ff45b278fe4b1419b1719f1968debbb80221480e44180849b4084"
+PKG_VERSION="21.0.1"
+PKG_SHA256="379fc984459394f2ab2d84049efdc3a659869dc1328ce72ef0598506611712bb"
 PKG_LICENSE="OSS"
 PKG_SITE="http://www.mesa3d.org/"
 PKG_URL="https://mesa.freedesktop.org/archive/mesa-${PKG_VERSION}.tar.xz"
@@ -32,7 +32,7 @@ PKG_MESON_OPTS_TARGET="-Ddri-drivers=${DRI_DRIVERS// /,} \
                        -Dlmsensors=disabled \
                        -Dbuild-tests=false \
                        -Dselinux=false \
-                       -Dosmesa=none"
+                       -Dosmesa=false"
 
 if [ "${DISPLAYSERVER}" = "x11" ]; then
   PKG_DEPENDS_TARGET+=" xorgproto libXext libXdamage libXfixes libXxf86vm libxcb libX11 libxshmfence libXrandr libglvnd"
diff --git a/packages/graphics/mesa/patches/0001-lima-always-set-stride-in-texture-descriptor.patch b/packages/graphics/mesa/patches/mesa-999.01-lima-always-set-stride-in-texture-descriptor.patch
similarity index 86%
rename from packages/graphics/mesa/patches/0001-lima-always-set-stride-in-texture-descriptor.patch
rename to packages/graphics/mesa/patches/mesa-999.01-lima-always-set-stride-in-texture-descriptor.patch
index 3c3f06c725..f2e199ee2b 100644
--- a/packages/graphics/mesa/patches/0001-lima-always-set-stride-in-texture-descriptor.patch
+++ b/packages/graphics/mesa/patches/mesa-999.01-lima-always-set-stride-in-texture-descriptor.patch
@@ -1,4 +1,4 @@
-From 9e361182db9ebca3514c055563f8ac459409ec7a Mon Sep 17 00:00:00 2001
+From 696b0ab2c923024c865fa0ffdf725b2d4b6328d0 Mon Sep 17 00:00:00 2001
 From: Erico Nunes <nunes.erico@gmail.com>
 Date: Mon, 1 Feb 2021 01:27:50 +0100
 Subject: [PATCH] lima: always set stride in texture descriptor
@@ -9,6 +9,8 @@ straightforward to detect the need to specify stride by checking the
 buffer width (e.g. imported dmabuf to be used as texture).
 
 Signed-off-by: Erico Nunes <nunes.erico@gmail.com>
+Reviewed-by: Vasily Khoruzhick <anarsoul@gmail.com>
+Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/8549>
 ---
  src/gallium/drivers/lima/lima_texture.c | 7 ++-----
  1 file changed, 2 insertions(+), 5 deletions(-)
@@ -31,6 +33,3 @@ index 4ac363178a9..7079865a3b5 100644
        layout = 0;
     }
  
--- 
-2.25.1
-