Index: general.ent
===================================================================
--- general.ent (revision cf1537ba9a667eff67d1d3c43c6f774e7e927ed9)
+++ general.ent (revision 3109c7ced40acd4250cc32d22dbb4b70fc0e89d2)
@@ -4,9 +4,9 @@
-->
-
+
-
+
Index: introduction/welcome/changelog.xml
===================================================================
--- introduction/welcome/changelog.xml (revision cf1537ba9a667eff67d1d3c43c6f774e7e927ed9)
+++ introduction/welcome/changelog.xml (revision 3109c7ced40acd4250cc32d22dbb4b70fc0e89d2)
@@ -43,4 +43,14 @@
+ May 24th, 2007
+
+
+ [dnicholson] - A patch was added to allow XFree86 against
+ newer FreeType releases.
+
+
+
+
+
May 23rd, 2007
Index: x/installing/xfree86.xml
===================================================================
--- x/installing/xfree86.xml (revision cf1537ba9a667eff67d1d3c43c6f774e7e927ed9)
+++ x/installing/xfree86.xml (revision 3109c7ced40acd4250cc32d22dbb4b70fc0e89d2)
@@ -60,4 +60,12 @@
+ Additional Downloads
+
+
+ Required patch:
+
+
+
XFree86 Dependencies
@@ -170,4 +178,26 @@
Installation of XFree86
+
+
+
+ Preparing the Sources
+
+ Three fixes are needed for XFree86.
+ First, a patch is needed to build against newer FreeType
+ releases. Second, the macro "PAGE_MASK" is manually defined because
+ including asm/page.h from the Linux kernel headers
+ does not work when compiling with -ansi. Finally,
+ the Linux kernel headers no longer install the unneeded header
+ linux/config.h. A sed is used
+ to remove all usage of this header. Perform these actions with the
+ following commands:
+
+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'
+
+
@@ -268,10 +298,5 @@
following commands:
-sed -i 's:^.*asm.*$:# define PAGE_MASK (~(getpagesize() - 1)):' \
- ../xc/programs/Xserver/hw/xfree86/fbdevhw/fbdevhw.c &&
-sed -i -e "s@^#include <linux/config.h>@/* & */@" \
- `grep -lr linux/config.h ../xc` &&
-( make World 2>&1 | tee xfree-compile.log && exit $PIPESTATUS )
-
+( make World 2>&1 | tee xfree-compile.log && exit $PIPESTATUS )
This package does not come with a test suite.
@@ -352,18 +377,4 @@
Command Explanations
-
- sed -i 's:^.*asm.* ... fbdevhw.c: This sed fixes a
- problem compiling against headers from kernels newer than linux-2.6.8.
-
- sed -i -e "s@^#include <linux/config.h>@...:
- The Linux-Libc-Headers package installed in
- LFS installs a /usr/include/linux/config.h file which
- is not compatible with userspace applications. The recommended fix for
- applications including this file is to remove it (see
- linux-libc-headers FAQ). The sed uses
- grep -lr to replace all occurrences. If you desire, just
- remove (comment) the line in the appropriate video driver file if you
- customized host.def.
( make World 2>&1 | tee xfree-compile.log