Author: bdubbs
Date: 2011-12-11 16:49:52 -0700 (Sun, 11 Dec 2011)
New Revision: 9097
Modified:
trunk/BOOK/general.ent
trunk/BOOK/general/genutils/imagemagick.xml
trunk/BOOK/general/graphlib/pixman.xml
trunk/BOOK/introduction/welcome/changelog.xml
trunk/BOOK/x/installing/x7driver.xml
trunk/BOOK/x/installing/xorg-config.xml
Log:
Added a section on testing Xorg.
Updated to pixman-0.24.0.
Modified: trunk/BOOK/general/genutils/imagemagick.xml
===================================================================
--- trunk/BOOK/general/genutils/imagemagick.xml 2011-12-11 15:24:28 UTC (rev
9096)
+++ trunk/BOOK/general/genutils/imagemagick.xml 2011-12-11 23:49:52 UTC (rev
9097)
@@ -12,7 +12,7 @@
after updates :-( Unfortunately, versions always roll on after patch
version 10, whether or not significant changes occur, and it takes
time before versions migrate to legacy/ -->
- <!ENTITY imagemagick-download-http
"&sourceforge-repo;/imagemagick/ImageMagick-&imagemagick-version;-&imagemagick-patch-version;.tar.xz">
+ <!ENTITY imagemagick-download-http " ">
<!ENTITY imagemagick-download-ftp
"ftp://ftp.imagemagick.org/pub/ImageMagick/ImageMagick-&imagemagick-version;-&imagemagick-patch-version;.tar.xz";>
<!ENTITY imagemagick-md5sum "6bf001ae206bffe77693732e4e886532">
<!ENTITY imagemagick-size "7.3 MB">
Modified: trunk/BOOK/general/graphlib/pixman.xml
===================================================================
--- trunk/BOOK/general/graphlib/pixman.xml 2011-12-11 15:24:28 UTC (rev
9096)
+++ trunk/BOOK/general/graphlib/pixman.xml 2011-12-11 23:49:52 UTC (rev
9097)
@@ -6,10 +6,10 @@
<!ENTITY pixman-download-http
"http://cairographics.org/releases/pixman-&pixman-version;.tar.gz";>
<!ENTITY pixman-download-ftp " ">
- <!ENTITY pixman-md5sum "613c95e7ddc8069b7aa2708f93219b7d">
- <!ENTITY pixman-size "520 KB">
- <!ENTITY pixman-buildsize "17.8 MB">
- <!ENTITY pixman-time "0.3 SBU">
+ <!ENTITY pixman-md5sum "a2d0b120509bdccb10aa7f4bec3730e4">
+ <!ENTITY pixman-size "616 KB">
+ <!ENTITY pixman-buildsize "49 MB">
+ <!ENTITY pixman-time "0.5 SBU">
]>
<sect1 id="pixman" xreflabel="pixman-&pixman-version;">
Modified: trunk/BOOK/general.ent
===================================================================
--- trunk/BOOK/general.ent 2011-12-11 15:24:28 UTC (rev 9096)
+++ trunk/BOOK/general.ent 2011-12-11 23:49:52 UTC (rev 9097)
@@ -243,7 +243,7 @@
<!ENTITY fribidi-version "0.10.9">
<!ENTITY poppler-version "0.14.4">
<!ENTITY jasper-version "1.900.1">
-<!ENTITY pixman-version "0.15.20">
+<!ENTITY pixman-version "0.24.0">
<!ENTITY clutter-version "1.2.10">
<!ENTITY clutter-gtk-version "0.10.4">
<!ENTITY babl-version "0.1.6">
Modified: trunk/BOOK/introduction/welcome/changelog.xml
===================================================================
--- trunk/BOOK/introduction/welcome/changelog.xml 2011-12-11 15:24:28 UTC
(rev 9096)
+++ trunk/BOOK/introduction/welcome/changelog.xml 2011-12-11 23:49:52 UTC
(rev 9097)
@@ -45,6 +45,12 @@
<para>December 11th, 2011</para>
<itemizedlist>
<listitem>
+ <para>[bdubbs] - Added a section on testing Xorg.</para>
+ </listitem>
+ <listitem>
+ <para>[bdubbs] - Updated to pixman-0.24.0.</para>
+ </listitem>
+ <listitem>
<para>[bdubbs] - Updated to intltool-0.50.0.</para>
</listitem>
<listitem>
Modified: trunk/BOOK/x/installing/x7driver.xml
===================================================================
--- trunk/BOOK/x/installing/x7driver.xml 2011-12-11 15:24:28 UTC (rev
9096)
+++ trunk/BOOK/x/installing/x7driver.xml 2011-12-11 23:49:52 UTC (rev
9097)
@@ -107,22 +107,24 @@
package:</para>
<screen><userinput>case $(basename "$PWD") in
-xf86-input-evdev-[0-9]* | xf86-video-ati-[0-9]* | \
-xf86-video-fbdev-[0-9]* | xf86-video-glint-[0-9]* | \
-xf86-video-newport-[0-9]* )
+ xf86-input-evdev-[0-9]* | xf86-video-ati-[0-9]* | \
+ xf86-video-fbdev-[0-9]* | xf86-video-glint-[0-9]* | \
+ xf86-video-newport-[0-9]* )
sed -i -e "s/\xc3\xb8/\\\\[\/o]/" \
-e "s/\xc3\xa4/\\\\[:a]/" \
-e "s/\xc3\x9c/\\\\[:U]/" man/*.man
;;
esac &&
+
case $(basename "$PWD") in
-xf86-video-s3-[0-9]* | xf86-video-xgi-[0-9]* )
+ xf86-video-s3-[0-9]* | xf86-video-xgi-[0-9]* )
for file in `grep -Rl "xf86Version.h" *`
do
- sed '[email protected]@xorgVersion.h@g' -i "$file"
+ sed '[email protected]@xorgVersion.h@g' -i "$file"
done
;;
esac &&
+
./configure $XORG_CONFIG \
--with-xorg-module-dir=$XORG_PREFIX/lib/X11/modules &&
make</userinput></screen>
Modified: trunk/BOOK/x/installing/xorg-config.xml
===================================================================
--- trunk/BOOK/x/installing/xorg-config.xml 2011-12-11 15:24:28 UTC (rev
9096)
+++ trunk/BOOK/x/installing/xorg-config.xml 2011-12-11 23:49:52 UTC (rev
9097)
@@ -13,9 +13,26 @@
<date>$Date$</date>
</sect1info>
+ <title>Xorg-&xorg7-release; Testing and Configuration</title>
- <title>Xorg-&xorg7-release; Configuration</title>
- <sect2 role="configuration" id='X11R6-compat-symlink'
+ <sect2 id='X11-testing' xreflabel="Testing Xorg">
+ <title>Testing Xorg</title>
+
+ <para>To test the <application>Xorg</application> installation, issue
+ <userinput>startx</userinput>. This command brings up a rudimentary
+ window manager called <emphasis>twm</emphasis> with three xterm and one
+ xclock window. The xterm window in the upper left is a login terminal
+ and running <emphasis>exit</emphasis> from this terminal will exit
+ the <application>X Window</application> session. the third xterm
+ window may be obscured on your system by the other two xterms.</para>
+
+ <para>Generally, there is no specific configuration required for
+ <application>Xorg</application>, but customization is possible. For
details
+ see <xref linkend='xconfig'/> below.</para>
+
+ </sect2>
+
+ <sect2 role="configuration" id='X11R6-compat-symlink'
xreflabel="Creating an X11R6 Compatibility Symlink">
<title>Creating an X11R6 Compatibility Symlink</title>
@@ -48,9 +65,8 @@
<screen role="root"><userinput>ln -vsf
<replaceable><$XORG_PREFIX></replaceable> /usr/X11R6</userinput></screen>
- </sect2>
+ </sect2>
-
<sect2 role="configuration" id="xft-font-protocol" xreflabel="Xft Font
Protocol">
<title>Xft Font Protocol</title>
--
http://linuxfromscratch.org/mailman/listinfo/blfs-book
FAQ: http://www.linuxfromscratch.org/blfs/faq.html
Unsubscribe: See the above information page
