r7410 - in trunk/BOOK: . gnome/add introduction/welcome x/installing x/lib

dj at linuxfromscratch.org dj at linuxfromscratch.org
Fri May 2 22:18:57 PDT 2008


Author: dj
Date: 2008-05-02 23:18:57 -0600 (Fri, 02 May 2008)
New Revision: 7410

Modified:
   trunk/BOOK/general.ent
   trunk/BOOK/gnome/add/gnome-mag.xml
   trunk/BOOK/introduction/welcome/changelog.xml
   trunk/BOOK/x/installing/installing.xml
   trunk/BOOK/x/installing/x-config.xml
   trunk/BOOK/x/installing/x-setup.xml
   trunk/BOOK/x/installing/xorg.xml
   trunk/BOOK/x/lib/mesalib.xml
Log:
Commented out remaining text related to XFree86.

Modified: trunk/BOOK/general.ent
===================================================================
--- trunk/BOOK/general.ent	2008-05-01 06:30:52 UTC (rev 7409)
+++ trunk/BOOK/general.ent	2008-05-03 05:18:57 UTC (rev 7410)
@@ -3,11 +3,11 @@
 $Date$
 -->
 
-<!ENTITY day          "01">                   <!-- Always 2 digits -->
+<!ENTITY day          "03">                   <!-- Always 2 digits -->
 <!ENTITY month        "05">                   <!-- Always 2 digits -->
 <!ENTITY year         "2008">
 <!ENTITY version      "svn-&year;&month;&day;">
-<!ENTITY releasedate  "May &day;st, &year;">
+<!ENTITY releasedate  "May &day;rd, &year;">
 <!ENTITY pubdate      "&year;-&month;-&day;"> <!-- metadata req. by TLDP -->
 <!ENTITY blfs-version "svn">                  <!-- svn|[release #] -->
 <!ENTITY lfs-version  "development">          <!-- version|testing|unstable|development] -->

Modified: trunk/BOOK/gnome/add/gnome-mag.xml
===================================================================
--- trunk/BOOK/gnome/add/gnome-mag.xml	2008-05-01 06:30:52 UTC (rev 7409)
+++ trunk/BOOK/gnome/add/gnome-mag.xml	2008-05-03 05:18:57 UTC (rev 7410)
@@ -74,6 +74,7 @@
     <para role="optional"><xref linkend="intltool"/> and
     <xref linkend="doxygen"/></para>
 
+<!-- XFREE86
     <bridgehead renderas="sect4">Optional (For
     <application>XFree86</application> Only)</bridgehead>
     <para role="optional"><ulink
@@ -86,9 +87,10 @@
     url="http://www.freedesktop.org/wiki/Software_2fxlibs">DamageExt</ulink>)
     </para>
 
-    <!-- <para>* Ensure you created the
+    <para>* Ensure you created the
     <filename>xextensions.pc</filename> file as shown in the
-    <xref linkend="xfree86"/> instructions.</para> -->
+    <xref linkend="xfree86"/> instructions.</para> 
+XFREE86 -->
 
     <para condition="html" role="usernotes">User Notes:
     <ulink url="&blfs-wiki;/gnome-mag"/></para>

Modified: trunk/BOOK/introduction/welcome/changelog.xml
===================================================================
--- trunk/BOOK/introduction/welcome/changelog.xml	2008-05-01 06:30:52 UTC (rev 7409)
+++ trunk/BOOK/introduction/welcome/changelog.xml	2008-05-03 05:18:57 UTC (rev 7410)
@@ -42,6 +42,15 @@
 -->
 
     <listitem>
+      <para>May 3rd, 2008</para>
+      <itemizedlist>
+        <listitem>
+          <para>[dj] - Commented out remaining text related to XFree86.</para>
+        </listitem>
+      </itemizedlist>
+    </listitem>
+
+    <listitem>
       <para>May 1st, 2008</para>
       <itemizedlist>
         <listitem>

Modified: trunk/BOOK/x/installing/installing.xml
===================================================================
--- trunk/BOOK/x/installing/installing.xml	2008-05-01 06:30:52 UTC (rev 7409)
+++ trunk/BOOK/x/installing/installing.xml	2008-05-03 05:18:57 UTC (rev 7410)
@@ -25,9 +25,12 @@
   more than 100 different packages. Most large commercial distributions have
   decided to use the <application>Xorg</application> package.</para>
 
-  <!-- <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="xmono-dummy.xml"/> -->
-  <!-- <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="xorg.xml"/> -->
-  <!-- <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="xfree86.xml"/> -->
+<!-- XFREE86 
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="xmono-dummy.xml"/> 
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="xorg.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="xfree86.xml"/>
+XFREE86 -->
+
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="xorg7-dummy.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="xorg7.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="x7proto.xml"/>

Modified: trunk/BOOK/x/installing/x-config.xml
===================================================================
--- trunk/BOOK/x/installing/x-config.xml	2008-05-01 06:30:52 UTC (rev 7409)
+++ trunk/BOOK/x/installing/x-config.xml	2008-05-03 05:18:57 UTC (rev 7410)
@@ -15,13 +15,21 @@
 
   <title>Additional X Window System Configuration</title>
 
+<!-- XFREE86
   <para>Below you will find information on fine tuning the components of both
   variants of the <application>X Window System</application>. The documentation
   links are specifically for <application>XFree86</application>, however, the
+XFREE86 -->
+  <para>Below you will find information on fine tuning the components
+  of the <application>X Window System</application>. The documentation
+  links are specifically for <application>XFree86</application>,
+  which has been retired in BLFS, however, the
   information contained in those documents usually pertains to
   <application>Xorg</application> as well.  Detailed descriptions are also
-  located in the <filename>xorg.conf</filename> or
-  <filename>XF86Config</filename> man pages.</para>
+  located in the <filename>xorg.conf</filename> man page.</para>
+<!-- XFREE86
+  or <filename>XF86Config</filename> man pages.</para>
+XFREE86 -->
 
   <sect2 id='xinput'>
     <title>Setting up X Input Devices</title>

Modified: trunk/BOOK/x/installing/x-setup.xml
===================================================================
--- trunk/BOOK/x/installing/x-setup.xml	2008-05-01 06:30:52 UTC (rev 7409)
+++ trunk/BOOK/x/installing/x-setup.xml	2008-05-03 05:18:57 UTC (rev 7410)
@@ -78,23 +78,30 @@
 
     <para>As the <systemitem class="username">root</systemitem> user
     create a basic X Window System configuration file with the following
-    commands:</para>
+    command:</para>
 
+<!-- XFREE86
     <para>For <application>Xorg</application>:</para>
+XFREE86 -->
+
 <screen><userinput>cd ~ &&
 Xorg -configure</userinput></screen>
 
+<!-- XFREE86
     <para>For <application>XFree86</application>:</para>
 <screen><userinput>cd ~ &&
 XFree86 -configure</userinput></screen>
+XFREE86 -->
 
     <indexterm zone="x-setup xconfig">
       <primary sortas="e-etc-X11-xorg-conf">/etc/X11/xorg.conf</primary>
     </indexterm>
 
+<!-- XFREE86
     <indexterm zone="x-setup xconfig">
       <primary sortas="e-etc-X11-XF86Config">/etc/X11/XF86Config</primary>
     </indexterm>
+XFREE86 -->
 
     <para>The screen will go black and you may hear some clicking of the
     monitor.  This command will create a file in your
@@ -104,8 +111,12 @@
 
     <para>Edit the newly created configuration file to suit your system. The
     details of the files are located in the <filename>xorg.conf.5x</filename>
+    man page.  Some things you may want to do are:</para>
+
+<!-- XFREE86
     and <filename>XF86Config.5x</filename> man
     pages. Some things you may want to do are:</para>
+XFREE86 -->
 
     <itemizedlist>
       <listitem>
@@ -141,30 +152,49 @@
       </listitem>
     </itemizedlist>
 
+<!-- XFREE86
     <para>Test the system with one of the following commands:</para>
+XFREE86 -->
 
+    <para>Test the system with the following command:</para>
+
+<!-- XFREE86
     <para>For <application>Xorg</application>:</para>
+XFREE86 -->
+
 <screen><userinput>X -config ~/xorg.conf.new</userinput></screen>
 
+<!-- XFREE86
     <para>For <application>XFree86</application>:</para>
 <screen><userinput>XFree86 -xf86config ~/XF86Config.new</userinput></screen>
+XFREE86 -->
 
     <para>You will only get a gray background with an X-shaped mouse cursor,
     but it confirms the system is working. Exit with
     <keycap>Control+Alt+Backspace</keycap>. If the system does not work, take
+    a look at <filename>/var/log/Xorg.0.log</filename> to see what went
+    wrong.</para>
+
+<!-- XFREE86
     a look at <filename>/var/log/Xorg.0.log</filename> or
     <filename>/var/log/XFree86.0.log</filename> to see what went
     wrong.</para>
+XFREE86 -->
 
     <para>As the <systemitem class="username">root</systemitem> user, create
     the configuration directory and move the configuration file to the new
     directory:</para>
 
+<!-- XFREE86
     <para>For <application>Xorg</application>:</para>
+XFREE86 -->
+
 <screen role="root"><userinput>install -v -m644 -D ~/xorg.conf.new /etc/X11/xorg.conf</userinput></screen>
 
+<!-- XFREE86
     <para>For <application>XFree86</application>:</para>
 <screen role="root"><userinput>install -v -m644 -D ~/XF86Config.new /etc/X11/XF86Config</userinput></screen>
+XFREE86 -->
 
     <para>As the <systemitem class="username">root</systemitem> user, create
     <filename>.xinitrc</filename>:</para>
@@ -223,8 +253,10 @@
     <para>and a basic functional <application>X Window
     System</application> should be displayed.</para>
 
-    <!-- <para>For a list of the package contents and a description of the commands,
-    see the sections in the <xref linkend="xfree86-contents"/>.</para> -->
+<!-- XFREE86
+    <para>For a list of the package contents and a description of the commands,
+    see the sections in the <xref linkend="xfree86-contents"/>.</para>
+XFREE86 -->
 
   </sect2>
 
@@ -244,8 +276,12 @@
     the "glx" and "dri" modules must be loaded.  Additionally, the created
     device nodes in <filename class="directory">/dev/dri</filename> must
     have proper permissions for your users.  A sample
+    <filename>xorg.conf</filename> file might look like this:</para>
+
+<!-- XFREE86
     <filename>XF86config</filename> or <filename>xorg.conf</filename>
     file might look like this:</para>
+XFREE86 -->
 
 <screen><literal>Section "Module"
     ...
@@ -273,21 +309,34 @@
     </note>
 
     <para>To check if DRI is installed properly, check the log file
+<!-- XFREE86
     <filename>/var/log/XFree86.0.log</filename> or
+XFREE86 -->
     <filename>/var/log/Xorg.0.log</filename> for statements like:</para>
 
 <screen><literal>(II) R128(0): Direct rendering enabled</literal></screen>
 
+<!-- XFREE86
     <para>From an <command>xterm</command>, run <command>glxinfo</command>
     and look for the phrase:</para>
+XFREE86 -->
 
+    <para>If you elected to install the Mesa-Demos package when installing
+    <xref linkend="mesalib"/>, from an <command>xterm</command>, run
+    <command>glxinfo</command> and look for the phrase:</para>
+
 <screen><computeroutput>direct rendering: Yes</computeroutput></screen>
 
     <para>If direct rendering is not enabled, you can add verbosity by
     running <command>LIBGL_DEBUG=verbose glxinfo</command>.  This will
     show the drivers, device nodes and files used by the DRI system.</para>
 
+<!-- XFREE86
     <para>You can also run the test program <command>glxgears</command>.
+XFREE86 -->
+
+    <para>Again, if you have added the Mesa-Demos package, you can also
+    run the test program <command>glxgears</command>.
     This program brings up a window with three gears turning.  The
     <command>xterm</command> will display how many frames were drawn every
     five seconds, so this is a reasonable benchmark.  The window is scalable,
@@ -324,9 +373,11 @@
       <primary sortas="e-etc-X11-xorg-conf">/etc/X11/xorg.conf</primary>
     </indexterm>
 
+<!-- XFREE86
     <indexterm zone="x-setup fonts">
       <primary sortas="e-etc-X11-XF86Config">/etc/X11/XF86Config</primary>
     </indexterm>
+XFREE86 -->
 
     <sect3>
       <title>Core X Font Protocol</title>
@@ -336,7 +387,10 @@
       </indexterm>
 
       <para>The core X font protocol finds fonts from the server configuration
+<!-- XFREE86
       file (<filename>xorg.conf</filename> or <filename>XF86Config</filename>).
+XFREE86 -->
+      file (<filename>xorg.conf</filename>).
       If no font paths exist in the configuration file, the server will fall
       back to an internal hard-coded path.  Assuming the prefix for your
       <application>X</application> installation is
@@ -371,8 +425,11 @@
       <filename>fonts.scale</filename> files by the server.  The core X font
       system uses the "freetype" module for non-antialiased rendering of these
       fonts.  Ensure that the "freetype" module is loaded in the
+<!-- XFREE86
       <filename>XF86config</filename> or <filename>xorg.conf</filename>
-      file by adding it to the "Module" section:</para>
+XFREE86 -->
+      <filename>xorg.conf</filename> file by adding it to the "Module"
+      section:</para>
 
 <screen><literal>Section "Module"
     ...
@@ -548,8 +605,10 @@
     keyboard layouts do not include Latin configurations as was previous
     practice. To set up a keyboard for Latin and non-Latin input, change
     the XkbLayout keyboard driver option in the InputDevice section
+<!-- XFREE86
     of the <filename>XF86Config</filename> or <filename>xorg.conf</filename>
-    file. For example:</para>
+XFREE86 -->
+    of the <filename>xorg.conf</filename> file. For example:</para>
 
 <screen><literal>Section "InputDevice"
     Identifier          "Keyboard0"

Modified: trunk/BOOK/x/installing/xorg.xml
===================================================================
--- trunk/BOOK/x/installing/xorg.xml	2008-05-01 06:30:52 UTC (rev 7409)
+++ trunk/BOOK/x/installing/xorg.xml	2008-05-03 05:18:57 UTC (rev 7410)
@@ -29,7 +29,8 @@
   <sect2 role="package">
     <title>Introduction to Xorg</title>
 
-    <!-- <note>
+<!-- XFREE86
+      <note>
       <para>There are three packages in BLFS that implement the <application>X
       Window System</application>: <application>Xorg</application>
       (X11R6 and X11R7) and  <application>XFree86</application>. These
@@ -52,14 +53,15 @@
 
       <para><application>XFree86</application> continues to be a solid,
       conservative application with excellent driver support.</para>
-    </note> -->
+    </note>
+XFREE86 -->
 
-    <para><application>Xorg</application> is a freely redistributable open-source
-    implementation of the <application>X</application> Window System. This
-    system provides a client/server interface between display hardware (the
-    mouse, keyboard, and video displays) and the desktop environment, while also
-    providing both the windowing infrastructure and a standardized application
-    interface (API).</para>
+    <para><application>Xorg</application> is a freely redistributable
+    open-source implementation of the <application>X</application> Window
+    System. This system provides a client/server interface between display
+    hardware (the mouse, keyboard, and video displays) and the desktop
+    environment, while also providing both the windowing infrastructure and
+    a standardized application interface (API).</para>
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
     <itemizedlist spacing="compact">
@@ -443,8 +445,10 @@
     managed via the above symbolic links. They are intended for utilization
     by users only.</quote></para>
 
-    <!-- <para>For a list of the package contents, see the sections in the
-    <xref linkend="xfree86-contents"/>.</para> -->
+<!-- XFREE86
+    <para>For a list of the package contents, see the sections in the
+    <xref linkend="xfree86-contents"/>.</para>
+XFREE86 -->
 
   </sect2>
 

Modified: trunk/BOOK/x/lib/mesalib.xml
===================================================================
--- trunk/BOOK/x/lib/mesalib.xml	2008-05-01 06:30:52 UTC (rev 7409)
+++ trunk/BOOK/x/lib/mesalib.xml	2008-05-03 05:18:57 UTC (rev 7410)
@@ -103,13 +103,15 @@
     <xref linkend="libdrm"/>, and
     <xref linkend="expat"/></para>
 
-    <!-- <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../../xincludes/xorg7-only.xml"/> -->
+<!-- XFREE86
+     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../../xincludes/xorg7-only.xml"/>
 
-    <!-- <note>
+    <note>
       <para>It is not recommended to build a newer version of
       <application>Mesa</application> with <xref linkend="xfree86"/>.</para>
-    </note> -->
+    </note>
+XFREE86 -->
 
     <para condition="html" role="usernotes">User Notes:
     <ulink url="&blfs-wiki;/mesalib"/></para>
@@ -124,13 +126,14 @@
     <filename class="directory">Mesa-&mesalib-version;</filename>
     directory.</para>
 
-    <!-- Commenting this out as there is already mention of this
+<!-- XFREE86
+    Commenting this out as there is already mention of this
     <caution>
       <para>You should ensure that the <envar>XORG_PREFIX</envar> variable in
       the commands below is the same as the one used in the installation prefix
       of <application>Xorg</application>.</para>
     </caution>
-    -->
+XFREE86 -->
 
     <para>Install <application>MesaLib</application> by running the following
     command:</para>




More information about the blfs-book mailing list