diff --git a/sys-libs/mesa/mesa-21.3.7.recipe b/sys-libs/mesa/mesa-22.0.5.recipe
similarity index 95%
rename from sys-libs/mesa/mesa-21.3.7.recipe
rename to sys-libs/mesa/mesa-22.0.5.recipe
index f17831107..24a43a391 100644
--- a/sys-libs/mesa/mesa-21.3.7.recipe
+++ b/sys-libs/mesa/mesa-22.0.5.recipe
@@ -8,7 +8,7 @@ COPYRIGHT="1999-2022 Brian Paul"
 LICENSE="MIT"
 REVISION="1"
 SOURCE_URI="https://mesa.freedesktop.org/archive/mesa-${portVersion}.tar.xz"
-CHECKSUM_SHA256="b4fa9db7aa61bf209ef0b40bef83080999d86ad98df8b8b4fada7c128a1efc3d"
+CHECKSUM_SHA256="5ee2dc06eff19e19b2867f12eb0db0905c9691c07974f6253f2f1443df4c7a35"
 SOURCE_DIR="mesa-${portVersion}"
 PATCHES="mesa-$portVersion.patchset"
 
@@ -32,7 +32,7 @@ PROVIDES="
 REQUIRES="
 	haiku$secondaryArchSuffix
 	lib:libz$secondaryArchSuffix
-	lib:libLLVM_9$secondaryArchSuffix
+	lib:libLLVM_12$secondaryArchSuffix
 	lib:libexpat$secondaryArchSuffix
 	"
 
@@ -64,7 +64,7 @@ PROVIDES_swpipe="
 	"
 REQUIRES_swpipe="
 	mesa$secondaryArchSuffix == $portVersion base
-	lib:libLLVM_9$secondaryArchSuffix
+	lib:libLLVM_12$secondaryArchSuffix
 	"
 
 SUMMARY_lavapipe="Vulkan software rasteriser driver"
@@ -75,13 +75,13 @@ PROVIDES_lavapipe="
 	mesa${secondaryArchSuffix}_lavapipe = $portVersion
 	"
 REQUIRES_lavapipe="
-	lib:libLLVM_9$secondaryArchSuffix
+	lib:libLLVM_12$secondaryArchSuffix
 	"
 
 BUILD_REQUIRES="
 	haiku${secondaryArchSuffix}_devel
 	devel:libz$secondaryArchSuffix
-	devel:libLLVM_9$secondaryArchSuffix
+	devel:libLLVM_12$secondaryArchSuffix
 	devel:libexpat$secondaryArchSuffix
 	devel:libvulkan$secondaryArchSuffix
 	"
@@ -94,7 +94,7 @@ BUILD_PREREQUIRES="
 	cmd:flex
 	cmd:meson
 	cmd:git
-	cmd:llvm_config >= 9
+	cmd:llvm_config >= 12
 	cmd:egrep
 	cmd:gcc$secondaryArchSuffix
 	cmd:ld$secondaryArchSuffix
diff --git a/sys-libs/mesa/patches/mesa-21.3.7.patchset b/sys-libs/mesa/patches/mesa-22.0.5.patchset
similarity index 94%
rename from sys-libs/mesa/patches/mesa-21.3.7.patchset
rename to sys-libs/mesa/patches/mesa-22.0.5.patchset
index 91deb1e09..79b8bd634 100644
--- a/sys-libs/mesa/patches/mesa-21.3.7.patchset
+++ b/sys-libs/mesa/patches/mesa-22.0.5.patchset
@@ -1,4 +1,4 @@
-From 7adad87f6f7237a19ef486d66481fe9735dffcee Mon Sep 17 00:00:00 2001
+From 409a1320c8fdbb7b21f01a3db5f8c56e1625e495 Mon Sep 17 00:00:00 2001
 From: Gerasim Troeglazov <3dEyes@gmail.com>
 Date: Sun, 8 Aug 2021 22:34:39 +1000
 Subject: Fix build for Haiku
@@ -44,7 +44,7 @@ index e93e8c6..5bef62c 100644
        }
     }
 diff --git a/src/util/u_thread.h b/src/util/u_thread.h
-index 013e8be..a80c2f7 100644
+index a421545..d138cc9 100644
 --- a/src/util/u_thread.h
 +++ b/src/util/u_thread.h
 @@ -43,10 +43,6 @@
@@ -70,7 +70,7 @@ index 013e8be..a80c2f7 100644
  /* For util_set_thread_affinity to size the mask. */
  #define UTIL_MAX_CPUS               1024  /* this should be enough */
  #define UTIL_MAX_L3_CACHES          UTIL_MAX_CPUS
-@@ -359,11 +360,13 @@ static inline void util_barrier_wait(util_barrier *barrier)
+@@ -357,11 +358,13 @@ static inline bool util_barrier_wait(util_barrier *barrier)
   * way), so thread_id's provide an alternative mechanism
   */
  
@@ -84,7 +84,7 @@ index 013e8be..a80c2f7 100644
  
  static inline thread_id
  util_get_thread_id(void)
-@@ -377,6 +380,8 @@ util_get_thread_id(void)
+@@ -375,6 +378,8 @@ util_get_thread_id(void)
      */
  #ifdef _WIN32
     return GetCurrentThreadId();
@@ -93,7 +93,7 @@ index 013e8be..a80c2f7 100644
  #else
     return thrd_current();
  #endif
-@@ -386,7 +391,7 @@ util_get_thread_id(void)
+@@ -384,7 +389,7 @@ util_get_thread_id(void)
  static inline int
  util_thread_id_equal(thread_id t1, thread_id t2)
  {
@@ -103,10 +103,10 @@ index 013e8be..a80c2f7 100644
  #else
     return thrd_equal(t1, t2);
 -- 
-2.30.2
+2.36.1
 
 
-From 01bf3fa56f3d9514229fadbd20164190f413d42f Mon Sep 17 00:00:00 2001
+From 436a579259023ce3e5b0be1f0bbdfca6eae90ca2 Mon Sep 17 00:00:00 2001
 From: Gerasim Troeglazov <3dEyes@gmail.com>
 Date: Sun, 8 Aug 2021 22:35:54 +1000
 Subject: Add any color_space support
@@ -238,10 +238,10 @@ index 96f19ae..6939e53 100644
  				dstClip.Shift(-fInfo->window_bounds.left, -fInfo->window_bounds.top);
  				dstClip.Blit(srcBuf);
 -- 
-2.30.2
+2.36.1
 
 
-From 5141f202c9784f42c5f9d16500adb8a99bb6e81c Mon Sep 17 00:00:00 2001
+From 0d3ec4fa641154b41b380c1a5de0cc69fc8de89a Mon Sep 17 00:00:00 2001
 From: X512 <danger_mail@list.ru>
 Date: Mon, 7 Feb 2022 13:01:04 +0900
 Subject: osmesa: fix framebuffer leak on resize
@@ -263,10 +263,10 @@ index 91a250d..9f08709 100644
  
     if (!osmesa->current_buffer) {
 -- 
-2.30.2
+2.36.1
 
 
-From d263cfa0f4dc6e2b37048d5d1dd4b16c329ae706 Mon Sep 17 00:00:00 2001
+From aca7ef315d1ed9ee79ed7c4ba54e63a32c8b5ed5 Mon Sep 17 00:00:00 2001
 From: X512 <danger_mail@list.ru>
 Date: Mon, 7 Feb 2022 15:06:17 +0900
 Subject: Fix path for lavapipe module
@@ -287,5 +287,5 @@ index 1648118..ddab474 100644
  lvp_icd = custom_target(
    'lvp_icd',
 -- 
-2.30.2
+2.36.1