Changeset 2d006066


Ignore:
Timestamp:
05/25/2007 10:09:39 PM (16 years ago)
Author:
Dan Nichilson <dnicholson@…>
Branches:
10.0, 10.1, 11.0, 11.1, 11.2, 11.3, 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/inkscape-core-mods, krejzi/svn, lazarus, nosym, perl-modules, plabs/python-mods, qt5new, systemd-11177, systemd-13485, trunk, upgradedb, xry111/intltool, xry111/soup3, xry111/test-20220226
Children:
0c5512d
Parents:
ba2ac60
Message:

Updated to Xorg-7.2 without XCB

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

Files:
11 edited

Legend:

Unmodified
Added
Removed

  • general.ent

    rba2ac60 r2d006066  
    383383<!-- Chapter 25 -->
    384384<!ENTITY xfree86-version              "4.6.0">
    385 <!ENTITY xorg7-version                "7.1">
     385<!ENTITY xorg7-version                "7.2">
    386386<!ENTITY luit-version                 "1.0.2">
    387387<!ENTITY xkeyboard-config-version     "0.9">
    388388<!ENTITY xbitmaps-version             "1.0.1">
    389 <!ENTITY xorg-server-version          "1.1.1">
     389<!ENTITY xorg-server-version          "1.2.0">
    390390<!ENTITY libdrm-version               "2.3.0">
    391391<!ENTITY mesalib-version              "6.5.2">

  • introduction/welcome/changelog.xml

    rba2ac60 r2d006066  
    5555          <para>[dnicholson] - Updated to MesaLib-6.5.2.</para>
    5656        </listitem>
     57        <listitem>
     58          <para>[dnicholson] - Updated to Xorg-7.2.</para>
     59        </listitem>
    5760      </itemizedlist>
    5861    </listitem>

  • x/installing/x7app.xml

    rba2ac60 r2d006066  
    88  <!ENTITY x7apps-download-ftp  "ftp://ftp.x.org/pub/individual/app/">
    99  <!ENTITY x7apps-md5sum        "&files-anduin;/xorg/md5sums-&xorg7-version;">
    10   <!ENTITY x7apps-size          "9.1 MB">
     10  <!ENTITY x7apps-size          "9.0 MB">
    1111  <!ENTITY x7apps-buildsize     "30.7 MB">
    1212  <!ENTITY x7apps-time          "2.9 SBU">
    … …  
    102102    <title>Installation of Xorg Applications</title>
    103103
    104     <para>A <ulink url='http://wiki.x.org/wiki/SecurityPage'>security
     104    <warning><para>The <application>mkcfm</application> package is
     105    deprecated and should not be installed.</para></warning>
     106
     107    <para>A <ulink url='http://wiki.x.org/wiki/Development/Security'>security
    105108    vulnerability</ulink> has been identified in the xload package.
    106109    Before building this package with the commands

  • x/installing/x7data.xml

    rba2ac60 r2d006066  
    88  <!ENTITY x7data-download-ftp  "ftp://ftp.x.org/pub/individual/data/">
    99  <!ENTITY x7data-md5sum        "&files-anduin;/xorg/md5sums-&xorg7-version;">
    10   <!ENTITY x7data-size          "2.5 MB">
     10  <!ENTITY x7data-size          "2.4 MB">
    1111  <!ENTITY x7data-buildsize     "19.5 MB">
    1212  <!ENTITY x7data-time          "0.1 SBU">

  • x/installing/x7driver.xml

    rba2ac60 r2d006066  
    88  <!ENTITY x7drivers-download-ftp  "ftp://ftp.x.org/pub/individual/driver/">
    99  <!ENTITY x7drivers-md5sum        "&files-anduin;/xorg/md5sums-&xorg7-version;">
    10   <!ENTITY x7drivers-size          "18.7 MB">
     10  <!ENTITY x7drivers-size          "18.3 MB">
    1111  <!ENTITY x7drivers-buildsize     "60.3 MB">
    1212  <!ENTITY x7drivers-time          "6.9 SBU">

  • x/installing/x7font.xml

    rba2ac60 r2d006066  
    88  <!ENTITY x7fonts-download-ftp  "ftp://ftp.x.org/pub/individual/font/">
    99  <!ENTITY x7fonts-md5sum        "&files-anduin;/xorg/md5sums-&xorg7-version;">
    10   <!ENTITY x7fonts-size          "13.3 MB">
     10  <!ENTITY x7fonts-size          "13.0 MB">
    1111  <!ENTITY x7fonts-buildsize     "100 MB">
    1212  <!ENTITY x7fonts-time          "2.0 SBU">

  • x/installing/x7lib.xml

    rba2ac60 r2d006066  
    88  <!ENTITY x7libs-download-ftp  "ftp://ftp.x.org/pub/individual/lib/">
    99  <!ENTITY x7libs-md5sum        "&files-anduin;/xorg/md5sums-&xorg7-version;">
    10   <!ENTITY x7libs-size          "12 MB">
     10  <!ENTITY x7libs-size          "11.7 MB">
    1111  <!ENTITY x7libs-buildsize     "186 MB">
    1212  <!ENTITY x7libs-time          "6.6 SBU">
    … …  
    5656    </itemizedlist>
    5757
    58     <!-- Following patch is security related and has been
    59         fixed for Xorg-7.2 -->
     58    <!-- Following patches are security related and should be
     59        fixed for Xorg-7.3 -->
    6060    <bridgehead renderas="sect3">Additional Downloads</bridgehead>
    6161    <itemizedlist spacing="compact">
    6262      <listitem>
    6363        <para>Required patch: <ulink
    64         url="&patch-root;/libXfont-1.1.0-cidfonts-1.patch"/></para>
     64        url="&patch-root;/libX11-1.1.1-xinitimage-1.patch"/></para>
     65      </listitem>
     66      <listitem>
     67        <para>Required patch: <ulink
     68        url="&patch-root;/libXfont-1.2.7-bdf_fontsdir-1.patch"/></para>
    6569      </listitem>
    6670    </itemizedlist>
    … …  
    7478    <xref linkend="xorg7-proto"/></para>
    7579
     80    <bridgehead renderas="sect4">Optional</bridgehead>
     81    <para role="optional"><ulink
     82    url="http://xcb.freedesktop.org/wiki/">XCB</ulink></para>
     83
    7684    <para condition="html" role="usernotes">User Notes:
    7785    <ulink url='&blfs-wiki;/Xorg7Libraries'/></para>
    … …  
    96104    <title>Installation of Xorg Libraries</title>
    97105
    98     <para><ulink url='http://wiki.x.org/wiki/SecurityPage'>Security
    99     vulnerabilities</ulink> have been identified in the libXfont package.
    100     Before building this package with the commands shown below, be sure
    101     to apply the supplied patch by issuing the following command:</para>
    102 
    103 <screen><userinput>patch -Np1 -i ../libXfont-1.1.0-cidfonts-1.patch</userinput></screen>
     106    <para><ulink url='http://wiki.x.org/wiki/Development/Security'>Security
     107    vulnerabilities</ulink> have been identified in the
     108    <application>libX11</application> and <application>libXfont</application>
     109    packages. Before building these packages with the commands shown below,
     110    be sure to apply the supplied patches. For <application>libX11</application>,
     111    this can be done by issuing the following command:</para>
     112
     113<screen><userinput>patch -Np1 -i ../libX11-1.1.1-xinitimage-1.patch</userinput></screen>
     114
     115    <para>For <application>libXfont</application>, the patch can be applied
     116    with the following command:</para>
     117
     118<screen><userinput>patch -Np1 -i ../libXfont-1.2.7-bdf_fontsdir-1.patch</userinput></screen>
    104119
    105120    <para>Install the libraries by running the following commands for each
    106121    of the chosen packages:</para>
    107122
    108 <screen><userinput>./configure $XORG_CONFIG &amp;&amp;
     123<screen><userinput>./configure $XORG_CONFIG --without-xcb &amp;&amp;
    109124make</userinput></screen>
    110125
    … …  
    116131<screen role="root"><userinput>make install &amp;&amp;
    117132ldconfig</userinput></screen>
     133
     134  </sect2>
     135
     136  <sect2 role="commands">
     137    <title>Command Explanations</title>
     138
     139    <para><parameter>--without-xcb</parameter>: <application>libX11</application>
     140    will try to use <ulink url="http://xcb.freedesktop.org/wiki/">XCB</ulink>
     141    for it's transport layer unless this parameter is supplied. This parameter
     142    will be ignored for other packages.</para>
    118143
    119144  </sect2>

  • x/installing/x7proto.xml

    rba2ac60 r2d006066  
    88  <!ENTITY x7proto-download-ftp  "ftp://ftp.x.org/pub/individual/proto/">
    99  <!ENTITY x7proto-md5sum        "&files-anduin;/xorg/md5sums-&xorg7-version;">
    10   <!ENTITY x7proto-size          "1.5 MB">
     10  <!ENTITY x7proto-size          "1.4 MB">
    1111<!-- Editors note:  Because we recommend a scripted build that removes
    1212     the source directories after installation, the xorg buildsizes are

  • x/installing/x7server.xml

    rba2ac60 r2d006066  
    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  "ftp://ftp.x.org/pub/individual/xserver/xorg-server-&xorg-server-version;.tar.bz2">
    9   <!ENTITY xorg-server-md5sum        "a8ed678677af8ebb2fba5624602f6b2e">
    10   <!ENTITY xorg-server-size          "6.0 MB">
    11   <!ENTITY xorg-server-buildsize     "424 MB">
    12   <!ENTITY xorg-server-time          "5.6 SBU">
     9  <!ENTITY xorg-server-md5sum        "ea291c89e68832d570d9d5e007218bd6">
     10  <!ENTITY xorg-server-size          "5.7 MB">
     11  <!ENTITY xorg-server-buildsize     "425 MB">
     12  <!ENTITY xorg-server-time          "4.9 SBU">
    1313
    1414]>
    … …  
    5757
    5858    <!-- Following patch is security related and should be
    59         fixed for Xorg-7.2 -->
     59        fixed for Xorg-7.3 -->
    6060    <bridgehead renderas="sect3">Additional Downloads</bridgehead>
    6161    <itemizedlist spacing="compact">
    6262      <listitem>
    6363        <para>Required patch: <ulink
    64         url="&patch-root;/xorg-server-&xorg-server-version;-security-1.patch"/></para>
     64        url="&patch-root;/xorg-server-&xorg-server-version;-xcmisc-1.patch"/></para>
    6565      </listitem>
    6666    </itemizedlist>
    … …  
    7373
    7474    <bridgehead renderas="sect4">Optional</bridgehead>
    75     <para role="optional"><xref linkend="mesalib"/> and
    76     <xref linkend="luit"/></para>
     75    <para role="optional"><xref linkend="mesalib"/></para>
    7776
    7877    <para condition="html" role="usernotes">User Notes:
    … …  
    9190    </note>
    9291
    93     <para>A <ulink url='http://wiki.x.org/wiki/SecurityPage'>security
     92    <para>A <ulink url='http://wiki.x.org/wiki/Development/Security'>security
    9493    vulnerability</ulink> have been identified in the xorg-server
    9594    package. Apply a patch to fix this vulnerability with the following
    9695    command:</para>
    9796
    98 <screen><userinput>patch -Np1 -i ../xorg-server-&xorg-server-version;-security-1.patch</userinput></screen>
     97<screen><userinput>patch -Np1 -i ../xorg-server-&xorg-server-version;-xcmisc-1.patch</userinput></screen>
    9998
    10099    <para>Install the server by running the following commands:</para>
    101100
    102 <screen><userinput>sed -i \
    103     's@-I$(top_builddir)/include@-I$(top_builddir)/GL/mesa/main@8' \
    104     GL/glx/Makefile.in &amp;&amp;
    105 sed -i \
    106     's@-I$(top_builddir)/include@-I$(top_builddir)/GL/mesa/glapi@7' \
    107     GL/glx/Makefile.in &amp;&amp;
    108 ./configure $XORG_CONFIG \
    109     --with-mesa-source='<replaceable>&lt;/path/to&gt;</replaceable>/Mesa-&mesalib-version;' \
     101<screen><userinput>./configure $XORG_CONFIG \
     102    --with-mesa-source='<replaceable>&lt;/full/path/to&gt;</replaceable>/Mesa-&mesalib-version;' \
    110103    --with-module-dir=$XORG_PREFIX/lib/X11/modules \
    111104    --with-dri-driver-path=$XORG_PREFIX/lib/X11/modules/dri \
    … …  
    125118    <title>Command Explanations</title>
    126119
    127     <para><command>sed -i '...' GL/glx/Makefile.in</command>: These commands
    128     correct the search path for the <application>Mesa</application> headers.
    129     The 8th and 7th instance of '-I$(top_builddir)' in the existing search
    130     search path are replaced with <application>Mesa</application> paths.</para>
    131 
    132120    <para><parameter>--with-mesa-source=...</parameter>: This switch directs
    133121    the build system to the location of the <application>Mesa</application>
    134     source directory.  If you wish to build without
    135     <application>Mesa</application>, omit this switch.</para>
     122    source directory.  This must be an absolute path. If you wish to build
     123    without <application>Mesa</application>, omit this switch.</para>
    136124
    137125    <para><parameter>--with-module-dir=...</parameter>:  This parameter

  • x/installing/x7util.xml

    rba2ac60 r2d006066  
    88  <!ENTITY x7utils-download-ftp  "ftp://ftp.x.org/pub/individual/util/">
    99  <!ENTITY x7utils-md5sum        "&files-anduin;/xorg/md5sums-&xorg7-version;">
    10   <!ENTITY x7utils-size          "664 KB">
     10  <!ENTITY x7utils-size          "659 KB">
    1111  <!ENTITY x7utils-buildsize     "5.2 MB">
    1212  <!ENTITY x7utils-time          "0.1 SBU">

  • x/installing/xbitmaps.xml

    rba2ac60 r2d006066  
    88  <!ENTITY xbitmaps-download-ftp  "ftp://ftp.x.org/pub/individual/data/xbitmaps-&xbitmaps-version;.tar.bz2">
    99  <!ENTITY xbitmaps-md5sum        "b28a9840cde3c38d7c09716372fea257">
    10   <!ENTITY xbitmaps-size          "56 KB">
     10  <!ENTITY xbitmaps-size          "54 KB">
    1111  <!ENTITY xbitmaps-buildsize     "1.7 MB">
    12   <!ENTITY xbitmaps-time          "0.01 SBU">
     12  <!ENTITY xbitmaps-time          "less than 0.1 SBU">
    1313
    1414]>
Note: See TracChangeset for help on using the changeset viewer.