r6541 - in trunk/BOOK: . introduction/welcome x/installing x/lib xincludes

randy at linuxfromscratch.org randy at linuxfromscratch.org
Sun Feb 4 11:03:16 PST 2007


Author: randy
Date: 2007-02-04 12:03:16 -0700 (Sun, 04 Feb 2007)
New Revision: 6541

Modified:
   trunk/BOOK/general.ent
   trunk/BOOK/introduction/welcome/changelog.xml
   trunk/BOOK/x/installing/installing.xml
   trunk/BOOK/x/installing/x-setup.xml
   trunk/BOOK/x/lib/mesalib.xml
   trunk/BOOK/xincludes/xorg7-only.xml
Log:
Removed the obsolete and unmaintained Xorg-6.9 package

Modified: trunk/BOOK/general.ent
===================================================================
--- trunk/BOOK/general.ent	2007-02-04 15:46:07 UTC (rev 6540)
+++ trunk/BOOK/general.ent	2007-02-04 19:03:16 UTC (rev 6541)
@@ -363,7 +363,6 @@
 
 <!-- Part VII -->
 <!-- Chapter 25 -->
-<!ENTITY xorg-version                 "6.9.0">
 <!ENTITY xfree86-version              "4.6.0">
 <!ENTITY xorg7-version                "7.1">
 <!ENTITY luit-version                 "1.0.2">
@@ -374,6 +373,8 @@
 <!ENTITY xterm-version                "223">
 <!ENTITY rman-version                 "3.2">
 
+<!-- Obsolete -->
+<!ENTITY xorg-version                 "6.9.0">
 
 <!-- Chapter 26 -->
 <!ENTITY qt-version                   "3.3.7">

Modified: trunk/BOOK/introduction/welcome/changelog.xml
===================================================================
--- trunk/BOOK/introduction/welcome/changelog.xml	2007-02-04 15:46:07 UTC (rev 6540)
+++ trunk/BOOK/introduction/welcome/changelog.xml	2007-02-04 19:03:16 UTC (rev 6541)
@@ -42,6 +42,16 @@
 -->
 
     <listitem>
+      <para>February 4th, 2007</para>
+      <itemizedlist>
+        <listitem>
+          <para>[randy] - Removed the obsolete and unmaintained Xorg-6.9
+          package.</para>
+        </listitem>
+      </itemizedlist>
+    </listitem>
+
+    <listitem>
       <para>February 3rd, 2007</para>
       <itemizedlist>
         <listitem>

Modified: trunk/BOOK/x/installing/installing.xml
===================================================================
--- trunk/BOOK/x/installing/installing.xml	2007-02-04 15:46:07 UTC (rev 6540)
+++ trunk/BOOK/x/installing/installing.xml	2007-02-04 19:03:16 UTC (rev 6541)
@@ -16,14 +16,16 @@
   <title>X Window System Environment</title>
 
   <para>This chapter contains instructions to build and configure a graphical
-  user environment. You will need to choose one of the three packages in BLFS
+  user environment. You will need to choose one of the two packages in BLFS
   that implements the <application>X Window System</application>:
-  <application>Xorg</application> X11R6 or X11R7 (<xref linkend="xorg"/> or
-  <xref linkend="xorg7"/>), or <application>XFree86</application>
-  (<xref linkend="xfree86"/>). These packages are all quite similar. In fact,
-  the base system of <application>Xorg</application> is
-  <application>XFree86</application>-4.4.0RC2. Differences in the licensing
-  philosophies was the original reason for the split.</para>
+  <application>Xorg</application> X11R7 (<xref linkend="xorg7"/>), or
+  <application>XFree86</application> (<xref linkend="xfree86"/>). The
+  functionality of these two packages is quite similar. In fact,
+  the base system of <application>Xorg</application> was derived from the
+  <application>XFree86</application>-4.4.0RC2 code (note that the
+  <application>Xorg</application> build system has changed, but the underlying
+  core code is the same). Differences in the licensing philosophies was the
+  original reason for the split.</para>
 
   <para>A second reason for the forking of <application>X</application>
   packages is the stated goals of the developers. Some developers were unhappy
@@ -32,15 +34,18 @@
   internals of the system and more frequent releases.</para>
 
   <para><application>Xorg</application>-&xorg7-version; introduces a completely
-  autotooled build system, but is otherwise the same codebase as
-  <application>Xorg</application>-&xorg-version;. Most large commercial
-  distributions have decided to use the <application>Xorg</application>
-  package, but several still provide <application>XFree86</application>.</para>
+  autotooled build system which means that the packages build and install
+  using the conventional <command>configure</command>, <command>make</command>
+  and <command>make install</command> commands, but it now requires installing
+  more than 100 different packages. Most large commercial distributions have
+  decided to use the <application>Xorg</application> package, but several still
+  provide <application>XFree86</application>.</para>
 
   <para><application>XFree86</application> continues to be a solid,
   conservative application with excellent driver support.</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="xorg.xml"/> -->
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="xfree86.xml"/>
   <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"/>
@@ -57,4 +62,5 @@
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="xconfig-dummy.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="x-setup.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="x-config.xml"/>
+
 </chapter>

Modified: trunk/BOOK/x/installing/x-setup.xml
===================================================================
--- trunk/BOOK/x/installing/x-setup.xml	2007-02-04 15:46:07 UTC (rev 6540)
+++ trunk/BOOK/x/installing/x-setup.xml	2007-02-04 19:03:16 UTC (rev 6541)
@@ -216,7 +216,7 @@
     <application>X</application> by default if you have a supported video card.
     To enable direct rendering using the OpenGL implementation from
     <xref linkend="mesalib"/> (built separately with <xref linkend="xorg7"/>
-    or included with <xref linkend="xorg"/> and <xref linkend="xfree86"/>),
+    or included with <xref linkend="xfree86"/>),
     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

Modified: trunk/BOOK/x/lib/mesalib.xml
===================================================================
--- trunk/BOOK/x/lib/mesalib.xml	2007-02-04 15:46:07 UTC (rev 6540)
+++ trunk/BOOK/x/lib/mesalib.xml	2007-02-04 19:03:16 UTC (rev 6541)
@@ -66,8 +66,7 @@
 
     <note>
       <para>It is not recommended to build a newer version of
-      <application>Mesa</application> with <xref linkend="xfree86"/> or
-      <xref linkend="xorg"/>.</para>
+      <application>Mesa</application> with <xref linkend="xfree86"/>.</para>
     </note>
 
     <bridgehead renderas="sect3">Recommended Download</bridgehead>

Modified: trunk/BOOK/xincludes/xorg7-only.xml
===================================================================
--- trunk/BOOK/xincludes/xorg7-only.xml	2007-02-04 15:46:07 UTC (rev 6540)
+++ trunk/BOOK/xincludes/xorg7-only.xml	2007-02-04 19:03:16 UTC (rev 6541)
@@ -8,7 +8,6 @@
 <note>
     <para>This package should only be built if you are installing
     <xref linkend="xorg7"/>. If you have installed or will be
-    installing <xref linkend="xorg"/> or <xref linkend="xfree86"/>,
-    it is provided by those packages and should not be installed
-    here.</para>
+    installing <xref linkend="xfree86"/>, it is already installed
+    (or will be) and should not be installed here.</para>
 </note>




More information about the blfs-book mailing list