LLVM setLangDefaults moved from clangFrontend to clangBasic

3 files changed, 26 insertions, 5 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 0eb9187e7a5b..23d30849562e 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.151511.80a29748268.40c467925f262c73b1da24b1dff22a4e
+	pkgver = 22.1.0_devel.152249.3ac73838433.d41d8cd98f00b204e9800998ecf8427e
 	pkgrel = 1
 	url = https://www.mesa3d.org
 	arch = x86_64
@@ -62,9 +62,12 @@ pkgbase = mesa-git
 	conflicts = mesa-libgl
 	source = mesa::git+https://gitlab.freedesktop.org/mesa/mesa.git#branch=main
 	source = LICENSE
+	source = clover-compat.patch
 	md5sums = SKIP
 	md5sums = 5c65a0fe315dd347e09b1f2826a1df5a
+	md5sums = 66105b07e15f9e4f0dd614b75da18230
 	sha512sums = SKIP
 	sha512sums = 25da77914dded10c1f432ebcbf29941124138824ceecaf1367b3deedafaecabc082d463abcfa3d15abff59f177491472b505bcb5ba0c4a51bb6b93b4721a23c2
+	sha512sums = b738961ef89c49e2699749a3eb2deb0dfd3c7fd0e27e7ea0006894ab44770349e27edbec36c22351704341207a63ee23614f2fb5b01e2f1c2efc36230807716a
 
 pkgname = mesa-git
diff --git a/PKGBUILD b/PKGBUILD
index 44a1776a3f31..7133e892ec4d 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.151514.a5884df949e.d41d8cd98f00b204e9800998ecf8427e
+pkgver=22.2.0_devel.152593.5f09ee77a15.22efc1fc44e0c04a8ab8a28a8733428c
 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-compat.patch')
 md5sums=('SKIP'
-         '5c65a0fe315dd347e09b1f2826a1df5a')
+         '5c65a0fe315dd347e09b1f2826a1df5a'
+         '66105b07e15f9e4f0dd614b75da18230')
 sha512sums=('SKIP'
-            '25da77914dded10c1f432ebcbf29941124138824ceecaf1367b3deedafaecabc082d463abcfa3d15abff59f177491472b505bcb5ba0c4a51bb6b93b4721a23c2')
+            '25da77914dded10c1f432ebcbf29941124138824ceecaf1367b3deedafaecabc082d463abcfa3d15abff59f177491472b505bcb5ba0c4a51bb6b93b4721a23c2'
+            'b738961ef89c49e2699749a3eb2deb0dfd3c7fd0e27e7ea0006894ab44770349e27edbec36c22351704341207a63ee23614f2fb5b01e2f1c2efc36230807716a')
 
 # 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-compat.patch b/clover-compat.patch
new file mode 100644
index 000000000000..2bea158d9eef
--- /dev/null
+++ b/clover-compat.patch
@@ -0,0 +1,15 @@
+diff '--color=auto' --unified --recursive --text a/src/gallium/frontends/clover/llvm/compat.hpp b/src/gallium/frontends/clover/llvm/compat.hpp
+--- a/src/gallium/frontends/clover/llvm/compat.hpp	2022-04-19 23:49:42.251266139 +0200
++++ b/src/gallium/frontends/clover/llvm/compat.hpp	2022-04-19 23:54:43.593411170 +0200
+@@ -102,7 +102,11 @@
+                                     clang::InputKind ik, const ::llvm::Triple& triple,
+                                     clang::LangStandard::Kind d)
+          {
++#if LLVM_VERSION_MAJOR >= 15
++            c->getLangOpts().setLangDefaults(c->getLangOpts(), ik.getLanguage(), triple,
++#else
+             c->getInvocation().setLangDefaults(c->getLangOpts(), ik, triple,
++#endif
+ #if LLVM_VERSION_MAJOR >= 12
+                                                c->getPreprocessorOpts().Includes,
+ #else