mesa: bump to 21.2.0

6 files changed, 31 insertions, 12 deletions

diff --git a/extra/mesa/build b/extra/mesa/build
index e640260e..38e0e437 100755
--- a/extra/mesa/build
+++ b/extra/mesa/build
@@ -29,13 +29,8 @@ 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
-)
+# Force byacc even if bison is installed
+patch -p1 < force-byacc.patch
 
 meson \
     --prefix=/usr \
diff --git a/extra/mesa/checksums b/extra/mesa/checksums
index 9c10eea7..11ccef67 100644
--- a/extra/mesa/checksums
+++ b/extra/mesa/checksums
@@ -1,2 +1,3 @@
-f38ba85c657a9670d92525c48c5910d43e96a9871fbfe3ccd5b84282d9bedb6f  mesa-21.1.6.tar.gz
+05a42a8f6324eec9bdf2a6ac8c957799d4437617018cff6879668bc1281b0128  mesa-21.2.0.tar.gz
 2984a6733e1d472796ceef37ad48c26f4a984bb18119bb2dbc37a44d8f6e75a4  Mako-1.1.1.tar.gz
+b4047f7afb3bcccebb9c949049c7ffd4a020edbd1fc66ae996d8fecaad827b48  force-byacc.patch
diff --git a/extra/mesa/depends b/extra/mesa/depends
index 98634462..582eef94 100644
--- a/extra/mesa/depends
+++ b/extra/mesa/depends
@@ -1,4 +1,3 @@
-bison        make
 expat
 flex         make
 libX11
@@ -12,7 +11,6 @@ libelf
 libxcb
 libxshmfence
 llvm
-m4           make
 meson        make
 python       make
 xorgproto
diff --git a/extra/mesa/patches/force-byacc.patch b/extra/mesa/patches/force-byacc.patch
new file mode 100644
index 00000000..9e649c0e
--- /dev/null
+++ b/extra/mesa/patches/force-byacc.patch
@@ -0,0 +1,24 @@
+--- meson.build.orig	Mon Aug  9 21:05:49 2021
++++ meson.build	Mon Aug  9 21:07:48 2021
+@@ -1821,19 +1821,8 @@
+     prog_bison = find_program('bison', 'yacc', required : with_any_opengl)
+   endif
+ else
+-  prog_bison = find_program('bison', required : false)
+-
+-  if not prog_bison.found()
+-    prog_bison = find_program('byacc', required : with_any_opengl)
+-    yacc_is_bison = false
+-  endif
+-
+-  # Disable deprecated keyword warnings, since we have to use them for
+-  # old-bison compat.  See discussion in
+-  # https://gitlab.freedesktop.org/mesa/mesa/merge_requests/2161
+-  if find_program('bison', required : false, version : '> 2.3').found()
+-    prog_bison = [prog_bison, '-Wno-deprecated']
+-  endif
++  prog_bison = find_program('byacc', required : with_any_opengl)
++  yacc_is_bison = false
+ 
+   prog_flex = find_program('flex', required : with_any_opengl)
+   prog_flex_cpp = prog_flex
diff --git a/extra/mesa/sources b/extra/mesa/sources
index 5da8f72f..49c7c7d3 100644
--- a/extra/mesa/sources
+++ b/extra/mesa/sources
@@ -1,2 +1,3 @@
-https://github.com/mesa3d/mesa/archive/mesa-21.1.6.tar.gz
+https://github.com/mesa3d/mesa/archive/mesa-21.2.0.tar.gz
 https://files.pythonhosted.org/packages/source/M/Mako/Mako-1.1.1.tar.gz mako
+patches/force-byacc.patch
diff --git a/extra/mesa/version b/extra/mesa/version
index f0c493ca..f3527125 100644
--- a/extra/mesa/version
+++ b/extra/mesa/version
@@ -1 +1 @@
-21.1.6 1
+21.2.0 2