Author: dj
Date: 2008-11-25 21:40:16 -0700 (Tue, 25 Nov 2008)
New Revision: 7614
Modified:
trunk/BOOK/general.ent
trunk/BOOK/introduction/welcome/changelog.xml
trunk/BOOK/x/installing/x7driver.xml
trunk/BOOK/x/installing/x7font.xml
trunk/BOOK/x/installing/x7lib.xml
trunk/BOOK/x/installing/x7proto.xml
trunk/BOOK/x/installing/x7util.xml
trunk/BOOK/x/installing/xorg7.xml
Log:
Updated to Xorg-7.4.
Modified: trunk/BOOK/general.ent
===================================================================
--- trunk/BOOK/general.ent 2008-11-26 04:33:14 UTC (rev 7613)
+++ trunk/BOOK/general.ent 2008-11-26 04:40:16 UTC (rev 7614)
@@ -409,7 +409,7 @@
<!-- Part VII -->
<!-- Chapter 25 -->
<!ENTITY xfree86-version "4.6.0">
-<!ENTITY xorg7-version "7.2">
+<!ENTITY xorg7-version "7.4">
<!ENTITY libXau-version "1.0.4">
<!ENTITY libXdmcp-version "1.0.2">
<!ENTITY luit-version "1.0.3">
Modified: trunk/BOOK/introduction/welcome/changelog.xml
===================================================================
--- trunk/BOOK/introduction/welcome/changelog.xml 2008-11-26 04:33:14 UTC
(rev 7613)
+++ trunk/BOOK/introduction/welcome/changelog.xml 2008-11-26 04:40:16 UTC
(rev 7614)
@@ -67,6 +67,9 @@
<listitem>
<para>[dj] - Updated to xorg-server-1.5.3.</para>
</listitem>
+ <listitem>
+ <para>[dj] - Updated to Xorg-7.4.</para>
+ </listitem>
</itemizedlist>
</listitem>
Modified: trunk/BOOK/x/installing/x7driver.xml
===================================================================
--- trunk/BOOK/x/installing/x7driver.xml 2008-11-26 04:33:14 UTC (rev
7613)
+++ trunk/BOOK/x/installing/x7driver.xml 2008-11-26 04:40:16 UTC (rev
7614)
@@ -150,7 +150,8 @@
<seglistitem>
<seg>None</seg>
- <seg>libI810XvMC.so, libviaXvMC.so, and libviaXvMCPro.so</seg>
+ <seg>libI810XvMC.so, libIntelXvMC.so, libchromeXvMC.so, and
+ libchromeXvMCPro.so</seg>
<seg><envar>$XORG_PREFIX</envar>/lib/X11/modules/{drivers,input}</seg>
</seglistitem>
</segmentedlist>
@@ -171,8 +172,19 @@
</listitem>
</varlistentry>
+ <varlistentry id="libIntelXvMC-x7">
+ <term><filename class='libraryfile'>libIntelXvMC.so</filename></term>
+ <listitem>
+ <para>is the X-Video Motion Compensation client library for the
+ Intel video driver.</para>
+ <indexterm zone="xorg7-driver libIntelXvMC-x7">
+ <primary sortas="c-libIntelXvMC">libIntelXvMC.so</primary>
+ </indexterm>
+ </listitem>
+ </varlistentry>
+
<varlistentry id="libviaXvMC-x7">
- <term><filename class='libraryfile'>libviaXvMC.so</filename></term>
+ <term><filename class='libraryfile'>libchromeXvMC.so</filename></term>
<listitem>
<para>is the X-Video Motion Compensation client library for the
VIA Unichrome video driver.</para>
@@ -183,7 +195,7 @@
</varlistentry>
<varlistentry id="libviaXvMCPro-x7">
- <term><filename class='libraryfile'>libviaXvMCPro.so</filename></term>
+ <term><filename
class='libraryfile'>libchromeXvMCPro.so</filename></term>
<listitem>
<para>is the X-Video Motion Compensation client library for the
VIA Unichrome Pro video driver.</para>
Modified: trunk/BOOK/x/installing/x7font.xml
===================================================================
--- trunk/BOOK/x/installing/x7font.xml 2008-11-26 04:33:14 UTC (rev 7613)
+++ trunk/BOOK/x/installing/x7font.xml 2008-11-26 04:40:16 UTC (rev 7614)
@@ -119,12 +119,10 @@
<segmentedlist>
<segtitle>Installed Programs</segtitle>
- <segtitle>Installed Libraries</segtitle>
<segtitle>Installed Directories</segtitle>
<seglistitem>
<seg>bdftruncate and ucs2any</seg>
- <seg>None</seg>
<seg><envar>$XORG_PREFIX</envar>/fonts and
/usr/share/fonts/X11-{TTF,OTF}</seg>
</seglistitem>
Modified: trunk/BOOK/x/installing/x7lib.xml
===================================================================
--- trunk/BOOK/x/installing/x7lib.xml 2008-11-26 04:33:14 UTC (rev 7613)
+++ trunk/BOOK/x/installing/x7lib.xml 2008-11-26 04:40:16 UTC (rev 7614)
@@ -66,19 +66,6 @@
<para>Required download list: <ulink url="&x7libs-wget;"/></para>
</listitem>
- <!-- Following patch should be fixed in libX11-1.1.3 if released
- prior to Xorg-7.3 -->
- <listitem>
- <para>Required patch: <ulink
- url="&patch-root;/libX11-&libX11-version;-badargs-1.patch"/></para>
- </listitem>
-
- <!-- Following patch is fixed in libXfont-1.3.2, which is compatible
- with Xorg-7.3+ -->
- <listitem>
- <para>Required patch: <ulink
-
url="&patch-root;/libXfont-&libXfont-version;-pcf_parser-1.patch"/></para>
- </listitem>
</itemizedlist>
<bridgehead renderas="sect3">Xorg Libraries Dependencies</bridgehead>
@@ -118,16 +105,7 @@
<para>Install the libraries by running the following commands for each
package:</para>
-<screen><userinput>case $(basename "$PWD") in
-libX11-&libX11-version; )
- patch -Np1 -i ../../libX11-&libX11-version;-badargs-1.patch &&
- sed -i 's/_XGet/XGet/' modules/im/ximcp/imDefLkup.c
- ;;
-libXfont-&libXfont-version; )
- patch -Np1 -i ../../libXfont-&libXfont-version;-pcf_parser-1.patch
&&
- sed -i 's/(ft_isdigit/(isdigit/' src/FreeType/fttools.c
- ;;
-esac &&
+<screen><userinput>
./configure $XORG_CONFIG &&
make</userinput></screen>
@@ -150,24 +128,6 @@
<command>./configure</command> command if <xref linkend="libxcb"/>
is not installed.</para>
- <para><command>patch -Np1 -i
../libX11-&libX11-version;-badargs-1.patch</command>:
- This patch fixes an error with argument ordering in one of the functions
- in <application>libX11</application>.</para>
-
- <para><command>sed -i 's/_XGet/XGet/'
modules/im/ximcp/imDefLkup.c</command>:
- This command fixes a locking bug in
<application>libX11</application>.</para>
-
- <para><command>patch -Np1 -i
../libXfont-&libXfont-version;-pcf_parser-1.patch</command>:
- This patch fixes a <ulink
- url="http://wiki.x.org/wiki/Development/Security";>security
- vulnerability</ulink> in the PCF font parser in
- <application>libXfont</application>.</para>
-
- <para><command>sed -i 's/(ft_isdigit/(isdigit/'
src/FreeType/fttools.c</command>:
- In newer versions of <application>Freetype2</application>, the
- ft_isdigit macro has been removed. This command replaces it with the
- compatible isdigit macro.</para>
-
</sect2>
<sect2 role="configuration">
@@ -191,26 +151,20 @@
<segmentedlist>
<segtitle>Installed Programs</segtitle>
<segtitle>Installed Libraries</segtitle>
-<!-- <segtitle>Installed Directory</segtitle> -->
<seglistitem>
<seg>cxpm, makestrs, sxpm, xft-config</seg>
<seg>libAppleWM.{so,a}, libdmx.{so,a}, libfontenc.{so,a},
-<!-- libFS.{so,a}, libICE.{so,a}, liblbxutil.{so,a}, liboldX.{so,a}, -->
- libFS.{so,a}, libICE.{so,a}, liboldX.{so,a},
- libSM.{so,a}, libWindowsWM.{so,a}, libX11.{so,a},
- libXaw6.{so,a}, libXaw7.{so,a}, libXaw8.{so,a}, libXaw.{so,a},
- libXcomposite.{so,a}, libXcursor.{so,a}, libXdamage.{so,a},
- libXevie.{so,a}, libXext.{so,a}, libXfixes.{so,a},
+ libFS.{so,a}, libICE.{so,a}, libpciaccess.{so,a}, libSM.{so,a},
+ libWindowsWM.{so,a}, libX11.{so,a}, libXaw6.{so,a}, libXaw7.{so,a},
+ libXaw.{so,a}, libXcomposite.{so,a}, libXcursor.{so,a},
+ libXdamage.{so,a}, libXext.{so,a}, libXfixes.{so,a},
libXfontcache.{so,a}, libXfont.{so,a}, libXft.{so,a},
- libXinerama.{so,a}, libXi.{so,a}, libxkbfile.{so,a}, libxkbui.{so,a},
- libXmu.{so,a}, libXmuu.{so,a}, libXpm.{so,a}, libXprintAppUtil.{so,a},
- libXprintUtil.{so,a}, libXp.{so,a}, libXrandr.{so,a},
- libXrender.{so,a}, libXRes.{so,a}, libXss.{so,a}, libXTrap.{so,a},
- libXt.{so,a}, libXtst.{so,a}, libXvMC.{so,a}, libXvMCW.{so,a},
- libXv.{so,a}, libXxf86dga.{so,a}, libXxf86misc.{so,a},
- and libXxf86vm.{so,a}</seg>
-<!-- <seg><envar>$XORG_PREFIX</envar>/share/X11</seg> -->
+ libXinerama.{so,a}, libXi.{so,a}, libxkbfile.{so,a}, libXmu.{so,a},
+ libXmuu.{so,a}, libXpm.{so,a}, libXrandr.{so,a}, libXrender.{so,a},
+ libXRes.{so,a}, libXss.{so,a}, libXt.{so,a}, libXtst.{so,a},
+ libXvMC.{so,a}, libXvMCW.{so,a}, libXv.{so,a}, libXxf86dga.{so,a},
+ libXxf86misc.{so,a}, and libXxf86vm.{so,a}</seg>
</seglistitem>
</segmentedlist>
@@ -311,26 +265,16 @@
</indexterm>
</listitem>
</varlistentry>
-<!--
- <varlistentry id="liblbxutil-x7">
- <term><filename class='libraryfile'>liblbxutil.{so,a}</filename></term>
+
+ <varlistentry id="libpciaccess-x7">
+ <term><filename
class='libraryfile'>libpciaccess.{so,a}</filename></term>
<listitem>
- <para>is the library of LBX utilities.</para>
- <indexterm zone="xorg7-lib liblbxutil-x7">
- <primary sortas="c-liblbxutil">liblbxutil.{so,a}</primary>
+ <para>is the generic PCI Access library for X.</para>
+ <indexterm zone="xorg7-lib libpciaccess-x7">
+ <primary sortas="c-libpciaccess">libpciaccess.{so,a}</primary>
</indexterm>
</listitem>
</varlistentry>
--->
- <varlistentry id="liboldX-x7">
- <term><filename class='libraryfile'>liboldX.{so,a}</filename></term>
- <listitem>
- <para>is the interface library to X10 routines.</para>
- <indexterm zone="xorg7-lib liboldX-x7">
- <primary sortas="c-liboldX">liboldX.{so,a}</primary>
- </indexterm>
- </listitem>
- </varlistentry>
<varlistentry id="libSM-x7">
<term><filename class='libraryfile'>libSM.{so,a}</filename></term>
@@ -382,21 +326,11 @@
</listitem>
</varlistentry>
- <varlistentry id="libXaw8-x7">
- <term><filename class='libraryfile'>libXaw8.{so,a}</filename></term>
- <listitem>
- <para>is the X Athena Widgets Library, version 8.</para>
- <indexterm zone="xorg7-lib libXaw8-x7">
- <primary sortas="c-libXaw8">libXaw8.{so,a}</primary>
- </indexterm>
- </listitem>
- </varlistentry>
-
<varlistentry id="libXaw-x7">
<term><filename class='libraryfile'>libXaw.{so,a}</filename></term>
<listitem>
<para>are symbolic links to the current X Athena Widgets Library,
- version 8.</para>
+ version 7.</para>
<indexterm zone="xorg7-lib libXaw-x7">
<primary sortas="c-libXaw">libXaw.{so,a}</primary>
</indexterm>
@@ -433,16 +367,6 @@
</listitem>
</varlistentry>
- <varlistentry id="libXevie-x7">
- <term><filename class='libraryfile'>libXevie.{so,a}</filename></term>
- <listitem>
- <para>is the X Event Interception Extension (XEvIE) Library.</para>
- <indexterm zone="xorg7-lib libXevie-x7">
- <primary sortas="c-libXevie">libXevie.{so,a}</primary>
- </indexterm>
- </listitem>
- </varlistentry>
-
<varlistentry id="libXext-x7">
<term><filename class='libraryfile'>libXext.{so,a}</filename></term>
<listitem>
@@ -456,7 +380,7 @@
<varlistentry id="libXfixes-x7">
<term><filename class='libraryfile'>libXfixes.{so,a}</filename></term>
<listitem>
- <para>a library to provide augmented versions of core protocol
+ <para>provides augmented versions of core protocol
requests.</para>
<indexterm zone="xorg7-lib libXfixes-x7">
<primary sortas="c-libXfixes">libXfixes.{so,a}</primary>
@@ -524,16 +448,6 @@
</listitem>
</varlistentry>
- <varlistentry id="libxkbui-x7">
- <term><filename class='libraryfile'>libxkbui.{so,a}</filename></term>
- <listitem>
- <para>is the xkbui Library.</para>
- <indexterm zone="xorg7-lib libxkbui-x7">
- <primary sortas="c-libxkbui">libxkbui.{so,a}</primary>
- </indexterm>
- </listitem>
- </varlistentry>
-
<varlistentry id="libXmu-x7">
<term><filename class='libraryfile'>libXmu.{so,a}</filename></term>
<listitem>
@@ -565,36 +479,6 @@
</listitem>
</varlistentry>
- <varlistentry id="libXprintAppUtil-x7">
- <term><filename
class='libraryfile'>libXprintAppUtil.{so,a}</filename></term>
- <listitem>
- <para>is the XprintAppUtil Library.</para>
- <indexterm zone="xorg7-lib libXprintAppUtil-x7">
- <primary
sortas="c-libXprintAppUtil">libXprintAppUtil.{so,a}</primary>
- </indexterm>
- </listitem>
- </varlistentry>
-
- <varlistentry id="libXprintUtil-x7">
- <term><filename
class='libraryfile'>libXprintUtil.{so,a}</filename></term>
- <listitem>
- <para>is the XprintUtil Library.</para>
- <indexterm zone="xorg7-lib libXprintUtil-x7">
- <primary sortas="c-libXprintUtil">libXprintUtil.{so,a}</primary>
- </indexterm>
- </listitem>
- </varlistentry>
-
- <varlistentry id="libXp-x7">
- <term><filename class='libraryfile'>libXp.{so,a}</filename></term>
- <listitem>
- <para>is the X Print Client Library.</para>
- <indexterm zone="xorg7-lib libXp-x7">
- <primary sortas="c-libXp">libXp.{so,a}</primary>
- </indexterm>
- </listitem>
- </varlistentry>
-
<varlistentry id="libXrandr-x7">
<term><filename class='libraryfile'>libXrandr.{so,a}</filename></term>
<listitem>
@@ -635,16 +519,6 @@
</listitem>
</varlistentry>
- <varlistentry id="libXTrap-x7">
- <term><filename class='libraryfile'>libXTrap.{so,a}</filename></term>
- <listitem>
- <para>is the X Trap Library.</para>
- <indexterm zone="xorg7-lib libXTrap-x7">
- <primary sortas="c-libXTrap">libXTrap.{so,a}</primary>
- </indexterm>
- </listitem>
- </varlistentry>
-
<varlistentry id="libXt-x7">
<term><filename class='libraryfile'>libXt.{so,a}</filename></term>
<listitem>
Modified: trunk/BOOK/x/installing/x7proto.xml
===================================================================
--- trunk/BOOK/x/installing/x7proto.xml 2008-11-26 04:33:14 UTC (rev 7613)
+++ trunk/BOOK/x/installing/x7proto.xml 2008-11-26 04:40:16 UTC (rev 7614)
@@ -109,13 +109,9 @@
<title>Contents</title>
<segmentedlist>
- <segtitle>Installed Programs</segtitle>
- <segtitle>Installed Libraries</segtitle>
<segtitle>Installed Directories</segtitle>
<seglistitem>
- <seg>None</seg>
- <seg>None</seg>
<seg>The following subdirectories of <envar>$XORG_PREFIX</envar>/:
include/X11, include/GL, and lib/pkgconfig</seg>
</seglistitem>
Modified: trunk/BOOK/x/installing/x7util.xml
===================================================================
--- trunk/BOOK/x/installing/x7util.xml 2008-11-26 04:33:14 UTC (rev 7613)
+++ trunk/BOOK/x/installing/x7util.xml 2008-11-26 04:40:16 UTC (rev 7614)
@@ -113,13 +113,11 @@
<segmentedlist>
<segtitle>Installed Programs</segtitle>
- <segtitle>Installed Libraries</segtitle>
<segtitle>Installed Directories</segtitle>
<seglistitem>
<seg>ccmakedep, cleanlinks, gccmakedep, imake, lndir, makedepend,
makeg, mergelib, mkdirhier, mkhtmlindex, revpath, xmkmf</seg>
- <seg>None</seg>
<seg>The following subdirectories of <envar>$XORG_PREFIX</envar>/:
bin, lib/X11/config, share/aclocal, and share/man</seg>
</seglistitem>
Modified: trunk/BOOK/x/installing/xorg7.xml
===================================================================
--- trunk/BOOK/x/installing/xorg7.xml 2008-11-26 04:33:14 UTC (rev 7613)
+++ trunk/BOOK/x/installing/xorg7.xml 2008-11-26 04:40:16 UTC (rev 7614)
@@ -33,7 +33,7 @@
<bridgehead renderas="sect3">Xorg Download and Installation
Instructions</bridgehead>
- <para>Xorg-7.0.0 introduced a completely auto-tooled, modular build system.
+ <para>Xorg-7.0 introduced a completely auto-tooled, modular build system.
With the new modular build system, it is no longer possible to download
the entire package in a single file. In fact, there may be as many as
293 files that need to be fetched from the download location. To assist
--
http://linuxfromscratch.org/mailman/listinfo/blfs-book
FAQ: http://www.linuxfromscratch.org/blfs/faq.html
Unsubscribe: See the above information page
