From f43453ad84d00b77c567f0ba8acd34cf36e52552 Mon Sep 17 00:00:00 2001
From: Reza Jahanbakhshi <reza.jahanbakhshi@gmail.com>
Date: Thu, 17 Feb 2022 09:20:21 +0100
Subject: [PATCH] Added a patch to workaround clover build failure.

---
 .SRCINFO            |  3 ++-
 PKGBUILD            | 11 +++++++----
 clover-common.patch | 22 ++++++++++++++++++++++
 3 files changed, 31 insertions(+), 5 deletions(-)
 create mode 100644 clover-common.patch

diff --git a/.SRCINFO b/.SRCINFO
index 122a5ad..0c5fb28 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = mesa-git
 	pkgdesc = an open-source implementation of the OpenGL specification, git version
-	pkgver = 22.1.0_devel.149926.4c61c8a0b85.d41d8cd98f00b204e9800998ecf8427e
+	pkgver = 22.1.0_devel.150214.eebe298a878.d41d8cd98f00b204e9800998ecf8427e
 	pkgrel = 1
 	url = https://www.mesa3d.org
 	arch = x86_64
@@ -62,6 +62,7 @@ pkgbase = mesa-git
 	conflicts = mesa-libgl
 	source = mesa::git+https://gitlab.freedesktop.org/mesa/mesa.git#branch=main
 	source = LICENSE
+	source = clover-common.patch
 	md5sums = SKIP
 	md5sums = 5c65a0fe315dd347e09b1f2826a1df5a
 	sha512sums = SKIP
diff --git a/PKGBUILD b/PKGBUILD
index ad641d1..819a3da 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -12,7 +12,7 @@
 
 pkgname=mesa-git
 pkgdesc="an open-source implementation of the OpenGL specification, git version"
-pkgver=22.1.0_devel.149926.4c61c8a0b85.d41d8cd98f00b204e9800998ecf8427e
+pkgver=22.1.0_devel.150237.9ef8af357dd.8bc02d9b7565c5f9961ae3bb7f058d35
 pkgrel=1
 arch=('x86_64')
 makedepends=('git' 'python-mako' 'xorgproto'
@@ -26,11 +26,14 @@ conflicts=('mesa' 'opencl-mesa' 'vulkan-intel' 'vulkan-radeon' 'vulkan-mesa-laye
 url="https://www.mesa3d.org"
 license=('custom')
 source=('mesa::git+https://gitlab.freedesktop.org/mesa/mesa.git#branch=main'
-        'LICENSE')
+        'LICENSE'
+        'clover-common.patch')
 md5sums=('SKIP'
-         '5c65a0fe315dd347e09b1f2826a1df5a')
+         '5c65a0fe315dd347e09b1f2826a1df5a'
+         'd6f0a1dba657afd1f593353c02fe2293')
 sha512sums=('SKIP'
-            '25da77914dded10c1f432ebcbf29941124138824ceecaf1367b3deedafaecabc082d463abcfa3d15abff59f177491472b505bcb5ba0c4a51bb6b93b4721a23c2')
+            '25da77914dded10c1f432ebcbf29941124138824ceecaf1367b3deedafaecabc082d463abcfa3d15abff59f177491472b505bcb5ba0c4a51bb6b93b4721a23c2'
+            '6f46745cf78460dece4b3104a244abe2a9b691b22530e4071f00a6f5ed5823b98176ba99855c34afe474f13c6e112371d9ff4e41e2fa58dd8841387c559e86bd')
 
 # NINJAFLAGS is an env var used to pass commandline options to ninja
 # NOTE: It's your responbility to validate the value of $NINJAFLAGS. If unsure, don't set it.
diff --git a/clover-common.patch b/clover-common.patch
new file mode 100644
index 0000000..ced1113
--- /dev/null
+++ b/clover-common.patch
@@ -0,0 +1,22 @@
+diff --git a/src/gallium/frontends/clover/llvm/codegen/common.cpp b/src/gallium/frontends/clover/llvm/codegen/common.cpp
+index ff87d9c2a0a..a95da068b1f 100644
+--- a/src/gallium/frontends/clover/llvm/codegen/common.cpp
++++ b/src/gallium/frontends/clover/llvm/codegen/common.cpp
+@@ -203,7 +203,7 @@ namespace {
+             // Other types.
+             const auto actual_type =
+                isa< ::llvm::PointerType>(arg_type) && arg.hasByValAttr() ?
+-               cast< ::llvm::PointerType>(arg_type)->getElementType() : arg_type;
++               cast< ::llvm::PointerType>(arg_type)->getPointerElementType() : arg_type;
+ 
+             if (actual_type->isPointerTy()) {
+                const unsigned address_space =
+@@ -214,7 +214,7 @@ namespace {
+                            static_cast<unsigned>(clang::LangAS::opencl_local);
+                if (address_space == map[offset]) {
+                   const auto pointee_type = cast<
+-                     ::llvm::PointerType>(actual_type)->getElementType();
++                     ::llvm::PointerType>(actual_type)->getPointerElementType();
+                   args.emplace_back(binary::argument::local, arg_api_size,
+                                     target_size,
+                                     dl.getABITypeAlignment(pointee_type),