Index: x/installing/installing.xml
===================================================================
--- x/installing/installing.xml	(revision 19bcba7d67329abd96c22f2a7b5a135275799f3b)
+++ x/installing/installing.xml	(revision 7a395d143a86bed5b33324e7b19e987db3000c4d)
@@ -64,5 +64,5 @@
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="xcb-util-renderutil.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="xcb-util-wm.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="mesalib.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="mesa.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="xbitmaps.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="x7app.xml"/>
Index: x/installing/libva.xml
===================================================================
--- x/installing/libva.xml	(revision 19bcba7d67329abd96c22f2a7b5a135275799f3b)
+++ x/installing/libva.xml	(revision 7a395d143a86bed5b33324e7b19e987db3000c4d)
@@ -125,5 +125,5 @@
     <bridgehead renderas="sect5">Required</bridgehead>
     <para role="required">
-      <xref linkend="mesalib"/>
+      <xref linkend="mesa"/>
     </para>
 
Index: x/installing/libvdpau-va-gl.xml
===================================================================
--- x/installing/libvdpau-va-gl.xml	(revision 19bcba7d67329abd96c22f2a7b5a135275799f3b)
+++ x/installing/libvdpau-va-gl.xml	(revision 7a395d143a86bed5b33324e7b19e987db3000c4d)
@@ -103,5 +103,5 @@
     <bridgehead renderas="sect5">Runtime Dependency</bridgehead>
     <para role="optional">
-      <xref linkend="mesalib"/>
+      <xref linkend="mesa"/>
     </para>
 
Index: x/installing/libvdpau.xml
===================================================================
--- x/installing/libvdpau.xml	(revision 19bcba7d67329abd96c22f2a7b5a135275799f3b)
+++ x/installing/libvdpau.xml	(revision 7a395d143a86bed5b33324e7b19e987db3000c4d)
@@ -107,5 +107,5 @@
     <bridgehead renderas="sect5">Runtime Dependency</bridgehead>
     <para role="optional">
-      <xref linkend="mesalib"/>
+      <xref linkend="mesa"/>
     </para>
 
Index: x/installing/mesa.xml
===================================================================
--- x/installing/mesa.xml	(revision 7a395d143a86bed5b33324e7b19e987db3000c4d)
+++ x/installing/mesa.xml	(revision 7a395d143a86bed5b33324e7b19e987db3000c4d)
@@ -0,0 +1,433 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
+   "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
+  <!ENTITY % general-entities SYSTEM "../../general.ent">
+  %general-entities;
+
+  <!ENTITY mesa-download-http " ">
+  <!ENTITY mesa-download-ftp  "ftp://ftp.freedesktop.org/pub/mesa/&mesa-version;/mesa-&mesa-version;.tar.xz">
+  <!ENTITY mesa-md5sum        "bf9118bf0fbf360715cfe60baf7a1db5">
+  <!ENTITY mesa-size          "6.9 MB">
+  <!ENTITY mesa-buildsize     "188 MB (without tests)">
+  <!ENTITY mesa-time          "4.5 SBU (without tests)">
+]>
+
+<sect1 id="mesa" xreflabel="Mesa-&mesa-version;">
+  <?dbhtml filename="mesa.html"?>
+
+  <sect1info>
+    <othername>$LastChangedBy$</othername>
+    <date>$Date$</date>
+  </sect1info>
+
+  <title>Mesa-&mesa-version;</title>
+
+  <indexterm zone="mesa">
+    <primary sortas="a-Mesa">Mesa</primary>
+  </indexterm>
+
+  <sect2 role="package">
+    <title>Introduction to Mesa</title>
+
+    <para>
+      <application>Mesa</application> is an OpenGL compatible 3D graphics
+      library.
+    </para>
+
+    &lfs78_checked;
+
+    <bridgehead renderas="sect3">Package Information</bridgehead>
+    <itemizedlist spacing="compact">
+      <listitem>
+        <para>
+          Download (HTTP): <ulink url="&mesa-download-http;"/>
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Download (FTP): <ulink url="&mesa-download-ftp;"/>
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Download MD5 sum: &mesa-md5sum;
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Download size: &mesa-size;
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Estimated disk space required: &mesa-buildsize;
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Estimated build time: &mesa-time;
+        </para>
+      </listitem>
+    </itemizedlist>
+
+    <bridgehead renderas="sect3">Additional Downloads</bridgehead>
+    <itemizedlist spacing="compact">
+      <listitem>
+        <para>
+          Recommended patch:
+          <ulink
+            url="&patch-root;/mesa-&mesa-version;-add_xdemos-1.patch"/>
+          (installs 2 demo programs for testing Mesa - not needed if you
+          install the <ulink url="ftp://ftp.freedesktop.org/pub/mesa/demos/">
+          mesa-demos</ulink> package)
+        </para>
+      </listitem>
+    </itemizedlist>
+
+    <bridgehead renderas="sect3">Mesa Dependencies</bridgehead>
+
+    <bridgehead renderas="sect4">Required</bridgehead>
+    <para role="required">
+      <xref linkend="xorg7-lib"/> and
+      <xref linkend="libdrm"/>
+    </para>
+
+    <bridgehead renderas="sect4">Recommended</bridgehead>
+    <para role="recommended">
+      <xref linkend="elfutils"/> (required for Gallium3D radeonsi driver),
+      <xref linkend="libvdpau"/> (to build VDPAU drivers),
+      <xref linkend="llvm"/> (required for Gallium3D r300, r600 and radeonsi
+      drivers and also for llvmpipe which is intended to be the fastest of the
+      three sw rasterizers, see
+      <ulink url="http://www.mesa3d.org/faq.html#part3"/>)
+    </para>
+
+    <bridgehead renderas="sect4">Optional</bridgehead>
+    <para role="optional">
+      <ulink url="ftp://ftp.freedesktop.org/pub/mesa/demos/">mesa-demos</ulink>
+      (provides more than 300 extra demos to test
+      <application>Mesa</application>; this includes the same programs
+      added by the patch above),
+      <ulink url="http://omxil.sourceforge.net/">Bellagio OpenMAX Integration
+      Layer</ulink> (for mobile platforms) and
+      <ulink url="http://wayland.freedesktop.org/">Wayland</ulink>
+    </para>
+
+    <note>
+      <para>
+        The instructions below assume that <application>elfutils</application>
+        and <application>LLVM</application> with the r600/amdgpu backend are
+        installed. You will need to modify the instructions if you choose not
+        to install them. Please note that <application>elfutils</application>
+        and <application>LLVM</application> are <emphasis>required</emphasis>
+        for Gallium3D r300, r600 and radeonsi drivers. For an explanation of
+        Gallium3D please see
+        <ulink url="https://en.wikipedia.org/wiki/Gallium3D"/>.
+      </para>
+    </note>
+
+    <para condition="html" role="usernotes">User Notes:
+      <ulink url="&blfs-wiki;/mesa"/>
+    </para>
+  </sect2>
+
+  <sect2 role="installation">
+    <title>Installation of Mesa</title>
+
+    <para>
+      If you have downloaded the xdemos patch (needed if testing the Xorg
+      installation per BLFS instructions), apply it by running the following
+      command:
+    </para>
+
+<screen><userinput>patch -Np1 -i ../mesa-&mesa-version;-add_xdemos-1.patch</userinput></screen>
+
+    <para>
+      Install <application>Mesa</application> by running the following
+      commands:
+    </para>
+
+<screen><userinput>GLL_DRV="nouveau,r300,r600,radeonsi,svga,swrast" &amp;&amp;
+
+./autogen.sh CFLAGS='-O2' CXXFLAGS='-O2'    \
+            --prefix=$XORG_PREFIX           \
+            --sysconfdir=/etc               \
+            --enable-texture-float          \
+            --enable-gles1                  \
+            --enable-gles2                  \
+            --enable-osmesa                 \
+            --enable-xa                     \
+            --enable-gbm                    \
+            --enable-glx-tls                \
+            --with-egl-platforms="drm,x11"  \
+            --with-gallium-drivers=$GLL_DRV &amp;&amp;
+
+unset GLL_DRV &amp;&amp;
+
+make</userinput></screen>
+
+    <para>
+      If you have applied the xdemos patch, build the demo programs by
+      running the following command:
+    </para>
+
+<screen><userinput>make -C xdemos DEMOS_PREFIX=$XORG_PREFIX</userinput></screen>
+
+    <para>
+      To test the results, issue: <command>make check</command>.
+    </para>
+
+    <para>
+      Now, as the <systemitem class="username">root</systemitem> user:
+    </para>
+
+<screen role="root"><userinput>make install</userinput></screen>
+
+    <para>
+      If you have built the demo programs, install them by running the
+      following command as the
+      <systemitem class="username">root</systemitem> user:
+    </para>
+
+<screen role="root"><userinput>make -C xdemos DEMOS_PREFIX=$XORG_PREFIX install</userinput></screen>
+
+    <para>
+      If desired, install the optional documentation by running
+      the following commands as the
+      <systemitem class="username">root</systemitem> user:
+    </para>
+
+<screen role="root"><userinput>install -v -dm755 /usr/share/doc/mesa-&mesa-version; &amp;&amp;
+cp -rfv docs/* /usr/share/doc/mesa-&mesa-version;</userinput></screen>
+
+  </sect2>
+
+  <sect2 role="commands">
+    <title>Command Explanations</title>
+
+    <para>
+      <parameter>CFLAGS="-O2" CXXFLAGS="-O2"</parameter>: By default,
+      <application>Autoconf</application> sets CFLAGS and CXXFLAGS to
+      "-g -O2". That results in binaries and libraries being built with
+      debugging symbols which make them bigger. Override the default
+      flags to omit -g compiler flag so the final libraries are smaller.
+    </para>
+
+    <para>
+      <parameter>--enable-texture-float</parameter>: This switch enables
+      floating-point textures and render buffers. Please consult
+      <filename>docs/patents.txt</filename> to see if there are
+      any legal issues if you use this feature.
+    </para>
+
+    <para>
+      <parameter>--enable-gles1</parameter>: This switch enables support for
+      OpenGL ES 1.x API.
+    </para>
+
+    <para>
+      <parameter>--enable-gles2</parameter>: This switch enables support for
+      OpenGL ES 2.x API.
+    </para>
+
+    <para>
+      <parameter>--enable-osmesa</parameter>: This switch enables building of
+      the <filename class="libraryfile">libOSMesa</filename> library.
+    </para>
+
+    <para>
+      <parameter>--enable-xa</parameter>: This switch enables building of the
+      XA X Acceleration API (Required for VMware 3D Driver).
+    </para>
+
+    <para>
+      <parameter>--enable-gbm</parameter>: This switch enables building of the
+      <application>Mesa</application> Graphics Buffer Manager library.
+    </para>
+
+    <para>
+      <parameter>--enable-glx-tls</parameter>: This switch enables TLS (Thread Local
+      Storage) support in GLX.
+    </para>
+
+    <para>
+      <parameter>--with-egl-platforms="..."</parameter>: This parameter
+      controls which platforms EGL will be built for. Available
+      platforms are drm, x11 and wayland.
+    </para>
+
+    <para>
+      <parameter>--with-gallium-drivers="..."</parameter>: This parameter
+      controls which Gallium3D drivers should be built. Available drivers
+      are: i915, ilo, nouveau, r300, r600, radeonsi, svga and swrast. You
+      will need to remove r300, r600 and radeonsi from the list if you did
+      not install <application>elfutils</application> and
+      <application>LLVM</application> with the r600/amdgpu backend.
+    </para>
+
+    <para>
+      <option>--enable-r600-llvm-compiler</option>: Use this switch to
+      enable an experimental R600 <application>LLVM</application> backend
+      for graphics shaders which claims to speed up the driver.
+    </para>
+
+    <para>
+      <option>--enable-sysfs</option>: Use this switch to enable simple PCI
+      identification method, required for building DRI on systems without udev.
+    </para>
+
+  </sect2>
+
+  <sect2 role="content">
+    <title>Contents</title>
+
+    <segmentedlist>
+      <segtitle>Installed Programs</segtitle>
+      <segtitle>Installed Libraries</segtitle>
+      <segtitle>Installed Directories</segtitle>
+
+      <seglistitem>
+        <seg>
+          glxgears and glxinfo
+        </seg>
+        <seg>
+          libEGL.so,
+          libgbm.so,
+          libglapi.so,
+          libGLESv1_CM.so,
+          libGLESv2.so,
+          libGL.so,
+          libOSMesa.so,
+          libxatracker.so,
+          libXvMCnouveau.so,
+          and libXvMCr600.so
+        </seg>
+        <seg>
+          $XORG_PREFIX/{include/{EGL,GL,GLES,GLES2,GLES3,KHR},lib/{dri,vdpau}}
+          and
+          /usr/share/doc/mesa-&mesa-version; (optional)
+        </seg>
+      </seglistitem>
+    </segmentedlist>
+
+    <variablelist>
+      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
+      <?dbfo list-presentation="list"?>
+      <?dbhtml list-presentation="table"?>
+
+      <varlistentry id="glxgears">
+        <term><command>glxgears</command></term>
+        <listitem>
+          <para>
+            is a GL demo useful for troubleshooting graphics
+            problems.
+          </para>
+          <indexterm zone="mesa glxgears">
+            <primary sortas="b-glxgears">glxgears</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="glxinfo">
+        <term><command>glxinfo</command></term>
+        <listitem>
+          <para>
+            is a diagnostic program that displays information about the
+            graphics hardware and installed GL libraries.
+          </para>
+          <indexterm zone="mesa glxinfo">
+            <primary sortas="b-glxinfo">glxinfo</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="libEGL">
+        <term><filename class="libraryfile">libEGL.so</filename></term>
+        <listitem>
+          <para>
+            provides a native platform graphics interface as
+            defined by the EGL-1.4 specification.
+          </para>
+          <indexterm zone="mesa libEGL">
+            <primary sortas="c-libGL">libEGL.so</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="libgbm">
+        <term><filename class="libraryfile">libgbm.so</filename></term>
+        <listitem>
+          <para>
+            is the <application>Mesa</application> Graphics Buffer
+            Manager library.
+          </para>
+          <indexterm zone="mesa libgbm">
+            <primary sortas="c-libgbm">libgbm.so</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="libGLESv1_CM">
+        <term><filename class="libraryfile">libGLESv1_CM.so</filename></term>
+        <listitem>
+          <para>
+            is the <application>Mesa</application> OpenGL ES 1.1 library.
+          </para>
+          <indexterm zone="mesa libGLESv1_CM">
+            <primary sortas="c-libGLESv1_CM">libGLESv1_CM.so</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="libGLES2">
+        <term><filename class="libraryfile">libGLES2.so</filename></term>
+        <listitem>
+          <para>
+            is the <application>Mesa</application> OpenGL ES 2.0 library.
+          </para>
+          <indexterm zone="mesa libGLES2">
+            <primary sortas="c-libGLES2">libGLES2.so</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="libGL">
+        <term><filename class="libraryfile">libGL.so</filename></term>
+        <listitem>
+          <para>
+            is the main <application>Mesa</application> OpenGL library.
+          </para>
+          <indexterm zone="mesa libGL">
+            <primary sortas="c-libGL">libGL.so</primary>
+          </indexterm>
+        </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>
+
+      <varlistentry id="libxatracker">
+        <term><filename class="libraryfile">libxatracker.so</filename></term>
+        <listitem>
+          <para>
+            is the Xorg Gallium3D acceleration library.
+          </para>
+          <indexterm zone="mesa libxatracker">
+            <primary sortas="c-libxatracker">libxatracker.so</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+    </variablelist>
+
+  </sect2>
+
+</sect1>
Index: x/installing/mesalib.xml
===================================================================
--- x/installing/mesalib.xml	(revision 19bcba7d67329abd96c22f2a7b5a135275799f3b)
+++ 	(revision )
@@ -1,433 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-   "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-
-  <!ENTITY mesalib-download-http " ">
-  <!ENTITY mesalib-download-ftp  "ftp://ftp.freedesktop.org/pub/mesa/&mesalib-version;/mesa-&mesalib-version;.tar.xz">
-  <!ENTITY mesalib-md5sum        "2b3369d64481c1f72ce2d88f7acdb0fb">
-  <!ENTITY mesalib-size          "6.9 MB">
-  <!ENTITY mesalib-buildsize     "188 MB (without tests)">
-  <!ENTITY mesalib-time          "4.5 SBU (without tests)">
-]>
-
-<sect1 id="mesalib" xreflabel="MesaLib-&mesalib-version;">
-  <?dbhtml filename="mesalib.html"?>
-
-  <sect1info>
-    <othername>$LastChangedBy$</othername>
-    <date>$Date$</date>
-  </sect1info>
-
-  <title>MesaLib-&mesalib-version;</title>
-
-  <indexterm zone="mesalib">
-    <primary sortas="a-MesaLib">MesaLib</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to MesaLib</title>
-
-    <para>
-      <application>Mesa</application> is an OpenGL compatible 3D graphics
-      library.
-    </para>
-
-    &lfs78_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&mesalib-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&mesalib-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &mesalib-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &mesalib-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &mesalib-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &mesalib-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">Additional Downloads</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Recommended patch:
-          <ulink
-            url="&patch-root;/mesa-&mesalib-version;-add_xdemos-1.patch"/>
-          (installs 2 demo programs for testing MesaLib - not needed if you
-          install the <ulink url="ftp://ftp.freedesktop.org/pub/mesa/demos/">
-          mesa-demos</ulink> package)
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">MesaLib Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-      <xref linkend="xorg7-lib"/> and
-      <xref linkend="libdrm"/>
-    </para>
-
-    <bridgehead renderas="sect4">Recommended</bridgehead>
-    <para role="recommended">
-      <xref linkend="elfutils"/> (required for Gallium3D radeonsi driver),
-      <xref linkend="libvdpau"/> (to build VDPAU drivers),
-      <xref linkend="llvm"/> (required for Gallium3D r300, r600 and radeonsi
-      drivers and also for llvmpipe which is intended to be the fastest of the
-      three sw rasterizers, see
-      <ulink url="http://www.mesa3d.org/faq.html#part3"/>)
-    </para>
-
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional">
-      <ulink url="ftp://ftp.freedesktop.org/pub/mesa/demos/">mesa-demos</ulink>
-      (provides more than 300 extra demos to test
-      <application>MesaLib</application>; this includes the same programs
-      added by the patch above),
-      <ulink url="http://omxil.sourceforge.net/">Bellagio OpenMAX Integration
-      Layer</ulink> (for mobile platforms) and
-      <ulink url="http://wayland.freedesktop.org/">Wayland</ulink>
-    </para>
-
-    <note>
-      <para>
-        The instructions below assume that <application>elfutils</application>
-        and <application>LLVM</application> with the r600/amdgpu backend are
-        installed. You will need to modify the instructions if you choose not
-        to install them. Please note that <application>elfutils</application>
-        and <application>LLVM</application> are <emphasis>required</emphasis>
-        for Gallium3D r300, r600 and radeonsi drivers. For an explanation of
-        Gallium3D please see
-        <ulink url="https://en.wikipedia.org/wiki/Gallium3D"/>.
-      </para>
-    </note>
-
-    <para condition="html" role="usernotes">User Notes:
-      <ulink url="&blfs-wiki;/mesalib"/>
-    </para>
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of MesaLib</title>
-
-    <para>
-      If you have downloaded the xdemos patch (needed if testing the Xorg
-      installation per BLFS instructions), apply it by running the following
-      command:
-    </para>
-
-<screen><userinput>patch -Np1 -i ../mesa-&mesalib-version;-add_xdemos-1.patch</userinput></screen>
-
-    <para>
-      Install <application>MesaLib</application> by running the following
-      commands:
-    </para>
-
-<screen><userinput>GLL_DRV="nouveau,r300,r600,radeonsi,svga,swrast" &amp;&amp;
-
-./autogen.sh CFLAGS='-O2' CXXFLAGS='-O2'    \
-            --prefix=$XORG_PREFIX           \
-            --sysconfdir=/etc               \
-            --enable-texture-float          \
-            --enable-gles1                  \
-            --enable-gles2                  \
-            --enable-osmesa                 \
-            --enable-xa                     \
-            --enable-gbm                    \
-            --enable-glx-tls                \
-            --with-egl-platforms="drm,x11"  \
-            --with-gallium-drivers=$GLL_DRV &amp;&amp;
-
-unset GLL_DRV &amp;&amp;
-
-make</userinput></screen>
-
-    <para>
-      If you have applied the xdemos patch, build the demo programs by
-      running the following command:
-    </para>
-
-<screen><userinput>make -C xdemos DEMOS_PREFIX=$XORG_PREFIX</userinput></screen>
-
-    <para>
-      To test the results, issue: <command>make check</command>.
-    </para>
-
-    <para>
-      Now, as the <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"><userinput>make install</userinput></screen>
-
-    <para>
-      If you have built the demo programs, install them by running the
-      following command as the
-      <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"><userinput>make -C xdemos DEMOS_PREFIX=$XORG_PREFIX install</userinput></screen>
-
-    <para>
-      If desired, install the optional documentation by running
-      the following commands as the
-      <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"><userinput>install -v -dm755 /usr/share/doc/mesa-&mesalib-version; &amp;&amp;
-cp -rfv docs/* /usr/share/doc/mesa-&mesalib-version;</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="commands">
-    <title>Command Explanations</title>
-
-    <para>
-      <parameter>CFLAGS="-O2" CXXFLAGS="-O2"</parameter>: By default,
-      <application>Autoconf</application> sets CFLAGS and CXXFLAGS to
-      "-g -O2". That results in binaries and libraries being built with
-      debugging symbols which make them bigger. Override the default
-      flags to omit -g compiler flag so the final libraries are smaller.
-    </para>
-
-    <para>
-      <parameter>--enable-texture-float</parameter>: This switch enables
-      floating-point textures and render buffers. Please consult
-      <filename>docs/patents.txt</filename> to see if there are
-      any legal issues if you use this feature.
-    </para>
-
-    <para>
-      <parameter>--enable-gles1</parameter>: This switch enables support for
-      OpenGL ES 1.x API.
-    </para>
-
-    <para>
-      <parameter>--enable-gles2</parameter>: This switch enables support for
-      OpenGL ES 2.x API.
-    </para>
-
-    <para>
-      <parameter>--enable-osmesa</parameter>: This switch enables building of
-      the <filename class="libraryfile">libOSMesa</filename> library.
-    </para>
-
-    <para>
-      <parameter>--enable-xa</parameter>: This switch enables building of the
-      XA X Acceleration API (Required for VMware 3D Driver).
-    </para>
-
-    <para>
-      <parameter>--enable-gbm</parameter>: This switch enables building of the
-      <application>Mesa</application> Graphics Buffer Manager library.
-    </para>
-
-    <para>
-      <parameter>--enable-glx-tls</parameter>: This switch enables TLS (Thread Local
-      Storage) support in GLX.
-    </para>
-
-    <para>
-      <parameter>--with-egl-platforms="..."</parameter>: This parameter
-      controls which platforms EGL will be built for. Available
-      platforms are drm, x11 and wayland.
-    </para>
-
-    <para>
-      <parameter>--with-gallium-drivers="..."</parameter>: This parameter
-      controls which Gallium3D drivers should be built. Available drivers
-      are: i915, ilo, nouveau, r300, r600, radeonsi, svga and swrast. You
-      will need to remove r300, r600 and radeonsi from the list if you did
-      not install <application>elfutils</application> and
-      <application>LLVM</application> with the r600/amdgpu backend.
-    </para>
-
-    <para>
-      <option>--enable-r600-llvm-compiler</option>: Use this switch to
-      enable an experimental R600 <application>LLVM</application> backend
-      for graphics shaders which claims to speed up the driver.
-    </para>
-
-    <para>
-      <option>--enable-sysfs</option>: Use this switch to enable simple PCI
-      identification method, required for building DRI on systems without udev.
-    </para>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Libraries</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-      <seglistitem>
-        <seg>
-          glxgears and glxinfo
-        </seg>
-        <seg>
-          libEGL.so,
-          libgbm.so,
-          libglapi.so,
-          libGLESv1_CM.so,
-          libGLESv2.so,
-          libGL.so,
-          libOSMesa.so,
-          libxatracker.so,
-          libXvMCnouveau.so,
-          and libXvMCr600.so
-        </seg>
-        <seg>
-          $XORG_PREFIX/{include/{EGL,GL,GLES,GLES2,GLES3,KHR},lib/{dri,vdpau}}
-          and
-          /usr/share/doc/mesa-&mesalib-version; (optional)
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="glxgears">
-        <term><command>glxgears</command></term>
-        <listitem>
-          <para>
-            is a GL demo useful for troubleshooting graphics
-            problems.
-          </para>
-          <indexterm zone="mesalib glxgears">
-            <primary sortas="b-glxgears">glxgears</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="glxinfo">
-        <term><command>glxinfo</command></term>
-        <listitem>
-          <para>
-            is a diagnostic program that displays information about the
-            graphics hardware and installed GL libraries.
-          </para>
-          <indexterm zone="mesalib glxinfo">
-            <primary sortas="b-glxinfo">glxinfo</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libEGL">
-        <term><filename class="libraryfile">libEGL.so</filename></term>
-        <listitem>
-          <para>
-            provides a native platform graphics interface as
-            defined by the EGL-1.4 specification.
-          </para>
-          <indexterm zone="mesalib libEGL">
-            <primary sortas="c-libGL">libEGL.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libgbm">
-        <term><filename class="libraryfile">libgbm.so</filename></term>
-        <listitem>
-          <para>
-            is the <application>Mesa</application> Graphics Buffer
-            Manager library.
-          </para>
-          <indexterm zone="mesalib libgbm">
-            <primary sortas="c-libgbm">libgbm.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libGLESv1_CM">
-        <term><filename class="libraryfile">libGLESv1_CM.so</filename></term>
-        <listitem>
-          <para>
-            is the <application>Mesa</application> OpenGL ES 1.1 library.
-          </para>
-          <indexterm zone="mesalib libGLESv1_CM">
-            <primary sortas="c-libGLESv1_CM">libGLESv1_CM.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libGLES2">
-        <term><filename class="libraryfile">libGLES2.so</filename></term>
-        <listitem>
-          <para>
-            is the <application>Mesa</application> OpenGL ES 2.0 library.
-          </para>
-          <indexterm zone="mesalib libGLES2">
-            <primary sortas="c-libGLES2">libGLES2.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libGL">
-        <term><filename class="libraryfile">libGL.so</filename></term>
-        <listitem>
-          <para>
-            is the main <application>Mesa</application> OpenGL library.
-          </para>
-          <indexterm zone="mesalib libGL">
-            <primary sortas="c-libGL">libGL.so</primary>
-          </indexterm>
-        </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="mesalib libOSMesa">
-            <primary sortas="c-libOSMesa">libOSMesa.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libxatracker">
-        <term><filename class="libraryfile">libxatracker.so</filename></term>
-        <listitem>
-          <para>
-            is the Xorg Gallium3D acceleration library.
-          </para>
-          <indexterm zone="mesalib libxatracker">
-            <primary sortas="c-libxatracker">libxatracker.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: x/installing/x7app.xml
===================================================================
--- x/installing/x7app.xml	(revision 19bcba7d67329abd96c22f2a7b5a135275799f3b)
+++ x/installing/x7app.xml	(revision 7a395d143a86bed5b33324e7b19e987db3000c4d)
@@ -174,5 +174,5 @@
     <para role="required">
       <xref linkend="libpng"/>,
-      <xref linkend="mesalib"/>,
+      <xref linkend="mesa"/>,
       <xref linkend="xbitmaps"/>, and
       <xref linkend="xcb-util"/>
Index: x/installing/x7driver-ati.xml
===================================================================
--- x/installing/x7driver-ati.xml	(revision 19bcba7d67329abd96c22f2a7b5a135275799f3b)
+++ x/installing/x7driver-ati.xml	(revision 7a395d143a86bed5b33324e7b19e987db3000c4d)
@@ -47,5 +47,5 @@
           For Direct Rendering to work with newer Radeon Cards (R300 and later
           chipsets), you need to enable the r300, r600 and radeonsi Gallium
-          drivers at <xref linkend="mesalib"/> build time. Also, some cards
+          drivers at <xref linkend="mesa"/> build time. Also, some cards
           require Firmware to be available when the kernel driver is loaded.
           Firmware can be obtained from <ulink
@@ -206,5 +206,5 @@
         to accelerate 2D rendering. Glamor acceleration is required for
         Radeon "Southern Islands" GPUs which use "radeonsi" Gallium3D driver
-        from <xref linkend="mesalib"/>. To see which cards fall under
+        from <xref linkend="mesa"/>. To see which cards fall under
         "Southern Islands" category, read the
         <ulink url="&radeon-marketing-names;">
Index: x/installing/xorg-config.xml
===================================================================
--- x/installing/xorg-config.xml	(revision 19bcba7d67329abd96c22f2a7b5a135275799f3b)
+++ x/installing/xorg-config.xml	(revision 7a395d143a86bed5b33324e7b19e987db3000c4d)
@@ -47,5 +47,5 @@
       DRI is a framework for allowing software to access graphics hardware in a safe and
       efficient manner. It is installed in <application>X</application> by default
-      (using <application>MesaLib</application>) if you have a supported video card.
+      (using <application>Mesa</application>) if you have a supported video card.
     </para>
 
@@ -92,5 +92,5 @@
       Another way to determine if DRI is working properly is to use one of the
       two optionally installed OpenGL demo programs in <xref
-      linkend="mesalib"/>. From an X terminal, run <command>glxinfo</command>
+      linkend="mesa"/>. From an X terminal, run <command>glxinfo</command>
       and look for the phrase:
     </para>
@@ -119,5 +119,5 @@
       Software Rasterizer for Direct Rendering. In such cases, you can use a new,
       LLVM-accelerated, Software Rasterizer called LLVMPipe. In order to build
-      LLVMPipe just make sure that <xref linkend="llvm"/> is present at MesaLib
+      LLVMPipe just make sure that <xref linkend="llvm"/> is present at Mesa
       build time. Note that all decoding is done on the CPU instead of the GPU,
       so the display will run slower than with hardware acceleration.  
Index: x/lib/cairo.xml
===================================================================
--- x/lib/cairo.xml	(revision 19bcba7d67329abd96c22f2a7b5a135275799f3b)
+++ x/lib/cairo.xml	(revision 7a395d143a86bed5b33324e7b19e987db3000c4d)
@@ -105,5 +105,5 @@
       <xref linkend="libdrm"/>,
       <xref linkend="lzo"/>,
-      <xref linkend="mesalib"/>,
+      <xref linkend="mesa"/>,
       <xref linkend="qt4"/>,
       <xref linkend="valgrind"/>,
Index: x/lib/clutter.xml
===================================================================
--- x/lib/clutter.xml	(revision 19bcba7d67329abd96c22f2a7b5a135275799f3b)
+++ x/lib/clutter.xml	(revision 7a395d143a86bed5b33324e7b19e987db3000c4d)
@@ -42,5 +42,5 @@
         Anything built with this toolkit needs hardware 3D acceleration from
         the graphics driver at runtime. This is provided by
-        <application>MesaLib</application> (or by proprietary graphics drivers),
+        <application>Mesa</application> (or by proprietary graphics drivers),
         but is not available for every graphics card nor for all virtual
         machines. You may wish to review <xref linkend="checking-dri"/>.
Index: x/lib/cogl.xml
===================================================================
--- x/lib/cogl.xml	(revision 19bcba7d67329abd96c22f2a7b5a135275799f3b)
+++ x/lib/cogl.xml	(revision 7a395d143a86bed5b33324e7b19e987db3000c4d)
@@ -78,5 +78,5 @@
     <para role="required">
       <xref linkend="gdk-pixbuf"/>,
-      <xref linkend="mesalib"/>, and
+      <xref linkend="mesa"/>, and
       <xref linkend="pango"/>
     </para>
Index: x/lib/fltk.xml
===================================================================
--- x/lib/fltk.xml	(revision 19bcba7d67329abd96c22f2a7b5a135275799f3b)
+++ x/lib/fltk.xml	(revision 7a395d143a86bed5b33324e7b19e987db3000c4d)
@@ -93,5 +93,5 @@
       <xref linkend="doxygen"/>,
       <xref linkend="glu"/>,
-      <xref linkend="mesalib"/>, and
+      <xref linkend="mesa"/>, and
       <xref linkend="texlive"/> (or <xref linkend="tl-installer"/>)
     </para>
Index: x/lib/freeglut.xml
===================================================================
--- x/lib/freeglut.xml	(revision 19bcba7d67329abd96c22f2a7b5a135275799f3b)
+++ x/lib/freeglut.xml	(revision 7a395d143a86bed5b33324e7b19e987db3000c4d)
@@ -80,5 +80,5 @@
     <para role="required">
       <xref linkend="cmake"/> and
-      <xref linkend="mesalib"/>
+      <xref linkend="mesa"/>
     </para>
 
Index: x/lib/glu.xml
===================================================================
--- x/lib/glu.xml	(revision 19bcba7d67329abd96c22f2a7b5a135275799f3b)
+++ x/lib/glu.xml	(revision 7a395d143a86bed5b33324e7b19e987db3000c4d)
@@ -74,5 +74,5 @@
     <bridgehead renderas="sect4">Required</bridgehead>
     <para role="required">
-      <xref linkend="mesalib"/>
+      <xref linkend="mesa"/>
     </para>
 
@@ -147,5 +147,5 @@
             Utility library.
           </para>
-          <indexterm zone="mesalib libGLU">
+          <indexterm zone="glu libGLU">
             <primary sortas="c-libGLU">libGLU.so</primary>
           </indexterm>
Index: x/lib/libepoxy.xml
===================================================================
--- x/lib/libepoxy.xml	(revision 19bcba7d67329abd96c22f2a7b5a135275799f3b)
+++ x/lib/libepoxy.xml	(revision 7a395d143a86bed5b33324e7b19e987db3000c4d)
@@ -75,5 +75,5 @@
     <bridgehead renderas="sect4">Required</bridgehead>
     <para role="required">
-      <xref linkend="mesalib"/>
+      <xref linkend="mesa"/>
     </para>
 
Index: x/lib/qt4.xml
===================================================================
--- x/lib/qt4.xml	(revision 19bcba7d67329abd96c22f2a7b5a135275799f3b)
+++ x/lib/qt4.xml	(revision 7a395d143a86bed5b33324e7b19e987db3000c4d)
@@ -120,5 +120,5 @@
     <para role="recommended">
       <xref linkend="alsa-lib"/>,
-      <xref linkend="mesalib"/>,
+      <xref linkend="mesa"/>,
       <xref linkend="cacerts"/>,
       <xref linkend="dbus"/>,
Index: x/lib/qt5.xml
===================================================================
--- x/lib/qt5.xml	(revision 19bcba7d67329abd96c22f2a7b5a135275799f3b)
+++ x/lib/qt5.xml	(revision 7a395d143a86bed5b33324e7b19e987db3000c4d)
@@ -101,5 +101,5 @@
       <xref linkend="libtiff"/>,
       <xref linkend="libwebp"/>,
-      <xref linkend="mesalib"/>,
+      <xref linkend="mesa"/>,
       <xref linkend="mtdev"/>,
       <xref linkend="openssl"/>,
Index: x/lib/webkitgtk.xml
===================================================================
--- x/lib/webkitgtk.xml	(revision 19bcba7d67329abd96c22f2a7b5a135275799f3b)
+++ x/lib/webkitgtk.xml	(revision 7a395d143a86bed5b33324e7b19e987db3000c4d)
@@ -87,5 +87,5 @@
       <xref linkend="libsoup"/>,
       <xref linkend="libwebp"/>,
-      <xref linkend="mesalib"/>,
+      <xref linkend="mesa"/>,
       <xref linkend="ruby"/>,
       <xref linkend="sqlite"/> and
Index: x/lib/webkitgtk2.xml
===================================================================
--- x/lib/webkitgtk2.xml	(revision 19bcba7d67329abd96c22f2a7b5a135275799f3b)
+++ x/lib/webkitgtk2.xml	(revision 7a395d143a86bed5b33324e7b19e987db3000c4d)
@@ -85,5 +85,5 @@
       <xref linkend="libsoup"/>,
       <xref linkend="libwebp"/>,
-      <xref linkend="mesalib"/>,
+      <xref linkend="mesa"/>,
       <xref linkend="ruby"/>,
       <xref linkend="sqlite"/> and
