r7415 - in trunk/BOOK: . general/graphlib introduction/welcome multimedia/libdriv multimedia/videoutils x/lib x/wm
dj at linuxfromscratch.org
dj at linuxfromscratch.org
Mon May 5 23:26:08 MDT 2008
Author: dj
Date: 2008-05-05 23:26:07 -0600 (Mon, 05 May 2008)
New Revision: 7415
Modified:
trunk/BOOK/general.ent
trunk/BOOK/general/graphlib/fontconfig.xml
trunk/BOOK/introduction/welcome/changelog.xml
trunk/BOOK/multimedia/libdriv/xine-lib.xml
trunk/BOOK/multimedia/videoutils/mplayer.xml
trunk/BOOK/x/lib/cairo.xml
trunk/BOOK/x/wm/metacity.xml
Log:
Commented out more XFree86 references
Modified: trunk/BOOK/general/graphlib/fontconfig.xml
===================================================================
--- trunk/BOOK/general/graphlib/fontconfig.xml 2008-05-05 12:26:38 UTC (rev 7414)
+++ trunk/BOOK/general/graphlib/fontconfig.xml 2008-05-06 05:26:07 UTC (rev 7415)
@@ -208,6 +208,7 @@
url="file:///usr/share/doc/fontconfig-&fontconfig-version;/fontconfig-user.html"/>.
</para>
+<!-- XFREE86
<note>
<para><application>XFree86</application> also includes an internal (and
older) version of <application>Fontconfig</application> and unless it
@@ -215,6 +216,7 @@
slightly incompatible libraries on your system. It is recommended that
you only install one version.</para>
</note>
+XFREE86 -->
</sect3>
Modified: trunk/BOOK/general.ent
===================================================================
--- trunk/BOOK/general.ent 2008-05-05 12:26:38 UTC (rev 7414)
+++ trunk/BOOK/general.ent 2008-05-06 05:26:07 UTC (rev 7415)
@@ -3,7 +3,7 @@
$Date$
-->
-<!ENTITY day "04"> <!-- Always 2 digits -->
+<!ENTITY day "05"> <!-- Always 2 digits -->
<!ENTITY month "05"> <!-- Always 2 digits -->
<!ENTITY year "2008">
<!ENTITY version "svn-&year;&month;&day;">
Modified: trunk/BOOK/introduction/welcome/changelog.xml
===================================================================
--- trunk/BOOK/introduction/welcome/changelog.xml 2008-05-05 12:26:38 UTC (rev 7414)
+++ trunk/BOOK/introduction/welcome/changelog.xml 2008-05-06 05:26:07 UTC (rev 7415)
@@ -40,6 +40,14 @@
</listitem>
-->
+ <listitem>
+ <para>May 5th, 2008</para>
+ <itemizedlist>
+ <listitem>
+ <para>[dj] - Removed (commented) more XFree86 related text.</para>
+ </listitem>
+ </itemizedlist>
+ </listitem>
<listitem>
<para>May 4th, 2008</para>
Modified: trunk/BOOK/multimedia/libdriv/xine-lib.xml
===================================================================
--- trunk/BOOK/multimedia/libdriv/xine-lib.xml 2008-05-05 12:26:38 UTC (rev 7414)
+++ trunk/BOOK/multimedia/libdriv/xine-lib.xml 2008-05-06 05:26:07 UTC (rev 7415)
@@ -88,8 +88,12 @@
<ulink url="http://www.musepack.net/">libmpcdec</ulink>,
<ulink url="http://www.wavpack.com/">WavPack</ulink>,
<ulink url="http://dxr3.sourceforge.net/">libdxr3</ulink>,
+
+<!-- XFREE86
<ulink url="http://sourceforge.net/projects/unichrome/">XvMC Wrapper</ulink>
(only if you have XFree86 installed),
+XFREE86 -->
+
<ulink url="http://sourceforge.net/projects/sgmltools-lite/">sgmltools-lite</ulink>,
and <ulink url="http://www.xfig.org/">Transfig</ulink></para>
Modified: trunk/BOOK/multimedia/videoutils/mplayer.xml
===================================================================
--- trunk/BOOK/multimedia/videoutils/mplayer.xml 2008-05-05 12:26:38 UTC (rev 7414)
+++ trunk/BOOK/multimedia/videoutils/mplayer.xml 2008-05-06 05:26:07 UTC (rev 7415)
@@ -201,10 +201,13 @@
<xref linkend="libjpeg"/>,
<xref linkend="libpng"/>,
<ulink url="http://maemo.org/">maemo</ulink>,
- <ulink url="http://vidix.sourceforge.net/">VIDIX</ulink>,
- <xref linkend="x-window-system"/>, and
+ <ulink url="http://vidix.sourceforge.net/">VIDIX</ulink>, and
+ <xref linkend="x-window-system"/></para>
+
+<!-- XFREE86
<ulink url="http://sourceforge.net/projects/unichrome/">XvMC Wrapper</ulink>
(only needed if you have XFree86 installed)</para>
+XFREE86 -->
<bridgehead renderas="sect4">Optional CODECs</bridgehead>
<para role="optional"><ulink url="http://www.3gpp.org/ftp/Specs/latest/Rel-7/26_series/26104-700.zip">AMR
Modified: trunk/BOOK/x/lib/cairo.xml
===================================================================
--- trunk/BOOK/x/lib/cairo.xml 2008-05-05 12:26:38 UTC (rev 7414)
+++ trunk/BOOK/x/lib/cairo.xml 2008-05-06 05:26:07 UTC (rev 7415)
@@ -100,12 +100,14 @@
<sect2 role="installation">
<title>Installation of cairo</title>
+<!-- XFREE86
<para><application>cairo</application> will look for an
<application>X Render</application> <application>pkg-config</application>
file. If you use <application>XFree86</application> as your
<application>X</application> Window system, ensure this file exists
(<filename>/usr/X11R6/lib/pkgconfig/xrender.pc</filename>) before beginning
the installation.</para>
+XFREE86 -->
<para>Install <application>cairo</application> by running the following
commands:</para>
Modified: trunk/BOOK/x/wm/metacity.xml
===================================================================
--- trunk/BOOK/x/wm/metacity.xml 2008-05-05 12:26:38 UTC (rev 7414)
+++ trunk/BOOK/x/wm/metacity.xml 2008-05-06 05:26:07 UTC (rev 7415)
@@ -67,14 +67,16 @@
<xref linkend="GConf"/>
(recommended if you are installing <application>GNOME</application>-2),
<xref linkend="intltool"/>, and
- <ulink url="&gnome-download-http;/libcm/">libcm</ulink>*</para>
+ <ulink url="&gnome-download-http;/libcm/">libcm</ulink></para>
+<!-- XFREE86
<para>* Xorg <application>X</application> installations only.
<application>libcm</application> is used to build the
<application>Metacity</application> composite manager and it also requires
<application>libXcomposite</application> >= 2.0. Xorg ships with
- (XFree86 does not) the required <application>libXcomposite</application>
+ the required <application>libXcomposite</application> (XFree86 does not)
and there is not a stand-alone version that works.</para>
+XFREE86 -->
<para condition="html" role="usernotes">User Notes:
<ulink url="&blfs-wiki;/metacity"/></para>
More information about the blfs-book
mailing list