Index: introduction/welcome/changelog.xml
===================================================================
--- introduction/welcome/changelog.xml	(revision 5a7d1382bd390fc394a142ad1ac27cc7a53fbd54)
+++ introduction/welcome/changelog.xml	(revision bee072a0393d4b2d40d3240a66e2b07dbd98f26f)
@@ -42,4 +42,15 @@
     </listitem>
     -->
+
+    <listitem>
+      <para>May 31st, 2022</para>
+      <itemizedlist>
+        <listitem>
+          <para>[bdubbs] - Update to mesa-22.1.0. Fixes
+          <ulink url="&blfs-ticket-root;16214">#16214</ulink>.</para>
+        </listitem>
+      </itemizedlist>
+    </listitem>
+
     <listitem>
       <para>May 30th, 2022</para>
Index: packages.ent
===================================================================
--- packages.ent	(revision 5a7d1382bd390fc394a142ad1ac27cc7a53fbd54)
+++ packages.ent	(revision bee072a0393d4b2d40d3240a66e2b07dbd98f26f)
@@ -730,6 +730,6 @@
 <!ENTITY xcb-util-wm-version          "0.4.1">
 <!ENTITY xcb-util-cursor-version      "0.1.3">
-<!ENTITY mesa-major-minor             "21.3">
-<!ENTITY mesa-version                 "&mesa-major-minor;.7">
+<!ENTITY mesa-major-minor             "22.1">
+<!ENTITY mesa-version                 "&mesa-major-minor;.0">
 <!ENTITY xbitmaps-version             "1.1.2">
 <!ENTITY xcursor-themes-version       "1.0.6">
Index: x/installing/mesa.xml
===================================================================
--- x/installing/mesa.xml	(revision 5a7d1382bd390fc394a142ad1ac27cc7a53fbd54)
+++ x/installing/mesa.xml	(revision bee072a0393d4b2d40d3240a66e2b07dbd98f26f)
@@ -7,8 +7,8 @@
   <!ENTITY mesa-download-http "https://mesa.freedesktop.org/archive/mesa-&mesa-version;.tar.xz">
   <!ENTITY mesa-download-ftp  "ftp://ftp.freedesktop.org/pub/mesa/mesa-&mesa-version;.tar.xz">
-  <!ENTITY mesa-md5sum        "689d32b071b10520a54d78267a2edcf7">
-  <!ENTITY mesa-size          "16 MB">
-  <!ENTITY mesa-buildsize     "674 MB (with docs, add 380 MB for tests)">
-  <!ENTITY mesa-time          "3.5 SBU (Using parallelism=4; with docs, add 0.5 SBU for tests)">
+  <!ENTITY mesa-md5sum        "d0342bd53a6c04dddd953f0a9cfa92cc">
+  <!ENTITY mesa-size          "15 MB">
+  <!ENTITY mesa-buildsize     "419 MB (with docs, add 375 MB for tests)">
+  <!ENTITY mesa-time          "2.8 SBU (Using parallelism=4; with docs, add 0.5 SBU for tests)">
 ]>
 
@@ -88,10 +88,4 @@
         </para>
       </listitem>
-      <listitem>
-        <para>
-          Required patch (for systems with NVIDIA GPUs):
-          <ulink url="&patch-root;/mesa-&mesa-version;-nouveau_fixes-1.patch"/>
-        </para>
-      </listitem>
     </itemizedlist>
 
@@ -112,13 +106,15 @@
       build <application>libva</application> first without EGL and GLX support,
       install this package, and rebuild <application>libva</application>),
+      
       <xref linkend="libvdpau"/> (to build VDPAU drivers),
-      <xref linkend="llvm"/> (required for Gallium3D, nouveau, r300, and radeonsi
+      
+      <xref linkend="llvm"/> (required for Gallium3D, nouveau, and radeonsi
       drivers and for swrast, the software rasterizer which is sometimes referred
       to as llvmpipe. See <ulink role="nodep"
       url="https://docs.mesa3d.org/systems.html"/> for more information), and
+      
       <xref linkend="wayland-protocols"/> (required for
         <xref role="nodep" linkend='plasma5-build'/>,
-        <!-- <xref role="nodep" linkend='lxqt'/>, -->
-        GNOME, and recommended for  <xref role="nodep" linkend='gtk3'/>)
+        GNOME, and recommended for <xref role="nodep" linkend='gtk3'/>)
     </para>
 
@@ -138,7 +134,7 @@
       <ulink url="https://github.com/tizonia/tizonia-openmax-il/wiki/Tizonia-OpenMAX-IL/">
       libtizonia</ulink>,  and
-      <ulink url="https://www.vulkan.org/">libvulkan</ulink> (for the zink driver)
-    </para>
-
+      <ulink url="https://www.vulkan.org/">libvulkan</ulink>
+    </para>
+<!--
     <note>
       <para>
@@ -151,5 +147,5 @@
       </para>
     </note>
-
+-->
     <para condition="html" role="usernotes">User Notes:
       <ulink url="&blfs-wiki;/mesalib"/>
@@ -173,5 +169,5 @@
         freedreno is for qualcom hardware, libdrm will build for it on suitable
         systems. VC4 is for the Broadcom VC4 used in the raspberry pi - ken -->
-
+<!--
     <note>
       <para>
@@ -193,12 +189,14 @@
       (you will need a freedesktop.org account to get to that page, you can
       download the 0.9.1 release without an account from
-     <ulink url="https://gitlab.freedesktop.org/virgl/virglrenderer/-/archive/0.9.1/virglrenderer-0.9.1.tar.bz2">virglrenderer-0.9.1</ulink>).
+     <ulink url="https://gitlab.freedesktop.org/virgl/virglrenderer/-/archive/0.9.1/virglrenderer-0.9.1.tar.bz2">virglrenderer-0.9.1</ulink>).-->
+
 <!-- If you wish to build all available gallium drivers,
       use 'auto'. FIXME : does not build crocus in 21.2.1 -->
 
       <!-- crocus was added to the default x86/x86_64 drivers for meson in the
-      master branch on 2021-08-31, at some point it will appear in a stable release -->
-    </para>
-
+      master branch on 2021-08-31, at some point it will appear in a stable release 
+    </para>
+-->
+<!--
     <para>
       The (non-gallium) DRI drivers available in X86 are auto, <emphasis>or
@@ -210,5 +208,5 @@
     <para>
       The platforms ("window systems") available for X86 linux are x11, wayland,
-     <!--drm,--> and surfaceless. By not specifying anything, the meson
+     drm, and surfaceless. By not specifying anything, the meson
       build-system will build for all these platforms if you have the
       dependencies, identical to if you had specified '-Dplatforms=auto'.
@@ -219,5 +217,7 @@
       below will cover most modern video cards and virtual machines.  For help in
       selecting drivers see <ulink url="https://docs.mesa3d.org/systems.html"/>.
+-->
       <!-- these two don't seem to be mentioned in that mesa link -->
+<!--
       For intel drivers, specify crocus for i965 gen 4 through to haswell, iris
       for broadwell and later.
@@ -233,18 +233,5 @@
 <screen><userinput>GALLIUM_DRV="crocus,i915,iris,nouveau,r600,radeonsi,svga,swrast,virgl"
 DRI_DRIVERS="i965,nouveau"</userinput></screen>
-
-    <note>
-      <para>
-        If you are using a NVIDIA GPU in your system, a special patch has been
-        created that allows for proper multi-threading in the Mesa driver. This
-        fixes issues with multi-threaded Qt applications, as well as with
-        starting some GNOME Applications. This patch is also essential if you
-        plan to use KDE Plasma.
-
-        Apply the patch using the following command:
-      </para>
-
-<screen><userinput remap="pre">patch -Np1 -i ../mesa-&mesa-version;-nouveau_fixes-1.patch</userinput></screen>
-    </note>
+-->
 
     <para>
@@ -256,15 +243,12 @@
 cd    build &amp;&amp;
 
-meson --prefix=$XORG_PREFIX          \
-      --buildtype=release            \
-      -Ddri-drivers=$DRI_DRIVERS     \
-      -Dgallium-drivers=$GALLIUM_DRV \
-      -Dgallium-nine=false           \
-      -Dglx=dri                      \
-      -Dvalgrind=disabled            \
-      -Dlibunwind=disabled           \
-      ..                             &amp;&amp;
-
-unset GALLIUM_DRV DRI_DRIVERS &amp;&amp;
+meson --prefix=$XORG_PREFIX   \
+      --buildtype=release     \
+      -Dplatforms=x11,wayland \
+      -Dgallium-drivers=auto  \
+      -Dglx=dri               \
+      -Dvalgrind=disabled     \
+      -Dlibunwind=disabled    \
+      ..                      &amp;&amp;
 
 ninja</userinput></screen>
@@ -272,10 +256,18 @@
     <para>
       If you built the tests (see 'Command Explanations'), to run them issue:
-      <command>ninja test</command>. One test,
-      <application>mesa: intel/anv_state_pool</application>, is known to fail.
+      <command>ninja test</command>. 
+    </para>
 <!-- All tests passed for me for 21.2.4 [pierre]
-      All 33 subtests tests in the mesa:compiler+glsl / glsl compiler warnings
-      suite are known to fail.-->
-    </para>
+     All 33 subtests tests in the mesa:compiler+glsl / glsl compiler warnings
+      suite are known to fail.
+  
+     For 22.1.0:
+     Ok:                 74
+     Expected Fail:      0
+     Fail:               0
+     Unexpected Pass:    0
+     Skipped:            0
+     Timeout:            0
+-->
 
     <para>
@@ -306,10 +298,10 @@
       switch, build sizes can span into the 2GB range.
     </para>
-
+<!--
     <para>
       <parameter>-Ddri-drivers="..."</parameter>: This parameter
       controls which (non-gallium) dri drivers should be built.
     </para>
-
+-->
     <para>
       <parameter>-Dgallium-drivers="..."</parameter>: This parameter
@@ -317,9 +309,4 @@
     </para>
 
-    <para>
-      <parameter>-Dgallium-nine=false</parameter>: Prevents building
-      support for (MS Windows) games designed for DX9. Set it to true if
-      this support is desired.
-    </para>
 <!--
     <para>
@@ -329,11 +316,17 @@
     </para>
 -->
-<!--
+
     <para>
       <parameter>-Dplatforms="..."</parameter>: This parameter
-      controls which platforms EGL will be built for. Available
-      linux X86 platforms are drm, x11, wayland, and surfaceless.
-    </para>
--->
+      controls which windowing systems will be supported. Available
+      linux platforms are x11 and wayland.
+    </para>
+
+    <para>
+      <parameter>-Degl-native-platform="..."</parameter>: This parameter
+      controls which Embedded Graphics Library support will be built. Available
+      linux options are auto (default), x11, wayland, surfaceless, and drm.
+    </para>
+
     <para>
       <parameter>-Dvalgrind=disabled</parameter>: This parameter disables
@@ -347,32 +340,15 @@
     </para>
 
-<!--
-    <para>
-      <parameter>- -enable-xa</parameter>: This switch enables building the
-      XA X Acceleration API (Required for VMware 3D Driver).
-    </para>
-
-    <para>
-      <parameter>- -enable-gbm</parameter>: This switch enables building the
-      <application>Mesa</application> Graphics Buffer Manager library.
-    </para>
-    These two seem to be automatic in 19.0 - ken
-
-    <para>
-      <parameter>- -enable-glx-tls</parameter>: This switch enables TLS (Thread Local
-      Storage) support in GLX.
-    </para>
--->
     <para>
       <option>-Dbuild-tests=true</option>: This option will cause the test code
-      to be enabled. To run the tests, issue: <command>ninja test</command>.
+      to be enabled. 
     </para>
 
     <para>
       <option>-Dvulkan-drivers=...</option>: This option allows choosing which
-      Vulkan drivers are built. Since those drivers depend on the
-      corresponding Gallium3D drivers, do not enable drivers that are not
-      enabled in Gallium3D drivers. Furthermore, since BLFS does not use
-      Vulkan, it is safe to leave the list of Vulkan drivers empty.
+      Vulkan drivers are built. 
+      Since BLFS does not use
+      Vulkan, it is safe to leave the list of Vulkan drivers empty. The default
+      is auto.
     </para>
 
@@ -397,5 +373,4 @@
           libGLESv1_CM.so,
           libGLESv2.so,
-<!--          libOSMesa.so,-->
           libXvMCnouveau.so,
           libXvMCr600.so,
@@ -416,15 +391,12 @@
 <!--          i830_dri.so,-->
           i915_dri.so,
-          i965_dri.so,
           iris_dri.so,
           kms_swrast_dri.so,
           nouveau_dri.so,
           nouveau_drv_video.so,
-          nouveau_vieux_dri.so,
-          r200_dri.so (optional),
-          r300_dri.so (optional),
+          r300_dri.so,
           r600_dri.so,
           r600_drv_video.so,
-          radeon_dri.so (optional),
+          radeon_dri.so,
           radeonsi_dri.so,
           radeonsi_drv_video.so,
@@ -442,5 +414,6 @@
         </seg>
         <seg>
-          $XORG_PREFIX/{include/{EGL,GL,GLES,GLES2,GLES3,KHR},lib/{dri,vdpau}},
+          $XORG_PREFIX/{include/{EGL,GL,GLES,GLES2,GLES3,KHR},
+          $XORG_PREFIX/lib/{dri,vdpau}},
           $XORG_PREFIX/include/d3adapter (optional),
           $XORG_PREFIX/lib/d3d (optional),
@@ -449,5 +422,5 @@
           $XORG_PREFIX/share/vulkan,
           and
-          /usr/share/doc/mesa-&mesa-version; (optional)
+          /usr/share/doc/mesa-&mesa-version; 
         </seg>
       </seglistitem>
@@ -546,17 +519,5 @@
         </listitem>
       </varlistentry>
-<!--
-      <varlistentry id="libOSMesa">
-        <term><filename class="libraryfile">libOSMesa.so</filename></term>
-        <listitem>
-          <para>
-            is the <application>Mesa</application> Off-screen Rendering library
-          </para>
-          <indexterm zone="mesa libOSMesa">
-            <primary sortas="c-libOSMesa">libOSMesa.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
--->
+
     </variablelist>
 
