[blfs-book] r12569 - in trunk/BOOK: general/graphlib x/lib

igor at higgs.linuxfromscratch.org igor at higgs.linuxfromscratch.org
Mon Jan 13 10:00:06 PST 2014


Author: igor
Date: Mon Jan 13 10:00:06 2014
New Revision: 12569

Log:
imlib2 requires xorg libs, move to x libs chapter

Added:
   trunk/BOOK/x/lib/imlib2.xml
      - copied, changed from r12568, trunk/BOOK/general/graphlib/imlib2.xml
Deleted:
   trunk/BOOK/general/graphlib/imlib2.xml
Modified:
   trunk/BOOK/general/graphlib/graphlib.xml
   trunk/BOOK/x/lib/lib.xml

Modified: trunk/BOOK/general/graphlib/graphlib.xml
==============================================================================
--- trunk/BOOK/general/graphlib/graphlib.xml	Sun Jan 12 22:04:53 2014	(r12568)
+++ trunk/BOOK/general/graphlib/graphlib.xml	Mon Jan 13 10:00:06 2014	(r12569)
@@ -30,7 +30,6 @@
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="giflib.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="harfbuzz.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="ijs.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="imlib2.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="jasper.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="lcms.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="lcms2.xml"/>

Copied and modified: trunk/BOOK/x/lib/imlib2.xml (from r12568, trunk/BOOK/general/graphlib/imlib2.xml)
==============================================================================
--- trunk/BOOK/general/graphlib/imlib2.xml	Sun Jan 12 22:04:53 2014	(r12568, copy source)
+++ trunk/BOOK/x/lib/imlib2.xml	Mon Jan 13 10:00:06 2014	(r12569)
@@ -60,18 +60,13 @@
 
     <bridgehead renderas="sect4">Required</bridgehead>
     <para role="required">
-      <xref linkend="freetype2"/>
-    </para>
-
-    <bridgehead renderas="sect4">Recommended</bridgehead>
-    <para role="recommended">
-      <xref linkend="x-window-system"/>,
-      <xref linkend="libpng"/>, and
-      <xref linkend="libjpeg"/>
+      <xref linkend="xorg7-lib"/>
     </para>
 
     <bridgehead renderas="sect4">Optional</bridgehead>
     <para role="optional">
+      <xref linkend="libpng"/>,
+      <xref linkend="libjpeg"/>,
       <xref linkend="libtiff"/>,
       <xref linkend="giflib"/>, and
       <ulink url="http://sourceforge.net/projects/mad">libid3tag</ulink>
@@ -116,9 +111,6 @@
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
       href="../../xincludes/static-libraries.xml"/>
 
-    <para><option>--without-x</option>: Add this switch if you do not
-    have an X Window System installed.</para>
-
   </sect2>
 
   <sect2 role="content">

Modified: trunk/BOOK/x/lib/lib.xml
==============================================================================
--- trunk/BOOK/x/lib/lib.xml	Sun Jan 12 22:04:53 2014	(r12568)
+++ trunk/BOOK/x/lib/lib.xml	Mon Jan 13 10:00:06 2014	(r12569)
@@ -43,6 +43,7 @@
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="gtk-engines.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="gtkmm2.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="gtkmm3.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="imlib2.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="libdrm.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="libnotify.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="libxklavier.xml"/>



More information about the blfs-book mailing list