Changeset 3109c7ce


Ignore:
Timestamp:
05/24/2007 02:53:23 PM (15 years ago)
Author:
Dan Nichilson <dnicholson@…>
Branches:
10.0, 10.1, 11.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, ken/refactor-virt, krejzi/svn, lazarus, nosym, perl-modules, qt5new, systemd-11177, systemd-13485, trunk, xry111/git-date, xry111/git-date-for-trunk, xry111/git-date-test
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:
3 edited

Legend:

Unmodified
Added
Removed
  • general.ent

    rcf1537ba r3109c7ce  
    44-->
    55
    6 <!ENTITY day          "23">                   <!-- Always 2 digits -->
     6<!ENTITY day          "24">                   <!-- Always 2 digits -->
    77<!ENTITY month        "05">                   <!-- Always 2 digits -->
    88<!ENTITY year         "2007">
    99<!ENTITY version      "svn-&year;&month;&day;">
    10 <!ENTITY releasedate  "May &day;rd, &year;">
     10<!ENTITY releasedate  "May &day;th, &year;">
    1111<!ENTITY pubdate      "&year;-&month;-&day;"> <!-- metadata req. by TLDP -->
    1212<!ENTITY blfs-version "svn">                  <!-- svn|[release #] -->
  • introduction/welcome/changelog.xml

    rcf1537ba r3109c7ce  
    4343
    4444    <listitem>
     45      <para>May 24th, 2007</para>
     46      <itemizedlist>
     47        <listitem>
     48          <para>[dnicholson] - A patch was added to allow XFree86 against
     49          newer FreeType releases.</para>
     50        </listitem>
     51      </itemizedlist>
     52    </listitem>
     53
     54    <listitem>
    4555      <para>May 23rd, 2007</para>
    4656      <itemizedlist>
  • x/installing/xfree86.xml

    rcf1537ba r3109c7ce  
    6060    </itemizedlist>
    6161
     62    <bridgehead renderas="sect3">Additional Downloads</bridgehead>
     63    <itemizedlist spacing="compact">
     64      <listitem>
     65        <para>Required patch: <ulink
     66        url="&patch-root;/XFree86-&xfree86-version;-freetype_internals-1.patch"/></para>
     67      </listitem>
     68    </itemizedlist>
     69
    6270    <bridgehead renderas="sect3">XFree86 Dependencies</bridgehead>
    6371
     
    170178  <sect2 role="installation">
    171179    <title>Installation of XFree86</title>
     180
     181    <sect3>
     182
     183      <title>Preparing the Sources</title>
     184
     185      <para>Three fixes are needed for <application>XFree86</application>.
     186      First, a patch is needed to build against newer <application>FreeType</application>
     187      releases. Second, the macro "PAGE_MASK" is manually defined because
     188      including <filename>asm/page.h</filename> from the Linux kernel headers
     189      does not work when compiling with <parameter>-ansi</parameter>. Finally,
     190      the Linux kernel headers no longer install the unneeded header
     191      <filename>linux/config.h</filename>. A <command>sed</command> is used
     192      to remove all usage of this header. Perform these actions with the
     193      following commands:</para>
     194
     195<screen><userinput>patch -Np1 -i ../XFree86-&xfree86-version;-freetype_internals-1.patch &amp;&amp;
     196sed -i '/page.h/c #define PAGE_MASK (~(getpagesize() - 1))' \
     197    programs/Xserver/hw/xfree86/fbdevhw/fbdevhw.c &amp;&amp;
     198grep -rl '^#include &lt;linux/config.h&gt;' . | \
     199    xargs sed -i '\@^#include &lt;linux/config.h&gt;@d'</userinput></screen>
     200
     201    </sect3>
    172202
    173203    <sect3>
     
    268298      following commands:</para>
    269299
    270 <screen><userinput>sed -i 's:^.*asm.*$:# define PAGE_MASK   (~(getpagesize() - 1)):' \
    271     ../xc/programs/Xserver/hw/xfree86/fbdevhw/fbdevhw.c &amp;&amp;
    272 sed -i -e "s@^#include &lt;linux/config.h&gt;@/* &amp; */@" \
    273     `grep -lr linux/config.h ../xc` &amp;&amp;
    274 ( make World 2&gt;&amp;1 | tee xfree-compile.log &amp;&amp; exit $PIPESTATUS )
    275 </userinput></screen>
     300<screen><userinput>( make World 2&gt;&amp;1 | tee xfree-compile.log &amp;&amp; exit $PIPESTATUS )</userinput></screen>
    276301
    277302      <para>This package does not come with a test suite.</para>
     
    352377  <sect2 role="commands">
    353378    <title>Command Explanations</title>
    354 
    355     <para><command>sed -i 's:^.*asm.* ... fbdevhw.c</command>: This sed fixes a
    356     problem compiling against headers from kernels newer than linux-2.6.8.</para>
    357 
    358     <para><command>sed -i -e "s@^#include &lt;linux/config.h&gt;@...</command>:
    359     The <application>Linux-Libc-Headers</application> package installed in
    360     LFS installs a <filename>/usr/include/linux/config.h</filename> file which
    361     is not compatible with userspace applications. The recommended fix for
    362     applications including this file is to remove it (see <ulink
    363     url="http://ep09.pld-linux.org/~mmazur/linux-libc-headers/doc/FAQ">
    364     linux-libc-headers FAQ</ulink>). The <command>sed</command> uses
    365     <command>grep -lr</command> to replace all occurrences. If you desire, just
    366     remove (comment) the line in the appropriate video driver file if you
    367     customized <filename>host.def</filename>.</para>
    368379
    369380    <para><command>( make World 2&gt;&amp;1 | tee xfree-compile.log
Note: See TracChangeset for help on using the changeset viewer.