diff --git a/ports/mesa/clang.patch b/ports/mesa/clang.patch
deleted file mode 100644
index b8c7b547af..0000000000
--- a/ports/mesa/clang.patch
+++ /dev/null
@@ -1,52 +0,0 @@
-diff --git a/meson.build b/meson.build
-index 53ec2c2ef95e65447dd0f0eb65c0f92a5906590d..c124b5fb0d2b28424f33aac54cd4f87c4249dc40 100644
---- a/meson.build
-+++ b/meson.build
-@@ -1087,7 +1087,18 @@ elif host_machine.system() == 'windows'
-       '-DNOMINMAX',
-     ]
-   else
--    pre_args += ['-D__MSVCRT_VERSION__=0x0700']
-+    # When the target is not mingw/ucrt
-+    # NOTE: clang's stddef.h are conflict with mingw/ucrt's stddef.h
-+    # So do not include headers that defined in clang for detecting
-+    # _UCRT
-+    if cc.compiles('''
-+      #include <string.h>
-+      #if defined(__MINGW32__) && defined(_UCRT)
-+      #error
-+      #endif
-+      int main(void) { return 0; }''')
-+      pre_args += ['-D__MSVCRT_VERSION__=0x0700']
-+    endif
-   endif
- elif host_machine.system() == 'openbsd'
-   pre_args += '-D_ISOC11_SOURCE'
-diff --git a/src/compiler/nir/nir_lower_atomics_to_ssbo.c b/src/compiler/nir/nir_lower_atomics_to_ssbo.c
-index c1799d0b9d0af70148928a4b224172c188c64194..448f63bdc7cc3b9cae123e3c0abe79b4b5af380b 100644
---- a/src/compiler/nir/nir_lower_atomics_to_ssbo.c
-+++ b/src/compiler/nir/nir_lower_atomics_to_ssbo.c
-@@ -27,10 +27,6 @@
- #include "nir.h"
- #include "nir_builder.h"
- 
--#if defined(_WIN32) && !defined(snprintf)
--#define snprintf _snprintf
--#endif
--
- /*
-  * Remap atomic counters to SSBOs, starting from the shader's next SSBO slot
-  * (info.num_ssbos).
-diff --git a/src/compiler/spirv/vtn_private.h b/src/compiler/spirv/vtn_private.h
-index b1b40c8ee992eaeea985c58f4e8923724c1d385b..6053c2544a2628300cc8dc3311c8e4f0f69d36d5 100644
---- a/src/compiler/spirv/vtn_private.h
-+++ b/src/compiler/spirv/vtn_private.h
-@@ -41,7 +41,7 @@ struct vtn_builder;
- struct vtn_decoration;
- 
- /* setjmp/longjmp is broken on MinGW: https://sourceforge.net/p/mingw-w64/bugs/406/ */
--#ifdef __MINGW32__
-+#if defined(__MINGW32__) && !defined(_UCRT)
-   #define vtn_setjmp __builtin_setjmp
-   #define vtn_longjmp __builtin_longjmp
- #else
diff --git a/ports/mesa/portfile.cmake b/ports/mesa/portfile.cmake
index 03ee3c3d99..1e29f998da 100644
--- a/ports/mesa/portfile.cmake
+++ b/ports/mesa/portfile.cmake
@@ -5,8 +5,6 @@
 set(PATCHES
     # Fix symbols exporting for MinGW GCC x86
     def-fixes.patch
-    # Fix MinGW clang build
-    clang.patch
     # Clover build on Windows
     clover.patch
 )
@@ -20,8 +18,8 @@ vcpkg_from_gitlab(
     GITLAB_URL https://gitlab.freedesktop.org
     OUT_SOURCE_PATH SOURCE_PATH
     REPO mesa/mesa
-    REF mesa-22.0.2
-    SHA512 1139bae1fa9f9b49727c5aaddad9b2908c7643d7c6c435544e8322c84d17c012f04aa73876bef8cab9b517e36957eb2a678b3001da2d69a32497ef4569f6172e
+    REF mesa-22.1.7
+    SHA512 41302fc55ef429c14b1595832db3a898380230f86d2b84ac1ae3bd453d0aad87ec7ad310004dc64fcf34f58d8ea2736c13971c04eba056bcc549a4e3cc7c9470
     FILE_DISAMBIGUATOR 1
     HEAD_REF master
     PATCHES ${PATCHES}
@@ -63,7 +61,12 @@ list(APPEND MESA_OPTIONS -Dvalgrind=disabled)
 list(APPEND MESA_OPTIONS -Dglvnd=false)
 list(APPEND MESA_OPTIONS -Dglx=disabled)
 list(APPEND MESA_OPTIONS -Dgbm=disabled)
-list(APPEND MESA_OPTIONS -Dosmesa=true)
+
+if("offscreen" IN_LIST FEATURES)
+    list(APPEND MESA_OPTIONS -Dosmesa=true)
+else()
+    list(APPEND MESA_OPTIONS -Dosmesa=false)
+endif()
 
 if("llvm" IN_LIST FEATURES)
     list(APPEND MESA_OPTIONS -Dllvm=enabled)
diff --git a/ports/mesa/vcpkg.json b/ports/mesa/vcpkg.json
index 6218984c0b..4fd11853b2 100644
--- a/ports/mesa/vcpkg.json
+++ b/ports/mesa/vcpkg.json
@@ -1,6 +1,6 @@
 {
   "name": "mesa",
-  "version": "22.0.2",
+  "version": "22.1.7",
   "description": "Mesa - The 3D Graphics Library",
   "homepage": "https://www.mesa3d.org/",
   "license": "MIT AND BSL-1.0 AND SGI-B-2.0",
@@ -89,11 +89,39 @@
           "name": "llvm",
           "default-features": false,
           "features": [
+            "enable-rtti",
             "libclc"
           ]
+        },
+        {
+          "name": "llvm",
+          "default-features": false,
+          "features": [
+            "target-arm"
+          ],
+          "platform": "arm32"
+        },
+        {
+          "name": "llvm",
+          "default-features": false,
+          "features": [
+            "target-aarch64"
+          ],
+          "platform": "arm64"
+        },
+        {
+          "name": "llvm",
+          "default-features": false,
+          "features": [
+            "target-x86"
+          ],
+          "platform": "x64 | x86"
         }
       ]
     },
+    "offscreen": {
+      "description": "Build with support for offscreen rendering (OSMesa)"
+    },
     "opengl": {
       "description": "Build support for OpenGL (all versions)",
       "dependencies": [
diff --git a/versions/baseline.json b/versions/baseline.json
index 8d82bdd510..46079e67fc 100644
--- a/versions/baseline.json
+++ b/versions/baseline.json
@@ -4629,7 +4629,7 @@
       "port-version": 2
     },
     "mesa": {
-      "baseline": "22.0.2",
+      "baseline": "22.1.7",
       "port-version": 0
     },
     "meschach": {
diff --git a/versions/m-/mesa.json b/versions/m-/mesa.json
index 47f3b1968e..9151abe24e 100644
--- a/versions/m-/mesa.json
+++ b/versions/m-/mesa.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "7febde5a35ffc0cc975e25219121f5dc7048e0ef",
+      "version": "22.1.7",
+      "port-version": 0
+    },
     {
       "git-tree": "7df282d97d0ef5ec5a19b770dced8cd773e570c0",
       "version": "22.0.2",