Changeset e257101 for x

Timestamp:

05/10/2006 05:17:10 AM (17 years ago)

Author:

DJ Lucas <dj@…>

Branches:

10.0, 10.1, 11.0, 11.1, 11.2, 11.3, 6.2, 6.2.0, 6.2.0-rc1, 6.2.0-rc2, 6.3, 6.3-rc1, 6.3-rc2, 6.3-rc3, 7.10, 7.4, 7.5, 7.6, 7.6-blfs, 7.6-systemd, 7.7, 7.8, 7.9, 8.0, 8.1, 8.2, 8.3, 8.4, 9.0, 9.1, basic, bdubbs/svn, elogind, gnome, kde5-13430, kde5-14269, kde5-14686, ken/inkscape-core-mods, krejzi/svn, lazarus, nosym, perl-modules, plabs/python-mods, qt5new, systemd-11177, systemd-13485, trunk, upgradedb, xry111/intltool, xry111/soup3, xry111/test-20220226

Children:

ccb2449

Parents:

d9dc1e9

Message:

xorg and xorg7 cleanup

git-svn-id: svn://svn.linuxfromscratch.org/BLFS/trunk/BOOK@6038 af4574ff-66df-0310-9fd7-8a98e5e911e0

Location:

x/installing

Files:

• x-setup.xml (modified) (1 diff)
• x7app.xml (modified) (2 diffs)
• x7font.xml (modified) (1 diff)
• x7lib.xml (modified) (1 diff)
• x7server.xml (modified) (1 diff)
• x7util.xml (modified) (1 diff)
• xorg.xml (modified) (1 diff)
• xorg7.xml (modified) (2 diffs)

x/installing/x-setup.xml

@@ -140 +140 @@
 
     <note>
-      <para>The default configuration for <application>Xorg</application> 
-      includes <application>xterm</application>.  
-      <application>Xorg</application>'s modular distribution no longer includes 
+      <para>Both the default, and the BLFS configuration for 
+      <application>Xorg</application> include <application>xterm</application>.
+      <application>Xorg</application>'s modular distribution no longer includes
       <application>xterm</application>, and 
       as a result, the <command>startx</command> command will fail if you have 
       not installed <xref linkend="xterm2"/> when using the modular X Window
-      System.</para>
+      System.  You can remove the <application>xterm</application> line in the 
+      above config file to test the xserver, or install one of the other 
+      terminal emulators and make appropriate changes.</para>
     </note>
 

x/installing/x7app.xml

@@ -65 +65 @@
 
   <bridgehead renderas="sect4">Required</bridgehead>
-  <para role="required"><xref linkend="xbitmaps"/></para>
+  <para role="required"><xref linkend="xbitmaps"/> and
+  <xref linkend="libpng"/></para>
 
   <bridgehead renderas="sect4">Recommended</bridgehead>
@@ -71 +72 @@
 
   <sect2>
-    <title>Downloading Xorg Applicatons</title>
+    <title>Downloading Xorg Applications</title>
 
     <para>To download the needed files using <application>wget</application>,

x/installing/x7font.xml

@@ -62 +62 @@
 
   <bridgehead renderas="sect4">Required</bridgehead>
-  <para role="required"><xref linkend="xorg7-data"/></para>
+  <para role="required"><xref linkend="xorg7-data"/> and
+  <xref linkend="xorg7-app"/></para>
 
   <sect2>

x/installing/x7lib.xml

@@ -66 +66 @@
   <para role="required"><xref linkend="ed"/>,
   <xref linkend="fontconfig"/>,
-  <xref linkend="libpng"/>,
   <xref linkend="pkgconfig"/>, and
   <xref linkend="xorg7-proto"/></para>

x/installing/x7server.xml

@@ -115 +115 @@
     setuid when the build is done by an unprivileged user.</para>
 
+    <para><parameter>--disable-glx</parameter>: Disable building of the GLX
+    extension.  This 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
+    <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>
+
   </sect2>
 

x/installing/x7util.xml

@@ -67 +67 @@
 
   <bridgehead renderas="sect4">Required</bridgehead>
-  <para role="required"><xref linkend="pkgconfig"/></para>
+  <para role="required"><xref linkend="pkgconfig"/> and
+  <xref linkend="xorg7-proto"/></para>
 
   <sect2>

x/installing/xorg.xml

@@ -203 +203 @@
       order to avoid a race condition with the <application>luit</application>
       program.  Additionally, the server portion of
-      <application>Xorg</application> contains a <ulink
-      url="http://wiki.x.org/wiki/SecurityPage">security vulnerability</ulink>.
+      <application>Xorg</application> contains 2   
+      <ulink url="http://wiki.x.org/wiki/SecurityPage">security vulnerabilities</ulink>.
       Fix these issues with the following commands:</para>
 
 <screen><userinput>patch -Np1 -i ../xorg-&xorg-version;-luit_race-1.patch &amp;&amp;
 sed -i 's/geteuid /geteuid() /' \
-    programs/Xserver/hw/xfree86/common/xf86Init.c</userinput></screen>
+    programs/Xserver/hw/xfree86/common/xf86Init.c &amp;&amp;
+sed -i 's/ntri &amp; sizeof/ntri * sizeof/' programs/Xserver/render/mitri.c</userinput></screen>
 
 <!-- To be removed if/when proposed glibc patch is added to LFS SVN

x/installing/xorg7.xml

@@ -42 +42 @@
   Instructions</bridgehead>
 
-  <para>Xorg-7.0.0 introduced a completly auto-tooled, modular build system.
+  <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
@@ -64 +64 @@
     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 proven to be
+    <application>Xorg</application> and have already proved to be
     incompatible with the current version of
     <application>GTK+</application>.  The installed size of