From e8a7f4b2f19794df896f6e653eaadc47353d40c5 Mon Sep 17 00:00:00 2001
From: Lone_Wolf <lone_wolf@klaas-de-kat.nl>
Date: Fri, 21 Aug 2020 23:21:02 +0200
Subject: [PATCH] building without asserts ( b_ndebug=true) works again with
 gcc 10.2.0

---
 .SRCINFO |  8 +++-----
 PKGBUILD | 12 ++++++------
 2 files changed, 9 insertions(+), 11 deletions(-)

diff --git a/.SRCINFO b/.SRCINFO
index a923088..3da98d8 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = mesa-git
 	pkgdesc = an open-source implementation of the OpenGL specification, git version
-	pkgver = 20.3.0_devel.127075.6723addd8a7
+	pkgver = 20.3.0_devel.127495.2da1178bf3e
 	pkgrel = 1
 	url = https://www.mesa3d.org
 	arch = x86_64
@@ -13,14 +13,12 @@ pkgbase = mesa-git
 	makedepends = libvdpau
 	makedepends = libva
 	makedepends = elfutils
-	makedepends = libomxil-bellagio
 	makedepends = libxrandr
 	makedepends = ocl-icd
-	makedepends = libgcrypt
-	makedepends = wayland
 	makedepends = wayland-protocols
 	makedepends = meson
 	makedepends = ninja
+	makedepends = glslang
 	makedepends = llvm=10.0.1
 	makedepends = clang=10.0.1
 	depends = libdrm
@@ -34,9 +32,9 @@ pkgbase = mesa-git
 	depends = wayland
 	depends = lm_sensors
 	depends = libclc
-	depends = glslang
 	depends = vulkan-icd-loader
 	depends = zstd
+	depends = expat
 	depends = llvm-libs=10.0.1
 	optdepends = opengl-man-pages: for the OpenGL API man pages
 	optdepends = clang: opencl
diff --git a/PKGBUILD b/PKGBUILD
index e2272eb..1cfa899 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -11,14 +11,14 @@
 
 pkgname=mesa-git
 pkgdesc="an open-source implementation of the OpenGL specification, git version"
-pkgver=20.3.0_devel.127075.6723addd8a7
+pkgver=20.3.0_devel.127495.2da1178bf3e
 pkgrel=1
 arch=('x86_64')
 makedepends=('git' 'python-mako' 'xorgproto'
-              'libxml2' 'libx11'  'libvdpau' 'libva' 'elfutils' 'libomxil-bellagio' 'libxrandr'
-              'ocl-icd' 'libgcrypt'  'wayland' 'wayland-protocols' 'meson' 'ninja')
+              'libxml2' 'libx11'  'libvdpau' 'libva' 'elfutils' 'libxrandr'
+              'ocl-icd' 'wayland-protocols' 'meson' 'ninja' 'glslang')
 depends=('libdrm' 'libxxf86vm' 'libxdamage' 'libxshmfence' 'libelf'
-         'libomxil-bellagio' 'libunwind' 'libglvnd' 'wayland' 'lm_sensors' 'libclc' 'glslang' 'vulkan-icd-loader' 'zstd')
+         'libomxil-bellagio' 'libunwind' 'libglvnd' 'wayland' 'lm_sensors' 'libclc' 'vulkan-icd-loader' 'zstd' 'expat')
 optdepends=('opengl-man-pages: for the OpenGL API man pages')
 provides=('mesa' 'opencl-mesa' 'vulkan-intel' 'vulkan-radeon' 'vulkan-mesa-layer' 'libva-mesa-driver' 'mesa-vdpau' 'vulkan-driver' 'opengl-driver' 'opencl-driver')
 conflicts=('mesa' 'opencl-mesa' 'vulkan-intel' 'vulkan-radeon' 'vulkan-mesa-layer' 'libva-mesa-driver' 'mesa-vdpau')
@@ -61,7 +61,7 @@ case $MESA_WHICH_LLVM in
         # depending on aur-llvm-* to avoid mixup with LH llvm-git
         makedepends+=('aur-llvm-git')
         depends+=('aur-llvm-libs-git')
-        optdepends+=('llvm-git: opencl')
+        optdepends+=('aur-llvm-git: opencl')
         ;;
     3)
         # mesa-git/llvm-git (lordheavy unofficial repo)
@@ -98,7 +98,7 @@ prepare() {
 
 build () {
     meson setup mesa _build \
-       -D b_ndebug=false \
+       -D b_ndebug=true \
        -D b_lto=true \
        -D buildtype=plain \
        --wrap-mode=nofallback \