Index: archive/x7driver-glamor.xml
===================================================================
--- archive/x7driver-glamor.xml	(revision 53a89e5c7c87f023e0d010a2fc49e381fe31aa79)
+++ archive/x7driver-glamor.xml	(revision 53a89e5c7c87f023e0d010a2fc49e381fe31aa79)
@@ -0,0 +1,165 @@
+<?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 glamor-egl-version "0.6.0">
+
+  <!ENTITY glamor-egl-download-http "http://xorg.freedesktop.org/archive/individual/driver/glamor-egl-&glamor-egl-version;.tar.bz2">
+  <!ENTITY glamor-egl-download-ftp  " ">
+  <!ENTITY glamor-egl-md5sum        "b3668594675f71a75153ee52dbd35535">
+  <!ENTITY glamor-egl-size          "419 KB">
+  <!ENTITY glamor-egl-buildsize     "11 MB">
+  <!ENTITY glamor-egl-time          "0.2 SBU">
+]>
+
+  <!-- Begin Glamor EGL -->
+  <sect2 id="glamor-egl" xreflabel="Glamor EGL-&glamor-egl-version;">
+
+    <title>Glamor EGL-&glamor-egl-version;</title>
+
+    <indexterm zone="glamor-egl">
+      <primary sortas="a-glamor-egl">glamor-egl</primary>
+    </indexterm>
+
+    <sect3 role="package">
+      <title>Introduction to Glamor EGL</title>
+
+      <para>
+        The <application>Glamor EGL</application> package contains a
+        GL-based rendering acceleration library for X server.
+      </para>
+
+      &lfs75_checked;
+
+      <bridgehead renderas="sect4">Package Information</bridgehead>
+      <itemizedlist spacing="compact">
+        <listitem>
+          <para>
+            Download (HTTP): <ulink url="&glamor-egl-download-http;"/>
+          </para>
+        </listitem>
+        <listitem>
+          <para>
+            Download (FTP): <ulink url="&glamor-egl-download-ftp;"/>
+          </para>
+        </listitem>
+        <listitem>
+          <para>
+            Download MD5 sum: &glamor-egl-md5sum;
+          </para>
+        </listitem>
+        <listitem>
+          <para>
+            Download size: &glamor-egl-size;
+          </para>
+        </listitem>
+        <listitem>
+          <para>
+            Estimated disk space required: &glamor-egl-buildsize;
+          </para>
+        </listitem>
+        <listitem>
+          <para>
+            Estimated build time: &glamor-egl-time;
+          </para>
+        </listitem>
+      </itemizedlist>
+
+      <bridgehead renderas="sect4">Glamor EGL Dependencies</bridgehead>
+
+      <bridgehead renderas="sect5">Required</bridgehead>
+      <para role="required">
+        <xref linkend="xorg-server"/>
+      </para>
+
+      <para condition="html" role="usernotes">
+        User Notes: <ulink url="&blfs-wiki;/glamor-egl"/>
+      </para>
+    </sect3>
+
+    <sect3 role="installation">
+      <title>Installation of Glamor EGL</title>
+
+      <para>
+        Install <application>Glamor EGL</application> by running the following
+        commands:
+      </para>
+
+<screen><userinput>./configure $XORG_CONFIG --enable-glx-tls &amp;&amp;
+make</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>
+    </sect3>
+
+    <sect3>
+      <title>Command Explanations</title>
+
+      <para>
+        <parameter>--enable-glx-tls</parameter>: This switch enables
+        TLS support in GLX.
+      </para>
+
+    </sect3>
+
+    <sect3 role="content">
+      <title>Contents</title>
+
+      <segmentedlist>
+        <segtitle>Installed Library</segtitle>
+        <segtitle>Installed Xorg Module</segtitle>
+
+        <seglistitem>
+          <seg>
+            libglamor.so
+          </seg>
+          <seg>
+            libglamoregl.so
+          </seg>
+        </seglistitem>
+      </segmentedlist>
+
+      <variablelist>
+        <bridgehead renderas="sect4">Short Descriptions</bridgehead>
+        <?dbfo list-presentation="list"?>
+        <?dbhtml list-presentation="table"?>
+
+        <varlistentry id="libglamoregl">
+          <term><filename class="libraryfile">libglamoregl.so</filename></term>
+          <listitem>
+            <para>
+              contains functions to create and initialize OpenGL/EGL context.
+            </para>
+            <indexterm zone="glamor-egl libglamoregl">
+              <primary sortas="c-libglamoregl">libglamoregl.so</primary>
+            </indexterm>
+          </listitem>
+        </varlistentry>
+
+        <varlistentry id="libglamor">
+          <term><filename class="libraryfile">libglamor.so</filename></term>
+          <listitem>
+            <para>
+              contains the <application>Glamor</application> rendering functions.
+            </para>
+            <indexterm zone="glamor-egl libglamor">
+              <primary sortas="c-libglamor">libglamor.so</primary>
+            </indexterm>
+          </listitem>
+        </varlistentry>
+
+      </variablelist>
+
+    </sect3>
+
+  </sect2>
+  <!-- End Glamor EGL -->
Index: introduction/welcome/changelog.xml
===================================================================
--- introduction/welcome/changelog.xml	(revision 5bee1977e55d2f36f1334d38e69acf425c89790f)
+++ introduction/welcome/changelog.xml	(revision 53a89e5c7c87f023e0d010a2fc49e381fe31aa79)
@@ -48,4 +48,8 @@
       <para>August 19th, 2014</para>
       <itemizedlist>
+        <listitem>
+          <para>[ken] - archive glamor-egl in favour of xorg-server's glamor.
+          Fixes <ulink url="&blfs-ticket-root;5347">#5347</ulink>.</para>
+        </listitem>
         <listitem>
           <para>[igor] - Update to dhcp-4.3.1. Fixes
Index: x/installing/x7driver-ati.xml
===================================================================
--- x/installing/x7driver-ati.xml	(revision 5bee1977e55d2f36f1334d38e69acf425c89790f)
+++ x/installing/x7driver-ati.xml	(revision 53a89e5c7c87f023e0d010a2fc49e381fe31aa79)
@@ -87,17 +87,13 @@
       <bridgehead renderas="sect5">Required</bridgehead>
       <para role="required">
-        <xref linkend="xorg-server"/>
-      </para>
-
-      <bridgehead renderas="sect5">Recommended</bridgehead>
-      <para role="Recommended">
-        <xref linkend="glamor-egl"/>
+        <xref linkend="xorg-server"/> (recommended to be built with glamor enabled)
       </para>
 
       <note>
         <para>
-          This is <emphasis>required for "Southern Islands" GPUs</emphasis>
-          but optional for R300 to R700, Evergreen and "Northern Islands"
-          GPUs - see the link under "Glamor Acceleration" below.
+          Glamor is <emphasis>required for "Southern Islands" and later
+          GPUs</emphasis> but optional for R300 to R700, Evergreen and
+          "Northern Islands" GPUs - see the link under "Glamor
+          Acceleration" below.
         </para>
       </note>
Index: installing/x7driver-glamor.xml
===================================================================
--- x/installing/x7driver-glamor.xml	(revision 5bee1977e55d2f36f1334d38e69acf425c89790f)
+++ 	(revision )
@@ -1,165 +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 glamor-egl-version "0.6.0">
-
-  <!ENTITY glamor-egl-download-http "http://xorg.freedesktop.org/archive/individual/driver/glamor-egl-&glamor-egl-version;.tar.bz2">
-  <!ENTITY glamor-egl-download-ftp  " ">
-  <!ENTITY glamor-egl-md5sum        "b3668594675f71a75153ee52dbd35535">
-  <!ENTITY glamor-egl-size          "419 KB">
-  <!ENTITY glamor-egl-buildsize     "11 MB">
-  <!ENTITY glamor-egl-time          "0.2 SBU">
-]>
-
-  <!-- Begin Glamor EGL -->
-  <sect2 id="glamor-egl" xreflabel="Glamor EGL-&glamor-egl-version;">
-
-    <title>Glamor EGL-&glamor-egl-version;</title>
-
-    <indexterm zone="glamor-egl">
-      <primary sortas="a-glamor-egl">glamor-egl</primary>
-    </indexterm>
-
-    <sect3 role="package">
-      <title>Introduction to Glamor EGL</title>
-
-      <para>
-        The <application>Glamor EGL</application> package contains a
-        GL-based rendering acceleration library for X server.
-      </para>
-
-      &lfs75_checked;
-
-      <bridgehead renderas="sect4">Package Information</bridgehead>
-      <itemizedlist spacing="compact">
-        <listitem>
-          <para>
-            Download (HTTP): <ulink url="&glamor-egl-download-http;"/>
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Download (FTP): <ulink url="&glamor-egl-download-ftp;"/>
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Download MD5 sum: &glamor-egl-md5sum;
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Download size: &glamor-egl-size;
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Estimated disk space required: &glamor-egl-buildsize;
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Estimated build time: &glamor-egl-time;
-          </para>
-        </listitem>
-      </itemizedlist>
-
-      <bridgehead renderas="sect4">Glamor EGL Dependencies</bridgehead>
-
-      <bridgehead renderas="sect5">Required</bridgehead>
-      <para role="required">
-        <xref linkend="xorg-server"/>
-      </para>
-
-      <para condition="html" role="usernotes">
-        User Notes: <ulink url="&blfs-wiki;/glamor-egl"/>
-      </para>
-    </sect3>
-
-    <sect3 role="installation">
-      <title>Installation of Glamor EGL</title>
-
-      <para>
-        Install <application>Glamor EGL</application> by running the following
-        commands:
-      </para>
-
-<screen><userinput>./configure $XORG_CONFIG --enable-glx-tls &amp;&amp;
-make</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>
-    </sect3>
-
-    <sect3>
-      <title>Command Explanations</title>
-
-      <para>
-        <parameter>--enable-glx-tls</parameter>: This switch enables
-        TLS support in GLX.
-      </para>
-
-    </sect3>
-
-    <sect3 role="content">
-      <title>Contents</title>
-
-      <segmentedlist>
-        <segtitle>Installed Library</segtitle>
-        <segtitle>Installed Xorg Module</segtitle>
-
-        <seglistitem>
-          <seg>
-            libglamor.so
-          </seg>
-          <seg>
-            libglamoregl.so
-          </seg>
-        </seglistitem>
-      </segmentedlist>
-
-      <variablelist>
-        <bridgehead renderas="sect4">Short Descriptions</bridgehead>
-        <?dbfo list-presentation="list"?>
-        <?dbhtml list-presentation="table"?>
-
-        <varlistentry id="libglamoregl">
-          <term><filename class="libraryfile">libglamoregl.so</filename></term>
-          <listitem>
-            <para>
-              contains functions to create and initialize OpenGL/EGL context.
-            </para>
-            <indexterm zone="glamor-egl libglamoregl">
-              <primary sortas="c-libglamoregl">libglamoregl.so</primary>
-            </indexterm>
-          </listitem>
-        </varlistentry>
-
-        <varlistentry id="libglamor">
-          <term><filename class="libraryfile">libglamor.so</filename></term>
-          <listitem>
-            <para>
-              contains the <application>Glamor</application> rendering functions.
-            </para>
-            <indexterm zone="glamor-egl libglamor">
-              <primary sortas="c-libglamor">libglamor.so</primary>
-            </indexterm>
-          </listitem>
-        </varlistentry>
-
-      </variablelist>
-
-    </sect3>
-
-  </sect2>
-  <!-- End Glamor EGL -->
Index: x/installing/x7driver-intel.xml
===================================================================
--- x/installing/x7driver-intel.xml	(revision 5bee1977e55d2f36f1334d38e69acf425c89790f)
+++ x/installing/x7driver-intel.xml	(revision 53a89e5c7c87f023e0d010a2fc49e381fe31aa79)
@@ -91,9 +91,4 @@
       </para>
 
-      <bridgehead renderas="sect5">Optional</bridgehead>
-      <para role="optional">
-        <xref linkend="glamor-egl"/>
-      </para>
-
       <para condition="html" role="usernotes">
         User Notes: <ulink url="&blfs-wiki;/xorg-intel-driver"/>
Index: x/installing/x7driver.xml
===================================================================
--- x/installing/x7driver.xml	(revision 5bee1977e55d2f36f1334d38e69acf425c89790f)
+++ x/installing/x7driver.xml	(revision 53a89e5c7c87f023e0d010a2fc49e381fe31aa79)
@@ -42,5 +42,5 @@
     </note>
 
-    <sect3 id="xorg-modules">
+ <!--   <sect3 id="xorg-modules">
       <title>Xorg Modules</title>
 
@@ -53,5 +53,5 @@
       </itemizedlist>
 
-    </sect3>
+    </sect3> -->
 
     <sect3 id="xorg-input-drivers">
@@ -187,7 +187,4 @@
 
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="x7driver-glamor.xml"/>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="libevdev.xml"/>
 
Index: x/installing/xorg-server.xml
===================================================================
--- x/installing/xorg-server.xml	(revision 5bee1977e55d2f36f1334d38e69acf425c89790f)
+++ x/installing/xorg-server.xml	(revision 53a89e5c7c87f023e0d010a2fc49e381fe31aa79)
@@ -73,4 +73,10 @@
     <bridgehead renderas="sect3">Additional Downloads</bridgehead>
     <itemizedlist spacing="compact">
+      <listitem>
+        <para>
+          Recommended patch:
+          <ulink url="&patch-root;/xorg-server-&xorg-server-version;-upstream_glamor_fix-1.patch"/>
+        </para>
+      </listitem>
       <listitem>
         <para>
@@ -93,4 +99,10 @@
     </para>
 
+    <bridgehead renderas="sect4">Recommended</bridgehead>
+    <para>
+      <xref linkend="libepoxy"/> (required for glamor, see command
+      explanations below)
+    </para>
+
     <bridgehead renderas="sect4">Optional</bridgehead>
     <para>
@@ -111,4 +123,11 @@
 
     <para>
+      If you are enabling glamor, apply the recommended patch by running
+      the following command:
+    </para>
+
+<screen><userinput>patch -Np1 -i ../xorg-server-&xorg-server-version;-upstream_glamor_fix-1.patch</userinput></screen>
+
+    <para>
       If you have downloaded the optional patch, apply it by running
       the following command:
@@ -124,4 +143,5 @@
            --with-xkb-output=/var/lib/xkb   \
            --enable-dmx                     \
+           --enable-glamor                  \
            --enable-install-setuid          \
            --enable-suid-wrapper            &amp;&amp;
@@ -152,4 +172,11 @@
       <parameter>--enable-dmx</parameter>: Build DMX (Distributed Multihead X)
       server.
+    </para>
+
+    <para>
+      <parameter>--enable-glamor</parameter>: Build the Glamor DIX (Device
+      Independent X) module which is currently required for Southern Islands and
+      Sea Islands radeon video chipsets, optional for some other radeons, and
+      also optional for the intel driver.
     </para>
 
