r8848 - in trunk/BOOK: introduction/welcome x/installing x/lib

dj at linuxfromscratch.org dj at linuxfromscratch.org
Sun Jan 23 13:07:57 PST 2011


Author: dj
Date: 2011-01-23 14:07:50 -0700 (Sun, 23 Jan 2011)
New Revision: 8848

Modified:
   trunk/BOOK/introduction/welcome/changelog.xml
   trunk/BOOK/x/installing/installing.xml
   trunk/BOOK/x/installing/x7app.xml
   trunk/BOOK/x/installing/x7lib.xml
   trunk/BOOK/x/installing/x7proto.xml
   trunk/BOOK/x/installing/x7server.xml
   trunk/BOOK/x/installing/x7util.xml
   trunk/BOOK/x/lib/mesalib.xml
Log:
Various xorg cleanups.

Modified: trunk/BOOK/introduction/welcome/changelog.xml
===================================================================
--- trunk/BOOK/introduction/welcome/changelog.xml	2011-01-23 06:24:55 UTC (rev 8847)
+++ trunk/BOOK/introduction/welcome/changelog.xml	2011-01-23 21:07:50 UTC (rev 8848)
@@ -92,6 +92,11 @@
           <para>[dj] - Added specific instructions for Xorg environment setup if
           using an alternate installation prefix.</para>
         </listitem>
+        <listitem>
+          <para>[dj] - Completed cleanup of descriptive text in xorg section,
+          corrected dependencies, and reverted to legacy configuration pages
+          until new page matures.</para>
+        </listitem>
       </itemizedlist>
     </listitem>
 

Modified: trunk/BOOK/x/installing/installing.xml
===================================================================
--- trunk/BOOK/x/installing/installing.xml	2011-01-23 06:24:55 UTC (rev 8847)
+++ trunk/BOOK/x/installing/installing.xml	2011-01-23 21:07:50 UTC (rev 8848)
@@ -27,12 +27,12 @@
 
 <!--  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="xorg7-dummy.xml"/> -->
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="xorg7.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="x7util.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="x7util.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"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="x7lib.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="xbitmaps.xml"/> -->
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="x7app.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="xcursorthemes.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="x7font.xml"/>
@@ -40,9 +40,9 @@
 <!--  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="luit.xml"/> -->
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="x7server.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="x7driver.xml"/>
-<!--  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="xconfig-dummy.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="xconfig-dummy.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="x-setup.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="x-config.xml"/>
--->
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="xorg-config.xml"/>
+
+<!-- New Page  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="xorg-config.xml"/> -->
 </chapter>

Modified: trunk/BOOK/x/installing/x7app.xml
===================================================================
--- trunk/BOOK/x/installing/x7app.xml	2011-01-23 06:24:55 UTC (rev 8847)
+++ trunk/BOOK/x/installing/x7app.xml	2011-01-23 21:07:50 UTC (rev 8848)
@@ -69,8 +69,9 @@
     <bridgehead renderas="sect3">Xorg Applications Dependencies</bridgehead>
 
     <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required"><xref linkend="xbitmaps"/>,
-    <xref linkend="libpng"/>, and <xref linkend="xorg7-lib"/></para>
+    <para role="required"><xref linkend="libpng"/>,
+    <xref linkend="xcb-util"/>, and
+    <xref linkend="xorg7-lib"/></para>
 
     <bridgehead renderas="sect4">Optional</bridgehead>
     <para role="optional"><xref linkend="linux-pam"/> (only used by XDM) and

Modified: trunk/BOOK/x/installing/x7lib.xml
===================================================================
--- trunk/BOOK/x/installing/x7lib.xml	2011-01-23 06:24:55 UTC (rev 8847)
+++ trunk/BOOK/x/installing/x7lib.xml	2011-01-23 21:07:50 UTC (rev 8848)
@@ -69,8 +69,7 @@
     <bridgehead renderas="sect3">Xorg Libraries Dependencies</bridgehead>
 
     <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required"><xref linkend="ed"/>,
-    <xref linkend="fontconfig"/>,
+    <para role="required"><xref linkend="fontconfig"/>,
     <xref linkend="xorg7-proto"/>,
     <xref linkend="libXdmcp"/>, and
     <xref linkend="libxcb"/></para>
@@ -112,9 +111,6 @@
 libXfont-[0-9]* )
                  ./configure $XORG_CONFIG --disable-devel-docs
                  ;;
-  libX11-[0-9]* )
-                 ./configure $XORG_CONFIG --without-xcb
-                 ;;
    libXt-[0-9]* )
                  ./configure $XORG_CONFIG \
                      --with-appdefaultdir=/etc/X11/app-defaults
@@ -138,11 +134,6 @@
   <sect2 role="commands">
     <title>Command Explanations</title>
 
-    <para><parameter>--without-xcb</parameter>: By default,
-    <application>libX11</application> will use <xref linkend="libxcb"/>
-    for its transport layer. Omit this parameter (or the <command>case</command>
-    statement) if you've installed <xref linkend="libxcb"/>.</para>
-
     <para><parameter>--with-fop</parameter>: Use <xref linkend="fop"/> to
     generate PDF documentation (only for the libXfont package).</para>
 

Modified: trunk/BOOK/x/installing/x7proto.xml
===================================================================
--- trunk/BOOK/x/installing/x7proto.xml	2011-01-23 06:24:55 UTC (rev 8847)
+++ trunk/BOOK/x/installing/x7proto.xml	2011-01-23 21:07:50 UTC (rev 8848)
@@ -71,6 +71,20 @@
       </listitem>
     </itemizedlist>
 
+    <bridgehead renderas="sect3">Xorg Protocol Headers Dependencies</bridgehead>
+
+    <bridgehead renderas="sect4">Required</bridgehead>
+    <para role="required"> <xref linkend="xorg7-util"/></para>
+
+    <bridgehead renderas="sect4">Optional</bridgehead>
+    <para role="required"> <xref linkend="fop"/> and <xref linkend="xmlto"/>
+    (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>
 

Modified: trunk/BOOK/x/installing/x7server.xml
===================================================================
--- trunk/BOOK/x/installing/x7server.xml	2011-01-23 06:24:55 UTC (rev 8847)
+++ trunk/BOOK/x/installing/x7server.xml	2011-01-23 21:07:50 UTC (rev 8848)
@@ -66,6 +66,8 @@
     <bridgehead renderas="sect4">Optional</bridgehead>
     <para><xref linkend="dbus"/>,
     <xref linkend="doxygen"/> (to build API documentation),
+    <xref linkend="xmlto"/>, (to build documentation),
+    <xref linkend="fop"/>, (to build documentation),
     <xref linkend="gs"/> (to build documentation),
     <xref linkend="hal"/> (not recommended, disabled by default),
     <xref linkend="mesalib"/> (required for DRI)</para>

Modified: trunk/BOOK/x/installing/x7util.xml
===================================================================
--- trunk/BOOK/x/installing/x7util.xml	2011-01-23 06:24:55 UTC (rev 8847)
+++ trunk/BOOK/x/installing/x7util.xml	2011-01-23 21:07:50 UTC (rev 8848)
@@ -32,11 +32,10 @@
     <title>Introduction to Xorg Utilities</title>
 
     <para>The <application>Xorg</application> utility packages provide
-    needed utilities, not for the <application>Xorg</application>
-    installation itself, but for other applications that make use of
-    legacy X11R6 installation methods.</para>
+    needed utilities, not for the <application>Xorg</application> build
+    environment.</para>
 
-    &lfs65_checked;
+    &lfs67_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
     <itemizedlist spacing="compact">
@@ -66,13 +65,13 @@
         <para>Required download list: <ulink url="&x7utils-wget;"/></para>
       </listitem>
     </itemizedlist>
-
+<!--
     <bridgehead renderas="sect3">Xorg Utilities Dependencies</bridgehead>
 
     <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required"><!-- <xref linkend="pkgconfig"/> and -->
+    <para role="required"> <xref linkend="pkgconfig"/> and 
     <xref linkend="xorg7-proto"/></para>
-
+-->
     <para condition="html" role="usernotes">User Notes:
     <ulink url='&blfs-wiki;/Xorg7Utilities'/></para>
 

Modified: trunk/BOOK/x/lib/mesalib.xml
===================================================================
--- trunk/BOOK/x/lib/mesalib.xml	2011-01-23 06:24:55 UTC (rev 8847)
+++ trunk/BOOK/x/lib/mesalib.xml	2011-01-23 21:07:50 UTC (rev 8848)
@@ -64,8 +64,10 @@
     <bridgehead renderas="sect4">Required</bridgehead>
     <para role="required"><xref linkend="xorg7-lib"/>,
     <xref linkend="xorg7-util"/>,
-    <xref linkend="libdrm"/>, and
-    <xref linkend="expat"/></para>
+    <xref linkend="libdrm"/>,
+    <xref linkend="expat"/>, and
+    <!-- <xref linkend="talloc"/>  -->
+    <ulink url="http://samba.org/ftp/talloc/">Talloc</ulink></para>
 
     <bridgehead renderas="sect4">Optional</bridgehead>
     <para role="optional"><xref linkend="lesstif"/> (required to build motif




More information about the blfs-book mailing list