diff --git a/x11/library/mesa/actions.py b/x11/library/mesa/actions.py
index eb06bfa96d..cf3d44f67b 100644
--- a/x11/library/mesa/actions.py
+++ b/x11/library/mesa/actions.py
@@ -16,15 +16,14 @@ def setup():
                -Db_ndebug=true \
                -Dplatforms=x11,wayland \
                -Ddri3=enabled \
-               -Ddri-drivers=i915,i965,r100,r200,nouveau \
-               -Dgallium-drivers=r300,r600,nouveau,radeonsi,svga,swr,iris,swrast,virgl,crocus,zink \
+               -Dgallium-drivers=r300,r600,nouveau,radeonsi,svga,iris,swrast,virgl,crocus,zink \
                -Dgallium-extra-hud=true \
                -Dgallium-vdpau=enabled \
                -Dgallium-xvmc=enabled \
                -Dgallium-va=enabled \
                -Dgallium-xa=enabled \
                -Dgallium-nine=true \
-               -Dvulkan-drivers=amd,intel \
+               -Dvulkan-drivers=amd,intel,swrast \
                -D vulkan-layers=device-select,intel-nullhw,overlay \
                -Dshared-glapi=enabled \
                -Dgles1=enabled \
@@ -39,7 +38,6 @@ def setup():
                -Dlibunwind=enabled \
                -Dbuild-tests=false \
                -Dosmesa=true \
-               -Dswr-arches=avx,avx2 \
                -Dgallium-opencl=icd \
               " % (libdir)
 
diff --git a/x11/library/mesa/pspec.xml b/x11/library/mesa/pspec.xml
index 0a720d35f0..7a0d485721 100644
--- a/x11/library/mesa/pspec.xml
+++ b/x11/library/mesa/pspec.xml
@@ -13,7 +13,7 @@
         <IsA>app:console</IsA>
         <Summary>Mesa graphics libraries and utilities</Summary>
         <Description>Mesa is an open-source implementation of the OpenGL specification - a system for rendering interactive 3D graphics.</Description>
-        <Archive sha1sum="a891cab170a5914cec3e8aa0a6f3ec0f490ab0e9" type="tarxz">https://archive.mesa3d.org/mesa-21.3.8.tar.xz</Archive>
+        <Archive sha1sum="3216eb14c69e9d470cd27ceb2300f996392e711c" type="tarxz">https://archive.mesa3d.org/mesa-22.0.1.tar.xz</Archive>
         <BuildDependencies>
             <Dependency>meson</Dependency>
             <Dependency>valgrind-devel</Dependency>
@@ -66,8 +66,8 @@
             <AdditionalFile owner="root" permission="0644" target="crossfile.ini">crossfile.ini</AdditionalFile>
         </AdditionalFiles>
         <Patches>
-            <Patch level="1">swr-llvm13-patch1.patch</Patch>
-            <Patch level="1">swr-llvm13-patch2.patch</Patch>
+<!--             <Patch level="1">swr-llvm13-patch1.patch</Patch> -->
+<!--             <Patch level="1">swr-llvm13-patch2.patch</Patch> -->
         </Patches>
     </Source>
 
@@ -77,6 +77,7 @@
             <Dependency>zstd</Dependency>
             <Dependency>zlib</Dependency>
             <Dependency>expat</Dependency>
+            <Dependency>eudev</Dependency>
             <Dependency>libXv</Dependency>
             <Dependency>libX11</Dependency>
             <Dependency>libdrm</Dependency>
@@ -86,6 +87,7 @@
             <Dependency>libXvMC</Dependency>
             <Dependency>elfutils</Dependency>
             <Dependency>libXfixes</Dependency>
+            <Dependency>libunwind</Dependency>
             <Dependency>libXdamage</Dependency>
             <Dependency>libXxf86vm</Dependency>
             <Dependency>libdrm-amd</Dependency>
@@ -214,6 +216,7 @@
             <Dependency>elfutils-32bit</Dependency>
             <Dependency>openssl-32bit</Dependency>
             <Dependency>libgcc</Dependency>
+            <Dependency>eudev-32bit</Dependency>
             <Dependency>libxcb-32bit</Dependency>
             <Dependency>expat-32bit</Dependency>
             <Dependency>libX11-32bit</Dependency>
@@ -247,6 +250,13 @@
     </Package>
 
     <History>
+        <Update release="62">
+            <Date>2022-04-12</Date>
+            <Version>22.0.1</Version>
+            <Comment>Version bump.</Comment>
+            <Name>Mustafa Cinasal</Name>
+            <Email>muscnsl@gmail.com</Email>
+        </Update>
         <Update release="61">
             <Date>2022-03-19</Date>
             <Version>21.3.8</Version>