r6776 - in trunk/BOOK: introduction/welcome x/installing

dnicholson at linuxfromscratch.org dnicholson at linuxfromscratch.org
Thu May 24 07:53:32 PDT 2007


Author: dnicholson
Date: 2007-05-24 08:53:32 -0600 (Thu, 24 May 2007)
New Revision: 6776

Modified:
   trunk/BOOK/introduction/welcome/changelog.xml
   trunk/BOOK/x/installing/xfree86.xml
Log:
Install all drivers by default in the example XFree86 host.def


Modified: trunk/BOOK/introduction/welcome/changelog.xml
===================================================================
--- trunk/BOOK/introduction/welcome/changelog.xml	2007-05-24 14:53:30 UTC (rev 6775)
+++ trunk/BOOK/introduction/welcome/changelog.xml	2007-05-24 14:53:32 UTC (rev 6776)
@@ -47,7 +47,10 @@
         <listitem>
           <para>[dnicholson] - Various changes were applied to the XFree86
           page. A patch was added to allow XFree86 against newer FreeType
-          releases. The install targets were reduced to a single command.</para>
+          releases. Also, the install targets were reduced to a single
+          command. Finally, the <filename>host.def</filename> file was
+          rewritten so that all the drivers are installed by default. This
+          requires a fix to allow one of the input drivers to build.</para>
         </listitem>
       </itemizedlist>
     </listitem>

Modified: trunk/BOOK/x/installing/xfree86.xml
===================================================================
--- trunk/BOOK/x/installing/xfree86.xml	2007-05-24 14:53:30 UTC (rev 6775)
+++ trunk/BOOK/x/installing/xfree86.xml	2007-05-24 14:53:32 UTC (rev 6776)
@@ -186,17 +186,21 @@
       First, a patch is needed to build against newer <application>FreeType</application>
       releases. Second, the macro "PAGE_MASK" is manually defined because
       including <filename>asm/page.h</filename> from the Linux kernel headers
-      does not work when compiling with <parameter>-ansi</parameter>. Finally,
+      does not work when compiling with <parameter>-ansi</parameter>. Third,
       the Linux kernel headers no longer install the unneeded header
       <filename>linux/config.h</filename>. A <command>sed</command> is used
-      to remove all usage of this header. Perform these actions with the
-      following commands:</para>
+      to remove all usage of this header. Finally, one of the input drivers
+      will not build with the <parameter>-ansi</parameter> setting, so the
+      <application>GCC</application> default is restored. Perform these
+      actions with the following commands:</para>
 
 <screen><userinput>patch -Np1 -i ../XFree86-&xfree86-version;-freetype_internals-1.patch &&
 sed -i '/page.h/c #define PAGE_MASK (~(getpagesize() - 1))' \
     programs/Xserver/hw/xfree86/fbdevhw/fbdevhw.c &&
 grep -rl '^#include <linux/config.h>' . | \
-    xargs sed -i '\@^#include <linux/config.h>@d'</userinput></screen>
+    xargs sed -i '\@^#include <linux/config.h>@d' &&
+echo 'CCOPTIONS += -std=gnu89' >> \
+    programs/Xserver/hw/xfree86/input/ur98/Imakefile</userinput></screen>
 
     </sect3>
 
@@ -238,49 +242,65 @@
 <screen><userinput>cat > config/cf/host.def << "EOF"
 <literal>/* Begin XFree86 host.def file */
 
-/* This setting reduces compile time a little by omitting rarely used
- * input devices.  You can find the complete list in
- * config/cf/xfree86.cf *********************************************/
+/* COMPILER SETTINGS
+ * The default compiler settings for x86 are shown below. These settings
+ * and those for other architectures can be found in config/cf/xfree86.cf.
+#define DefaultGcc2i386Opt  -O2 -fno-strength-reduce -fno-strict-aliasing
+ */
 
-#define XInputDrivers                 mouse void
+/* INPUT DRIVERS
+ * The build will pick the correct drivers for your platform, but a shorter
+ * list can be defined to reduce compile time if they will not all be needed.
+ * The list below shows the default input drivers from config/cf/xfree86.cf.
+ *
+#define XInputDrivers    mouse keyboard acecad calcomp citron \
+                         digitaledge dmc dynapro elographics tek4957 \
+                         microtouch mutouch penmount spaceorb summa \
+                         wacom void magellan magictouch hyperpen \
+                         jamstudio fpit palmax \
+                         OSXInputDrivers ExtraXInputDrivers
+ */
 
-/* VIDEO DRIVERS ****************************************************
- * If you are sure you only want the drivers for one or a few video
- * cards, you can delete the drivers you do not want. ***************/
+/* VIDEO DRIVERS
+ * The build will pick the correct drivers for your platform, but a shorter
+ * list can be defined to reduce compile time if they will not all be needed.
+ * The list below shows the default input drivers from config/cf/xfree86.cf.
+ *
+#define XF86CardDrivers  mga glint nv tga s3 s3virge sis xgi rendition \
+                         neomagic i740 tdfx savage cirrus vmware tseng \
+                         trident chips aspeed apm GlideDriver i128 NscDriver \
+                         ati i810 AgpGartDrivers DevelDrivers ark cyrix \
+                         siliconmotion via fbdev vesa vga dummy \
+                         XF86OSCardDrivers XF86ExtraCardDrivers
+ */
 
-#define XF86CardDrivers  mga glint nv tga s3 s3virge sis rendition \
-                         neomagic i740 tdfx savage \
-                         cirrus vmware tseng trident chips apm \
-                         GlideDriver fbdev i128 nsc \
-                         ati i810 DevelDrivers ark \
-                         cyrix siliconmotion \
-                         v4l vesa vga \
-                         dummy XF86OSCardDrivers XF86ExtraCardDrivers
+/* SYSTEM LIBRARIES
+ * These settings ensure we use our libraries. Comment them if you prefer to
+ * use the versions shipped with XFree86.
+ */
+#define HasFreetype2        YES
+#define HasFontconfig       YES
+#define HasExpat            YES
+#define HasLibpng           YES
+#define HasZlib             YES
 
-/* These settings ensure we use our libraries ************************/
-#define HasFreetype2             YES
-#define HasFontconfig            YES
-#define HasExpat                 YES
-#define HasLibpng                YES
-#define HasZlib                  YES
+/* Use Linux-PAM with xdm
+#define HasPam              YES
+ */
 
-/* Uncomment the following define if you'd like
- * xdm to use Linux-PAM
-#define HasPam                  YES
+/* GENERAL SETTINGS
  */
+#define ManPath             /usr/share/man
+#define DocDir              /usr/share/doc/xfree86-4.6.0
 
-/* GENERAL SETTINGS */
+/* INSTALLATION PREFIX
+ * The default is to install into /usr/X11R6. If you would like to install
+ * into /usr, uncomment these options.
+#define ProjectRoot         /usr
+#define LinkGLToUsrLib      NO
+#define LinkGLToUsrInclude  NO
+ */
 
-#define SystemManDirectory        /usr/share/man
-#define DocDir                    /usr/share/doc/xfree86-4.6.0
-
-/* Installation prefix. The default is to install into /usr/X11R6. If you
- * would like to install into /usr, uncomment these options. */
-
-/* #define ProjectRoot            /usr */
-/* #define LinkGLToUsrLib         NO   */
-/* #define LinkGLToUsrInclude     NO   */
-
 /* End XFree86 host.def file */</literal>
 EOF</userinput></screen>
 




More information about the blfs-book mailing list