Changeset b8a1c6d

Timestamp:

01/23/2011 09:07:50 PM (13 years ago)

Author:

DJ Lucas <dj@…>

Branches:

10.0, 10.1, 11.0, 11.1, 11.2, 11.3, 12.0, 12.1, 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, kea, ken/TL2024, ken/inkscape-core-mods, ken/tuningfonts, krejzi/svn, lazarus, lxqt, nosym, perl-modules, plabs/newcss, plabs/python-mods, python3.11, qt5new, rahul/power-profiles-daemon, renodr/vulkan-addition, systemd-11177, systemd-13485, trunk, upgradedb, xry111/intltool, xry111/llvm18, xry111/soup3, xry111/test-20220226, xry111/xf86-video-removal

Children:

1a1fc45

Parents:

804fd46

Message:

Various xorg cleanups.

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

Files:

• introduction/welcome/changelog.xml (modified) (1 diff)
• x/installing/installing.xml (modified) (2 diffs)
• x/installing/x7app.xml (modified) (1 diff)
• x/installing/x7lib.xml (modified) (3 diffs)
• x/installing/x7proto.xml (modified) (1 diff)
• x/installing/x7server.xml (modified) (1 diff)
• x/installing/x7util.xml (modified) (2 diffs)
• x/lib/mesalib.xml (modified) (1 diff)

introduction/welcome/changelog.xml

@@ -92 +92 @@
           <para>[dj] - Added specific instructions for Xorg environment setup if
           using an alternate installation prefix.</para>
+        </listitem>
+        <listitem>
+          <para>[dj] - Completed cleanup of descriptive text in xorg section,
+          corrected dependencies, and reverted to legacy configuration pages
+          until new page matures.</para>
         </listitem>
       </itemizedlist>

x/installing/installing.xml

@@ -28 +28 @@
 <!--  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="xorg7-dummy.xml"/> -->
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="xorg7.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="x7util.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="x7proto.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="x7util.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="libXau.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="libXdmcp.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="x7lib.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="xbitmaps.xml"/>
+<!--  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="xbitmaps.xml"/> -->
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="x7app.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="xcursorthemes.xml"/>
@@ -41 +41 @@
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="x7server.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="x7driver.xml"/>
-<!--  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="xconfig-dummy.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="xconfig-dummy.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="x-setup.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="x-config.xml"/>
--->
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="xorg-config.xml"/>
+
+<!-- New Page  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="xorg-config.xml"/> -->
 </chapter>

x/installing/x7app.xml

@@ -70 +70 @@
 
     <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required"><xref linkend="xbitmaps"/>,
-    <xref linkend="libpng"/>, and <xref linkend="xorg7-lib"/></para>
+    <para role="required"><xref linkend="libpng"/>,
+    <xref linkend="xcb-util"/>, and
+    <xref linkend="xorg7-lib"/></para>
 
     <bridgehead renderas="sect4">Optional</bridgehead>

x/installing/x7lib.xml

@@ -70 +70 @@
 
     <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required"><xref linkend="ed"/>,
-    <xref linkend="fontconfig"/>,
+    <para role="required"><xref linkend="fontconfig"/>,
     <xref linkend="xorg7-proto"/>,
     <xref linkend="libXdmcp"/>, and
@@ -112 +111 @@
 libXfont-[0-9]* )
                  ./configure $XORG_CONFIG --disable-devel-docs
-                 ;;
-  libX11-[0-9]* )
-                 ./configure $XORG_CONFIG --without-xcb
                  ;;
    libXt-[0-9]* )
@@ -138 +134 @@
   <sect2 role="commands">
     <title>Command Explanations</title>
-
-    <para><parameter>--without-xcb</parameter>: By default,
-    <application>libX11</application> will use <xref linkend="libxcb"/>
-    for its transport layer. Omit this parameter (or the <command>case</command>
-    statement) if you've installed <xref linkend="libxcb"/>.</para>
 
     <para><parameter>--with-fop</parameter>: Use <xref linkend="fop"/> to

x/installing/x7proto.xml

@@ -72 +72 @@
     </itemizedlist>
 
+    <bridgehead renderas="sect3">Xorg Protocol Headers Dependencies</bridgehead>
+
+    <bridgehead renderas="sect4">Required</bridgehead>
+    <para role="required"> <xref linkend="xorg7-util"/></para>
+
+    <bridgehead renderas="sect4">Optional</bridgehead>
+    <para role="required"> <xref linkend="fop"/> and <xref linkend="xmlto"/>
+    (to build additional documentation)</para>
+
+    <note><para>There is a reciprocal dependency with <xref linkend="fop"/>. If
+    you wish to build the documentation, you'll need to re-install the 
+    Protocol Headers after the installation is complete and
+    <xref linkend="fop"/> has been installed.</para></note>
+
     <para condition="html" role="usernotes">User Notes:
     <ulink url='&blfs-wiki;/Xorg7ProtocolHeaders'/></para>

x/installing/x7server.xml

@@ -67 +67 @@
     <para><xref linkend="dbus"/>,
     <xref linkend="doxygen"/> (to build API documentation),
+    <xref linkend="xmlto"/>, (to build documentation),
+    <xref linkend="fop"/>, (to build documentation),
     <xref linkend="gs"/> (to build documentation),
     <xref linkend="hal"/> (not recommended, disabled by default),

x/installing/x7util.xml

@@ -33 +33 @@
 
     <para>The <application>Xorg</application> utility packages provide
-    needed utilities, not for the <application>Xorg</application>
-    installation itself, but for other applications that make use of
-    legacy X11R6 installation methods.</para>
-
-    &lfs65_checked;
+    needed utilities, not for the <application>Xorg</application> build
+    environment.</para>
+
+    &lfs67_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
@@ -67 +66 @@
       </listitem>
     </itemizedlist>
-
+<!--
     <bridgehead renderas="sect3">Xorg Utilities Dependencies</bridgehead>
 
     <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required"><!-- <xref linkend="pkgconfig"/> and -->
+    <para role="required"> <xref linkend="pkgconfig"/> and 
     <xref linkend="xorg7-proto"/></para>
-
+-->
     <para condition="html" role="usernotes">User Notes:
     <ulink url='&blfs-wiki;/Xorg7Utilities'/></para>

x/lib/mesalib.xml

@@ -65 +65 @@
     <para role="required"><xref linkend="xorg7-lib"/>,
     <xref linkend="xorg7-util"/>,
-    <xref linkend="libdrm"/>, and
-    <xref linkend="expat"/></para>
+    <xref linkend="libdrm"/>,
+    <xref linkend="expat"/>, and
+    <!-- <xref linkend="talloc"/>  -->
+    <ulink url="http://samba.org/ftp/talloc/">Talloc</ulink></para>
 
     <bridgehead renderas="sect4">Optional</bridgehead>