Changeset 7be99f2c


Ignore:
Timestamp:
05/25/2006 06:52:00 AM (18 years ago)
Author:
DJ Lucas <dj@…>
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:
04c940c3
Parents:
e639150
Message:

Updated to xorg-7.1, xterm-213, and MesaLib-6.5.

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

Files:
16 edited

Legend:

Unmodified
Added
Removed

  • general.ent

    re639150 r7be99f2c  
    144144<!ENTITY tidy-version                 "051026">
    145145<!ENTITY desktop-file-utils-version   "0.11">
    146 <!ENTITY xterm-version                "209">
    147146<!ENTITY xscreensaver-version         "4.24">
    148 <!ENTITY rman-version                 "3.2">
    149147<!ENTITY pilot-link-version           "0.11.8">
    150148<!ENTITY unixodbc-version             "2.2.11">
    … …  
    355353<!ENTITY xorg-version                 "6.9.0">
    356354<!ENTITY xfree86-version              "4.6.0">
    357 <!ENTITY xorg7-version                "7.0.0">
     355<!ENTITY xorg7-version                "7.1">
    358356<!ENTITY luit-version                 "1.0.1">
    359357<!ENTITY xbitmaps-version             "1.0.1">
    360 <!ENTITY xorg-server-version          "1.0.2">
     358<!ENTITY xorg-server-version          "1.1.0">
     359<!ENTITY libdrm-version               "2.0.1">
     360<!ENTITY mesalib-version              "6.5">
     361<!ENTITY xterm-version                "213">
     362<!ENTITY rman-version                 "3.2">
     363
    361364
    362365<!-- Chapter 26 -->
    363 <!ENTITY libdrm-version               "2.0">
    364 <!ENTITY mesalib-version              "6.4.2">
    365366<!ENTITY qt-version                   "3.3.6">
    366367<!ENTITY GTK-version                  "1.2.10">

  • introduction/welcome/changelog.xml

    re639150 r7be99f2c  
    4848          <para>[randy] - Updated to desktop-file-utils-0.11.</para>
    4949        </listitem>
     50        <listitem>
     51          <para>[dj] - Updated Xorg Modular to 7.1 release.</para>
     52        </listitem>
     53        <listitem>
     54          <para>[dj] - Updated to xterm-213.</para>
     55        </listitem>
     56        <listitem>
     57          <para>[dj] - Updated to Mesa-6.5.</para>
     58        </listitem>
    5059      </itemizedlist>
    5160    </listitem>

  • x/installing/libdrm.xml

    re639150 r7be99f2c  
    88  <!ENTITY libdrm-download-ftp  "ftp://ftp.fu-berlin.de/unix/linux/mirrors/gentoo/distfiles/libdrm-&libdrm-version;.tar.gz">
    99  <!ENTITY libdrm-md5sum        "9d1aab104eb757ceeb2c1a6d38d57411">
    10   <!ENTITY libdrm-size          "370 KB">
    11   <!ENTITY libdrm-buildsize     "5.1 MB">
     10  <!ENTITY libdrm-size          "276 KB">
     11  <!ENTITY libdrm-buildsize     "3.2 MB">
    1212  <!ENTITY libdrm-time          "0.1 SBU">
    1313]>
    … …  
    7171    commands:</para>
    7272
    73 <screen><userinput>autoreconf -ifv &amp;&amp;
    74 ./configure --prefix=$XORG_PREFIX &amp;&amp;
     73<screen><userinput>./configure --prefix=$XORG_PREFIX &amp;&amp;
    7574make</userinput></screen>
    7675
    … …  
    8180<screen role="root"><userinput>make install</userinput></screen>
    8281
    83   </sect2>
    84 
    85   <sect2>
    86     <title>Command Explanations</title>
    87     <para><command>autoreconf -ifv</command>:  regenerates the
    88     <command>configure</command> script to fix a broken test in the included
    89     <command>configure</command> script.  The <option>-f</option> option is
    90     needed to force <command>libtoolize</command> to run. Without it, the
    91     shared library will not be built correctly.</para>
    9282  </sect2>
    9383

  • x/installing/mesalib.xml

    re639150 r7be99f2c  
    77  <!ENTITY mesalib-download-http "http://prdownloads.sourceforge.net/mesa3d/MesaLib-&mesalib-version;.tar.bz2">
    88  <!ENTITY mesalib-download-ftp  " ">
    9   <!ENTITY mesalib-md5sum        "7674d2c603b5834259e4e5a820cefd5b">
    10   <!ENTITY mesalib-size          "3.9 MB">
    11   <!ENTITY mesalib-buildsize     "672 MB">
    12   <!ENTITY mesalib-time          "2.2 SBU">
     9  <!ENTITY mesalib-md5sum        "61beda590bfc5b4a12e979d5f2d70d7a">
     10  <!ENTITY mesalib-size          "3.3 MB">
     11  <!ENTITY mesalib-buildsize     "823 MB">
     12  <!ENTITY mesalib-time          "1.7 SBU">
    1313]>
    1414
    … …  
    4949      </listitem>
    5050      <listitem>
    51         <para>Download size (including Recommended downloads):
     51        <para>Download size (including recommended download):
    5252        &mesalib-size;</para>
    5353      </listitem>
    5454      <listitem>
    55         <para>Estimated disk space required (including Recommended downloads):
     55        <para>Estimated disk space required (including recommended download):
    5656        &mesalib-buildsize;</para>
    5757      </listitem>
    5858      <listitem>
    59         <para>Estimated build time (including optional downloads):
     59        <para>Estimated build time (including recommended download):
    6060        &mesalib-time;</para>
    6161      </listitem>
    … …  
    7777    <bridgehead renderas="sect3">Recommended Download</bridgehead>
    7878    <para><ulink
    79     url="http://prdownloads.sourceforge.net/mesa3d/MesaDemos-&mesalib-version;.tar.bz2"/>
     79    url="http://prdownloads.sourceforge.net/mesa3d/MesaDemos-&mesalib-version;.tar.bz2">MesaDemos-&mesalib-version;</ulink>
    8080    provides a demo and a diagnostic program to verify that GL is working
    8181    properly.</para>
    … …  
    8383    <bridgehead renderas="sect3">Optional Download</bridgehead>
    8484    <para><ulink
    85     url="http://prdownloads.sourceforge.net/mesa3d/MesaGLUT-&mesalib-version;.tar.bz2"/>
     85    url="http://prdownloads.sourceforge.net/mesa3d/MesaGLUT-&mesalib-version;.tar.bz2">MesaGLUT-&mesalib-version;</ulink>
    8686    provides a working <filename class='libraryfile'>libglut</filename>.</para>
    8787
    … …  
    107107
    108108<screen><userinput>find . -type f -exec sed -i "s@/usr/X11R6@$XORG_PREFIX@g" {} \; &amp;&amp;
    109 sed -i 's@lib/modules@lib/X11/modules@' src/glx/x11/dri_glx.c</userinput></screen>
     109sed -i 's@lib/modules@lib/X11/modules@' src/glx/x11/dri_glx.c &amp;&amp;
     110sed -i 's@lib/modules@lib/X11/modules@' src/mesa/drivers/dri/Makefile.template</userinput></screen>
    110111
    111112    <para>Build <application>MesaLib</application>

  • x/installing/x-setup.xml

    re639150 r7be99f2c  
    125125<screen role="root"><userinput>install -v -m755 -D ~/XF86Config.new /etc/X11/XF86Config</userinput></screen>
    126126
     127    <para>As a convienience, Xorg-&xorg7-version; users should populate the
     128    <filename class="directory">/etc/X11</filename> directory with symlinks
     129    to various configuration directories that were located in
     130    <filename class="directory">/etc/X11</filename> with previous
     131    versions of <application>Xorg</application>.  This step is not needed
     132    for users of Xorg-&xorg-version; or XFree86.  Exectute the following
     133    commands as the <systemitem class="username">root</systemitem>
     134    user:</para>
     135
     136<screen><userinput role="root">mkdir $XORG_PREFIX/lib/X11/twm &amp;&amp;
     137ln -svt /etc/X11 \
     138    $XORG_PREFIX/lib/X11/{app-defaults,twm,xkb,fs,lbxproxy,proxymngr} \
     139    $XORG_PREFIX/lib/X11/{rstart,xdm,xinit,xserver,xsm}</userinput></screen>
     140
    127141    <para>As the <systemitem class="username">root</systemitem> user, create
    128142    <filename>.xinitrc</filename>:</para>
    … …  
    138152    managed by a simple window manager, Tab Window Manager. For details of
    139153    <command>twm</command>, see the man page.</para>
     154
     155    <indexterm zone="x-setup xconfig">
     156      <primary sortas="e-AA.xinitrc">~/.xinitrc</primary>
     157    </indexterm>
    140158
    141159    <note>
    … …  
    150168      terminal emulators and make appropriate changes.</para>
    151169    </note>
    152 
    153     <indexterm zone="x-setup xconfig">
    154       <primary sortas="e-AA.xinitrc">~/.xinitrc</primary>
    155     </indexterm>
    156170
    157171    <para>When needed, the X Window System creates the directory

  • x/installing/x7app.xml

    re639150 r7be99f2c  
    88  <!ENTITY x7apps-download-ftp  "">
    99  <!ENTITY x7apps-md5sum        "http://anduin.linuxfromscratch.org/sources/BLFS/svn/x/files/md5sums">
    10   <!ENTITY x7apps-size          "9.0 MB">
    11   <!ENTITY x7apps-buildsize     "30.6 MB">
    12   <!ENTITY x7apps-time          "2.1 SBU">
     10  <!ENTITY x7apps-size          "9.1 MB">
     11  <!ENTITY x7apps-buildsize     "30.7 MB">
     12  <!ENTITY x7apps-time          "2.9 SBU">
    1313
    1414]>
    … …  
    6565
    6666  <bridgehead renderas="sect4">Required</bridgehead>
    67   <para role="required"><xref linkend="xbitmaps"/> and
    68   <xref linkend="libpng"/></para>
     67  <para role="required"><xref linkend="xbitmaps"/>,
     68  <xref linkend="libpng"/>, and <xref linkend="xorg7-lib"/></para>
    6969
    7070  <bridgehead renderas="sect4">Recommended</bridgehead>
    … …  
    8080    use the following commands:</para>
    8181
    82 <screen><userinput>wget http://anduin.linuxfromscratch.org/sources/BLFS/svn/x/wget/app.wget &amp;&amp;
     82<screen><userinput>wget http://anduin.linuxfromscratch.org/sources/BLFS/svn/x/wget/app-7.1.wget &amp;&amp;
    8383mkdir app &amp;&amp;
    8484cd app &amp;&amp;
    85 wget -B http://xorg.freedesktop.org/releases/individual/app/ -i ../app.wget</userinput></screen>
     85wget -B http://xorg.freedesktop.org/releases/individual/app/ -i ../app-7.1.wget</userinput></screen>
    8686
    8787  </sect2>
    … …  
    8989  <sect2 role="installation">
    9090    <title>Installation of Xorg Applications</title>
    91 
    92     <note><para>First install the <application>lbxproxy</application> package
    93     since it is required by <application>proxymngr</application>.</para></note>
    9491
    9592    <para>Install the applications by running the following commands for each

  • x/installing/x7data.xml

    re639150 r7be99f2c  
    7777    use the following commands:</para>
    7878
    79 <screen><userinput>wget http://anduin.linuxfromscratch.org/sources/BLFS/svn/x/wget/data.wget &amp;&amp;
     79<screen><userinput>wget http://anduin.linuxfromscratch.org/sources/BLFS/svn/x/wget/data-7.1.wget &amp;&amp;
    8080mkdir data &amp;&amp;
    8181cd data &amp;&amp;
    82 wget -B http://xorg.freedesktop.org/releases/individual/data/ -i ../data.wget</userinput></screen>
     82wget -B http://xorg.freedesktop.org/releases/individual/data/ -i ../data-7.1.wget</userinput></screen>
    8383
    8484  </sect2>

  • x/installing/x7driver.xml

    re639150 r7be99f2c  
    88  <!ENTITY x7drivers-download-ftp  "">
    99  <!ENTITY x7drivers-md5sum        "http://anduin.linuxfromscratch.org/sources/BLFS/svn/x/files/md5sums">
    10   <!ENTITY x7drivers-size          "17.3 MB">
    11   <!ENTITY x7drivers-buildsize     "53.8 MB">
    12   <!ENTITY x7drivers-time          "4.6 SBU">
     10  <!ENTITY x7drivers-size          "18.7 MB">
     11  <!ENTITY x7drivers-buildsize     "60.3 MB">
     12  <!ENTITY x7drivers-time          "6.9 SBU">
    1313
    1414]>
    … …  
    7979    use the following commands:</para>
    8080
    81 <screen><userinput>wget http://anduin.linuxfromscratch.org/sources/BLFS/svn/x/wget/driver.wget &amp;&amp;
     81<screen><userinput>wget http://anduin.linuxfromscratch.org/sources/BLFS/svn/x/wget/driver-7.1.wget &amp;&amp;
    8282mkdir driver &amp;&amp;
    8383cd driver &amp;&amp;
    84 wget -B http://xorg.freedesktop.org/releases/individual/driver/ -i ../driver.wget</userinput></screen>
     84wget -B http://xorg.freedesktop.org/releases/individual/driver/ -i ../driver-7.1.wget</userinput></screen>
    8585
    8686  </sect2>

  • x/installing/x7font.xml

    re639150 r7be99f2c  
    88  <!ENTITY x7fonts-download-ftp  "">
    99  <!ENTITY x7fonts-md5sum        "http://anduin.linuxfromscratch.org/sources/BLFS/svn/x/files/md5sums">
    10   <!ENTITY x7fonts-size          "13.5 MB">
    11   <!ENTITY x7fonts-buildsize     "90.4 MB">
    12   <!ENTITY x7fonts-time          "1.82 SBU">
     10  <!ENTITY x7fonts-size          "13.3 MB">
     11  <!ENTITY x7fonts-buildsize     "100 MB">
     12  <!ENTITY x7fonts-time          "2.0 SBU">
    1313]>
    1414
    … …  
    7474    use the following commands:</para>
    7575
    76 <screen><userinput>wget http://anduin.linuxfromscratch.org/sources/BLFS/svn/x/wget/font.wget &amp;&amp;
     76<screen><userinput>wget http://anduin.linuxfromscratch.org/sources/BLFS/svn/x/wget/font-7.1.wget &amp;&amp;
    7777mkdir font &amp;&amp;
    7878cd font &amp;&amp;
    79 wget -B http://xorg.freedesktop.org/releases/individual/font/ -i ../font.wget</userinput></screen>
     79wget -B http://xorg.freedesktop.org/releases/individual/font/ -i ../font-7.1.wget</userinput></screen>
    8080
    8181  </sect2>
    … …  
    8585
    8686    <para>Run the following commands for each package:</para>
    87 
    88     <note>
    89       <para>You should install encodings first, and then font-util before all
    90       other font packages.</para>
    91     </note>
    9287
    9388<screen><userinput>./configure $XORG_CONFIG &amp;&amp;

  • x/installing/x7lib.xml

    re639150 r7be99f2c  
    1010  <!ENTITY x7libs-size          "12 MB">
    1111  <!ENTITY x7libs-buildsize     "186 MB">
    12   <!ENTITY x7libs-time          "5.8 SBU">
     12  <!ENTITY x7libs-time          "6.6 SBU">
    1313
    1414]>
    … …  
    8181    use the following commands:</para>
    8282
    83 <screen><userinput>wget http://anduin.linuxfromscratch.org/sources/BLFS/svn/x/wget/lib.wget &amp;&amp;
     83<screen><userinput>wget http://anduin.linuxfromscratch.org/sources/BLFS/svn/x/wget/lib-7.1.wget &amp;&amp;
    8484mkdir lib &amp;&amp;
    8585cd lib &amp;&amp;
    86 wget -B http://xorg.freedesktop.org/releases/individual/lib/ -i ../lib.wget</userinput></screen>
    87 
    88   </sect2>
    89 
    90   <sect2>
    91     <title>Meeting Library Dependencies</title>
    92 
    93     <para>These 17 libraries must be built first, in the order provided,
    94     to cover the dependencies of the other library packages:</para>
    95 
    96 <screen>xtrans-1.0.0
    97 libXau-1.0.0
    98 libXdmcp-1.0.0
    99 libX11-1.0.0
    100 libXext-1.0.0
    101 libICE-1.0.0
    102 libSM-1.0.0
    103 libXt-1.0.0
    104 libXmu-1.0.0
    105 libXpm-3.5.4.2
    106 libXp-1.0.0
    107 libXfixes-3.0.1.2
    108 libXrender-0.9.0.2
    109 libfontenc-1.0.1
    110 libxkbfile-1.0.2
    111 libXprintUtil-1.0.1
    112 libXv-1.0.1</screen>
     86wget -B http://xorg.freedesktop.org/releases/individual/lib/ -i ../lib-7.1.wget</userinput></screen>
    11387
    11488  </sect2>

  • x/installing/x7proto.xml

    re639150 r7be99f2c  
    1414     installed files, and the size of the largest package's build
    1515     directory after running make install. -->
    16   <!ENTITY x7proto-buildsize     "3.5 MB">
     16  <!ENTITY x7proto-buildsize     "4.0 MB">
    1717  <!ENTITY x7proto-time          "0.2 SBU">
    1818
    … …  
    7676    use the following commands:</para>
    7777
    78 <screen><userinput>wget http://anduin.linuxfromscratch.org/sources/BLFS/svn/x/wget/proto.wget &amp;&amp;
     78<screen><userinput>wget http://anduin.linuxfromscratch.org/sources/BLFS/svn/x/wget/proto-7.1.wget &amp;&amp;
    7979mkdir proto &amp;&amp;
    8080cd proto &amp;&amp;
    81 wget -B http://xorg.freedesktop.org/releases/individual/proto/ -i ../proto.wget</userinput></screen>
     81wget -B http://xorg.freedesktop.org/releases/individual/proto/ -i ../proto-7.1.wget</userinput></screen>
    8282
    8383  </sect2>

  • x/installing/x7server.xml

    re639150 r7be99f2c  
    77  <!ENTITY xorg-server-download-http "http://xorg.freedesktop.org/releases/individual/xserver/xorg-server-&xorg-server-version;.tar.bz2">
    88  <!ENTITY xorg-server-download-ftp  "">
    9   <!ENTITY xorg-server-md5sum        "5cd3316f07ed32a05cbd69e73a71bc74">
    10   <!ENTITY xorg-server-size          "5.8 MB">
    11   <!ENTITY xorg-server-buildsize     "413 MB">
    12   <!ENTITY xorg-server-time          "5.96 SBU">
     9  <!ENTITY xorg-server-md5sum        "d070c58a598fb52c5cb86344725c4ad6">
     10  <!ENTITY xorg-server-size          "6.1 MB">
     11  <!ENTITY xorg-server-buildsize     "424 MB">
     12  <!ENTITY xorg-server-time          "5.6 SBU">
    1313
    1414]>
    … …  
    6565
    6666  <bridgehead renderas="sect4">Required</bridgehead>
    67   <para role="required"><xref linkend="xorg7-font"/></para>
     67  <para role="required"><xref linkend="xorg7-font"/> and
     68  <xref linkend="xorg7-lib"/></para>
    6869
    6970  <bridgehead renderas="sect4">Optional</bridgehead>
    … …  
    8485    </note>
    8586
    86     <para>A serious security vulnerability was recently discovered that will
    87     allow a malicious user to execute code as the root user.  Fix the
    88     vulnerability with the following command:</para>
    89 
    90 <screen><userinput>sed -i 's/ntri &amp; sizeof/ntri * sizeof/' render/mitri.c</userinput></screen>
    91 
    9287<!-- To be removed if/when proposed glibc patch is added to LFS SVN
    9388     Leave in in for a couple of weeks with 'you may need' and a testcase
    9489     around it to save the support list silly questions.  Should remove in
    95      a couple of weeks -->       
     90     a couple of weeks
    9691      <para>Recent <application>Glibc</application> may have a problem with its
    9792      installed <filename>sys/kd.h</filename> file. This has recently been
    … …  
    10499    sed -i.bak '/CONFIG_H/i #include &lt;linux/types.h&gt;' \
    105100        hw/xfree86/os-support/linux/lnx_agp.c</userinput></screen>
    106 <!-- End remove -->
     101 End remove -->
    107102
    108103    <para>Install the server by running the following commands:</para>
    109104
    110 <screen><userinput>./configure $XORG_CONFIG \
     105<screen><userinput>sed -i \
     106    's@-I$(top_builddir)/include@-I$(top_builddir)/GL/mesa/main@8' \
     107    GL/glx/Makefile.in &amp;&amp;
     108sed -i \
     109    's@-I$(top_builddir)/include@-I$(top_builddir)/GL/mesa/glapi@7' \
     110    GL/glx/Makefile.in &amp;&amp;
     111./configure $XORG_CONFIG \
    111112    --with-mesa-source='<replaceable>&lt;/path/to&gt;</replaceable>/Mesa-&mesalib-version;' \
    112113    --with-fontdir=$XORG_PREFIX/lib/X11/fonts \
    113114    --with-module-dir=$XORG_PREFIX/lib/X11/modules \
     115    --with-dri-driver-path=$XORG_PREFIX/lib/X11/modules/dri \
    114116    --enable-install-setuid &amp;&amp;
    115117make</userinput></screen>
    … …  
    127129    <title>Command Explanations</title>
    128130
     131    <para><command>sed -i '...' GL/glx/Makefile.in</command>: These commands
     132    correct the search path for the <application>Mesa</application> headers. 
     133    The 8th and 7th instance of '-I$(top_builddir)' in the existing search
     134    search path are replaced with <application>Mesa</application> paths.</para>
     135
    129136    <para><parameter>--with-mesa-source=...</parameter>: This switch directs
    130137    the build system to the location of the <application>Mesa</application>
    … …  
    132139    <application>Mesa</application>, omit this switch.</para>
    133140
     141    <para><parameter>--with-module-dir=...</parameter>:  This parameter
     142    sets the destination for the installed modules.</para>
     143
     144    <para><parameter>--with-dri-driver-path=...</parameter>:  This is the
     145    location of the <application>Mesa</application> dri drivers.</para>
     146
    134147    <para><parameter>--enable-install-setuid</parameter>: The Xorg binary must
    135148    run as the root user.  This switch ensures that the binary is installed
    136     setuid when the build is done by an unprivileged user.</para>
     149    setuid when make is run by an unprivileged user.</para>
    137150
    138151    <para><parameter>--disable-glx</parameter>: Disable building of the GLX
    139     extension.  This is required if building without
     152    extension.  This parameter is required if building without
    140153    <application>Mesa</application>.</para>
    141154
    142155    <para><parameter>--disable-dri</parameter>: Disable building of the DRI
    143     extension.  This is required if building without
     156    extension.  This parameter is required if building without
    144157    <application>Mesa</application>.</para>
    145158
    146159    <para><parameter>--disable-xprint</parameter>: Disable building of
    147     the <application>Xprint</application>  extension and server.  This is
    148     required if building without <application>Mesa</application>.</para>
     160    the <application>Xprint</application>  extension and server.  This
     161    parameter is required if building without
     162    <application>Mesa</application>.</para>
    149163
    150164  </sect2>

  • x/installing/x7util.xml

    re639150 r7be99f2c  
    88  <!ENTITY x7utils-download-ftp  "">
    99  <!ENTITY x7utils-md5sum        "http://anduin.linuxfromscratch.org/sources/BLFS/svn/x/files/md5sums">
    10   <!ENTITY x7utils-size          "656 KB">
    11   <!ENTITY x7utils-buildsize     "6.8 MB">
     10  <!ENTITY x7utils-size          "664 KB">
     11  <!ENTITY x7utils-buildsize     "5.2 MB">
    1212  <!ENTITY x7utils-time          "0.1 SBU">
    1313
    … …  
    7979    use the following commands:</para>
    8080
    81 <screen><userinput>wget http://anduin.linuxfromscratch.org/sources/BLFS/svn/x/wget/util.wget &amp;&amp;
     81<screen><userinput>wget http://anduin.linuxfromscratch.org/sources/BLFS/svn/x/wget/util-7.1.wget &amp;&amp;
    8282mkdir util &amp;&amp;
    8383cd util &amp;&amp;
    84 wget -B http://xorg.freedesktop.org/releases/individual/util/ -i ../util.wget</userinput></screen>
     84wget -B http://xorg.freedesktop.org/releases/individual/util/ -i ../util-7.1.wget</userinput></screen>
    8585
    8686  </sect2>
    … …  
    9292    with the following commands:</para>
    9393
    94 <screen><userinput>sed -i "s@/usr/X11R6@$XORG_PREFIX@" site.def &amp;&amp;
    95 sed -i "s@/usr/X11R6@$XORG_PREFIX@" X11.tmpl &amp;&amp;
     94<screen><userinput>sed -i "s@/usr/X11R6@$XORG_PREFIX@" X11.tmpl &amp;&amp;
    9695./configure $XORG_CONFIG --with-config-dir=$XORG_PREFIX/lib/X11/config</userinput></screen>
    9796

  • x/installing/xbitmaps.xml

    re639150 r7be99f2c  
    99  <!ENTITY xbitmaps-md5sum        "b28a9840cde3c38d7c09716372fea257">
    1010  <!ENTITY xbitmaps-size          "56 KB">
    11   <!ENTITY xbitmaps-buildsize     "1.2 MB">
     11  <!ENTITY xbitmaps-buildsize     "1.7 MB">
    1212  <!ENTITY xbitmaps-time          "0.01 SBU">
    1313

  • x/installing/xorg7.xml

    re639150 r7be99f2c  
    4343
    4444  <para>Xorg-7.0.0 introduced a completely auto-tooled, modular build system.
    45   The code is otherwise identical to that in the Xorg-6.9.0 release.
    4645  With the new modular build system, it is no longer possible to download
    4746  the entire package in a single file.  In fact, there may be as many as
    48   280 files that need to be fetched from the download location.  To assist
     47  293 files that need to be fetched from the download location.  To assist
    4948  with such a large task, installing <xref linkend="wget"/> is strongly
    5049  recommended for downloading the needed files.  A complete
    … …  
    6261  <note>
    6362    <para>Even if you intend to download only the necessary packages, you
    64     should download the wget file lists and use the package versions in the
    65     file.  Newer packages are likely intended for the next release of
    66     <application>Xorg</application> and have already proved to be
    67     incompatible with the current version of
    68     <application>GTK+</application>.  The installed size of
    69     <application>Xorg</application> can be reduced considerably by
    70     installing only the packages that you will need and use, however, the
    71     BLFS book cannot account for all dependencies and build options for
    72     the individual <application>Xorg</application> packages.  The
    73     instructions assume that all packages have been built.  A
     63    should download the wget file lists.  The list of files are ordered by
     64    dependency, and the package versions listed in the files are know to
     65    work well with each other.  Newer packages are likely intended for the
     66    next release of <application>Xorg</application> and have already proved
     67    to be incompatible with current versions of software installed in BLFS.
     68    The installed size of <application>Xorg</application> can be reduced
     69    considerably by installing only the packages that you will need and use,
     70    however, the BLFS book cannot account for all dependencies and build
     71    options for the individual <application>Xorg</application> packages.
     72    The instructions assume that all packages have been built.  A
    7473    <ulink url="http://wiki.linuxfromscratch.org/blfs/wiki/Xorg-&xorg7-version;">wiki</ulink>
    7574    page containing dependency information, is under development.  You are
    … …  
    134133    <envar>XORG_CONFIG</envar> variable to use for substitution:</para>
    135134
    136 <screen><userinput>export XORG_CONFIG="--prefix=$XORG_PREFIX --sysconfdir=/etc --localstatedir=/var"</userinput></screen>
     135<screen><userinput>export XORG_CONFIG="--prefix=$XORG_PREFIX --sysconfdir=/etc \
     136    --localstatedir=/var --datadir=$XORG_PREFIX/lib"</userinput></screen>
    137137
    138138    <para>If you've decided to use an alternate prefix, be sure to add

  • x/installing/xterm.xml

    re639150 r7be99f2c  
    77  <!ENTITY xterm-download-http " ">
    88  <!ENTITY xterm-download-ftp  "ftp://invisible-island.net/xterm/xterm-&xterm-version;.tgz">
    9   <!ENTITY xterm-md5sum        "c75cdbf9395bbc2cd69863fbe7c2e019">
    10   <!ENTITY xterm-size          "745 KB">
    11   <!ENTITY xterm-buildsize     "7.1 MB">
     9  <!ENTITY xterm-md5sum        "20827d968ed7406d01b2125a84b7a2cd">
     10  <!ENTITY xterm-size          "749 KB">
     11  <!ENTITY xterm-buildsize     "7.5 MB">
    1212  <!ENTITY xterm-time          "0.1 SBU">
    1313]>
    … …  
    6262
    6363    <bridgehead renderas="sect4">Required</bridgehead>
    64     <para><xref linkend="x-window-system"/> and
     64    <para><xref linkend="xorg7-server"/> and
    6565    <xref linkend="pkgconfig"/></para>
    6666
    … …  
    7575  <sect2 role="installation">
    7676    <title>Installation of xterm</title>
    77 
    78     <para>Correct the PROJECTROOT variable with the following command:</para>
    79 
    80 <screen><userinput>sed -i "s@/usr/X11R6@$XORG_PREFIX@" main.h</userinput></screen>
    8177
    8278    <para>Install <application>xterm</application> by running the
    … …  
    10096    <title>Command Explanations</title>
    10197
    102     <para><parameter>--enable-luit</parameter>: enables the luit filter for
     98    <para><parameter>--with-app-defaults=...</parameter>: Sets the location
     99    for the <filename class="directory">app-defaults</filename>
     100    directory.</para>
     101
     102    <para><parameter>--enable-luit</parameter>: Enables the luit filter for
    103103    unicode translation.</para>
    104104
    105     <para><parameter>--with-wide-chars</parameter>: adds support for wide
     105    <para><parameter>--with-wide-chars</parameter>: Adds support for wide
    106106    characters.</para>
    107 
    108     <para><command>sed -i "s@/usr/X11R6@$XORG_PREFIX@" main.h</command>: This
    109     command corrects the PROJECTROOT definition to match that of the installed
    110     X Window System.</para>
    111107
    112108    <para><command>make install-ti</command>: This command installs corrected
Note: See TracChangeset for help on using the changeset viewer.