Index: archive/x7proto.xml
===================================================================
--- archive/x7proto.xml	(revision 49df687a07d82c546da482aa26344913f14fd49e)
+++ archive/x7proto.xml	(revision 49df687a07d82c546da482aa26344913f14fd49e)
@@ -0,0 +1,285 @@
+<?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 x7proto-download-http "&xorg-download-http;/proto/">
+  <!ENTITY x7proto-download-ftp  "&xorg-download-ftp;/proto/">
+  <!ENTITY x7proto-size          "3.3 MB">
+  <!ENTITY x7proto-buildsize     "26 MB">
+  <!ENTITY x7proto-time          "0.8 SBU">
+
+  <!ENTITY bigreqsproto-version            "1.1.2">
+  <!ENTITY bigreqsproto-md5sum             "1a05fb01fa1d5198894c931cf925c025">
+
+  <!ENTITY compositeproto-version          "0.4.2">
+  <!ENTITY compositeproto-md5sum           "98482f65ba1e74a08bf5b056a4031ef0">
+
+  <!ENTITY damageproto-version             "1.2.1">
+  <!ENTITY damageproto-md5sum              "998e5904764b82642cc63d97b4ba9e95">
+
+  <!ENTITY dmxproto-version                "2.3.1">
+  <!ENTITY dmxproto-md5sum                 "4ee175bbd44d05c34d43bb129be5098a">
+
+  <!ENTITY dri2proto-version               "2.8">
+  <!ENTITY dri2proto-md5sum                "b2721d5d24c04d9980a0c6540cb5396a">
+
+  <!ENTITY dri3proto-version               "1.0">
+  <!ENTITY dri3proto-md5sum                "a3d2cbe60a9ca1bf3aea6c93c817fee3">
+
+  <!ENTITY fixesproto-version              "5.0">
+  <!ENTITY fixesproto-md5sum               "e7431ab84d37b2678af71e29355e101d">
+
+  <!ENTITY fontsproto-version              "2.1.3">
+  <!ENTITY fontsproto-md5sum               "36934d00b00555eaacde9f091f392f97">
+
+  <!ENTITY glproto-version                 "1.4.17">
+  <!ENTITY glproto-md5sum                  "5565f1b0facf4a59c2778229c1f70d10">
+
+  <!ENTITY inputproto-version              "2.3.2">
+  <!ENTITY inputproto-md5sum               "b290a463af7def483e6e190de460f31a">
+
+  <!ENTITY kbproto-version                 "1.0.7">
+  <!ENTITY kbproto-md5sum                  "94afc90c1f7bef4a27fdd59ece39c878">
+
+  <!ENTITY presentproto-version            "1.1">
+  <!ENTITY presentproto-md5sum             "92f9dda9c870d78a1d93f366bcb0e6cd">
+
+  <!ENTITY randrproto-version              "1.5.0">
+  <!ENTITY randrproto-md5sum               "a46765c8dcacb7114c821baf0df1e797">
+
+  <!ENTITY recordproto-version             "1.14.2">
+  <!ENTITY recordproto-md5sum              "1b4e5dede5ea51906f1530ca1e21d216">
+
+  <!ENTITY renderproto-version             "0.11.1">
+  <!ENTITY renderproto-md5sum              "a914ccc1de66ddeb4b611c6b0686e274">
+
+  <!ENTITY resourceproto-version           "1.2.0">
+  <!ENTITY resourceproto-md5sum            "cfdb57dae221b71b2703f8e2980eaaf4">
+
+  <!ENTITY scrnsaverproto-version          "1.2.2">
+  <!ENTITY scrnsaverproto-md5sum           "edd8a73775e8ece1d69515dd17767bfb">
+
+  <!ENTITY videoproto-version              "2.3.3">
+  <!ENTITY videoproto-md5sum               "fe86de8ea3eb53b5a8f52956c5cd3174">
+
+  <!ENTITY xcmiscproto-version             "1.2.2">
+  <!ENTITY xcmiscproto-md5sum              "5f4847c78e41b801982c8a5e06365b24">
+
+  <!ENTITY xextproto-version               "7.3.0">
+  <!ENTITY xextproto-md5sum                "70c90f313b4b0851758ef77b95019584">
+
+  <!ENTITY xf86bigfontproto-version        "1.2.0">
+  <!ENTITY xf86bigfontproto-md5sum         "120e226ede5a4687b25dd357cc9b8efe">
+
+  <!ENTITY xf86dgaproto-version            "2.1">
+  <!ENTITY xf86dgaproto-md5sum             "a036dc2fcbf052ec10621fd48b68dbb1">
+
+  <!ENTITY xf86driproto-version            "2.1.1">
+  <!ENTITY xf86driproto-md5sum             "1d716d0dac3b664e5ee20c69d34bc10e">
+
+  <!ENTITY xf86vidmodeproto-version        "2.3.1">
+  <!ENTITY xf86vidmodeproto-md5sum         "e793ecefeaecfeabd1aed6a01095174e">
+
+  <!ENTITY xineramaproto-version           "1.2.1">
+  <!ENTITY xineramaproto-md5sum            "9959fe0bfb22a0e7260433b8d199590a">
+
+  <!ENTITY xproto-version                  "7.0.31">
+  <!ENTITY xproto-md5sum                   "16791f7ca8c51a20608af11702e51083">
+
+]>
+
+<sect1 id="xorg7-proto" xreflabel="Xorg Protocol Headers">
+  <?dbhtml filename="x7proto.html"?>
+
+  <sect1info>
+    <othername>$LastChangedBy$</othername>
+    <date>$Date$</date>
+  </sect1info>
+
+  <title>Xorg Protocol Headers</title>
+
+  <indexterm zone="xorg7-proto">
+    <primary sortas="a-xorg7-proto">Xorg Protocol Headers</primary>
+  </indexterm>
+
+  <sect2 role="package">
+    <title>Introduction to Xorg Protocol Headers</title>
+
+    <para>The <application>Xorg</application> protocol headers provide the
+    header files required to build the system, and to allow other
+    applications to build against the installed X Window system.</para>
+
+    &lfs82_checked;
+
+    <bridgehead renderas="sect3">Package Information</bridgehead>
+    <itemizedlist spacing="compact">
+      <listitem>
+        <para>Download (HTTP): <ulink url="&x7proto-download-http;"/></para>
+      </listitem>
+      <listitem>
+        <para>Download (FTP): <ulink url="&x7proto-download-ftp;"/></para>
+      </listitem>
+      <listitem>
+        <para>Download size: &x7proto-size;</para>
+      </listitem>
+      <listitem>
+        <para>Estimated disk space required: &x7proto-buildsize;</para>
+      </listitem>
+      <listitem>
+        <para>Estimated build time: &x7proto-time;</para>
+      </listitem>
+    </itemizedlist>
+
+    <bridgehead renderas="sect3">Xorg Protocol Headers Dependencies</bridgehead>
+
+    <bridgehead renderas="sect4">Required</bridgehead>
+    <para role="required"> <xref linkend="util-macros"/></para>
+
+    <bridgehead renderas="sect4">Recommended</bridgehead>
+    <para role="recommended"> <xref linkend="sudo"/> and
+    <xref linkend="wget"/></para>
+
+    <bridgehead renderas="sect4">Optional</bridgehead>
+    <para role="optional">
+      <xref linkend="fop"/>,
+      <xref linkend="libxslt"/>,
+      <xref linkend="xmlto"/> and
+      <xref linkend="asciidoc"/> (to build additional documentation)
+    </para>
+
+    <note><para>There is a reciprocal dependency with <xref linkend="fop"/>. If
+    you wish to build the documentation, you'll need to re-install the
+    Protocol Headers after the installation is complete and
+    <xref linkend="fop"/> has been installed.</para></note>
+
+    <para condition="html" role="usernotes">User Notes:
+    <ulink url='&blfs-wiki;/Xorg7ProtocolHeaders'/></para>
+
+  </sect2>
+
+  <sect2>
+    <title>Downloading Xorg Protocol Headers</title>
+
+    <para>First, create a list of files to be downloaded. This file will also
+    be used to verify the integrity of the downloads when complete:</para>
+
+<screen><userinput>cat &gt; proto-&xorg-version;.md5 &lt;&lt; "EOF"
+<literal>&bigreqsproto-md5sum;  bigreqsproto-&bigreqsproto-version;.tar.bz2
+&compositeproto-md5sum;  compositeproto-&compositeproto-version;.tar.bz2
+&damageproto-md5sum;  damageproto-&damageproto-version;.tar.bz2
+&dmxproto-md5sum;  dmxproto-&dmxproto-version;.tar.bz2
+&dri2proto-md5sum;  dri2proto-&dri2proto-version;.tar.bz2
+&dri3proto-md5sum;  dri3proto-&dri3proto-version;.tar.bz2
+&fixesproto-md5sum;  fixesproto-&fixesproto-version;.tar.bz2
+&fontsproto-md5sum;  fontsproto-&fontsproto-version;.tar.bz2
+&glproto-md5sum;  glproto-&glproto-version;.tar.bz2
+&inputproto-md5sum;  inputproto-&inputproto-version;.tar.bz2
+&kbproto-md5sum;  kbproto-&kbproto-version;.tar.bz2
+&presentproto-md5sum;  presentproto-&presentproto-version;.tar.bz2
+&randrproto-md5sum;  randrproto-&randrproto-version;.tar.bz2
+&recordproto-md5sum;  recordproto-&recordproto-version;.tar.bz2
+&renderproto-md5sum;  renderproto-&renderproto-version;.tar.bz2
+&resourceproto-md5sum;  resourceproto-&resourceproto-version;.tar.bz2
+&scrnsaverproto-md5sum;  scrnsaverproto-&scrnsaverproto-version;.tar.bz2
+&videoproto-md5sum;  videoproto-&videoproto-version;.tar.bz2
+&xcmiscproto-md5sum;  xcmiscproto-&xcmiscproto-version;.tar.bz2
+&xextproto-md5sum;  xextproto-&xextproto-version;.tar.bz2
+&xf86bigfontproto-md5sum;  xf86bigfontproto-&xf86bigfontproto-version;.tar.bz2
+&xf86dgaproto-md5sum;  xf86dgaproto-&xf86dgaproto-version;.tar.bz2
+&xf86driproto-md5sum;  xf86driproto-&xf86driproto-version;.tar.bz2
+&xf86vidmodeproto-md5sum;  xf86vidmodeproto-&xf86vidmodeproto-version;.tar.bz2
+&xineramaproto-md5sum;  xineramaproto-&xineramaproto-version;.tar.bz2
+&xproto-md5sum;  xproto-&xproto-version;.tar.bz2</literal>
+EOF</userinput></screen>
+
+    <para>To download the needed files using <application>wget</application>,
+    use the following commands:</para>
+
+<screen><userinput>mkdir proto &amp;&amp;
+cd proto &amp;&amp;
+grep -v '^#' ../proto-&xorg-version;.md5 | awk '{print $2}' | wget -i- -c \
+    -B &xorg-download-http;/proto/ &amp;&amp;
+md5sum -c ../proto-&xorg-version;.md5</userinput></screen>
+
+  </sect2>
+
+  <sect2 role="installation">
+    <title>Installation of Xorg Protocol Headers</title>
+
+    &as_root;
+
+    <para>First, start a subshell that will exit on error:</para>
+
+<screen><userinput>bash -e</userinput></screen>
+
+    <para>Install all of the packages by running the following
+    commands:</para>
+
+<screen><userinput>for package in $(grep -v '^#' ../proto-&xorg-version;.md5 | awk '{print $2}')
+do
+  packagedir=${package%.tar.bz2}
+  tar -xf $package
+  pushd $packagedir
+  ./configure $XORG_CONFIG
+  as_root make install
+  popd
+  rm -rf $packagedir
+done</userinput></screen>
+
+    <para>Finally, exit the shell that was started earlier:</para>
+
+<screen><userinput>exit</userinput></screen>
+
+  </sect2>
+
+  <sect2 role="commands">
+    <title>Command Explanations</title>
+
+    <para><command>bash -e</command>: This command starts a subshell that will
+    exit if any command returns a value other than 0, causing the for loop to
+    exit immediately if an error occurs. This also eliminates the need for the
+    <command>&amp;&amp;</command> construct used elsewhere in the book.</para>
+
+  </sect2>
+
+  <sect2 role="content">
+    <title>Contents</title>
+
+    <segmentedlist>
+      <segtitle>Installed Programs</segtitle>
+      <segtitle>Installed Libraries</segtitle>
+      <segtitle>Installed Directories</segtitle>
+
+      <seglistitem>
+        <seg>None</seg>
+        <seg>None</seg>
+        <seg>
+          <envar>$XORG_PREFIX</envar>/include/GL,
+          <envar>$XORG_PREFIX</envar>/include/X11,
+          <envar>$XORG_PREFIX</envar>/share/doc/bigreqsproto,
+          <envar>$XORG_PREFIX</envar>/share/doc/compositeproto,
+          <envar>$XORG_PREFIX</envar>/share/doc/damageproto,
+          <envar>$XORG_PREFIX</envar>/share/doc/dri2proto,
+          <envar>$XORG_PREFIX</envar>/share/doc/dri3proto,
+          <envar>$XORG_PREFIX</envar>/share/doc/fixesproto,
+          <envar>$XORG_PREFIX</envar>/share/doc/fontsproto,
+          <envar>$XORG_PREFIX</envar>/share/doc/kbproto,
+          <envar>$XORG_PREFIX</envar>/share/doc/presentproto,
+          <envar>$XORG_PREFIX</envar>/share/doc/randrproto,
+          <envar>$XORG_PREFIX</envar>/share/doc/recordproto,
+          <envar>$XORG_PREFIX</envar>/share/doc/renderproto,
+          <envar>$XORG_PREFIX</envar>/share/doc/resourceproto,
+          <envar>$XORG_PREFIX</envar>/share/doc/scrnsaverproto,
+          <envar>$XORG_PREFIX</envar>/share/doc/videoproto,
+          <envar>$XORG_PREFIX</envar>/share/doc/xcmiscproto,
+          <envar>$XORG_PREFIX</envar>/share/doc/xextproto and
+          <envar>$XORG_PREFIX</envar>/share/doc/xproto
+        </seg>
+      </seglistitem>
+    </segmentedlist>
+
+  </sect2>
+
+</sect1>
Index: general.ent
===================================================================
--- general.ent	(revision 3bcea12356959d685f60f22857b1487a9914bd85)
+++ general.ent	(revision 49df687a07d82c546da482aa26344913f14fd49e)
@@ -1,5 +1,5 @@
 <!-- $LastChangedBy$ $Date$ -->
 
-<!ENTITY day          "05">                   <!-- Always 2 digits -->
+<!ENTITY day          "07">                   <!-- Always 2 digits -->
 <!ENTITY month        "03">                   <!-- Always 2 digits -->
 <!ENTITY year         "2018">
@@ -7,5 +7,5 @@
 <!ENTITY copyholder   "The BLFS Development Team">
 <!ENTITY version      "&year;-&month;-&day;">
-<!ENTITY releasedate  "March 5th, &year;">
+<!ENTITY releasedate  "March 7th, &year;">
 <!ENTITY pubdate      "&year;-&month;-&day;"> <!-- metadata req. by TLDP -->
 <!ENTITY blfs-version "svn">                  <!-- svn|[release #] -->
Index: general/graphlib/fontconfig.xml
===================================================================
--- general/graphlib/fontconfig.xml	(revision 3bcea12356959d685f60f22857b1487a9914bd85)
+++ general/graphlib/fontconfig.xml	(revision 49df687a07d82c546da482aa26344913f14fd49e)
@@ -8,8 +8,8 @@
            "https://www.freedesktop.org/software/fontconfig/release/fontconfig-&fontconfig-version;.tar.bz2">
   <!ENTITY fontconfig-download-ftp  " ">
-  <!ENTITY fontconfig-md5sum        "733f5e2371ca77b69707bd7b30cc2163">
-  <!ENTITY fontconfig-size          "1.5 MB">
-  <!ENTITY fontconfig-buildsize     "15 MB (with tests)">
-  <!ENTITY fontconfig-time          "0.2 SBU (with tests)">
+  <!ENTITY fontconfig-md5sum        "60d2394a79d3b2e5db2daea55193fa47">
+  <!ENTITY fontconfig-size          "1.6 MB">
+  <!ENTITY fontconfig-buildsize     "19 MB (with tests)">
+  <!ENTITY fontconfig-time          "0.3 SBU (with tests)">
 ]>
 
@@ -268,6 +268,6 @@
       <seglistitem>
         <seg>
-          fc-cache, fc-cat, fc-list, fc-match, fc-pattern, fc-query,
-          fc-scan, and fc-validate
+          fc-cache, fc-cat, fc-conflist, fc-list, fc-match, fc-pattern,
+          fc-query, fc-scan, and fc-validate
         </seg>
         <seg>
@@ -314,4 +314,16 @@
       </varlistentry>
 
+      <varlistentry id="fc-conflist">
+        <term><command>fc-conflist</command></term>
+        <listitem>
+          <para>
+            shows the ruleset files' information on the system.
+          </para>
+          <indexterm zone="fontconfig fc-conflist">
+            <primary sortas="b-fc-conflist">fc-conflist</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
       <varlistentry id="fc-list">
         <term><command>fc-list</command></term>
Index: introduction/welcome/changelog.xml
===================================================================
--- introduction/welcome/changelog.xml	(revision 3bcea12356959d685f60f22857b1487a9914bd85)
+++ introduction/welcome/changelog.xml	(revision 49df687a07d82c546da482aa26344913f14fd49e)
@@ -42,4 +42,30 @@
     </listitem>
 -->
+    <listitem>
+      <para>March 7th, 2018</para>
+      <itemizedlist>
+        <listitem>
+          <para>[pierre] - Update to libdrm-2.4.91. Fixes
+          <ulink url="&blfs-ticket-root;10481">#10481</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[pierre] - Update to xcb-proto-1.13. Fixes
+          <ulink url="&blfs-ticket-root;10480">#10480</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[pierre] - Update to libxcb-1.13. Fixes
+          <ulink url="&blfs-ticket-root;10479">#10479</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[pierre] - Update to fontconfig-2.13.0. Fixes
+          <ulink url="&blfs-ticket-root;10476">#10476</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[pierre] - New Xorg protocols bundle xorgproto-2018.4.
+          Remove the previous page. Thanks to Ken for help. Fixes
+          <ulink url="&blfs-ticket-root;10347">#10347</ulink>.</para>
+        </listitem>
+      </itemizedlist>
+    </listitem>
     <listitem>
       <para>March 5th, 2019</para>
Index: packages.ent
===================================================================
--- packages.ent	(revision 3bcea12356959d685f60f22857b1487a9914bd85)
+++ packages.ent	(revision 49df687a07d82c546da482aa26344913f14fd49e)
@@ -132,5 +132,5 @@
 <!ENTITY libcroco-version             "0.6.12">
 <!ENTITY libdaemon-version            "0.14">
-<!ENTITY libdrm-version               "2.4.90">
+<!ENTITY libdrm-version               "2.4.91">
 <!ENTITY libepoxy-minor               "1.5">
 <!ENTITY libepoxy-version             "&libepoxy-minor;.0">
@@ -198,5 +198,5 @@
 <!ENTITY exiv2-version                "0.26">
 <!ENTITY freetype2-version            "2.9">
-<!ENTITY fontconfig-version           "2.12.6">  <!-- stable lt .90 micro version -->
+<!ENTITY fontconfig-version           "2.13.0">  <!-- stable lt .90 micro version -->
 <!ENTITY fribidi-version              "1.0.1">
 <!ENTITY gegl-version                 "0.3.28">
@@ -525,9 +525,10 @@
 <!ENTITY xorg-version                 "7">      <!-- applies to all xorg packages -->
 <!ENTITY util-macros-version          "1.19.2">
+<!ENTITY xorgproto-version            "2018.4">
 <!ENTITY libXau-version               "1.0.8">
 <!ENTITY libXdmcp-version             "1.1.2">
 <!ENTITY libpthread-stubs-version     "0.3">
-<!ENTITY xcb-proto-version            "1.12">
-<!ENTITY libxcb-version               "1.12">
+<!ENTITY xcb-proto-version            "1.13">
+<!ENTITY libxcb-version               "1.13">
 <!ENTITY xbitmaps-version             "1.1.1">
 <!ENTITY xcursor-themes-version       "1.0.4">
Index: x/installing/installing.xml
===================================================================
--- x/installing/installing.xml	(revision 3bcea12356959d685f60f22857b1487a9914bd85)
+++ x/installing/installing.xml	(revision 49df687a07d82c546da482aa26344913f14fd49e)
@@ -53,5 +53,5 @@
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="xorg7.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="util-macros.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="x7proto.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="xorgproto.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="libXau.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="libXdmcp.xml"/>
Index: x/installing/libXau.xml
===================================================================
--- x/installing/libXau.xml	(revision 3bcea12356959d685f60f22857b1487a9914bd85)
+++ x/installing/libXau.xml	(revision 49df687a07d82c546da482aa26344913f14fd49e)
@@ -61,5 +61,5 @@
 
     <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required"><xref linkend="xorg7-proto"/></para>
+    <para role="required"><xref linkend="xorgproto"/></para>
 
     <para condition="html" role="usernotes">User Notes:
Index: x/installing/libXdmcp.xml
===================================================================
--- x/installing/libXdmcp.xml	(revision 3bcea12356959d685f60f22857b1487a9914bd85)
+++ x/installing/libXdmcp.xml	(revision 49df687a07d82c546da482aa26344913f14fd49e)
@@ -61,5 +61,5 @@
 
     <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required"><xref linkend="xorg7-proto"/></para>
+    <para role="required"><xref linkend="xorgproto"/></para>
 
     <bridgehead renderas="sect4">Optional</bridgehead>
Index: x/installing/libxcb.xml
===================================================================
--- x/installing/libxcb.xml	(revision 3bcea12356959d685f60f22857b1487a9914bd85)
+++ x/installing/libxcb.xml	(revision 49df687a07d82c546da482aa26344913f14fd49e)
@@ -7,7 +7,7 @@
   <!ENTITY libxcb-download-http "https://xcb.freedesktop.org/dist/libxcb-&libxcb-version;.tar.bz2">
   <!ENTITY libxcb-download-ftp  " ">
-  <!ENTITY libxcb-md5sum        "28e552bd78bc1050b6b26ca1db0e5bb6">
-  <!ENTITY libxcb-size          "600 KB">
-  <!ENTITY libxcb-buildsize     "28 MB (with tests, add 62 MB for doxygen docs)">
+  <!ENTITY libxcb-md5sum        "c2b6cf928afa16b0047c974e7aaa783f">
+  <!ENTITY libxcb-size          "498 KB">
+  <!ENTITY libxcb-buildsize     "41 MB (with tests, add 62 MB for doxygen docs)">
   <!ENTITY libxcb-time          "0.3 SBU (with tests, add 1.4 SBU for doxygen docs)">
 ]>
@@ -59,4 +59,5 @@
     </itemizedlist>
 
+<!--
     <bridgehead renderas="sect3">Additional Downloads</bridgehead>
     <itemizedlist spacing="compact">
@@ -68,5 +69,5 @@
       </listitem>
     </itemizedlist>
-
+-->
     <bridgehead renderas="sect3">libxcb Dependencies</bridgehead>
 
@@ -96,4 +97,5 @@
     <title>Installation of libxcb</title>
 
+<!--
     <para>
       If building with Python 3, issue the following command:
@@ -101,5 +103,5 @@
 
 <screen><userinput>patch -Np1 -i ../libxcb-&libxcb-version;-python3-1.patch</userinput></screen>
-
+-->
     <para>Install <application>libxcb</application> by running the following
     commands:</para>
@@ -108,5 +110,4 @@
 
 ./configure $XORG_CONFIG      \
-            --enable-xinput   \
             --without-doxygen \
             --docdir='${datadir}'/doc/libxcb-&libxcb-version; &amp;&amp;
@@ -128,6 +129,8 @@
     Linux.</para>
 
-    <para><parameter>--enable-xinput</parameter>: This switch enables XCB Xinput
+<!-- enabled by default in libxcb-1.13
+    <para><parameter>-\-enable-xinput</parameter>: This switch enables XCB Xinput
     extension.</para>
+-->
 
     <para><parameter>--without-doxygen</parameter>: Do not use doxygen to
@@ -155,7 +158,7 @@
           libxcb-randr.so, libxcb-record.so, libxcb-render.so, libxcb-res.so,
           libxcb-screensaver.so, libxcb-shape.so, libxcb-shm.so, libxcb-sync.so,
-          libxcb-xevie.so, libxcb-xf86dri.so, libxcb-xfixes.so,
+          libxcb-xf86dri.so, libxcb-xfixes.so,
           libxcb-xinerama.so, libxcb-xinput.so, libxcb-xkb.so,
-          libxcb-xprint.so, libxcb-xtest.so, libxcb-xvmc.so, and libxcb-xv.so
+          libxcb-xtest.so, libxcb-xvmc.so, and libxcb-xv.so
         </seg>
         <seg>
Index: installing/x7proto.xml
===================================================================
--- x/installing/x7proto.xml	(revision 3bcea12356959d685f60f22857b1487a9914bd85)
+++ 	(revision )
@@ -1,285 +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 x7proto-download-http "&xorg-download-http;/proto/">
-  <!ENTITY x7proto-download-ftp  "&xorg-download-ftp;/proto/">
-  <!ENTITY x7proto-size          "3.3 MB">
-  <!ENTITY x7proto-buildsize     "26 MB">
-  <!ENTITY x7proto-time          "0.8 SBU">
-
-  <!ENTITY bigreqsproto-version            "1.1.2">
-  <!ENTITY bigreqsproto-md5sum             "1a05fb01fa1d5198894c931cf925c025">
-
-  <!ENTITY compositeproto-version          "0.4.2">
-  <!ENTITY compositeproto-md5sum           "98482f65ba1e74a08bf5b056a4031ef0">
-
-  <!ENTITY damageproto-version             "1.2.1">
-  <!ENTITY damageproto-md5sum              "998e5904764b82642cc63d97b4ba9e95">
-
-  <!ENTITY dmxproto-version                "2.3.1">
-  <!ENTITY dmxproto-md5sum                 "4ee175bbd44d05c34d43bb129be5098a">
-
-  <!ENTITY dri2proto-version               "2.8">
-  <!ENTITY dri2proto-md5sum                "b2721d5d24c04d9980a0c6540cb5396a">
-
-  <!ENTITY dri3proto-version               "1.0">
-  <!ENTITY dri3proto-md5sum                "a3d2cbe60a9ca1bf3aea6c93c817fee3">
-
-  <!ENTITY fixesproto-version              "5.0">
-  <!ENTITY fixesproto-md5sum               "e7431ab84d37b2678af71e29355e101d">
-
-  <!ENTITY fontsproto-version              "2.1.3">
-  <!ENTITY fontsproto-md5sum               "36934d00b00555eaacde9f091f392f97">
-
-  <!ENTITY glproto-version                 "1.4.17">
-  <!ENTITY glproto-md5sum                  "5565f1b0facf4a59c2778229c1f70d10">
-
-  <!ENTITY inputproto-version              "2.3.2">
-  <!ENTITY inputproto-md5sum               "b290a463af7def483e6e190de460f31a">
-
-  <!ENTITY kbproto-version                 "1.0.7">
-  <!ENTITY kbproto-md5sum                  "94afc90c1f7bef4a27fdd59ece39c878">
-
-  <!ENTITY presentproto-version            "1.1">
-  <!ENTITY presentproto-md5sum             "92f9dda9c870d78a1d93f366bcb0e6cd">
-
-  <!ENTITY randrproto-version              "1.5.0">
-  <!ENTITY randrproto-md5sum               "a46765c8dcacb7114c821baf0df1e797">
-
-  <!ENTITY recordproto-version             "1.14.2">
-  <!ENTITY recordproto-md5sum              "1b4e5dede5ea51906f1530ca1e21d216">
-
-  <!ENTITY renderproto-version             "0.11.1">
-  <!ENTITY renderproto-md5sum              "a914ccc1de66ddeb4b611c6b0686e274">
-
-  <!ENTITY resourceproto-version           "1.2.0">
-  <!ENTITY resourceproto-md5sum            "cfdb57dae221b71b2703f8e2980eaaf4">
-
-  <!ENTITY scrnsaverproto-version          "1.2.2">
-  <!ENTITY scrnsaverproto-md5sum           "edd8a73775e8ece1d69515dd17767bfb">
-
-  <!ENTITY videoproto-version              "2.3.3">
-  <!ENTITY videoproto-md5sum               "fe86de8ea3eb53b5a8f52956c5cd3174">
-
-  <!ENTITY xcmiscproto-version             "1.2.2">
-  <!ENTITY xcmiscproto-md5sum              "5f4847c78e41b801982c8a5e06365b24">
-
-  <!ENTITY xextproto-version               "7.3.0">
-  <!ENTITY xextproto-md5sum                "70c90f313b4b0851758ef77b95019584">
-
-  <!ENTITY xf86bigfontproto-version        "1.2.0">
-  <!ENTITY xf86bigfontproto-md5sum         "120e226ede5a4687b25dd357cc9b8efe">
-
-  <!ENTITY xf86dgaproto-version            "2.1">
-  <!ENTITY xf86dgaproto-md5sum             "a036dc2fcbf052ec10621fd48b68dbb1">
-
-  <!ENTITY xf86driproto-version            "2.1.1">
-  <!ENTITY xf86driproto-md5sum             "1d716d0dac3b664e5ee20c69d34bc10e">
-
-  <!ENTITY xf86vidmodeproto-version        "2.3.1">
-  <!ENTITY xf86vidmodeproto-md5sum         "e793ecefeaecfeabd1aed6a01095174e">
-
-  <!ENTITY xineramaproto-version           "1.2.1">
-  <!ENTITY xineramaproto-md5sum            "9959fe0bfb22a0e7260433b8d199590a">
-
-  <!ENTITY xproto-version                  "7.0.31">
-  <!ENTITY xproto-md5sum                   "16791f7ca8c51a20608af11702e51083">
-
-]>
-
-<sect1 id="xorg7-proto" xreflabel="Xorg Protocol Headers">
-  <?dbhtml filename="x7proto.html"?>
-
-  <sect1info>
-    <othername>$LastChangedBy$</othername>
-    <date>$Date$</date>
-  </sect1info>
-
-  <title>Xorg Protocol Headers</title>
-
-  <indexterm zone="xorg7-proto">
-    <primary sortas="a-xorg7-proto">Xorg Protocol Headers</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to Xorg Protocol Headers</title>
-
-    <para>The <application>Xorg</application> protocol headers provide the
-    header files required to build the system, and to allow other
-    applications to build against the installed X Window system.</para>
-
-    &lfs82_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>Download (HTTP): <ulink url="&x7proto-download-http;"/></para>
-      </listitem>
-      <listitem>
-        <para>Download (FTP): <ulink url="&x7proto-download-ftp;"/></para>
-      </listitem>
-      <listitem>
-        <para>Download size: &x7proto-size;</para>
-      </listitem>
-      <listitem>
-        <para>Estimated disk space required: &x7proto-buildsize;</para>
-      </listitem>
-      <listitem>
-        <para>Estimated build time: &x7proto-time;</para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">Xorg Protocol Headers Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required"> <xref linkend="util-macros"/></para>
-
-    <bridgehead renderas="sect4">Recommended</bridgehead>
-    <para role="recommended"> <xref linkend="sudo"/> and
-    <xref linkend="wget"/></para>
-
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional">
-      <xref linkend="fop"/>,
-      <xref linkend="libxslt"/>,
-      <xref linkend="xmlto"/> and
-      <xref linkend="asciidoc"/> (to build additional documentation)
-    </para>
-
-    <note><para>There is a reciprocal dependency with <xref linkend="fop"/>. If
-    you wish to build the documentation, you'll need to re-install the
-    Protocol Headers after the installation is complete and
-    <xref linkend="fop"/> has been installed.</para></note>
-
-    <para condition="html" role="usernotes">User Notes:
-    <ulink url='&blfs-wiki;/Xorg7ProtocolHeaders'/></para>
-
-  </sect2>
-
-  <sect2>
-    <title>Downloading Xorg Protocol Headers</title>
-
-    <para>First, create a list of files to be downloaded. This file will also
-    be used to verify the integrity of the downloads when complete:</para>
-
-<screen><userinput>cat &gt; proto-&xorg-version;.md5 &lt;&lt; "EOF"
-<literal>&bigreqsproto-md5sum;  bigreqsproto-&bigreqsproto-version;.tar.bz2
-&compositeproto-md5sum;  compositeproto-&compositeproto-version;.tar.bz2
-&damageproto-md5sum;  damageproto-&damageproto-version;.tar.bz2
-&dmxproto-md5sum;  dmxproto-&dmxproto-version;.tar.bz2
-&dri2proto-md5sum;  dri2proto-&dri2proto-version;.tar.bz2
-&dri3proto-md5sum;  dri3proto-&dri3proto-version;.tar.bz2
-&fixesproto-md5sum;  fixesproto-&fixesproto-version;.tar.bz2
-&fontsproto-md5sum;  fontsproto-&fontsproto-version;.tar.bz2
-&glproto-md5sum;  glproto-&glproto-version;.tar.bz2
-&inputproto-md5sum;  inputproto-&inputproto-version;.tar.bz2
-&kbproto-md5sum;  kbproto-&kbproto-version;.tar.bz2
-&presentproto-md5sum;  presentproto-&presentproto-version;.tar.bz2
-&randrproto-md5sum;  randrproto-&randrproto-version;.tar.bz2
-&recordproto-md5sum;  recordproto-&recordproto-version;.tar.bz2
-&renderproto-md5sum;  renderproto-&renderproto-version;.tar.bz2
-&resourceproto-md5sum;  resourceproto-&resourceproto-version;.tar.bz2
-&scrnsaverproto-md5sum;  scrnsaverproto-&scrnsaverproto-version;.tar.bz2
-&videoproto-md5sum;  videoproto-&videoproto-version;.tar.bz2
-&xcmiscproto-md5sum;  xcmiscproto-&xcmiscproto-version;.tar.bz2
-&xextproto-md5sum;  xextproto-&xextproto-version;.tar.bz2
-&xf86bigfontproto-md5sum;  xf86bigfontproto-&xf86bigfontproto-version;.tar.bz2
-&xf86dgaproto-md5sum;  xf86dgaproto-&xf86dgaproto-version;.tar.bz2
-&xf86driproto-md5sum;  xf86driproto-&xf86driproto-version;.tar.bz2
-&xf86vidmodeproto-md5sum;  xf86vidmodeproto-&xf86vidmodeproto-version;.tar.bz2
-&xineramaproto-md5sum;  xineramaproto-&xineramaproto-version;.tar.bz2
-&xproto-md5sum;  xproto-&xproto-version;.tar.bz2</literal>
-EOF</userinput></screen>
-
-    <para>To download the needed files using <application>wget</application>,
-    use the following commands:</para>
-
-<screen><userinput>mkdir proto &amp;&amp;
-cd proto &amp;&amp;
-grep -v '^#' ../proto-&xorg-version;.md5 | awk '{print $2}' | wget -i- -c \
-    -B &xorg-download-http;/proto/ &amp;&amp;
-md5sum -c ../proto-&xorg-version;.md5</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of Xorg Protocol Headers</title>
-
-    &as_root;
-
-    <para>First, start a subshell that will exit on error:</para>
-
-<screen><userinput>bash -e</userinput></screen>
-
-    <para>Install all of the packages by running the following
-    commands:</para>
-
-<screen><userinput>for package in $(grep -v '^#' ../proto-&xorg-version;.md5 | awk '{print $2}')
-do
-  packagedir=${package%.tar.bz2}
-  tar -xf $package
-  pushd $packagedir
-  ./configure $XORG_CONFIG
-  as_root make install
-  popd
-  rm -rf $packagedir
-done</userinput></screen>
-
-    <para>Finally, exit the shell that was started earlier:</para>
-
-<screen><userinput>exit</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="commands">
-    <title>Command Explanations</title>
-
-    <para><command>bash -e</command>: This command starts a subshell that will
-    exit if any command returns a value other than 0, causing the for loop to
-    exit immediately if an error occurs. This also eliminates the need for the
-    <command>&amp;&amp;</command> construct used elsewhere in the book.</para>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Libraries</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-      <seglistitem>
-        <seg>None</seg>
-        <seg>None</seg>
-        <seg>
-          <envar>$XORG_PREFIX</envar>/include/GL,
-          <envar>$XORG_PREFIX</envar>/include/X11,
-          <envar>$XORG_PREFIX</envar>/share/doc/bigreqsproto,
-          <envar>$XORG_PREFIX</envar>/share/doc/compositeproto,
-          <envar>$XORG_PREFIX</envar>/share/doc/damageproto,
-          <envar>$XORG_PREFIX</envar>/share/doc/dri2proto,
-          <envar>$XORG_PREFIX</envar>/share/doc/dri3proto,
-          <envar>$XORG_PREFIX</envar>/share/doc/fixesproto,
-          <envar>$XORG_PREFIX</envar>/share/doc/fontsproto,
-          <envar>$XORG_PREFIX</envar>/share/doc/kbproto,
-          <envar>$XORG_PREFIX</envar>/share/doc/presentproto,
-          <envar>$XORG_PREFIX</envar>/share/doc/randrproto,
-          <envar>$XORG_PREFIX</envar>/share/doc/recordproto,
-          <envar>$XORG_PREFIX</envar>/share/doc/renderproto,
-          <envar>$XORG_PREFIX</envar>/share/doc/resourceproto,
-          <envar>$XORG_PREFIX</envar>/share/doc/scrnsaverproto,
-          <envar>$XORG_PREFIX</envar>/share/doc/videoproto,
-          <envar>$XORG_PREFIX</envar>/share/doc/xcmiscproto,
-          <envar>$XORG_PREFIX</envar>/share/doc/xextproto and
-          <envar>$XORG_PREFIX</envar>/share/doc/xproto
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-  </sect2>
-
-</sect1>
Index: x/installing/xcb-proto.xml
===================================================================
--- x/installing/xcb-proto.xml	(revision 3bcea12356959d685f60f22857b1487a9914bd85)
+++ x/installing/xcb-proto.xml	(revision 49df687a07d82c546da482aa26344913f14fd49e)
@@ -7,7 +7,7 @@
   <!ENTITY xcb-proto-download-http "https://xcb.freedesktop.org/dist/xcb-proto-&xcb-proto-version;.tar.bz2">
   <!ENTITY xcb-proto-download-ftp  " ">
-  <!ENTITY xcb-proto-md5sum        "14e60919f859560f28426a685a555962">
-  <!ENTITY xcb-proto-size          "152 KB">
-  <!ENTITY xcb-proto-buildsize     "1.2 MB">
+  <!ENTITY xcb-proto-md5sum        "abe9aa4886138150bbc04ae4f29b90e3">
+  <!ENTITY xcb-proto-size          "148 KB">
+  <!ENTITY xcb-proto-buildsize     "2.2 MB">
   <!ENTITY xcb-proto-time          "less than 0.1 SBU">
 ]>
@@ -58,4 +58,5 @@
     </itemizedlist>
 
+<!--
     <bridgehead renderas="sect3">Additional Downloads</bridgehead>
     <itemizedlist spacing="compact">
@@ -73,4 +74,5 @@
       </listitem>
     </itemizedlist>
+-->
 
     <bridgehead renderas="sect3">xcb-proto Dependencies</bridgehead>
@@ -96,4 +98,5 @@
     <title>Installation of xcb-proto</title>
 
+<!--
     <para>First, fix a file that allows the checks to run properly:</para>
 
@@ -105,5 +108,5 @@
 
 <screen><userinput>patch -Np1 -i ../xcb-proto-&xcb-proto-version;-python3-1.patch</userinput></screen>
-
+-->
     <para>Install <application>xcb-proto</application> by running the following
     commands:</para>
Index: x/installing/xorgproto.xml
===================================================================
--- x/installing/xorgproto.xml	(revision 49df687a07d82c546da482aa26344913f14fd49e)
+++ x/installing/xorgproto.xml	(revision 49df687a07d82c546da482aa26344913f14fd49e)
@@ -0,0 +1,163 @@
+<?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 xorgproto-download-http "https://xorg.freedesktop.org/archive/individual/proto/xorgproto-&xorgproto-version;.tar.bz2">
+  <!ENTITY xorgproto-download-ftp  " ">
+  <!ENTITY xorgproto-md5sum        "81557ca47ee66a4e54590fcdadd28114">
+  <!ENTITY xorgproto-size          "381 KB">
+  <!ENTITY xorgproto-buildsize     "5 MB">
+  <!ENTITY xorgproto-time          "less than 0.1 SBU">
+]>
+
+<sect1 id="xorgproto" xreflabel="xorgproto-&xorgproto-version;">
+  <?dbhtml filename="xorgproto.html"?>
+
+  <sect1info>
+    <othername>$LastChangedBy: bdubbs $</othername>
+    <date>$Date: 2018-02-18 22:04:14 +0100 (dim. 18 févr. 2018) $</date>
+  </sect1info>
+
+  <title>xorgproto-&xorgproto-version;</title>
+
+  <indexterm zone="xorgproto">
+    <primary sortas="a-xorgproto">xorgproto</primary>
+  </indexterm>
+
+  <sect2 role="package">
+    <title>Introduction to xorgproto</title>
+
+    <para>The <application>xorgproto</application> package provides the
+    header files required to build the X Window system, and to allow other
+    applications to build against the installed X Window system.</para>
+
+    &lfs82_checked;
+
+    <bridgehead renderas="sect3">Package Information</bridgehead>
+    <itemizedlist spacing="compact">
+      <listitem>
+        <para>
+          Download (HTTP): <ulink url="&xorgproto-download-http;"/>
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Download (FTP): <ulink url="&xorgproto-download-ftp;"/>
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Download MD5 sum: &xorgproto-md5sum;
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Download size: &xorgproto-size;
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Estimated disk space required: &xorgproto-buildsize;
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Estimated build time: &xorgproto-time;
+        </para>
+      </listitem>
+    </itemizedlist>
+
+    <bridgehead renderas="sect3">xorgproto Dependencies</bridgehead>
+
+    <bridgehead renderas="sect4">Required</bridgehead>
+    <para role="required">
+      <xref linkend="util-macros"/>
+    </para>
+
+    <bridgehead renderas="sect4">Optional</bridgehead>
+    <para role="optional">
+      <xref linkend="fop"/>,
+      <xref linkend="libxslt"/>,
+      <xref linkend="xmlto"/> and
+      <xref linkend="asciidoc"/> (to build additional documentation)
+    </para>
+
+    <note>
+      <para>
+        There is a reciprocal dependency with <xref linkend="fop"/>. If
+        you wish to build the documentation, you'll need to re-install the
+        Protocol Headers after the installation is complete and
+        <xref linkend="fop"/> has been installed.
+      </para>
+    </note>
+
+    <para condition="html" role="usernotes">User Notes:
+    <ulink url='&blfs-wiki;/Xorg7ProtocolHeaders'/></para>
+
+  </sect2>
+
+  <sect2 role="installation">
+    <title>Installation of xorgproto</title>
+
+    <para>
+      Install <application>xorgproto</application> by running the
+      following commands:
+    </para>
+
+<screen><userinput>mkdir build &amp;&amp;
+cd build    &amp;&amp;
+
+meson --prefix=$XORG_PREFIX &amp;&amp;
+ninja</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>ninja install &amp;&amp;
+
+install -vdm 755 $XORG_PREFIX/share/doc/xorgproto-&xorgproto-version; &amp;&amp;
+install -vm 644 ../[^m]*.txt ../PM_spec $XORG_PREFIX/share/doc/xorgproto-&xorgproto-version;</userinput></screen>
+
+  </sect2>
+
+  <sect2 role="commands">
+    <title>Command Explanations</title>
+
+    <para>
+      <command>install -vm 644 ../[^m]*.txt ../PM_spec ...</command>: The meson
+      build system does not install the text files into <filename
+      class="directory">/usr/share/doc</filename>. The <command>[^m]</command>
+      part prevents copying the <filename>meson_config.txt</filename> file.
+    </para>
+
+  </sect2>
+
+  <sect2 role="content">
+    <title>Contents</title>
+
+    <segmentedlist>
+      <segtitle>Installed Programs</segtitle>
+      <segtitle>Installed Libraries</segtitle>
+      <segtitle>Installed Directories</segtitle>
+
+      <seglistitem>
+        <seg>None</seg>
+        <seg>None</seg>
+        <seg>
+          <envar>$XORG_PREFIX</envar>/include/GL,
+          <envar>$XORG_PREFIX</envar>/include/X11, and
+          <envar>$XORG_PREFIX</envar>/share/doc/xorgproto-&xorgproto-version;
+        </seg>
+      </seglistitem>
+    </segmentedlist>
+
+  </sect2>
+
+</sect1>
Index: x/lib/libdrm.xml
===================================================================
--- x/lib/libdrm.xml	(revision 3bcea12356959d685f60f22857b1487a9914bd85)
+++ x/lib/libdrm.xml	(revision 49df687a07d82c546da482aa26344913f14fd49e)
@@ -7,8 +7,8 @@
   <!ENTITY libdrm-download-http "https://dri.freedesktop.org/libdrm/libdrm-&libdrm-version;.tar.bz2">
   <!ENTITY libdrm-download-ftp  " ">
-  <!ENTITY libdrm-md5sum        "61dcb4989c728f566e3c15c236585a17">
-  <!ENTITY libdrm-size          "804 KB">
-  <!ENTITY libdrm-buildsize     "13 MB (add 1 MB for the tests)">
-  <!ENTITY libdrm-time          "0.2 SBU (add 0.8 SBU for the tests)">
+  <!ENTITY libdrm-md5sum        "23d87cda92700b710a37d9b8edaa9f54">
+  <!ENTITY libdrm-size          "796 KB">
+  <!ENTITY libdrm-buildsize     "12 MB">
+  <!ENTITY libdrm-time          "less than 0.1 SBU (add 0.8 SBU for tests)">
 ]>
 
@@ -104,9 +104,11 @@
     </para>
 
-<screen><userinput>./configure --prefix=/usr --enable-udev &amp;&amp;
-make</userinput></screen>
-
-    <para>
-      To check the results, issue <command>make check</command>. Tests may hang
+<screen><userinput>mkdir build &amp;&amp;
+cd build &amp;&amp;
+meson --prefix=$XORG_PREFIX -Dudev=true &amp;&amp;
+ninja</userinput></screen>
+
+    <para>
+      To check the results, issue <command>ninja test</command>. Tests may hang
       for unknown reasons. If nouveau threaded test hangs, you can disable it
       with
@@ -118,5 +120,5 @@
     </para>
 
-<screen role="root"><userinput>make install</userinput></screen>
+<screen role="root"><userinput>ninja install</userinput></screen>
 
   </sect2>
@@ -126,5 +128,5 @@
 
     <para>
-      <parameter>--enable-udev</parameter>: This parameter enables support for using
+      <parameter>-Dudev=true</parameter>: This parameter enables support for using
       <application>Udev</application> instead of <command>mknod</command>.
     </para>
