Index: introduction/welcome/changelog.xml
===================================================================
--- introduction/welcome/changelog.xml	(revision cdf6da35a498459331c816121106f987c19309c0)
+++ introduction/welcome/changelog.xml	(revision ef936e4d0b003d0a1093ce879c587c0ff2a3dca8)
@@ -45,4 +45,8 @@
       <para>August 26th, 2021</para>
       <itemizedlist>
+        <listitem>
+          <para>[ken] - Update to mesa-21.2.1. Fixes
+          <ulink url="&blfs-ticket-root;15349">#15349</ulink>.</para>
+        </listitem>
         <listitem>
           <para>[ken] - Add --wrap-mode=nofallback to gdk-pixbuf and pango. Fixes
Index: packages.ent
===================================================================
--- packages.ent	(revision cdf6da35a498459331c816121106f987c19309c0)
+++ packages.ent	(revision ef936e4d0b003d0a1093ce879c587c0ff2a3dca8)
@@ -704,6 +704,6 @@
 <!ENTITY xcursor-themes-version       "1.0.6">
 <!ENTITY xkeyboard-config-version     "2.33">
-<!ENTITY mesa-major-minor             "21.1">
-<!ENTITY mesa-version                 "&mesa-major-minor;.6">
+<!ENTITY mesa-major-minor             "21.2">
+<!ENTITY mesa-version                 "&mesa-major-minor;.1">
 <!ENTITY xcb-util-version             "0.4.0">
 <!ENTITY xcb-util-image-version       "0.4.0">
Index: x/installing/mesa.xml
===================================================================
--- x/installing/mesa.xml	(revision cdf6da35a498459331c816121106f987c19309c0)
+++ x/installing/mesa.xml	(revision ef936e4d0b003d0a1093ce879c587c0ff2a3dca8)
@@ -7,8 +7,9 @@
   <!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        "115a4b7383982f03b2aa5b91d1a8a259">
+  <!ENTITY mesa-md5sum        "f81336168864b1f890edfa5db8587f2b">
   <!ENTITY mesa-size          "15 MB">
-  <!ENTITY mesa-buildsize     "547 MB (with docs)">
-  <!ENTITY mesa-time          "3.1 SBU (with parallelism=4 and docs)">
+  <!ENTITY mesa-buildsize     "799 MB (with docs, add 376 MB if running the tests)">
+                              <!-- using NINJAJOBS=6 -->
+  <!ENTITY mesa-time          "5.1 SBU (on a 4-core machine with docs)">
 ]>
 
@@ -129,7 +130,8 @@
       <ulink url="http://omxil.sourceforge.net/">Bellagio OpenMAX Integration
       Layer</ulink> (for mobile platforms), 
-      <ulink url="http://www.nongnu.org/libunwind/">libunwind</ulink>, and
+      <ulink url="http://www.nongnu.org/libunwind/">libunwind</ulink>,
       <ulink url="https://github.com/tizonia/tizonia-openmax-il/wiki/Tizonia-OpenMAX-IL/">
-      libtizonia</ulink>
+      libtizonia</ulink>,  and
+      <ulink url="https://www.vulkan.org/">libvulkan</ulink> (for the zink driver)
     </para>
 
@@ -185,9 +187,10 @@
     <para>
       Now, select the drivers you wish to install. For the X86 architecture, the
-      available gallium drivers are auto, <emphasis>or alternatively a choice
-      from</emphasis> i915, nouveau, r300, r600, radeonsi, svga, swrast, and
-      virgl. The latter is recommended if you intend to run the system under
-      <xref linkend="qemu"/>. If you wish to build all available gallium drivers,
-      use 'auto'.
+      available gallium drivers are auto (<emphasis>in 21.2.1 this does not select
+      crocus </emphasis>), <emphasis>or alternatively a choice from</emphasis>
+      crocus, i915, nouveau, r300, r600, radeonsi, svga, swrast, and virgl. The
+      latter is recommended if you intend to run the system under
+      <xref linkend="qemu"/>.<!-- If you wish to build all available gallium drivers,
+      use 'auto'. FIXME : does not build crocus in 21.2.1 -->
     </para>
 
@@ -210,4 +213,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.
     </para>
 
@@ -219,5 +225,5 @@
     </note>
 
-<screen><userinput>GALLIUM_DRV="i915,iris,nouveau,r600,radeonsi,svga,swrast,virgl"
+<screen><userinput>GALLIUM_DRV="crocus,i915,iris,nouveau,r600,radeonsi,svga,swrast,virgl"
 DRI_DRIVERS="i965,nouveau"</userinput></screen>
 
@@ -245,13 +251,10 @@
 
     <para>
-      This package no longer comes with a test suite.
-    </para>
-<!--
-    <para>
       If you built the tests (see 'Command Explanations'), to run them issue:
       <command>ninja test</command>. 
-      Two tests in the llvmpipe suite are known to fail.
-    </para>
--->
+      All 33 subtests tests in the mesa:compiler+glsl / glsl compiler warnings
+      suite are known to fail.
+    </para>
+
     <para>
       Now, as the <systemitem class="username">root</systemitem> user:
@@ -376,7 +379,9 @@
         </seg>
         <seg>
-          <!-- Begin DRI drivers : this is the full set from auto -->
+          <!-- Begini gallium DRI drivers : this is the full set -->
           d3dadapter9.so (optional), <!-- For Windows games. This is DirectX's
                                           Direct3D -->
+          crocus_dri.so,
+          i830_dri.so,
           i915_dri.so,
           i965_dri.so,
@@ -403,4 +408,5 @@
           libvdpau_radeonsi.so
           <!-- End VDPAU drivers -->
+          (Many of these drivers are hard-linked).
         </seg>
         <seg>
