Index: x/installing/installing.xml
===================================================================
--- x/installing/installing.xml	(revision 2b96dcc0e51f134fc95844b09abae845ac981229)
+++ x/installing/installing.xml	(revision 4ffc987ad5d70c9a7daf040e1d8f6aed97bb7277)
@@ -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="mesalib-systemd.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/mesalib-systemd.xml
===================================================================
--- x/installing/mesalib-systemd.xml	(revision 4ffc987ad5d70c9a7daf040e1d8f6aed97bb7277)
+++ x/installing/mesalib-systemd.xml	(revision 4ffc987ad5d70c9a7daf040e1d8f6aed97bb7277)
@@ -0,0 +1,481 @@
+<?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;/MesaLib-&mesalib-version;.tar.bz2">
+  <!ENTITY mesalib-md5sum        "11d3542da1b703618634be840a87b0b2">
+  <!ENTITY mesalib-size          "6.9 MB">
+  <!ENTITY mesalib-buildsize     "313 MB (additional 1.6 MB for the docs)">
+  <!ENTITY mesalib-time          "4.4 SBU">
+
+]>
+
+<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>
+
+    &lfs75_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 Patch</bridgehead>
+    <itemizedlist spacing="compact">
+      <listitem>
+        <para>
+          Recommended patch:
+          <ulink url="&patch-root;/MesaLib-&mesalib-version;-add_xdemos-1.patch"/>
+          (Needed if testing the Xorg installation per BLFS instructions).
+        </para>
+      </listitem>
+    </itemizedlist>
+
+    <bridgehead renderas="sect3">MesaLib Dependencies</bridgehead>
+
+    <bridgehead renderas="sect4">Required</bridgehead>
+    <para role="required">
+      <xref linkend="libxml2"/>,
+      <xref linkend="xorg7-lib"/>, and
+      <xref linkend="libdrm"/>
+    </para>
+
+    <bridgehead renderas="sect4">Recommended</bridgehead>
+    <para role="recommended">
+      <xref linkend="elfutils"/> (required for Radeon 3D drivers),
+      <xref linkend="libvdpau"/> (to build VDPAU drivers for supported hardware),
+      <xref linkend="llvm"/> (required for Radeon 3D 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"></ulink>) and
+      <xref linkend="wayland"/> (required for <filename>libwayland-egl</filename>
+      library which is used by many packages that use
+      <application>Wayland</application>)
+    </para>
+
+    <bridgehead renderas="sect4">Optional</bridgehead>
+    <para role="optional">
+      <ulink url="http://libclc.llvm.org/">libclc</ulink>
+      (to build Radeon OpenCL library) and
+      <ulink url="http://omxil.sourceforge.net/">libomxil-bellagio</ulink>
+      (to build Radeon OpenMAX driver)
+    </para>
+
+    <note>
+      <para>
+        The instructions below assume that <application>elfutils</application>
+        and <application>LLVM</application> 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 Radeon 3D drivers. For an explanation of gallium please see
+        <ulink url="https://en.wikipedia.org/wiki/Gallium3D"></ulink>.
+      </para>
+    </note>
+
+    <note>
+      <para>
+        The <application>libxml2</application>
+        <application>Python</application> module must have been built
+        during the installation of <application>libxml2</application>
+        or else <application>MesaLib</application> build will fail.
+      </para>
+    </note>
+
+    <para condition="html" role="usernotes">User Notes:
+      <ulink url="&blfs-wiki;/mesalib"/>
+    </para>
+  </sect2>
+
+  <sect2 role="installation">
+    <title>Installation of MesaLib</title>
+
+    <note>
+      <para>
+        Unlike other packages, the
+        <filename>MesaLib-&mesalib-version;.tar.bz2</filename>
+        archive will extract to the
+        <filename class="directory">Mesa-&mesalib-version;</filename>
+        directory.
+      </para>
+    </note>
+
+    <para>
+      If you have downloaded the recommended patch, apply it by running the
+      following command:
+    </para>
+
+<screen><userinput>patch -Np1 -i ../MesaLib-&mesalib-version;-add_xdemos-1.patch</userinput></screen>
+
+    <para>
+      Install <application>MesaLib</application> by running the following
+      commands:
+    </para>
+
+<screen><userinput>./autogen.sh CFLAGS="-O2" CXXFLAGS="-O2" \
+            --prefix=/usr                \
+            --sysconfdir=/etc            \
+            --enable-texture-float       \
+            --enable-gles1               \
+            --enable-gles2               \
+            --enable-openvg              \
+            --enable-osmesa              \
+            --enable-xa                  \
+            --enable-gbm                 \
+            --enable-gallium-egl         \
+            --enable-gallium-gbm         \
+            --enable-glx-tls             \
+            --with-egl-platforms="drm,x11,wayland" \
+            --with-gallium-drivers="nouveau,r300,r600,radeonsi,svga,swrast" &amp;&amp;
+make</userinput></screen>
+
+    <para>
+      If you have applied the recommended patch, build the demo programs by
+      running the following command:
+    </para>
+
+<screen><userinput>make -C xdemos DEMOS_PREFIX=/usr</userinput></screen>
+
+    <para>
+      This package does not come with a test suite.
+    </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=/usr 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/MesaLib-&mesalib-version; &amp;&amp;
+cp -rfv docs/* /usr/share/doc/MesaLib-&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-openvg</parameter>: This switch enables support for
+      OpenVG 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-gallium-egl</parameter>: This switch enables optional
+      EGL state tracker for Gallium.
+    </para>
+
+    <para>
+      <parameter>--enable-gallium-gbm</parameter>: This switch enables optional
+      GBM state tracker for Gallium.
+    </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 for which platforms EGL should be built. Available
+      platforms are drm, x11 and wayland. Remove <option>wayland</option>
+      from the list if you have not installed
+      <application>Wayland</application>.
+    </para>
+
+    <para>
+      <parameter>--with-gallium-drivers="..."</parameter>: This parameter
+      controls which Gallium 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>.
+    </para>
+
+    <para>
+      <option>--enable-r600-llvm-compiler</option>: Use this switch to
+      enable experimental R600 <application>LLVM</application> backend
+      for graphics shaders which claims to speed up the driver.
+    </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,
+          libOpenVG.so,
+          libwayland-egl.so, and
+          libxatracker.so
+        </seg>
+        <seg>
+          /usr/include/EGL,
+          /usr/include/GL,
+          /usr/include/GLES,
+          /usr/include/GLES2,
+          /usr/include/GLES3,
+          /usr/include/KHR,
+          /usr/include/VG,
+          /usr/lib/dri,
+          /usr/lib/egl,
+          /usr/lib/gallium-pipe,
+          /usr/lib/gbm,
+          /usr/lib/vdpau, and
+          /usr/share/doc/MesaLib-&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="libOpenVG">
+        <term><filename class="libraryfile">libOpenVG.so</filename></term>
+        <listitem>
+          <para>
+            is the <application>Mesa</application> OpenVG 1.0 library.
+          </para>
+          <indexterm zone="mesalib libOpenVG">
+            <primary sortas="c-libOpenVG">libOpenVG.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: installing/mesalib.xml
===================================================================
--- x/installing/mesalib.xml	(revision 2b96dcc0e51f134fc95844b09abae845ac981229)
+++ 	(revision )
@@ -1,483 +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;/MesaLib-&mesalib-version;.tar.bz2">
-<!--  <!ENTITY mesalib-download-ftp
-  "ftp://ftp.freedesktop.org/pub/mesa/&mesalib-version;/MesaLib-&mesalib-version;.tar.bz2">-->
-  <!ENTITY mesalib-md5sum        "11d3542da1b703618634be840a87b0b2">
-  <!ENTITY mesalib-size          "6.9 MB">
-  <!ENTITY mesalib-buildsize     "313 MB (additional 1.6 MB for the docs)">
-  <!ENTITY mesalib-time          "4.4 SBU">
-
-]>
-
-<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>
-
-    &lfs75_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 Patch</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Recommended patch:
-          <ulink url="&patch-root;/MesaLib-&mesalib-version;-add_xdemos-1.patch"/>
-          (Needed if testing the Xorg installation per BLFS instructions).
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">MesaLib Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-      <xref linkend="libxml2"/>,
-      <xref linkend="xorg7-lib"/>, and
-      <xref linkend="libdrm"/>
-    </para>
-
-    <bridgehead renderas="sect4">Recommended</bridgehead>
-    <para role="recommended">
-      <xref linkend="elfutils"/> (required for radeon 3d drivers),
-      <xref linkend="libvdpau"/> (to build VDPAU drivers),
-      <xref linkend="llvm"/> (required for radeon 3d 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"></ulink> )
-    </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>; two of them overwrites the ones
-      included by
-      <filename>MesaLib-&mesalib-version;-add_xdemos-1.patch</filename>;
-      to avoid that, install in a different prefix or add, e.g.
-      <option>--program-prefix=md</option> to configure, and
-      <ulink url="http://wayland.freedesktop.org/">Wayland</ulink>
-    </para>
-
-    <note>
-      <para>
-        The instructions below assume that <application>elfutils</application>
-        and <application>LLVM</application> 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 Radeon 3D drivers.  For an explanation of gallium please see
-        <ulink url="https://en.wikipedia.org/wiki/Gallium3D"></ulink>.
-      </para>
-    </note>
-
-    <note>
-      <para>
-        The <application>libxml2</application>
-        <application>Python</application> module must have been built
-        during the installation of <application>libxml2</application>
-        or else <application>MesaLib</application> build will fail.
-      </para>
-    </note>
-
-    <para condition="html" role="usernotes">User Notes:
-      <ulink url="&blfs-wiki;/mesalib"/>
-    </para>
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of MesaLib</title>
-
-    <note>
-      <para>
-        Unlike other packages, the
-        <filename>MesaLib-&mesalib-version;.tar.bz2</filename>
-        archive will extract to the
-        <filename class="directory">Mesa-&mesalib-version;</filename>
-        directory.
-      </para>
-    </note>
-
-    <para>
-      If you have downloaded the recommended patch, apply it by running the
-      following command:
-    </para>
-
-<screen><userinput>patch -Np1 -i ../MesaLib-&mesalib-version;-add_xdemos-1.patch</userinput></screen>
-
-    <para>
-      Install <application>MesaLib</application> by running the following
-      commands:
-    </para>
-
-<screen><userinput>./autogen.sh CFLAGS="-O2" CXXFLAGS="-O2"   \
-            --prefix=$XORG_PREFIX          \
-            --sysconfdir=/etc              \
-            --enable-texture-float         \
-            --enable-gles1                 \
-            --enable-gles2                 \
-            --enable-openvg                \
-            --enable-osmesa                \
-            --enable-xa                    \
-            --enable-gbm                   \
-            --enable-gallium-egl           \
-            --enable-gallium-gbm           \
-            --enable-glx-tls               \
-            --with-egl-platforms="drm,x11" \
-            --with-gallium-drivers="nouveau,r300,r600,radeonsi,svga,swrast" &amp;&amp;
-make</userinput></screen>
-
-    <para>
-      If you have applied the recommended patch, build the demo programs by
-      running the following command:
-    </para>
-
-<screen><userinput>make -C xdemos DEMOS_PREFIX=$XORG_PREFIX</userinput></screen>
-
-    <para>
-      This package does not come with a test suite.
-    </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/MesaLib-&mesalib-version; &amp;&amp;
-cp -rfv docs/* /usr/share/doc/MesaLib-&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-openvg</parameter>: This switch enables support for
-      OpenVG 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-gallium-egl</parameter>: This switch enables optional
-      EGL state tracker for Gallium.
-    </para>
-
-    <para>
-      <parameter>--enable-gallium-gbm</parameter>: This switch enables optional
-      GBM state tracker for Gallium.
-    </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 for which platforms EGL should be built. Available
-      platforms are drm, x11 and wayland.
-    </para>
-
-    <para>
-      <parameter>--with-gallium-drivers="..."</parameter>: This parameter
-      controls which Gallium 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>.
-    </para>
-
-    <para>
-      <option>--enable-r600-llvm-compiler</option>: Use this switch to
-      enable experimental R600 <application>LLVM</application> backend
-      for graphics shaders which claims to speed up the driver.
-    </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>
-          libGL.so, 
-          libEGL.so, 
-          libGLESv1_CM.so, 
-          libGLESv2.so,
-          libOSMesa.so, 
-          libOpenVG.so, 
-          libgbm.so, 
-          libglapi.so, 
-          libxatracker.so,
-          <!--libXvMCnouveau.so and libXvMCr600.so--> and
-          several libs under /usr/lib/{dri,egl,gallium-pipe,gbm,vdpau}
-        </seg>
-        <seg>
-          $XORG_PREFIX/include/EGL,
-          $XORG_PREFIX/include/GL,
-          $XORG_PREFIX/include/GLES,
-          $XORG_PREFIX/include/GLES2,
-          $XORG_PREFIX/include/GLES3,
-          $XORG_PREFIX/include/KHR,
-          $XORG_PREFIX/include/VG,
-          $XORG_PREFIX/lib/dri,
-          $XORG_PREFIX/lib/egl,
-          $XORG_PREFIX/lib/gallium-pipe,
-          $XORG_PREFIX/lib/gbm,
-          $XORG_PREFIX/lib/vdpau, and
-          /usr/share/doc/MesaLib-&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="libOpenVG">
-        <term><filename class="libraryfile">libOpenVG.so</filename></term>
-        <listitem>
-          <para>
-            is the <application>Mesa</application> OpenVG 1.0 library.
-          </para>
-          <indexterm zone="mesalib libOpenVG">
-            <primary sortas="c-libOpenVG">libOpenVG.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/lib/cairo-systemd.xml
===================================================================
--- x/lib/cairo-systemd.xml	(revision 4ffc987ad5d70c9a7daf040e1d8f6aed97bb7277)
+++ x/lib/cairo-systemd.xml	(revision 4ffc987ad5d70c9a7daf040e1d8f6aed97bb7277)
@@ -0,0 +1,265 @@
+<?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 cairo-download-http "http://cairographics.org/releases/cairo-&cairo-version;.tar.xz">
+  <!ENTITY cairo-download-ftp  " ">
+  <!ENTITY cairo-md5sum        "a1304edcdc99282f478b995ee5f8f854">
+  <!ENTITY cairo-size          "35 MB">
+  <!ENTITY cairo-buildsize     "158 MB">
+  <!ENTITY cairo-time          "1.0 SBU">
+]>
+
+<sect1 id="cairo" xreflabel="Cairo-&cairo-version;">
+  <?dbhtml filename="cairo.html"?>
+
+  <sect1info>
+    <othername>$LastChangedBy$</othername>
+    <date>$Date$</date>
+  </sect1info>
+
+  <title>Cairo-&cairo-version;</title>
+
+  <indexterm zone="cairo">
+    <primary sortas="a-Cairo">Cairo</primary>
+  </indexterm>
+
+  <sect2 role="package">
+    <title>Introduction to Cairo</title>
+
+    <para>
+      <application>Cairo</application> is a 2D graphics library with support for
+      multiple output devices. Currently supported output targets include the
+      <application>X</application> Window System, win32, image buffers,
+      PostScript, PDF and SVG. Experimental backends include OpenGL, Quartz and
+      XCB file output. <application>Cairo</application> is designed to produce
+      consistent output on all output media while taking advantage of display
+      hardware acceleration when available (e.g., through the X Render
+      Extension). The <application>Cairo</application> API provides operations
+      similar to the drawing operators of PostScript and PDF. Operations in
+      <application>Cairo</application> include stroking and filling cubic
+      B&eacute;zier splines, transforming and compositing translucent images,
+      and antialiased text rendering. All drawing operations can be transformed
+      by any
+      <ulink url="http://en.wikipedia.org/wiki/Affine_transformation">affine
+      transformation</ulink> (scale, rotation, shear, etc.).
+    </para>
+
+    &lfs75_checked;
+
+    <bridgehead renderas="sect3">Package Information</bridgehead>
+    <itemizedlist spacing="compact">
+      <listitem>
+        <para>
+          Download (HTTP): <ulink url="&cairo-download-http;"/>
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Download (FTP): <ulink url="&cairo-download-ftp;"/>
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Download MD5 sum: &cairo-md5sum;
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Download size: &cairo-size;
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Estimated disk space required: &cairo-buildsize;
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Estimated build time: &cairo-time;
+        </para>
+      </listitem>
+    </itemizedlist>
+
+    <bridgehead renderas="sect3">Cairo Dependencies</bridgehead>
+
+    <bridgehead renderas="sect4">Required</bridgehead>
+    <para role="required">
+      <xref linkend="libpng"/>,
+      <xref linkend="glib2"/> and
+      <xref linkend="pixman"/>
+    </para>
+
+    <bridgehead renderas="sect4">Recommended</bridgehead>
+    <para role="recommended">
+      <xref linkend="fontconfig"/>,
+      <xref linkend="mesalib"/> and
+      <xref linkend="xorg7-lib"/>
+    </para>
+
+    <bridgehead renderas="sect4">Optional</bridgehead>
+    <para role="optional">
+      <xref linkend="cogl"/>,
+      <ulink url="http://www.directfb.org/">DirectFB</ulink>,
+      <xref linkend="gtk-doc"/>,
+      <xref linkend="libdrm"/>,
+      <xref linkend="lzo"/>,
+      <xref linkend="qt4"/>,
+      <ulink url="http://code.google.com/p/skia/">Skia</ulink>, and
+      <xref linkend="valgrind"/>
+    </para>
+
+    <para condition="html" role="usernotes">
+      User Notes: <ulink url="&blfs-wiki;/cairo"/>
+    </para>
+  </sect2>
+
+  <sect2 role="installation">
+    <title>Installation of Cairo</title>
+
+    <para>
+      Install <application>Cairo</application> by running the following
+      commands:
+    </para>
+
+<screen><userinput>CFLAGS="$CFLAGS -ffat-lto-objects" \
+./configure --prefix=/usr    \
+            --enable-gl      \
+            --enable-tee     \
+            --disable-static &amp;&amp;
+make</userinput></screen>
+
+    <para>
+      This package does not have a working testsuite.
+    </para>
+
+    <para>
+      Now, as the <systemitem class="username">root</systemitem> user:
+    </para>
+
+<screen role="root"><userinput>make install</userinput></screen>
+  </sect2>
+
+  <sect2 role="commands">
+    <title>Command Explanations</title>
+
+    <para>
+      <command>CFLAGS="$CFLAGS -ffat-lto-objects"</command>: Fixes building
+      with GCC 4.9.
+    </para>
+
+    <para>
+      <parameter>--enable-gl</parameter>: This switch enables experimental
+      OpenGL surface backend which is required for
+      <application>Weston</application>. Remove it if you have not installed
+      <xref linkend="mesalib"/>.
+    </para>
+
+    <para>
+      <parameter>--enable-tee</parameter>: This switch enables experimental tee
+      surface backend which is required if using system-installed
+      <application>Cairo</application> with Mozilla applications.
+    </para>
+
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+      href="../../xincludes/static-libraries.xml"/>
+
+    <para>
+      <option>--enable-xlib-xcb</option>: This switch enables experimental
+      Xlib/XCB functions used by some window managers.
+    </para>
+
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+      href="../../xincludes/gtk-doc-rebuild.xml"/>
+
+  </sect2>
+
+  <sect2 role="content">
+    <title>Contents</title>
+
+    <segmentedlist>
+      <segtitle>Installed Programs</segtitle>
+      <segtitle>Installed Libraries</segtitle>
+      <segtitle>Installed Directories</segtitle>
+
+      <seglistitem>
+        <seg>
+          cairo-sphinx and cairo-trace
+        </seg>
+        <seg>
+          libcairo.so, libcairo-gobject.so and
+          libcairo-script-interpreter.so
+        </seg>
+        <seg>
+          /usr/include/cairo,
+          /usr/lib/cairo and
+          /usr/share/gtk-doc/html/cairo
+        </seg>
+      </seglistitem>
+    </segmentedlist>
+
+    <variablelist>
+      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
+      <?dbfo list-presentation="list"?>
+      <?dbhtml list-presentation="table"?>
+
+      <varlistentry id="cairo-trace">
+        <term><command>cairo-trace</command></term>
+        <listitem>
+          <para>
+            generates a log of all calls made by an application to
+            <application>Cairo</application>.
+          </para>
+          <indexterm zone="cairo cairo-trace">
+            <primary sortas="b-cairo-trace">cairo-trace</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="libcairo">
+        <term><filename class="libraryfile">libcairo.so</filename></term>
+        <listitem>
+          <para>
+            contains the 2D graphics functions required for rendering to the
+            various output targets.
+          </para>
+          <indexterm zone="cairo libcairo">
+            <primary sortas="c-libcairo">libcairo.so</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="libcairo-gobject">
+        <term><filename class="libraryfile">libcairo-gobject.so</filename></term>
+        <listitem>
+          <para>
+            contains functions that integrate
+            <application>Cairo</application> with <xref linkend="glib2"/>'s
+            GObject type system.
+          </para>
+          <indexterm zone="cairo libcairo-gobject">
+            <primary sortas="c-libcairo-gobject">libcairo-gobject.so</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="libcairo-script-interpreter">
+        <term><filename class="libraryfile">libcairo-script-interpreter.so</filename></term>
+        <listitem>
+          <para>
+            contains the script interpreter functions for executing and
+            manipulating <application>Cairo</application> execution traces.
+          </para>
+          <indexterm zone="cairo libcairo-script-interpreter">
+            <primary sortas="c-libcairo-script-interpreter">libcairo-script-interpreter.so</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+    </variablelist>
+
+  </sect2>
+
+</sect1>
Index: lib/cairo.xml
===================================================================
--- x/lib/cairo.xml	(revision 2b96dcc0e51f134fc95844b09abae845ac981229)
+++ 	(revision )
@@ -1,266 +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 cairo-download-http "http://cairographics.org/releases/cairo-&cairo-version;.tar.xz">
-  <!ENTITY cairo-download-ftp  " ">
-  <!ENTITY cairo-md5sum        "a1304edcdc99282f478b995ee5f8f854">
-  <!ENTITY cairo-size          "35 MB">
-  <!ENTITY cairo-buildsize     "158 MB">
-  <!ENTITY cairo-time          "1.0 SBU">
-]>
-
-<sect1 id="cairo" xreflabel="Cairo-&cairo-version;">
-  <?dbhtml filename="cairo.html"?>
-
-  <sect1info>
-    <othername>$LastChangedBy$</othername>
-    <date>$Date$</date>
-  </sect1info>
-
-  <title>Cairo-&cairo-version;</title>
-
-  <indexterm zone="cairo">
-    <primary sortas="a-Cairo">Cairo</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to Cairo</title>
-
-    <para>
-      <application>Cairo</application> is a 2D graphics library with support for
-      multiple output devices. Currently supported output targets include the
-      <application>X</application> Window System, win32, image buffers,
-      PostScript, PDF and SVG. Experimental backends include OpenGL, Quartz and
-      XCB file output. <application>Cairo</application> is designed to produce
-      consistent output on all output media while taking advantage of display
-      hardware acceleration when available (e.g., through the X Render
-      Extension). The <application>Cairo</application> API provides operations
-      similar to the drawing operators of PostScript and PDF. Operations in
-      <application>Cairo</application> include stroking and filling cubic
-      B&eacute;zier splines, transforming and compositing translucent images,
-      and antialiased text rendering. All drawing operations can be transformed
-      by any
-      <ulink url="http://en.wikipedia.org/wiki/Affine_transformation">affine
-      transformation</ulink> (scale, rotation, shear, etc.).
-    </para>
-
-    &lfs75_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&cairo-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&cairo-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &cairo-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &cairo-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &cairo-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &cairo-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">Cairo Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-      <xref linkend="libpng"/>,
-      <xref linkend="glib2"/> and
-      <xref linkend="pixman"/>
-    </para>
-
-    <bridgehead renderas="sect4">Recommended</bridgehead>
-    <para role="recommended">
-      <xref linkend="fontconfig"/> and
-      <xref linkend="xorg7-lib"/>
-    </para>
-
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional">
-      <xref linkend="cogl"/>,
-      <ulink url="http://www.directfb.org/">DirectFB</ulink>,
-      <xref linkend="gtk-doc"/>,
-      <xref linkend="libdrm"/>,
-      <xref linkend="lzo"/>,
-      <xref linkend="mesalib"/>,
-      <xref linkend="qt4"/>,
-      <ulink url="http://code.google.com/p/skia/">Skia</ulink>, and
-      <xref linkend="valgrind"/>
-    </para>
-
-    <para condition="html" role="usernotes">
-      User Notes: <ulink url="&blfs-wiki;/cairo"/>
-    </para>
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of Cairo</title>
-
-    <para>
-      Install <application>Cairo</application> by running the following
-      commands:
-    </para>
-
-<screen><userinput>CFLAGS="$CFLAGS -ffat-lto-objects" \
-./configure --prefix=/usr    \
-            --disable-static \
-            --enable-tee &amp;&amp;
-make</userinput></screen>
-
-    <para>
-      This package does not have a working testsuite.
-    </para>
-
-    <para>
-      Now, as the <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"><userinput>make install</userinput></screen>
-  </sect2>
-
-  <sect2 role="commands">
-    <title>Command Explanations</title>
-
-    <para>
-      <command>CFLAGS="$CFLAGS -ffat-lto-objects"</command>: Fixes building
-      with GCC 4.9.
-    </para>
-
-    <para>
-      <parameter>--enable-tee</parameter>: This switch enables experimental tee
-      surface backend which is required if using system-installed
-      <application>Cairo</application> with Mozilla applications.
-    </para>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-      href="../../xincludes/static-libraries.xml"/>
-
-    <para>
-      <option>--enable-xlib-xcb</option>: This switch enables experimental
-      Xlib/XCB functions used by some window managers.
-    </para>
-
-    <para>
-      <option>--enable-gl</option>: This switch enables
-      <application>Cairo</application>'s experimental
-      <application>OpenGL</application> surface which
-      is required for <application>Wayland</application>
-      compositor and some other packages that are not
-      part of BLFS.
-    </para>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-      href="../../xincludes/gtk-doc-rebuild.xml"/>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Libraries</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-      <seglistitem>
-        <seg>
-          cairo-sphinx and cairo-trace
-        </seg>
-        <seg>
-          libcairo.so, libcairo-gobject.so and
-          libcairo-script-interpreter.so
-        </seg>
-        <seg>
-          /usr/include/cairo,
-          /usr/lib/cairo and
-          /usr/share/gtk-doc/html/cairo
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="cairo-trace">
-        <term><command>cairo-trace</command></term>
-        <listitem>
-          <para>
-            generates a log of all calls made by an application to
-            <application>Cairo</application>.
-          </para>
-          <indexterm zone="cairo cairo-trace">
-            <primary sortas="b-cairo-trace">cairo-trace</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libcairo">
-        <term><filename class="libraryfile">libcairo.so</filename></term>
-        <listitem>
-          <para>
-            contains the 2D graphics functions required for rendering to the
-            various output targets.
-          </para>
-          <indexterm zone="cairo libcairo">
-            <primary sortas="c-libcairo">libcairo.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libcairo-gobject">
-        <term><filename class="libraryfile">libcairo-gobject.so</filename></term>
-        <listitem>
-          <para>
-            contains functions that integrate
-            <application>Cairo</application> with <xref linkend="glib2"/>'s
-            GObject type system.
-          </para>
-          <indexterm zone="cairo libcairo-gobject">
-            <primary sortas="c-libcairo-gobject">libcairo-gobject.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libcairo-script-interpreter">
-        <term><filename class="libraryfile">libcairo-script-interpreter.so</filename></term>
-        <listitem>
-          <para>
-            contains the script interpreter functions for executing and
-            manipulating <application>Cairo</application> execution traces.
-          </para>
-          <indexterm zone="cairo libcairo-script-interpreter">
-            <primary sortas="c-libcairo-script-interpreter">libcairo-script-interpreter.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: x/lib/lib.xml
===================================================================
--- x/lib/lib.xml	(revision 2b96dcc0e51f134fc95844b09abae845ac981229)
+++ x/lib/lib.xml	(revision 4ffc987ad5d70c9a7daf040e1d8f6aed97bb7277)
@@ -30,5 +30,5 @@
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="at-spi2-core.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="at-spi2-atk.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="cairo.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="cairo-systemd.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="cairomm.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="cogl.xml"/>
