Index: x/installing/mesalib.xml
===================================================================
--- x/installing/mesalib.xml	(revision 6b547632eb6bb7ecba162306b4fa142fbf278299)
+++ x/installing/mesalib.xml	(revision bad6be19257478dc47879217ca79a34c3b6521b2)
@@ -7,8 +7,8 @@
   <!ENTITY mesalib-download-http " ">
   <!ENTITY mesalib-download-ftp  "ftp://ftp.freedesktop.org/pub/mesa/&mesalib-version;/MesaLib-&mesalib-version;.tar.bz2">
-  <!ENTITY mesalib-md5sum        "0837c52698fe3252369c3fdb5195afcc">
-  <!ENTITY mesalib-size          "6.0 MB">
-  <!ENTITY mesalib-buildsize     "356 MB">
-  <!ENTITY mesalib-time          "4.0 SBU">
+  <!ENTITY mesalib-md5sum        "24eeebf66971809d8f40775a379b36c9">
+  <!ENTITY mesalib-size          "5.5 MB">
+  <!ENTITY mesalib-buildsize     "460 MB">
+  <!ENTITY mesalib-time          "3.0 SBU">
 ]>
 
@@ -30,5 +30,5 @@
     <title>Introduction to MesaLib</title>
 
-    <para><application>Mesa</application> is an OpenGL compatible 3-D graphics
+    <para><application>Mesa</application> is an OpenGL compatible 3D graphics
     library.</para>
 
@@ -62,9 +62,4 @@
     <bridgehead renderas="sect3">Additional Downloads</bridgehead>
     <itemizedlist spacing="compact">
-      <listitem>
-        <para>Required patch: <ulink
-        url="&patch-root;/MesaLib-&mesalib-version;-llvm_3.0-1.patch"/>
-        </para>
-      </listitem>
       <listitem>
         <para>Recommended patch: <ulink
@@ -86,8 +81,4 @@
     </para>
 
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional"><xref linkend="lesstif"/> (required to build motif
-    widgets)</para>
-
     <para condition="html" role="usernotes">User Notes:
     <ulink url="&blfs-wiki;/mesalib"/></para>
@@ -108,7 +99,7 @@
 
 <screen><userinput>sed 's@FLAGS=\"-g@FLAGS=\"@' -i configure &amp;&amp;
-patch -Np1 -i ../MesaLib-&mesalib-version;-llvm_3.0-1.patch   &amp;&amp;
 patch -Np1 -i ../MesaLib-&mesalib-version;-add_xdemos-2.patch &amp;&amp;
-./configure $XORG_CONFIG --enable-xcb &amp;&amp;
+./configure --prefix=$XORG_PREFIX --enable-shared-dricore --enable-xa \
+            --with-gallium-drivers="nouveau,r300,r600,svga,swrast" &amp;&amp;
 make</userinput></screen>
 
@@ -130,5 +121,9 @@
 <screen role="root"><userinput>ln -s -v ${XORG_PREFIX}/include/GL  /usr/include &amp;&amp;
 ln -s -v ${XORG_PREFIX}/include/EGL /usr/include &amp;&amp;
-ln -s -v ${XORG_PREFIX}/include/KHR /usr/include</userinput></screen>
+ln -s -v ${XORG_PREFIX}/include/KHR /usr/include &amp;&amp;
+for HEADER in xa_{composite,context,tracker}.h
+do
+  ln -s -v ${$XORG_PREFIX}/include/$HEADER /usr/include
+done</userinput></screen>
 
   </sect2>
@@ -142,13 +137,14 @@
     command.</para>
 
-    <para><option>--enable-xcb</option>: use the XCB backend instead of the
-    default XLib backend for GLX.</para>
-
-    <para><option>--enable-motif</option>: build motif widgets into the
-    GL widgets library (requires <application>lesstif</application>).</para>
-
-    <para><option>--with-gallium-driver=...</option>: build additional gallium
-    drivers. Defaults to r300, r600, and swrast. You must specify i9xx and
-    nouveau drivers.</para>
+    <para><command>--enable-shared-dricore</command>: link DRI modules with 
+    shared core DRI routines.</para>
+
+    <para><command>--enable-xa</command>: enables building of the XA X 
+    Acceleration API (Required for VMware 3D Driver).</para>
+
+    <para><ocommand>--with-gallium-drivers=...</command>: build additional gallium
+    drivers. Defaults to r300, r600, and swrast. Extended to build nouveau
+    driver.</para>
+
   </sect2>
 
@@ -163,7 +159,7 @@
       <seglistitem>
         <seg>glxgears and glxinfo</seg>
-        <seg>libEGL.so, libGL.so, libGLU.so, libGLw.so, and *_dri.so</seg>
-        <seg><envar>$XORG_PREFIX</envar>/include/{EGL,KHR},
-        <envar>$XORG_PREFIX</envar>/lib/{dri,egl}, and
+        <seg>libEGL.so, libGL.so, libGLU.so, libxatracker.so, and *_dri.so</seg>
+        <seg><envar>$XORG_PREFIX</envar>/include/{EGL,GL,KHR},
+        <envar>$XORG_PREFIX</envar>/lib/dri, and
         <envar>$XORG_PREFIX</envar>/share/doc/MesaLib-&mesalib-version;</seg>
       </seglistitem>
@@ -228,10 +224,10 @@
       </varlistentry>
 
-      <varlistentry id="libGLw">
-        <term><filename class='libraryfile'>libGLw.so</filename></term>
-        <listitem>
-          <para>is the Xt/Motif OpenGL drawing area widget library.</para>
-          <indexterm zone="mesalib libGLw">
-            <primary sortas="c-libGLw">libGLw.so</primary>
+      <varlistentry id="libxatracker">
+        <term><filename class='libraryfile'>libxatracker.so</filename></term>
+        <listitem>
+          <para>is the XA X Acceleration API library.</para>
+          <indexterm zone="mesalib libxatracker">
+            <primary sortas="c-libxatracker">libxatracker.so</primary>
           </indexterm>
         </listitem>
