Changeset 3109c7ce

Timestamp:

05/24/2007 02:53:23 PM (16 years ago)

Author:

Dan Nichilson <dnicholson@…>

Branches:

10.0, 10.1, 11.0, 11.1, 11.2, 11.3, 12.0, 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, kea, ken/inkscape-core-mods, krejzi/svn, lazarus, lxqt, nosym, perl-modules, plabs/python-mods, qt5new, systemd-11177, systemd-13485, trunk, upgradedb, xry111/intltool, xry111/soup3, xry111/test-20220226, xry111/xf86-video-removal

Children:

d4d6592

Parents:

cf1537ba

Message:

Patch for building XFree86 against newer FreeType

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

Files:

• general.ent (modified) (1 diff)
• introduction/welcome/changelog.xml (modified) (1 diff)
• x/installing/xfree86.xml (modified) (4 diffs)

general.ent

@@ -4 +4 @@
 -->
 
-<!ENTITY day          "23">                   <!-- Always 2 digits -->
+<!ENTITY day          "24">                   <!-- Always 2 digits -->
 <!ENTITY month        "05">                   <!-- Always 2 digits -->
 <!ENTITY year         "2007">
 <!ENTITY version      "svn-&year;&month;&day;">
-<!ENTITY releasedate  "May &day;rd, &year;">
+<!ENTITY releasedate  "May &day;th, &year;">
 <!ENTITY pubdate      "&year;-&month;-&day;"> <!-- metadata req. by TLDP -->
 <!ENTITY blfs-version "svn">                  <!-- svn|[release #] -->

introduction/welcome/changelog.xml

@@ -43 +43 @@
 
     <listitem>
+      <para>May 24th, 2007</para>
+      <itemizedlist>
+        <listitem>
+          <para>[dnicholson] - A patch was added to allow XFree86 against
+          newer FreeType releases.</para>
+        </listitem>
+      </itemizedlist>
+    </listitem>
+
+    <listitem>
       <para>May 23rd, 2007</para>
       <itemizedlist>

x/installing/xfree86.xml

@@ -60 +60 @@
     </itemizedlist>
 
+    <bridgehead renderas="sect3">Additional Downloads</bridgehead>
+    <itemizedlist spacing="compact">
+      <listitem>
+        <para>Required patch: <ulink
+        url="&patch-root;/XFree86-&xfree86-version;-freetype_internals-1.patch"/></para>
+      </listitem>
+    </itemizedlist>
+
     <bridgehead renderas="sect3">XFree86 Dependencies</bridgehead>
 
@@ -170 +178 @@
   <sect2 role="installation">
     <title>Installation of XFree86</title>
+
+    <sect3>
+
+      <title>Preparing the Sources</title>
+
+      <para>Three fixes are needed for <application>XFree86</application>.
+      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,
+      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>
+
+<screen><userinput>patch -Np1 -i ../XFree86-&xfree86-version;-freetype_internals-1.patch &amp;&amp;
+sed -i '/page.h/c #define PAGE_MASK (~(getpagesize() - 1))' \
+    programs/Xserver/hw/xfree86/fbdevhw/fbdevhw.c &amp;&amp;
+grep -rl '^#include &lt;linux/config.h&gt;' . | \
+    xargs sed -i '\@^#include &lt;linux/config.h&gt;@d'</userinput></screen>
+
+    </sect3>
 
     <sect3>
@@ -268 +298 @@
       following commands:</para>
 
-<screen><userinput>sed -i 's:^.*asm.*$:# define PAGE_MASK   (~(getpagesize() - 1)):' \
-    ../xc/programs/Xserver/hw/xfree86/fbdevhw/fbdevhw.c &amp;&amp;
-sed -i -e "s@^#include &lt;linux/config.h&gt;@/* &amp; */@" \
-    `grep -lr linux/config.h ../xc` &amp;&amp;
-( make World 2&gt;&amp;1 | tee xfree-compile.log &amp;&amp; exit $PIPESTATUS )
-</userinput></screen>
+<screen><userinput>( make World 2&gt;&amp;1 | tee xfree-compile.log &amp;&amp; exit $PIPESTATUS )</userinput></screen>
 
       <para>This package does not come with a test suite.</para>
@@ -352 +377 @@
   <sect2 role="commands">
     <title>Command Explanations</title>
-
-    <para><command>sed -i 's:^.*asm.* ... fbdevhw.c</command>: This sed fixes a
-    problem compiling against headers from kernels newer than linux-2.6.8.</para>
-
-    <para><command>sed -i -e "s@^#include &lt;linux/config.h&gt;@...</command>:
-    The <application>Linux-Libc-Headers</application> package installed in
-    LFS installs a <filename>/usr/include/linux/config.h</filename> file which
-    is not compatible with userspace applications. The recommended fix for
-    applications including this file is to remove it (see <ulink
-    url="http://ep09.pld-linux.org/~mmazur/linux-libc-headers/doc/FAQ">
-    linux-libc-headers FAQ</ulink>). The <command>sed</command> uses
-    <command>grep -lr</command> to replace all occurrences. If you desire, just
-    remove (comment) the line in the appropriate video driver file if you
-    customized <filename>host.def</filename>.</para>
 
     <para><command>( make World 2&gt;&amp;1 | tee xfree-compile.log