r6129 - in trunk/BOOK: . introduction/welcome x/installing

dj at linuxfromscratch.org dj at linuxfromscratch.org
Wed May 24 23:52:06 PDT 2006


Author: dj
Date: 2006-05-25 00:52:00 -0600 (Thu, 25 May 2006)
New Revision: 6129

Modified:
   trunk/BOOK/general.ent
   trunk/BOOK/introduction/welcome/changelog.xml
   trunk/BOOK/x/installing/libdrm.xml
   trunk/BOOK/x/installing/mesalib.xml
   trunk/BOOK/x/installing/x-setup.xml
   trunk/BOOK/x/installing/x7app.xml
   trunk/BOOK/x/installing/x7data.xml
   trunk/BOOK/x/installing/x7driver.xml
   trunk/BOOK/x/installing/x7font.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/installing/xbitmaps.xml
   trunk/BOOK/x/installing/xorg7.xml
   trunk/BOOK/x/installing/xterm.xml
Log:
Updated to xorg-7.1, xterm-213, and MesaLib-6.5.

Modified: trunk/BOOK/general.ent
===================================================================
--- trunk/BOOK/general.ent	2006-05-25 01:38:42 UTC (rev 6128)
+++ trunk/BOOK/general.ent	2006-05-25 06:52:00 UTC (rev 6129)
@@ -143,9 +143,7 @@
 <!ENTITY screen-version               "4.0.2">
 <!ENTITY tidy-version                 "051026">
 <!ENTITY desktop-file-utils-version   "0.11">
-<!ENTITY xterm-version                "209">
 <!ENTITY xscreensaver-version         "4.24">
-<!ENTITY rman-version                 "3.2">
 <!ENTITY pilot-link-version           "0.11.8">
 <!ENTITY unixodbc-version             "2.2.11">
 <!ENTITY graphviz-version             "2.8">
@@ -354,14 +352,17 @@
 <!-- Chapter 25 -->
 <!ENTITY xorg-version                 "6.9.0">
 <!ENTITY xfree86-version              "4.6.0">
-<!ENTITY xorg7-version                "7.0.0">
+<!ENTITY xorg7-version                "7.1">
 <!ENTITY luit-version                 "1.0.1">
 <!ENTITY xbitmaps-version             "1.0.1">
-<!ENTITY xorg-server-version          "1.0.2">
+<!ENTITY xorg-server-version          "1.1.0">
+<!ENTITY libdrm-version               "2.0.1">
+<!ENTITY mesalib-version              "6.5">
+<!ENTITY xterm-version                "213">
+<!ENTITY rman-version                 "3.2">
 
+
 <!-- Chapter 26 -->
-<!ENTITY libdrm-version               "2.0">
-<!ENTITY mesalib-version              "6.4.2">
 <!ENTITY qt-version                   "3.3.6">
 <!ENTITY GTK-version                  "1.2.10">
 <!ENTITY cairo-version                "1.0.4">

Modified: trunk/BOOK/introduction/welcome/changelog.xml
===================================================================
--- trunk/BOOK/introduction/welcome/changelog.xml	2006-05-25 01:38:42 UTC (rev 6128)
+++ trunk/BOOK/introduction/welcome/changelog.xml	2006-05-25 06:52:00 UTC (rev 6129)
@@ -47,6 +47,15 @@
         <listitem>
           <para>[randy] - Updated to desktop-file-utils-0.11.</para>
         </listitem>
+        <listitem>
+          <para>[dj] - Updated Xorg Modular to 7.1 release.</para>
+        </listitem>
+        <listitem>
+          <para>[dj] - Updated to xterm-213.</para>
+        </listitem>
+        <listitem>
+          <para>[dj] - Updated to Mesa-6.5.</para>
+        </listitem>
       </itemizedlist>
     </listitem>
 

Modified: trunk/BOOK/x/installing/libdrm.xml
===================================================================
--- trunk/BOOK/x/installing/libdrm.xml	2006-05-25 01:38:42 UTC (rev 6128)
+++ trunk/BOOK/x/installing/libdrm.xml	2006-05-25 06:52:00 UTC (rev 6129)
@@ -7,8 +7,8 @@
   <!ENTITY libdrm-download-http "http://dri.freedesktop.org/libdrm/libdrm-&libdrm-version;.tar.gz">
   <!ENTITY libdrm-download-ftp  "ftp://ftp.fu-berlin.de/unix/linux/mirrors/gentoo/distfiles/libdrm-&libdrm-version;.tar.gz">
   <!ENTITY libdrm-md5sum        "9d1aab104eb757ceeb2c1a6d38d57411">
-  <!ENTITY libdrm-size          "370 KB">
-  <!ENTITY libdrm-buildsize     "5.1 MB">
+  <!ENTITY libdrm-size          "276 KB">
+  <!ENTITY libdrm-buildsize     "3.2 MB">
   <!ENTITY libdrm-time          "0.1 SBU">
 ]>
 
@@ -70,8 +70,7 @@
     <para>Install <application>libdrm</application> by running the following
     commands:</para>
 
-<screen><userinput>autoreconf -ifv &&
-./configure --prefix=$XORG_PREFIX &&
+<screen><userinput>./configure --prefix=$XORG_PREFIX &&
 make</userinput></screen>
 
     <para>This package does not come with a test suite.</para>
@@ -82,15 +81,6 @@
 
   </sect2>
 
-  <sect2>
-    <title>Command Explanations</title>
-    <para><command>autoreconf -ifv</command>:  regenerates the
-    <command>configure</command> script to fix a broken test in the included
-    <command>configure</command> script.  The <option>-f</option> option is
-    needed to force <command>libtoolize</command> to run. Without it, the
-    shared library will not be built correctly.</para>
-  </sect2>
-
   <sect2 role="content">
     <title>Contents</title>
 

Modified: trunk/BOOK/x/installing/mesalib.xml
===================================================================
--- trunk/BOOK/x/installing/mesalib.xml	2006-05-25 01:38:42 UTC (rev 6128)
+++ trunk/BOOK/x/installing/mesalib.xml	2006-05-25 06:52:00 UTC (rev 6129)
@@ -6,10 +6,10 @@
 
   <!ENTITY mesalib-download-http "http://prdownloads.sourceforge.net/mesa3d/MesaLib-&mesalib-version;.tar.bz2">
   <!ENTITY mesalib-download-ftp  " ">
-  <!ENTITY mesalib-md5sum        "7674d2c603b5834259e4e5a820cefd5b">
-  <!ENTITY mesalib-size          "3.9 MB">
-  <!ENTITY mesalib-buildsize     "672 MB">
-  <!ENTITY mesalib-time          "2.2 SBU">
+  <!ENTITY mesalib-md5sum        "61beda590bfc5b4a12e979d5f2d70d7a">
+  <!ENTITY mesalib-size          "3.3 MB">
+  <!ENTITY mesalib-buildsize     "823 MB">
+  <!ENTITY mesalib-time          "1.7 SBU">
 ]>
 
 <sect1 id="mesalib" xreflabel="MesaLib-&mesalib-version;">
@@ -48,15 +48,15 @@
         <para>Download MD5 sum: &mesalib-md5sum;</para>
       </listitem>
       <listitem>
-        <para>Download size (including Recommended downloads):
+        <para>Download size (including recommended download):
         &mesalib-size;</para>
       </listitem>
       <listitem>
-        <para>Estimated disk space required (including Recommended downloads):
+        <para>Estimated disk space required (including recommended download):
         &mesalib-buildsize;</para>
       </listitem>
       <listitem>
-        <para>Estimated build time (including optional downloads):
+        <para>Estimated build time (including recommended download):
         &mesalib-time;</para>
       </listitem>
     </itemizedlist>
@@ -76,13 +76,13 @@
 
     <bridgehead renderas="sect3">Recommended Download</bridgehead>
     <para><ulink
-    url="http://prdownloads.sourceforge.net/mesa3d/MesaDemos-&mesalib-version;.tar.bz2"/>
+    url="http://prdownloads.sourceforge.net/mesa3d/MesaDemos-&mesalib-version;.tar.bz2">MesaDemos-&mesalib-version;</ulink>
     provides a demo and a diagnostic program to verify that GL is working
     properly.</para>
 
     <bridgehead renderas="sect3">Optional Download</bridgehead>
     <para><ulink
-    url="http://prdownloads.sourceforge.net/mesa3d/MesaGLUT-&mesalib-version;.tar.bz2"/>
+    url="http://prdownloads.sourceforge.net/mesa3d/MesaGLUT-&mesalib-version;.tar.bz2">MesaGLUT-&mesalib-version;</ulink>
     provides a working <filename class='libraryfile'>libglut</filename>.</para>
 
     <note>
@@ -106,7 +106,8 @@
     commands:</para>
 
 <screen><userinput>find . -type f -exec sed -i "s@/usr/X11R6@$XORG_PREFIX at g" {} \; &&
-sed -i 's at lib/modules at lib/X11/modules@' src/glx/x11/dri_glx.c</userinput></screen>
+sed -i 's at lib/modules at lib/X11/modules@' src/glx/x11/dri_glx.c &&
+sed -i 's at lib/modules at lib/X11/modules@' src/mesa/drivers/dri/Makefile.template</userinput></screen>
 
     <para>Build <application>MesaLib</application>
     by running the following command:</para>

Modified: trunk/BOOK/x/installing/x-setup.xml
===================================================================
--- trunk/BOOK/x/installing/x-setup.xml	2006-05-25 01:38:42 UTC (rev 6128)
+++ trunk/BOOK/x/installing/x-setup.xml	2006-05-25 06:52:00 UTC (rev 6129)
@@ -124,6 +124,20 @@
     <para>For <application>XFree86</application>:</para>
 <screen role="root"><userinput>install -v -m755 -D ~/XF86Config.new /etc/X11/XF86Config</userinput></screen>
 
+    <para>As a convienience, Xorg-&xorg7-version; users should populate the 
+    <filename class="directory">/etc/X11</filename> directory with symlinks
+    to various configuration directories that were located in 
+    <filename class="directory">/etc/X11</filename> with previous
+    versions of <application>Xorg</application>.  This step is not needed
+    for users of Xorg-&xorg-version; or XFree86.  Exectute the following
+    commands as the <systemitem class="username">root</systemitem> 
+    user:</para>
+
+<screen><userinput role="root">mkdir $XORG_PREFIX/lib/X11/twm &&
+ln -svt /etc/X11 \
+    $XORG_PREFIX/lib/X11/{app-defaults,twm,xkb,fs,lbxproxy,proxymngr} \
+    $XORG_PREFIX/lib/X11/{rstart,xdm,xinit,xserver,xsm}</userinput></screen>
+
     <para>As the <systemitem class="username">root</systemitem> user, create
     <filename>.xinitrc</filename>:</para>
 
@@ -138,6 +152,10 @@
     managed by a simple window manager, Tab Window Manager. For details of
     <command>twm</command>, see the man page.</para>
 
+    <indexterm zone="x-setup xconfig">
+      <primary sortas="e-AA.xinitrc">~/.xinitrc</primary>
+    </indexterm>
+
     <note>
       <para>Both the default, and the BLFS configuration for 
       <application>Xorg</application> include <application>xterm</application>.
@@ -150,10 +168,6 @@
       terminal emulators and make appropriate changes.</para>
     </note>
 
-    <indexterm zone="x-setup xconfig">
-      <primary sortas="e-AA.xinitrc">~/.xinitrc</primary>
-    </indexterm>
-
     <para>When needed, the X Window System creates the directory
     <filename class='directory'>/tmp/.ICE-unix</filename> if it does not
     exist. If this directory is not owned by

Modified: trunk/BOOK/x/installing/x7app.xml
===================================================================
--- trunk/BOOK/x/installing/x7app.xml	2006-05-25 01:38:42 UTC (rev 6128)
+++ trunk/BOOK/x/installing/x7app.xml	2006-05-25 06:52:00 UTC (rev 6129)
@@ -7,9 +7,9 @@
   <!ENTITY x7apps-download-http "http://xorg.freedesktop.org/releases/individual/app/">
   <!ENTITY x7apps-download-ftp  "">
   <!ENTITY x7apps-md5sum        "http://anduin.linuxfromscratch.org/sources/BLFS/svn/x/files/md5sums">
-  <!ENTITY x7apps-size          "9.0 MB">
-  <!ENTITY x7apps-buildsize     "30.6 MB">
-  <!ENTITY x7apps-time          "2.1 SBU">
+  <!ENTITY x7apps-size          "9.1 MB">
+  <!ENTITY x7apps-buildsize     "30.7 MB">
+  <!ENTITY x7apps-time          "2.9 SBU">
 
 ]>
 
@@ -64,8 +64,8 @@
   <bridgehead renderas="sect3">Xorg Applications Dependencies</bridgehead>
 
   <bridgehead renderas="sect4">Required</bridgehead>
-  <para role="required"><xref linkend="xbitmaps"/> and
-  <xref linkend="libpng"/></para>
+  <para role="required"><xref linkend="xbitmaps"/>,
+  <xref linkend="libpng"/>, and <xref linkend="xorg7-lib"/></para>
 
   <bridgehead renderas="sect4">Recommended</bridgehead>
   <para><xref linkend="mesalib"/></para>
@@ -79,19 +79,16 @@
     <para>To download the needed files using <application>wget</application>,
     use the following commands:</para>
 
-<screen><userinput>wget http://anduin.linuxfromscratch.org/sources/BLFS/svn/x/wget/app.wget &&
+<screen><userinput>wget http://anduin.linuxfromscratch.org/sources/BLFS/svn/x/wget/app-7.1.wget &&
 mkdir app &&
 cd app &&
-wget -B http://xorg.freedesktop.org/releases/individual/app/ -i ../app.wget</userinput></screen>
+wget -B http://xorg.freedesktop.org/releases/individual/app/ -i ../app-7.1.wget</userinput></screen>
 
   </sect2>
 
   <sect2 role="installation">
     <title>Installation of Xorg Applications</title>
 
-    <note><para>First install the <application>lbxproxy</application> package
-    since it is required by <application>proxymngr</application>.</para></note>
-
     <para>Install the applications by running the following commands for each
     chosen package:</para>
 

Modified: trunk/BOOK/x/installing/x7data.xml
===================================================================
--- trunk/BOOK/x/installing/x7data.xml	2006-05-25 01:38:42 UTC (rev 6128)
+++ trunk/BOOK/x/installing/x7data.xml	2006-05-25 06:52:00 UTC (rev 6129)
@@ -76,10 +76,10 @@
     <para>To download the needed files using <application>wget</application>,
     use the following commands:</para>
 
-<screen><userinput>wget http://anduin.linuxfromscratch.org/sources/BLFS/svn/x/wget/data.wget &&
+<screen><userinput>wget http://anduin.linuxfromscratch.org/sources/BLFS/svn/x/wget/data-7.1.wget &&
 mkdir data &&
 cd data &&
-wget -B http://xorg.freedesktop.org/releases/individual/data/ -i ../data.wget</userinput></screen>
+wget -B http://xorg.freedesktop.org/releases/individual/data/ -i ../data-7.1.wget</userinput></screen>
 
   </sect2>
 

Modified: trunk/BOOK/x/installing/x7driver.xml
===================================================================
--- trunk/BOOK/x/installing/x7driver.xml	2006-05-25 01:38:42 UTC (rev 6128)
+++ trunk/BOOK/x/installing/x7driver.xml	2006-05-25 06:52:00 UTC (rev 6129)
@@ -7,9 +7,9 @@
   <!ENTITY x7drivers-download-http "http://xorg.freedesktop.org/releases/individual/driver/">
   <!ENTITY x7drivers-download-ftp  "">
   <!ENTITY x7drivers-md5sum        "http://anduin.linuxfromscratch.org/sources/BLFS/svn/x/files/md5sums">
-  <!ENTITY x7drivers-size          "17.3 MB">
-  <!ENTITY x7drivers-buildsize     "53.8 MB">
-  <!ENTITY x7drivers-time          "4.6 SBU">
+  <!ENTITY x7drivers-size          "18.7 MB">
+  <!ENTITY x7drivers-buildsize     "60.3 MB">
+  <!ENTITY x7drivers-time          "6.9 SBU">
 
 ]>
 
@@ -78,10 +78,10 @@
     <para>To download the needed files using <application>wget</application>,
     use the following commands:</para>
 
-<screen><userinput>wget http://anduin.linuxfromscratch.org/sources/BLFS/svn/x/wget/driver.wget &&
+<screen><userinput>wget http://anduin.linuxfromscratch.org/sources/BLFS/svn/x/wget/driver-7.1.wget &&
 mkdir driver &&
 cd driver &&
-wget -B http://xorg.freedesktop.org/releases/individual/driver/ -i ../driver.wget</userinput></screen>
+wget -B http://xorg.freedesktop.org/releases/individual/driver/ -i ../driver-7.1.wget</userinput></screen>
 
   </sect2>
 

Modified: trunk/BOOK/x/installing/x7font.xml
===================================================================
--- trunk/BOOK/x/installing/x7font.xml	2006-05-25 01:38:42 UTC (rev 6128)
+++ trunk/BOOK/x/installing/x7font.xml	2006-05-25 06:52:00 UTC (rev 6129)
@@ -7,9 +7,9 @@
   <!ENTITY x7fonts-download-http "http://xorg.freedesktop.org/releases/individual/font/">
   <!ENTITY x7fonts-download-ftp  "">
   <!ENTITY x7fonts-md5sum        "http://anduin.linuxfromscratch.org/sources/BLFS/svn/x/files/md5sums">
-  <!ENTITY x7fonts-size          "13.5 MB">
-  <!ENTITY x7fonts-buildsize     "90.4 MB">
-  <!ENTITY x7fonts-time          "1.82 SBU">
+  <!ENTITY x7fonts-size          "13.3 MB">
+  <!ENTITY x7fonts-buildsize     "100 MB">
+  <!ENTITY x7fonts-time          "2.0 SBU">
 ]>
 
 <sect1 id="xorg7-font" xreflabel="Xorg Fonts">
@@ -73,10 +73,10 @@
     <para>To download the needed files using <application>wget</application>,
     use the following commands:</para>
 
-<screen><userinput>wget http://anduin.linuxfromscratch.org/sources/BLFS/svn/x/wget/font.wget &&
+<screen><userinput>wget http://anduin.linuxfromscratch.org/sources/BLFS/svn/x/wget/font-7.1.wget &&
 mkdir font &&
 cd font &&
-wget -B http://xorg.freedesktop.org/releases/individual/font/ -i ../font.wget</userinput></screen>
+wget -B http://xorg.freedesktop.org/releases/individual/font/ -i ../font-7.1.wget</userinput></screen>
 
   </sect2>
 
@@ -85,11 +85,6 @@
 
     <para>Run the following commands for each package:</para>
 
-    <note>
-      <para>You should install encodings first, and then font-util before all
-      other font packages.</para>
-    </note>
-
 <screen><userinput>./configure $XORG_CONFIG &&
 make</userinput></screen>
 

Modified: trunk/BOOK/x/installing/x7lib.xml
===================================================================
--- trunk/BOOK/x/installing/x7lib.xml	2006-05-25 01:38:42 UTC (rev 6128)
+++ trunk/BOOK/x/installing/x7lib.xml	2006-05-25 06:52:00 UTC (rev 6129)
@@ -9,7 +9,7 @@
   <!ENTITY x7libs-md5sum        "http://anduin.linuxfromscratch.org/sources/BLFS/svn/x/files/md5sums">
   <!ENTITY x7libs-size          "12 MB">
   <!ENTITY x7libs-buildsize     "186 MB">
-  <!ENTITY x7libs-time          "5.8 SBU">
+  <!ENTITY x7libs-time          "6.6 SBU">
 
 ]>
 
@@ -80,39 +80,13 @@
     <para>To download the needed files using <application>wget</application>,
     use the following commands:</para>
 
-<screen><userinput>wget http://anduin.linuxfromscratch.org/sources/BLFS/svn/x/wget/lib.wget &&
+<screen><userinput>wget http://anduin.linuxfromscratch.org/sources/BLFS/svn/x/wget/lib-7.1.wget &&
 mkdir lib &&
 cd lib &&
-wget -B http://xorg.freedesktop.org/releases/individual/lib/ -i ../lib.wget</userinput></screen>
+wget -B http://xorg.freedesktop.org/releases/individual/lib/ -i ../lib-7.1.wget</userinput></screen>
 
   </sect2>
 
-  <sect2>
-    <title>Meeting Library Dependencies</title>
-
-    <para>These 17 libraries must be built first, in the order provided,
-    to cover the dependencies of the other library packages:</para>
-
-<screen>xtrans-1.0.0
-libXau-1.0.0
-libXdmcp-1.0.0
-libX11-1.0.0
-libXext-1.0.0
-libICE-1.0.0
-libSM-1.0.0
-libXt-1.0.0
-libXmu-1.0.0
-libXpm-3.5.4.2
-libXp-1.0.0
-libXfixes-3.0.1.2
-libXrender-0.9.0.2
-libfontenc-1.0.1
-libxkbfile-1.0.2
-libXprintUtil-1.0.1
-libXv-1.0.1</screen>
-
-  </sect2>
-
   <sect2 role="installation">
     <title>Installation of Xorg Libraries</title>
 

Modified: trunk/BOOK/x/installing/x7proto.xml
===================================================================
--- trunk/BOOK/x/installing/x7proto.xml	2006-05-25 01:38:42 UTC (rev 6128)
+++ trunk/BOOK/x/installing/x7proto.xml	2006-05-25 06:52:00 UTC (rev 6129)
@@ -13,7 +13,7 @@
      determined by the sum of all package source tarballs, the size of 
      installed files, and the size of the largest package's build 
      directory after running make install. -->
-  <!ENTITY x7proto-buildsize     "3.5 MB">
+  <!ENTITY x7proto-buildsize     "4.0 MB">
   <!ENTITY x7proto-time          "0.2 SBU">
 
 ]>
@@ -75,10 +75,10 @@
     <para>To download the needed files using <application>wget</application>,
     use the following commands:</para>
 
-<screen><userinput>wget http://anduin.linuxfromscratch.org/sources/BLFS/svn/x/wget/proto.wget &&
+<screen><userinput>wget http://anduin.linuxfromscratch.org/sources/BLFS/svn/x/wget/proto-7.1.wget &&
 mkdir proto &&
 cd proto &&
-wget -B http://xorg.freedesktop.org/releases/individual/proto/ -i ../proto.wget</userinput></screen>
+wget -B http://xorg.freedesktop.org/releases/individual/proto/ -i ../proto-7.1.wget</userinput></screen>
 
   </sect2>
 

Modified: trunk/BOOK/x/installing/x7server.xml
===================================================================
--- trunk/BOOK/x/installing/x7server.xml	2006-05-25 01:38:42 UTC (rev 6128)
+++ trunk/BOOK/x/installing/x7server.xml	2006-05-25 06:52:00 UTC (rev 6129)
@@ -6,10 +6,10 @@
 
   <!ENTITY xorg-server-download-http "http://xorg.freedesktop.org/releases/individual/xserver/xorg-server-&xorg-server-version;.tar.bz2">
   <!ENTITY xorg-server-download-ftp  "">
-  <!ENTITY xorg-server-md5sum        "5cd3316f07ed32a05cbd69e73a71bc74">
-  <!ENTITY xorg-server-size          "5.8 MB">
-  <!ENTITY xorg-server-buildsize     "413 MB">
-  <!ENTITY xorg-server-time          "5.96 SBU">
+  <!ENTITY xorg-server-md5sum        "d070c58a598fb52c5cb86344725c4ad6">
+  <!ENTITY xorg-server-size          "6.1 MB">
+  <!ENTITY xorg-server-buildsize     "424 MB">
+  <!ENTITY xorg-server-time          "5.6 SBU">
 
 ]>
 
@@ -64,7 +64,8 @@
   <bridgehead renderas="sect3">Xorg Server Dependencies</bridgehead>
 
   <bridgehead renderas="sect4">Required</bridgehead>
-  <para role="required"><xref linkend="xorg7-font"/></para>
+  <para role="required"><xref linkend="xorg7-font"/> and
+  <xref linkend="xorg7-lib"/></para>
 
   <bridgehead renderas="sect4">Optional</bridgehead>
   <para><xref linkend="mesalib"/> and
@@ -83,16 +84,10 @@
       <application>Xorg-server</application>.</para>
     </note>
 
-    <para>A serious security vulnerability was recently discovered that will
-    allow a malicious user to execute code as the root user.  Fix the
-    vulnerability with the following command:</para>
-
-<screen><userinput>sed -i 's/ntri & sizeof/ntri * sizeof/' render/mitri.c</userinput></screen>
-
 <!-- To be removed if/when proposed glibc patch is added to LFS SVN
      Leave in in for a couple of weeks with 'you may need' and a testcase 
      around it to save the support list silly questions.  Should remove in
-     a couple of weeks -->       
+     a couple of weeks 
       <para>Recent <application>Glibc</application> may have a problem with its
       installed <filename>sys/kd.h</filename> file. This has recently been 
       fixed in LFS SVN.  Execute the following commands to work around a 
@@ -103,14 +98,21 @@
     /usr/include/sys/kd.h 2>&1 > /dev/null || \
     sed -i.bak '/CONFIG_H/i #include <linux/types.h>' \
         hw/xfree86/os-support/linux/lnx_agp.c</userinput></screen>
-<!-- End remove -->
+ End remove -->
 
     <para>Install the server by running the following commands:</para>
 
-<screen><userinput>./configure $XORG_CONFIG \
+<screen><userinput>sed -i \
+    's at -I$(top_builddir)/include at -I$(top_builddir)/GL/mesa/main at 8' \
+    GL/glx/Makefile.in &&
+sed -i \
+    's at -I$(top_builddir)/include at -I$(top_builddir)/GL/mesa/glapi at 7' \
+    GL/glx/Makefile.in &&
+./configure $XORG_CONFIG \
     --with-mesa-source='<replaceable></path/to></replaceable>/Mesa-&mesalib-version;' \
     --with-fontdir=$XORG_PREFIX/lib/X11/fonts \
     --with-module-dir=$XORG_PREFIX/lib/X11/modules \
+    --with-dri-driver-path=$XORG_PREFIX/lib/X11/modules/dri \
     --enable-install-setuid &&
 make</userinput></screen>
 
@@ -126,26 +128,38 @@
   <sect2 role="commands">
     <title>Command Explanations</title>
 
+    <para><command>sed -i '...' GL/glx/Makefile.in</command>: These commands
+    correct the search path for the <application>Mesa</application> headers.  
+    The 8th and 7th instance of '-I$(top_builddir)' in the existing search
+    search path are replaced with <application>Mesa</application> paths.</para>
+
     <para><parameter>--with-mesa-source=...</parameter>: This switch directs
     the build system to the location of the <application>Mesa</application>
     source directory.  If you wish to build without 
     <application>Mesa</application>, omit this switch.</para>
 
+    <para><parameter>--with-module-dir=...</parameter>:  This parameter 
+    sets the destination for the installed modules.</para>
+
+    <para><parameter>--with-dri-driver-path=...</parameter>:  This is the
+    location of the <application>Mesa</application> dri drivers.</para>
+
     <para><parameter>--enable-install-setuid</parameter>: The Xorg binary must
     run as the root user.  This switch ensures that the binary is installed 
-    setuid when the build is done by an unprivileged user.</para>
+    setuid when make is run by an unprivileged user.</para>
 
     <para><parameter>--disable-glx</parameter>: Disable building of the GLX
-    extension.  This is required if building without 
+    extension.  This parameter is required if building without 
     <application>Mesa</application>.</para>
 
     <para><parameter>--disable-dri</parameter>: Disable building of the DRI
-    extension.  This is required if building without
+    extension.  This parameter is required if building without
     <application>Mesa</application>.</para>
 
     <para><parameter>--disable-xprint</parameter>: Disable building of
-    the <application>Xprint</application>  extension and server.  This is 
-    required if building without <application>Mesa</application>.</para>
+    the <application>Xprint</application>  extension and server.  This 
+    parameter is required if building without 
+    <application>Mesa</application>.</para>
 
   </sect2>
 

Modified: trunk/BOOK/x/installing/x7util.xml
===================================================================
--- trunk/BOOK/x/installing/x7util.xml	2006-05-25 01:38:42 UTC (rev 6128)
+++ trunk/BOOK/x/installing/x7util.xml	2006-05-25 06:52:00 UTC (rev 6129)
@@ -7,8 +7,8 @@
   <!ENTITY x7utils-download-http "http://xorg.freedesktop.org/releases/individual/util/">
   <!ENTITY x7utils-download-ftp  "">
   <!ENTITY x7utils-md5sum        "http://anduin.linuxfromscratch.org/sources/BLFS/svn/x/files/md5sums">
-  <!ENTITY x7utils-size          "656 KB">
-  <!ENTITY x7utils-buildsize     "6.8 MB">
+  <!ENTITY x7utils-size          "664 KB">
+  <!ENTITY x7utils-buildsize     "5.2 MB">
   <!ENTITY x7utils-time          "0.1 SBU">
 
 ]>
@@ -78,10 +78,10 @@
     <para>To download the needed files using <application>wget</application>,
     use the following commands:</para>
 
-<screen><userinput>wget http://anduin.linuxfromscratch.org/sources/BLFS/svn/x/wget/util.wget &&
+<screen><userinput>wget http://anduin.linuxfromscratch.org/sources/BLFS/svn/x/wget/util-7.1.wget &&
 mkdir util &&
 cd util &&
-wget -B http://xorg.freedesktop.org/releases/individual/util/ -i ../util.wget</userinput></screen>
+wget -B http://xorg.freedesktop.org/releases/individual/util/ -i ../util-7.1.wget</userinput></screen>
 
   </sect2>
 
@@ -91,8 +91,7 @@
     <para>First install the <application>xorg-cf-files</application> package
     with the following commands:</para>
 
-<screen><userinput>sed -i "s@/usr/X11R6@$XORG_PREFIX@" site.def &&
-sed -i "s@/usr/X11R6@$XORG_PREFIX@" X11.tmpl &&
+<screen><userinput>sed -i "s@/usr/X11R6@$XORG_PREFIX@" X11.tmpl &&
 ./configure $XORG_CONFIG --with-config-dir=$XORG_PREFIX/lib/X11/config</userinput></screen>
 
     <para>This package does not come with a test suite.</para>

Modified: trunk/BOOK/x/installing/xbitmaps.xml
===================================================================
--- trunk/BOOK/x/installing/xbitmaps.xml	2006-05-25 01:38:42 UTC (rev 6128)
+++ trunk/BOOK/x/installing/xbitmaps.xml	2006-05-25 06:52:00 UTC (rev 6129)
@@ -8,7 +8,7 @@
   <!ENTITY xbitmaps-download-ftp  "">
   <!ENTITY xbitmaps-md5sum        "b28a9840cde3c38d7c09716372fea257">
   <!ENTITY xbitmaps-size          "56 KB">
-  <!ENTITY xbitmaps-buildsize     "1.2 MB">
+  <!ENTITY xbitmaps-buildsize     "1.7 MB">
   <!ENTITY xbitmaps-time          "0.01 SBU">
 
 ]>

Modified: trunk/BOOK/x/installing/xorg7.xml
===================================================================
--- trunk/BOOK/x/installing/xorg7.xml	2006-05-25 01:38:42 UTC (rev 6128)
+++ trunk/BOOK/x/installing/xorg7.xml	2006-05-25 06:52:00 UTC (rev 6129)
@@ -42,10 +42,9 @@
   Instructions</bridgehead>
 
   <para>Xorg-7.0.0 introduced a completely auto-tooled, modular build system.
-  The code is otherwise identical to that in the Xorg-6.9.0 release.
   With the new modular build system, it is no longer possible to download
   the entire package in a single file.  In fact, there may be as many as
-  280 files that need to be fetched from the download location.  To assist
+  293 files that need to be fetched from the download location.  To assist
   with such a large task, installing <xref linkend="wget"/> is strongly 
   recommended for downloading the needed files.  A complete
   <application>wget</application> file list is provided for each section 
@@ -61,16 +60,16 @@
 
   <note>
     <para>Even if you intend to download only the necessary packages, you
-    should download the wget file lists and use the package versions in the
-    file.  Newer packages are likely intended for the next release of
-    <application>Xorg</application> and have already proved to be
-    incompatible with the current version of
-    <application>GTK+</application>.  The installed size of 
-    <application>Xorg</application> can be reduced considerably by 
-    installing only the packages that you will need and use, however, the 
-    BLFS book cannot account for all dependencies and build options for 
-    the individual <application>Xorg</application> packages.  The 
-    instructions assume that all packages have been built.  A
+    should download the wget file lists.  The list of files are ordered by 
+    dependency, and the package versions listed in the files are know to 
+    work well with each other.  Newer packages are likely intended for the 
+    next release of <application>Xorg</application> and have already proved
+    to be incompatible with current versions of software installed in BLFS.
+    The installed size of <application>Xorg</application> can be reduced 
+    considerably by installing only the packages that you will need and use,
+    however, the BLFS book cannot account for all dependencies and build 
+    options for the individual <application>Xorg</application> packages.  
+    The instructions assume that all packages have been built.  A
     <ulink url="http://wiki.linuxfromscratch.org/blfs/wiki/Xorg-&xorg7-version;">wiki</ulink> 
     page containing dependency information, is under development.  You are 
     encouraged to add to these pages if you discover additional information 
@@ -133,7 +132,8 @@
     <command>configure</command> switches for all of the packages.  Create the
     <envar>XORG_CONFIG</envar> variable to use for substitution:</para>
 
-<screen><userinput>export XORG_CONFIG="--prefix=$XORG_PREFIX --sysconfdir=/etc --localstatedir=/var"</userinput></screen>
+<screen><userinput>export XORG_CONFIG="--prefix=$XORG_PREFIX --sysconfdir=/etc \
+    --localstatedir=/var --datadir=$XORG_PREFIX/lib"</userinput></screen>
 
     <para>If you've decided to use an alternate prefix, be sure to add
     <filename class="directory">

Modified: trunk/BOOK/x/installing/xterm.xml
===================================================================
--- trunk/BOOK/x/installing/xterm.xml	2006-05-25 01:38:42 UTC (rev 6128)
+++ trunk/BOOK/x/installing/xterm.xml	2006-05-25 06:52:00 UTC (rev 6129)
@@ -6,9 +6,9 @@
 
   <!ENTITY xterm-download-http " ">
   <!ENTITY xterm-download-ftp  "ftp://invisible-island.net/xterm/xterm-&xterm-version;.tgz">
-  <!ENTITY xterm-md5sum        "c75cdbf9395bbc2cd69863fbe7c2e019">
-  <!ENTITY xterm-size          "745 KB">
-  <!ENTITY xterm-buildsize     "7.1 MB">
+  <!ENTITY xterm-md5sum        "20827d968ed7406d01b2125a84b7a2cd">
+  <!ENTITY xterm-size          "749 KB">
+  <!ENTITY xterm-buildsize     "7.5 MB">
   <!ENTITY xterm-time          "0.1 SBU">
 ]>
 
@@ -61,7 +61,7 @@
     <bridgehead renderas="sect3">xterm Dependencies</bridgehead>
 
     <bridgehead renderas="sect4">Required</bridgehead>
-    <para><xref linkend="x-window-system"/> and
+    <para><xref linkend="xorg7-server"/> and
     <xref linkend="pkgconfig"/></para>
 
     <bridgehead renderas="sect4">Optional</bridgehead>
@@ -75,10 +75,6 @@
   <sect2 role="installation">
     <title>Installation of xterm</title>
 
-    <para>Correct the PROJECTROOT variable with the following command:</para>
-
-<screen><userinput>sed -i "s@/usr/X11R6@$XORG_PREFIX@" main.h</userinput></screen>
-
     <para>Install <application>xterm</application> by running the
     following commands:</para>
 
@@ -99,16 +95,16 @@
   <sect2 role="commands">
     <title>Command Explanations</title>
 
-    <para><parameter>--enable-luit</parameter>: enables the luit filter for
+    <para><parameter>--with-app-defaults=...</parameter>: Sets the location
+    for the <filename class="directory">app-defaults</filename> 
+    directory.</para>
+
+    <para><parameter>--enable-luit</parameter>: Enables the luit filter for
     unicode translation.</para>
 
-    <para><parameter>--with-wide-chars</parameter>: adds support for wide
+    <para><parameter>--with-wide-chars</parameter>: Adds support for wide
     characters.</para>
 
-    <para><command>sed -i "s@/usr/X11R6@$XORG_PREFIX@" main.h</command>: This 
-    command corrects the PROJECTROOT definition to match that of the installed 
-    X Window System.</para>
-
     <para><command>make install-ti</command>: This command installs corrected
     terminfo description files for use with
     <application>xterm</application>.</para>




More information about the blfs-book mailing list