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

dj at linuxfromscratch.org dj at linuxfromscratch.org
Mon Mar 27 22:44:03 PST 2006


Author: dj
Date: 2006-03-27 23:44:03 -0700 (Mon, 27 Mar 2006)
New Revision: 5762

Modified:
   trunk/BOOK/general.ent
   trunk/BOOK/introduction/welcome/changelog.xml
   trunk/BOOK/x/installing/xorg7.xml
   trunk/BOOK/x/lib/mesalib.xml
Log:
Removed -lglut from MesaDemos and corrected xorg-server download link.

Modified: trunk/BOOK/general.ent
===================================================================
--- trunk/BOOK/general.ent	2006-03-27 23:17:00 UTC (rev 5761)
+++ trunk/BOOK/general.ent	2006-03-28 06:44:03 UTC (rev 5762)
@@ -1,4 +1,4 @@
-<!ENTITY day          "27">                   <!-- Always 2 digits -->
+<!ENTITY day          "28">                   <!-- Always 2 digits -->
 <!ENTITY month        "03">                   <!-- Always 2 digits -->
 <!ENTITY year         "2006">
 <!ENTITY version      "svn-&year;&month;&day;">

Modified: trunk/BOOK/introduction/welcome/changelog.xml
===================================================================
--- trunk/BOOK/introduction/welcome/changelog.xml	2006-03-27 23:17:00 UTC (rev 5761)
+++ trunk/BOOK/introduction/welcome/changelog.xml	2006-03-28 06:44:03 UTC (rev 5762)
@@ -41,7 +41,20 @@
 
 -->
 
-    <listitem>
+   <listitem>
+      <para>March 28th, 2006</para>
+      <itemizedlist>
+        <listitem>
+          <para>[dj] - Fixed xorg-server download link.</para>
+        </listitem>
+        <listitem>
+          <para>[dj] - Removed unneeded -lglut from Mesa Demos linker 
+          flags.</para>
+        </listitem>
+      </itemizedlist>
+    </listitem>
+ 
+   <listitem>
       <para>March 27th, 2006</para>
       <itemizedlist>
         <listitem>

Modified: trunk/BOOK/x/installing/xorg7.xml
===================================================================
--- trunk/BOOK/x/installing/xorg7.xml	2006-03-27 23:17:00 UTC (rev 5761)
+++ trunk/BOOK/x/installing/xorg7.xml	2006-03-28 06:44:03 UTC (rev 5762)
@@ -484,7 +484,7 @@
     of the X Window system.</para>
 
       <para>The Xorg Server is a single download.  Get it from
-      <ulink url="http://xorg.freedesktop.org/releases/individual/xserver/xorg-server-X11R7.0-1.0.2.tar.bz2"/>.</para>
+      <ulink url="http://xorg.freedesktop.org/releases/individual/xserver/xorg-server-1.0.2.tar.bz2"/>.</para>
 
     <sect3 role="installation">
       <title>Installation of Xorg Server</title>

Modified: trunk/BOOK/x/lib/mesalib.xml
===================================================================
--- trunk/BOOK/x/lib/mesalib.xml	2006-03-27 23:17:00 UTC (rev 5761)
+++ trunk/BOOK/x/lib/mesalib.xml	2006-03-28 06:44:03 UTC (rev 5762)
@@ -56,7 +56,7 @@
         &mesalib-buildsize;</para>
       </listitem>
       <listitem>
-        <para>Estimated build time (including Recommended downloads):
+        <para>Estimated build time (including optional downloads):
         &mesalib-time;</para>
       </listitem>
     </itemizedlist>
@@ -68,11 +68,10 @@
     <xref linkend="xorg7"/> Libs and Utilities), and
     <xref linkend="libdrm"/></para>
 
-    <bridgehead renderas="sect3">Recommended Downloads</bridgehead>
+    <bridgehead renderas="sect3">Optional Downloads</bridgehead>
     <para><ulink
     url="http://prdownloads.sourceforge.net/mesa3d/MesaGLUT-&mesalib-version;.tar.bz2"/>
-    provides a working <filename class='libraryfile'>libglut</filename>
-    (needed for the demos).</para>
+    provides a working <filename class='libraryfile'>libglut</filename>.</para>
 
     <para><ulink
     url="http://prdownloads.sourceforge.net/mesa3d/MesaDemos-&mesalib-version;.tar.bz2"/>
@@ -112,10 +111,11 @@
 mkdir -v -p /usr/lib/X11/modules/dri &&
 install -v -m755 lib/*dri* /usr/lib/X11/modules/dri</userinput></screen>
 
-    <para>If you've extracted the GLUT and Demos packages as well, then
+    <para>If you've extracted the Demos package as well, then
     build the test programs with the following commands:</para>
 
-<screen><userinput>cd progs/xdemos &&
+<screen><userinput>sed -i 's at -l$(GLUT_LIB)@@g' configs/default &&
+cd progs/xdemos &&
 make PROGS='glxinfo glxgears'</userinput></screen>
 
     <para>Install the demos as the
@@ -157,6 +157,9 @@
     <para><command>install -v -m755 lib/*dri*
     /usr/lib/X11/modules/dri</command>: installs the DRI modules.</para>
 
+    <para><command>sed -i 's at -l$(GLUT_LIB)@@g' configs/default</command>:
+    disables linking against GLUT libraries for the demo programs.</para>
+
     <para><command>make PROGS='glxinfo glxgears'</command>: build only
     the glxinfo and glxgears programs.</para>
 




More information about the blfs-book mailing list