diff --git a/.SRCINFO b/.SRCINFO
index 0cee5af..1839c60 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.2.0_devel.152593.5f09ee77a15.22efc1fc44e0c04a8ab8a28a8733428c
+	pkgver = 22.2.0_devel.153422.cfec9a55ea6.6aa0994e8686145503079d47a8bd2ae8
 	pkgrel = 1
 	url = https://www.mesa3d.org
 	arch = x86_64
@@ -62,15 +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
 	source = workaround--LLVM15-FTBFS-no-more-Coroutines.h.patch
 	md5sums = SKIP
 	md5sums = 5c65a0fe315dd347e09b1f2826a1df5a
-	md5sums = 66105b07e15f9e4f0dd614b75da18230
 	md5sums = a4e1e8a8a90b6434b80d8ec859747e0c
 	sha512sums = SKIP
 	sha512sums = 25da77914dded10c1f432ebcbf29941124138824ceecaf1367b3deedafaecabc082d463abcfa3d15abff59f177491472b505bcb5ba0c4a51bb6b93b4721a23c2
-	sha512sums = b738961ef89c49e2699749a3eb2deb0dfd3c7fd0e27e7ea0006894ab44770349e27edbec36c22351704341207a63ee23614f2fb5b01e2f1c2efc36230807716a
 	sha512sums = ee96c9c3c29cfd7bffc1ee72fecf6bdd9a4ac7245afa11e7b28432e8695fc9d16d241cb8330029e5460cc54898258b87bc73d99fc1bf9743ce9bb718a85f5806
 
 pkgname = mesa-git
diff --git a/PKGBUILD b/PKGBUILD
index c4669ba..f6ace0a 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.2.0_devel.153080.53fe6f10846.6aa0994e8686145503079d47a8bd2ae8
+pkgver=22.2.0_devel.153440.ad864a7c150.3cc0e974fa373c7b4680878df5ed6e21
 pkgrel=1
 arch=('x86_64')
 makedepends=('git' 'python-mako' 'xorgproto'
@@ -27,15 +27,12 @@ url="https://www.mesa3d.org"
 license=('custom')
 source=('mesa::git+https://gitlab.freedesktop.org/mesa/mesa.git#branch=main'
         'LICENSE'
-        'clover-compat.patch'
         'workaround--LLVM15-FTBFS-no-more-Coroutines.h.patch')
 md5sums=('SKIP'
          '5c65a0fe315dd347e09b1f2826a1df5a'
-         '66105b07e15f9e4f0dd614b75da18230'
          'a4e1e8a8a90b6434b80d8ec859747e0c')
 sha512sums=('SKIP'
             '25da77914dded10c1f432ebcbf29941124138824ceecaf1367b3deedafaecabc082d463abcfa3d15abff59f177491472b505bcb5ba0c4a51bb6b93b4721a23c2'
-            'b738961ef89c49e2699749a3eb2deb0dfd3c7fd0e27e7ea0006894ab44770349e27edbec36c22351704341207a63ee23614f2fb5b01e2f1c2efc36230807716a'
             'ee96c9c3c29cfd7bffc1ee72fecf6bdd9a4ac7245afa11e7b28432e8695fc9d16d241cb8330029e5460cc54898258b87bc73d99fc1bf9743ce9bb718a85f5806')
 
 # NINJAFLAGS is an env var used to pass commandline options to ninja
diff --git a/clover-compat.patch b/clover-compat.patch
deleted file mode 100644
index 2bea158..0000000
--- a/clover-compat.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-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