Changeset fb69e2e


Ignore:
Timestamp:
05/11/2006 06:15:29 PM (18 years ago)
Author:
Andrew Benton <andy@…>
Branches:
10.0, 10.1, 11.0, 11.1, 11.2, 11.3, 12.0, 12.1, 6.2, 6.2.0, 6.2.0-rc1, 6.2.0-rc2, 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/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:
ef040389
Parents:
aeaebda9
Message:

Updated to XFree86-4.6.0

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

Files:
3 edited

Legend:

Unmodified
Added
Removed

  • general.ent

    raeaebda9 rfb69e2e  
    351351<!-- Chapter 25 -->
    352352<!ENTITY xorg-version                 "6.9.0">
    353 <!ENTITY xfree86-version              "4.5.0">
     353<!ENTITY xfree86-version              "4.6.0">
    354354<!ENTITY xorg7-version                "7.0.0">
    355355<!ENTITY luit-version                 "1.0.1">

  • introduction/welcome/changelog.xml

    raeaebda9 rfb69e2e  
    5858          X11R6.</para>
    5959        </listitem>
     60        <listitem>
     61          <para>[andy] - Updated to XFree86-4.6.0.</para>
     62        </listitem>
    6063      </itemizedlist>
    6164    </listitem>

  • x/installing/xfree86.xml

    raeaebda9 rfb69e2e  
    55  %general-entities;
    66
    7     <!-- Inserted as a reminder to do this. The mention of a test suite
    8          is usually right before the root user installation commands. Please
    9          delete these 12 (including one blank) lines after you are done.-->
    10 
    11     <!-- Use one of the two mentions below about a test suite,
    12          delete the line that is not applicable. Of course, if the
    13          test suite uses syntax other than "make check", revise the
    14          line to reflect the actual syntax to run the test suite -->
    15 
    16     <!-- <para>This package does not come with a test suite.</para> -->
    17     <!-- <para>To test the results, issue: <command>make check</command>.</para> -->
    18 
    197  <!ENTITY xfree86-download-http "http://gnu.kookel.org/ftp/XFree86/&xfree86-version;/source/">
    208  <!ENTITY xfree86-download-ftp  "ftp://ftp.xfree86.org/pub/XFree86/&xfree86-version;/source/">
    219  <!ENTITY xfree86-md5sum        "ftp://ftp.xfree86.org/pub/XFree86/&xfree86-version;/source/SUMS.md5sum">
    2210  <!ENTITY xfree86-size          "51 MB">
    23   <!ENTITY xfree86-buildsize     "775 MB">
     11  <!ENTITY xfree86-buildsize     "740 MB">
    2412  <!ENTITY xfree86-time          "12 SBU">
    2513]>
    … …  
    7664    </itemizedlist>
    7765
    78     <bridgehead renderas="sect3">Additional Downloads</bridgehead>
    79     <itemizedlist spacing='compact'>
    80       <listitem>
    81         <para>Required patch: <ulink
    82         url="&patch-root;/XFree86-&xfree86-version;-kernel_headers-1.patch"/>
    83         </para>
    84       </listitem>
    85     </itemizedlist>
    86 
    8766    <bridgehead renderas="sect3">XFree86 Dependencies</bridgehead>
    8867
    … …  
    140119    <para>The first three packages are the <application>XFree86</application>
    141120    programs, the fourth and fifth are fonts, the sixth is normal documentation,
    142     and the seventh is hardcopy documentation. There are also two packages
    143     <filename>doctools-1.3.x.tgz</filename>, which contain programs to
    144     regenerate hardcopy documentation, and <filename>utils-1.1.x.tgz</filename>,
    145     which contain <application>GNU TAR</application> and
    146     <application>zlib</application> which are already installed on an
    147     LFS system.</para>
     121    and the seventh is hardcopy documentation.</para>
    148122
    149123    <para>To check your downloads for integrity, download the
    … …  
    156130    and <filename>XFree86-xtest-4.0.x.tar.bz2</filename> files if you did not
    157131    download them.</para>
    158 
    159 <!--
    160 <para>The fixes subdirectory also has a <filename>SUMS.md5sum</filename>.  Note that
    161 this is the same filename as the sums for the main sources, so you need to rename the
    162 file if you download it.  Otherwise, you can just look at it and use it to
    163 check against the patch files:</para>
    164 <screen><userinput><command>md5sum 4.3.0-4.3.0.1.diff.gz</command></userinput>
    165 <userinput><command>md5sum fontfile.diff</command></userinput></screen>
    166 
    167 <para>After unpacking the <filename>X430src-?.tgz</filename> files and uncompressing the
    168 diff file, change to the <filename class="directory">xc</filename> directory and run:</para>
    169 
    170 <screen><userinput><command>patch -Np1 -i ../4.3.0-4.3.0.1.diff</command></userinput>
    171 <userinput><command>pushd  lib/font/fontfile/</command></userinput>
    172 <userinput><command>patch -N -i ../../../../fontfile.diff</command></userinput>
    173 <userinput><command>popd</command></userinput></screen>
    174 -->
    175132
    176133  </sect2>
    … …  
    226183      <filename class='directory'>xc</filename> directory:</para>
    227184
    228 <screen><userinput>pushd config/util &amp;&amp;
    229 make -f Makefile.ini lndir
    230 popd</userinput></screen>
     185<screen><userinput>make -C config/util -f Makefile.ini lndir</userinput></screen>
    231186
    232187      <para>Now create the shadow tree:</para>
    … …  
    369324#define ForceNormalLib            YES
    370325#define BuildSpecsDocs             NO
     326#define DocDir                    /usr/share/doc
     327
     328/* Installation prefix. The default is to install into /usr/X11R6. If you
     329 * would like to install into /usr, uncomment these options. */
     330
     331/* #define ProjectRoot            /usr */
     332/* #define LinkGLToUsrLib         NO */
     333/* #define LinkGLToUsrInclude     NO */
    371334
    372335/* End XFree86 host.def file */</literal>
    … …  
    383346      following commands:</para>
    384347
    385 <screen><userinput>patch -Np1 -i ../XFree86-&xfree86-version;-kernel_headers-1.patch &amp;&amp;
     348<screen><userinput>sed -i 's:^.*asm.*$:# define PAGE_MASK   (~(getpagesize() - 1)):' \
     349    ../xc/programs/Xserver/hw/xfree86/fbdevhw/fbdevhw.c &amp;&amp;
    386350sed -i -e "s@^#include &lt;linux/config.h&gt;@/* &amp; */@" \
    387     `grep -lr linux/config.h *` &amp;&amp;
    388 ( make WORLDOPTS="" World 2&gt;&amp;1 | \
    389     tee xfree-compile.log &amp;&amp; exit $PIPESTATUS )</userinput></screen>
     351    `grep -lr linux/config.h ../xc` &amp;&amp;
     352( make World 2&gt;&amp;1 | tee xfree-compile.log &amp;&amp; exit $PIPESTATUS )
     353</userinput></screen>
     354
     355      <para>This package does not come with a test suite.</para>
    390356
    391357      <para>Now, as the <systemitem class="username">root</systemitem>
    … …  
    394360<screen role="root"><userinput>make install &amp;&amp;
    395361make install.man &amp;&amp;
    396 ln -v -sf ../X11R6/bin /usr/bin/X11 &amp;&amp;
    397 ln -v -sf ../X11R6/lib/X11 /usr/lib/X11 &amp;&amp;
    398 ln -v -sf ../X11R6/include/X11 /usr/include/X11</userinput></screen>
     362ln -v -s ../X11R6/bin /usr/bin/X11 &amp;&amp;
     363ln -v -s ../X11R6/lib/X11 /usr/lib/X11 &amp;&amp;
     364ln -v -s ../X11R6/include/X11 /usr/include/X11</userinput></screen>
    399365
    400366      <para>The <application>XFree86</application> fonts have been installed
    … …  
    455421  <sect2 role="commands">
    456422    <title>Command Explanations</title>
     423
     424    <para><command>sed -i 's:^.*asm.* ... fbdevhw.c</command>: This sed fixes a
     425    problem compiling against kernel headers since linux-2.6.8.</para>
    457426
    458427    <para><command>sed -i -e "s@^#include &lt;linux/config.h&gt;@...</command>:
    … …  
    467436    customized <filename>host.def</filename>.</para>
    468437
    469     <para><command>( make WORLDOPTS="" World 2&gt;&amp;1 | tee xfree-compile.log
     438    <para><command>( make World 2&gt;&amp;1 | tee xfree-compile.log
    470439      &amp;&amp; exit $PIPESTATUS )</command>:
    471440    This command runs multiple <filename>Makefile</filename>s to completely
    472     rebuild the system. <envar>WORLDOPTS</envar>="" disables the default setting
    473     to continue after encountering an error. <option>2&gt;&amp;1</option>
     441    rebuild the system. <option>2&gt;&amp;1</option>
    474442    redirects error messages to the same location as standard output. The
    475443    <command>tee</command> command allows viewing of the output while logging
    … …  
    513481    <note>
    514482      <para>The following lists are not comprehensive. The full list of
    515       programs is in <filename class="directory">/usr/X11R6/bin</filename>.
     483      programs is (if you install into
     484      <filename class="directory">/usr/X11R6</filename>) in
     485      <filename class="directory">/usr/X11R6/bin</filename>.
    516486      For additional information about these programs, see the respective
    517487      man page.</para>
Note: See TracChangeset for help on using the changeset viewer.