From 18c2513c2af381e5e302f5f046105e930b4bba72 Mon Sep 17 00:00:00 2001
From: Cem Keylan <cem@ckyln.com>
Date: Thu, 1 Apr 2021 15:52:19 +0300
Subject: Revert "Merge branch 'master' into libressl"

This reverts commit 11a05be4ac3bb1271762b1de1336124e7f7883e9, reversing
changes made to 83e38c53034aa640d582fa9598a34d4e33b031a4.
---
 extra/mesa/build     | 9 ---------
 extra/mesa/checksums | 2 +-
 extra/mesa/sources   | 2 +-
 extra/mesa/version   | 2 +-
 4 files changed, 3 insertions(+), 12 deletions(-)

(limited to 'extra/mesa')

diff --git a/extra/mesa/build b/extra/mesa/build
index e640260e..9d8984da 100755
--- a/extra/mesa/build
+++ b/extra/mesa/build
@@ -29,14 +29,6 @@ python3 bin/git_sha1_gen.py --output include/git_sha1.h
 platforms=x11
 cpt l wayland-protocols >/dev/null 2>&1 && platforms=$platforms,wayland
 
-# Fix broken radeon object links
-(
-    cd src/mesa/drivers/dri/r200
-    find . -type l | while read -r link; do
-        ln -sf "$PWD/../radeon/$link" "$link"
-    done
-)
-
 meson \
     --prefix=/usr \
     --sysconfdir=/etc \
@@ -44,7 +36,6 @@ meson \
     --localstatedir=/var \
     --buildtype=release \
     -Dplatforms="$platforms" \
-    -Dzstd=false \
     . output
 
 ninja -C output
diff --git a/extra/mesa/checksums b/extra/mesa/checksums
index d9a5158f..ebfd6ca7 100644
--- a/extra/mesa/checksums
+++ b/extra/mesa/checksums
@@ -1,2 +1,2 @@
-abe673eb92c62156f708ced5a9607573ba524eca2b6609d5fc16698ba5a09ed7  mesa-21.0.1.tar.gz
+9c899b165497ccf816042a271ec9931d548c0a7734fb08e9945f0e9c31188b15  mesa-20.3.4.tar.gz
 2984a6733e1d472796ceef37ad48c26f4a984bb18119bb2dbc37a44d8f6e75a4  Mako-1.1.1.tar.gz
diff --git a/extra/mesa/sources b/extra/mesa/sources
index f8b2041f..c5d4df2f 100644
--- a/extra/mesa/sources
+++ b/extra/mesa/sources
@@ -1,2 +1,2 @@
-https://github.com/mesa3d/mesa/archive/mesa-21.0.1.tar.gz
+https://github.com/mesa3d/mesa/archive/mesa-20.3.4.tar.gz
 https://files.pythonhosted.org/packages/source/M/Mako/Mako-1.1.1.tar.gz mako
diff --git a/extra/mesa/version b/extra/mesa/version
index 8ffdbf95..971bebb1 100644
--- a/extra/mesa/version
+++ b/extra/mesa/version
@@ -1 +1 @@
-21.0.1 1
+20.3.4 1
-- 
cgit v1.2.3