r1578 - in profiles/BLFS/trunk: . chapter09 config_standard/packages wget

jbeckers at linuxfromscratch.org jbeckers at linuxfromscratch.org
Thu Nov 11 05:19:46 PST 2004


Author: jbeckers
Date: 2004-11-11 06:19:43 -0700 (Thu, 11 Nov 2004)
New Revision: 1578

Modified:
   profiles/BLFS/trunk/BLFS.xml
   profiles/BLFS/trunk/chapter09/aalib.xml
   profiles/BLFS/trunk/chapter09/fontconfig.xml
   profiles/BLFS/trunk/chapter09/freetype.xml
   profiles/BLFS/trunk/chapter09/imlib.xml
   profiles/BLFS/trunk/chapter09/imlib2.xml
   profiles/BLFS/trunk/chapter09/libmng.xml
   profiles/BLFS/trunk/chapter09/libpng.xml
   profiles/BLFS/trunk/chapter09/libtiff.xml
   profiles/BLFS/trunk/chapter09/libungif.xml
   profiles/BLFS/trunk/config_standard/packages/ch09.ent
   profiles/BLFS/trunk/system.ent
   profiles/BLFS/trunk/wget/chapter09.urls
Log:
chapter 9 updates

Modified: profiles/BLFS/trunk/BLFS.xml
===================================================================
--- profiles/BLFS/trunk/BLFS.xml	2004-11-06 00:29:35 UTC (rev 1577)
+++ profiles/BLFS/trunk/BLFS.xml	2004-11-11 13:19:43 UTC (rev 1578)
@@ -15,7 +15,7 @@
 <!DOCTYPE alfs SYSTEM "DTD/ALFS.dtd"
 [
 <!ENTITY % general_entities SYSTEM "config/general.ent">
-<!ENTITY % config_entities SYSTEM  "config/config.ent">
+<!ENTITY % config_entities SYSTEM "config/config.ent">
 
 %general_entities;
 %config_entities;
@@ -106,14 +106,14 @@
       <xi:include href="chapter09/libpng.xml" />
       <xi:include href="chapter09/libtiff.xml" />
       <xi:include href="chapter09/libungif.xml" />
+      <xi:include href="chapter09/giflib.xml" />
       <xi:include href="chapter09/libmng.xml" />
       <xi:include href="chapter09/lcms.xml" />
       <xi:include href="chapter09/freetype.xml" />
       <xi:include href="chapter09/fontconfig.xml" />
+      <xi:include href="chapter09/libart_lgpl.xml" />
       <xi:include href="chapter09/imlib.xml" />
       <xi:include href="chapter09/aalib.xml" />
-      <xi:include href="chapter09/svgalib.xml" />
-      <xi:include href="chapter09/directfb.xml" />
       <xi:include href="chapter09/imlib2.xml" />
     </stage>
     <stage name="Chapter 10 (General Utilities)">

Modified: profiles/BLFS/trunk/chapter09/aalib.xml
===================================================================
--- profiles/BLFS/trunk/chapter09/aalib.xml	2004-11-06 00:29:35 UTC (rev 1577)
+++ profiles/BLFS/trunk/chapter09/aalib.xml	2004-11-11 13:19:43 UTC (rev 1578)
@@ -19,6 +19,9 @@
       <utilizes>
         <name>slang</name>
       </utilizes>
+      <utilizes>
+        <name>gpm</name>
+      </utilizes>
     </packageinfo>
     <stage name="Unpacking">
       <unpack>

Modified: profiles/BLFS/trunk/chapter09/fontconfig.xml
===================================================================
--- profiles/BLFS/trunk/chapter09/fontconfig.xml	2004-11-06 00:29:35 UTC (rev 1577)
+++ profiles/BLFS/trunk/chapter09/fontconfig.xml	2004-11-11 13:19:43 UTC (rev 1578)
@@ -19,9 +19,11 @@
       <requires>
         <name>expat</name>
       </requires>
-      <utilizes>
+      <!-- The book lists docbook-utils as an optional dependency,
+           but the way we build fontconfig makes it a requirement. -->
+      <requires>
         <name>docbook-utils</name>
-      </utilizes>
+      </requires>
     </packageinfo>
     <stage name="Unpacking">
       <unpack>
@@ -37,14 +39,14 @@
         <param>--prefix=/usr</param>
         <param>--sysconfdir=/etc</param>
       </configure>
+      <execute command="sed -i -e '/^<\/fontconfig>/i
+                        <dir>/usr/X11R6/lib/X11/fonts/TTF</dir>
+                        <dir>usr/X11R6/lib/X11/fonts/Type1</dir>
+                              <dir>/usr/X11R6/lib/X11/fonts/truetype</dir>' /etc/fonts/local.conf" />
       <make />
       <make>
         <param>install</param>
       </make>
-      <execute command="sed -i -e '/^<\/fontconfig>/i
-                        <dir>/usr/X11R6/lib/X11/fonts/TTF</dir>
-                        <dir>usr/X11R6/lib/X11/fonts/Type1</dir>
-                              <dir>/usr/X11R6/lib/X11/fonts/truetype</dir>' /etc/fonts/local.conf" />
     </stage>
     <stage name="Cleanup">
       <remove>&build_dir;/&fontconfig-directory;</remove>

Modified: profiles/BLFS/trunk/chapter09/freetype.xml
===================================================================
--- profiles/BLFS/trunk/chapter09/freetype.xml	2004-11-06 00:29:35 UTC (rev 1577)
+++ profiles/BLFS/trunk/chapter09/freetype.xml	2004-11-11 13:19:43 UTC (rev 1578)
@@ -25,7 +25,7 @@
     <patch>
       <param>-N</param>
       <param>-p1</param>
-      <param>-i &packages_dir;/&freetype-bytecode-interpreter-patch;</param>
+      <param>-i &packages_dir;/&freetype-bytecode_interpreter-patch;</param>
     </patch>
     <configure>
       <param>--prefix=/usr</param>
@@ -33,7 +33,9 @@
     <make />
     <make>
       <param>install</param>
-    </make>&ldconfig;</stage>
+    </make>
+    &ldconfig;
+    </stage>
     <stage name="Cleanup">
       <remove>&build_dir;/&freetype-directory;</remove>
     </stage>

Modified: profiles/BLFS/trunk/chapter09/imlib.xml
===================================================================
--- profiles/BLFS/trunk/chapter09/imlib.xml	2004-11-06 00:29:35 UTC (rev 1577)
+++ profiles/BLFS/trunk/chapter09/imlib.xml	2004-11-11 13:19:43 UTC (rev 1578)
@@ -14,10 +14,13 @@
   <package name="imlib" version="&imlib-version;">
     <packageinfo>
       <requires>
+        <name>gtk+</name>
+      </requires>
+      <requires>
         <name>libungif</name>
       </requires>
       <requires>
-        <name>gtk+</name>
+        <name>giflib</name>
       </requires>
     </packageinfo>
     <stage name="Unpacking">

Modified: profiles/BLFS/trunk/chapter09/imlib2.xml
===================================================================
--- profiles/BLFS/trunk/chapter09/imlib2.xml	2004-11-06 00:29:35 UTC (rev 1577)
+++ profiles/BLFS/trunk/chapter09/imlib2.xml	2004-11-11 13:19:43 UTC (rev 1578)
@@ -25,6 +25,9 @@
       <utilizes>
         <name>libungif</name>
       </utilizes>
+      <utilizes>
+        <name>giflib</name>
+      </utilizes>
     </packageinfo>
     <stage name="Unpacking">
       <unpack>

Modified: profiles/BLFS/trunk/chapter09/libmng.xml
===================================================================
--- profiles/BLFS/trunk/chapter09/libmng.xml	2004-11-06 00:29:35 UTC (rev 1577)
+++ profiles/BLFS/trunk/chapter09/libmng.xml	2004-11-11 13:19:43 UTC (rev 1578)
@@ -30,7 +30,7 @@
       <stageinfo>
         <base>&build_dir;/&libmng-directory;</base>
       </stageinfo>
-      <execute command="./autogen.sh" />
+      <execute command="sh autogen.sh" />
       <configure>
         <param>--prefix=/usr</param>
       </configure>

Modified: profiles/BLFS/trunk/chapter09/libpng.xml
===================================================================
--- profiles/BLFS/trunk/chapter09/libpng.xml	2004-11-06 00:29:35 UTC (rev 1577)
+++ profiles/BLFS/trunk/chapter09/libpng.xml	2004-11-11 13:19:43 UTC (rev 1578)
@@ -25,7 +25,7 @@
     <patch>
       <param>-N</param>
       <param>-p1</param>
-      <param>-i &packages_dir;/&libpng-link-to-proper-libs-patch;</param>
+      <param>-i &packages_dir;/&libpng-link_to_proper_libs-patch;</param>
     </patch>
     <make>
       <param>prefix=/usr</param>
@@ -37,7 +37,9 @@
       <param>prefix=/usr</param>
       <param>install</param>
       <param>-f scripts/makefile.linux</param>
-    </make>&ldconfig;</stage>
+    </make>
+    &ldconfig;
+    </stage>
     <stage name="Cleanup">
       <remove>&build_dir;/&libpng-directory;</remove>
     </stage>

Modified: profiles/BLFS/trunk/chapter09/libtiff.xml
===================================================================
--- profiles/BLFS/trunk/chapter09/libtiff.xml	2004-11-06 00:29:35 UTC (rev 1577)
+++ profiles/BLFS/trunk/chapter09/libtiff.xml	2004-11-11 13:19:43 UTC (rev 1578)
@@ -27,17 +27,21 @@
     <stageinfo>
       <base>&build_dir;/&libtiff-directory;</base>
     </stageinfo>
+    <patch>
+      <param>-N</param>
+      <param>-p1</param>
+      <param>-i &packages_dir;/&libtiff-libtool_fix-patch;</param>
+    </patch>
     <configure>
       <param>--prefix=/usr</param>
-      <param>--noninteractive</param>
-      <param>--with-DIR_MAN=/usr/share/man</param>
-      <param>--with-ZIP=yes</param>
-      <param>--with-DIR_GZLIB=/usr/lib</param>
+      <param>--disable-jpeg</param>
     </configure>
     <make />
     <make>
       <param>install</param>
-    </make>&ldconfig;</stage>
+    </make>
+    &ldconfig;
+    </stage>
     <stage name="Cleanup">
       <remove>&build_dir;/&libtiff-directory;</remove>
     </stage>

Modified: profiles/BLFS/trunk/chapter09/libungif.xml
===================================================================
--- profiles/BLFS/trunk/chapter09/libungif.xml	2004-11-06 00:29:35 UTC (rev 1577)
+++ profiles/BLFS/trunk/chapter09/libungif.xml	2004-11-11 13:19:43 UTC (rev 1578)
@@ -12,6 +12,11 @@
 ]>
 <alfs>
   <package name="libungif" version="&libungif-version;">
+    <packageinfo>
+      <requires>
+        <name>&ximpl;</name>
+      </requires>
+    </packageinfo>
     <stage name="Unpacking">
       <unpack>
         <archive>&packages_dir;/&libungif-package;</archive>
@@ -22,11 +27,6 @@
       <stageinfo>
         <base>&build_dir;/&libungif-directory;</base>
       </stageinfo>
-      <patch>
-        <param>-N</param>
-        <param>-p1</param>
-        <param>-i &packages_dir;/&libungif-patch;</param>
-      </patch>
       <configure>
         <param>--prefix=/usr</param>
       </configure>

Modified: profiles/BLFS/trunk/config_standard/packages/ch09.ent
===================================================================
--- profiles/BLFS/trunk/config_standard/packages/ch09.ent	2004-11-06 00:29:35 UTC (rev 1577)
+++ profiles/BLFS/trunk/config_standard/packages/ch09.ent	2004-11-11 13:19:43 UTC (rev 1578)
@@ -4,62 +4,56 @@
 <!ENTITY libjpeg-package   "jpegsrc.v&libjpeg-version;.tar.gz">
 <!ENTITY libjpeg-directory "jpeg-&libjpeg-version;">
 
-<!ENTITY libpng-version   "1.2.5">
+<!ENTITY libpng-version   "1.2.7">
 <!ENTITY libpng-package   "libpng-&libpng-version;.tar.bz2">
 <!ENTITY libpng-directory "libpng-&libpng-version;">
 
-<!ENTITY libpng-link-to-proper-libs-patch     "libpng-&libpng-version;-link-to-proper-libs.patch">
+<!ENTITY libpng-link_to_proper_libs-patch "libpng-&libpng-version;-link_to_proper_libs-1.patch">
 
-<!ENTITY libtiff-version   "3.6.1">
+<!ENTITY libtiff-version   "3.7.0">
 <!ENTITY libtiff-package   "tiff-v&libtiff-version;.tar.gz">
 <!ENTITY libtiff-directory "tiff-v&libtiff-version;">
 
-<!ENTITY libungif-version   "4.1.0b1">
-<!ENTITY libungif-package   "libungif-&libungif-version;.tar.gz">
+<!ENTITY libtiff-libtool_fix-patch "libtiff-&libtiff-version;-libtool_fix-1.patch">
+
+<!ENTITY libungif-version   "4.1.3">
+<!ENTITY libungif-package   "libungif-&libungif-version;.tar.bz2">
 <!ENTITY libungif-directory "libungif-&libungif-version;">
 
-<!ENTITY libungif-patch     "libungif-&libungif-version;-va_start.patch">
+<!ENTITY giflib-version   "4.1.3">
+<!ENTITY giflib-package   "giflib-&giflib-version;.tar.bz2">
+<!ENTITY giflib-directory "giflib-&giflib-version;">
 
-<!ENTITY libmng-version   "1.0.7">
+<!ENTITY libmng-version   "1.0.8">
 <!ENTITY libmng-package   "libmng-&libmng-version;.tar.gz">
 <!ENTITY libmng-directory "libmng-&libmng-version;">
 
-<!ENTITY lcms-version   "1.12">
+<!ENTITY lcms-version   "1.13">
 <!ENTITY lcms-package   "lcms-&lcms-version;.tar.gz">
 <!ENTITY lcms-directory "lcms-&lcms-version;">
 
-<!ENTITY freetype-version   "2.1.7">
+<!ENTITY freetype-version   "2.1.9">
 <!ENTITY freetype-package   "freetype-&freetype-version;.tar.bz2">
 <!ENTITY freetype-directory "freetype-&freetype-version;">
 
-<!ENTITY freetype-bytecode-interpreter-patch "freetype-&freetype-version;-bytecode-interpreter.patch">
+<!ENTITY freetype-bytecode_interpreter-patch "freetype-&freetype-version;-bytecode_interpreter-1.patch">
 
-<!ENTITY fontconfig-version   "2.2.2">
+<!ENTITY fontconfig-version   "2.2.3">
 <!ENTITY fontconfig-package   "fontconfig-&fontconfig-version;.tar.gz">
 <!ENTITY fontconfig-directory "fontconfig-&fontconfig-version;">
 
-<!ENTITY imlib-version   "1.9.14">
-<!ENTITY imlib-package   "imlib-&imlib-version;.tar.gz">
+<!ENTITY libart_lgpl-version   "2.3.16">
+<!ENTITY libart_lgpl-package   "libart_lgpl-&libart_lgpl-version;.tar.bz2">
+<!ENTITY libart_lgpl-directory "libart_lgpl-&libart_lgpl-version;">
+
+<!ENTITY imlib-version   "1.9.15">
+<!ENTITY imlib-package   "imlib-&imlib-version;.tar.bz2">
 <!ENTITY imlib-directory "imlib-&imlib-version;">
 
 <!ENTITY aalib-version   "1.4rc5">
 <!ENTITY aalib-package   "aalib-&aalib-version;.tar.gz">
 <!ENTITY aalib-directory "aalib-&aalib-version;">
 
-<!ENTITY svgalib-version   "1.4.3">
-<!ENTITY svgalib-package   "svgalib-&svgalib-version;.tar.gz">
-<!ENTITY svgalib-directory "svgalib-&svgalib-version;">
-
-<!ENTITY svgalib-gcc3-1-patch     "svgalib-&svgalib-version;-gcc3-1.patch">
-
-<!ENTITY directfb-version   "0.9.20">
-<!ENTITY directfb-package   "DirectFB-&directfb-version;.tar.gz">
-<!ENTITY directfb-directory "DirectFB-&directfb-version;">
-
-<!ENTITY directfb-extra-version   "0.9.16">
-<!ENTITY directfb-extra-package   "DirectFB-extra-&directfb-extra-version;.tar.gz">
-<!ENTITY directfb-extra-directory "DirectFB-extra-&directfb-extra-version;">
-
-<!ENTITY imlib2-version   "1.1.0">
+<!ENTITY imlib2-version   "1.1.2">
 <!ENTITY imlib2-package   "imlib2-&imlib2-version;.tar.gz">
 <!ENTITY imlib2-directory "imlib2-&imlib2-version;">

Modified: profiles/BLFS/trunk/system.ent
===================================================================
--- profiles/BLFS/trunk/system.ent	2004-11-06 00:29:35 UTC (rev 1577)
+++ profiles/BLFS/trunk/system.ent	2004-11-11 13:19:43 UTC (rev 1578)
@@ -60,19 +60,19 @@
 <!ENTITY libusb     SYSTEM "./chapter08/libusb.xml">
 
 <!-- chapter 9 -->
-<!ENTITY libjpeg    SYSTEM "./chapter09/libjpeg.xml">
-<!ENTITY libpng     SYSTEM "./chapter09/libpng.xml">
-<!ENTITY libtiff    SYSTEM "./chapter09/libtiff.xml">
-<!ENTITY libungif   SYSTEM "./chapter09/libungif.xml">
-<!ENTITY libmng     SYSTEM "./chapter09/libmng.xml">
-<!ENTITY lcms       SYSTEM "./chapter09/lcms.xml">
-<!ENTITY freetype   SYSTEM "./chapter09/freetype.xml">
-<!ENTITY fontconfig SYSTEM "./chapter09/fontconfig.xml">
-<!ENTITY imlib      SYSTEM "./chapter09/imlib.xml">
-<!ENTITY aalib      SYSTEM "./chapter09/aalib.xml">
-<!ENTITY svgalib    SYSTEM "./chapter09/svgalib.xml">
-<!ENTITY directfb   SYSTEM "./chapter09/directfb.xml">
-<!ENTITY imlib2     SYSTEM "./chapter09/imlib2.xml">
+<!ENTITY libjpeg     SYSTEM "./chapter09/libjpeg.xml">
+<!ENTITY libpng      SYSTEM "./chapter09/libpng.xml">
+<!ENTITY libtiff     SYSTEM "./chapter09/libtiff.xml">
+<!ENTITY libungif    SYSTEM "./chapter09/libungif.xml">
+<!ENTITY giflib      SYSTEM "./chapter09/giflib.xml">
+<!ENTITY libmng      SYSTEM "./chapter09/libmng.xml">
+<!ENTITY lcms        SYSTEM "./chapter09/lcms.xml">
+<!ENTITY freetype    SYSTEM "./chapter09/freetype.xml">
+<!ENTITY fontconfig  SYSTEM "./chapter09/fontconfig.xml">
+<!ENTITY libart_lgpl SYSTEM "./chapter09/libart_lgpl.xml">
+<!ENTITY imlib       SYSTEM "./chapter09/imlib.xml">
+<!ENTITY aalib       SYSTEM "./chapter09/aalib.xml">
+<!ENTITY imlib2      SYSTEM "./chapter09/imlib2.xml">
 
 <!-- chapter 10 -->
 <!ENTITY bc         SYSTEM "./chapter10/bc.xml">

Modified: profiles/BLFS/trunk/wget/chapter09.urls
===================================================================
--- profiles/BLFS/trunk/wget/chapter09.urls	2004-11-06 00:29:35 UTC (rev 1577)
+++ profiles/BLFS/trunk/wget/chapter09.urls	2004-11-11 13:19:43 UTC (rev 1578)
@@ -1,30 +1,28 @@
 ftp://ftp.uu.net/graphics/jpeg/jpegsrc.v6b.tar.gz
 
-ftp://ftp.iasi.roedu.net/pub/mirrors/ftp.gimp.org/gimp/libs/libpng-1.2.5.tar.bz2
-http://www.linuxfromscratch.org/patches/blfs/5.1/libpng-1.2.5-link-to-proper-libs.patch
+http://unc.dl.sourceforge.net/sourceforge/libpng/libpng-1.2.7.tar.bz2
+http://www.linuxfromscratch.org/blfs/downloads/svn/libpng-1.2.7-link_to_proper_libs-1.patch
 
-ftp://ftp.remotesensing.org/pub/libtiff/tiff-v3.6.1.tar.gz
+ftp://ftp.remotesensing.org/pub/libtiff/tiff-3.7.0.tar.gz
+http://www.linuxfromscratch.org/blfs/downloads/svn/tiff-3.7.0-libtool_fix-1.patch
 
-ftp://sunfreeware.secsup.org/pub/solaris/freeware/SOURCES/libungif-4.1.0b1.tar.gz
-http://www.linuxfromscratch.org/patches/blfs/5.1/libungif-4.1.0b1-va_start.patch
+http://easynews.dl.sourceforge.net/sourceforge/libungif/libungif-4.1.3.tar.bz2
 
-http://umn.dl.sourceforge.net/sourceforge/libmng/libmng-1.0.7.tar.gz
+http://aleron.dl.sourceforge.net/sourceforge/libungif/giflib-4.1.3.tar.bz2
 
-http://www.littlecms.com/lcms-1.12.tar.gz
+http://unc.dl.sourceforge.net/sourceforge/libmng/libmng-1.0.8.tar.gz
 
-http://umn.dl.sourceforge.net/sourceforge/freetype/freetype-2.1.7.tar.bz2
-http://www.linuxfromscratch.org/patches/blfs/5.1/freetype-2.1.7-bytecode-interpreter.patch
+http://www.littlecms.com/lcms-1.13.tar.gz
 
-http://freedesktop.org/~fontconfig/release/fontconfig-2.2.2.tar.gz
+http://umn.dl.sourceforge.net/sourceforge/freetype/freetype-2.1.9.tar.bz2
+http://www.linuxfromscratch.org/blfs/downloads/svn/freetype-2.1.9-bytecode_interpreter-1.patch
 
-ftp://ftp.gnome.org/pub/GNOME/sources/imlib/1.9/imlib-1.9.14.tar.bz2
+http://freedesktop.org/~fontconfig/release/fontconfig-2.2.3.tar.gz
 
-http://unc.dl.sourceforge.net/sourceforge/aa-project/aalib-1.4rc5.tar.gz
+ftp://ftp.gnome.org/pub/GNOME/sources/libart_lgpl/2.3/libart_lgpl-2.3.16.tar.bz2
 
-http://www.svgalib.org/svgalib-1.4.3.tar.gz
-http://www.linuxfromscratch.org/patches/blfs/5.1/svgalib-1.4.3-gcc3-1.patch
+ftp://ftp.gnome.org/pub/GNOME/sources/imlib/1.9/imlib-1.9.15.tar.bz2
 
-http://www.directfb.org/download/DirectFB/DirectFB-0.9.20.tar.gz
-http://www.directfb.org/download/DirectFB-extra/DirectFB-extra-0.9.16.tar.gz
+http://unc.dl.sourceforge.net/sourceforge/aa-project/aalib-1.4rc5.tar.gz
 
-ftp://ftp.tux.org/X-Windows/enlightenment/ftp/enlightenment/imlib2-1.1.0.tar.gz
+ftp://ftp.tux.org/X-Windows/enlightenment/ftp/enlightenment/imlib2-1.1.2.tar.gz




More information about the alfs-log mailing list