cvs commit: ALFS/profiles/BLFS/chapter09 directfb.xml fontconfig.xml freetype.xml imlib.xml imlib2.xml lcms.xml libmng.xml libpng.xml libtiff.xml svgalib.xml

jbeckers at linuxfromscratch.org jbeckers at linuxfromscratch.org
Sat May 15 00:20:24 PDT 2004


jbeckers    04/05/15 01:20:24

  Modified:    profiles/BLFS BLFS.xml packages.ent system.ent
               profiles/BLFS/chapter09 directfb.xml fontconfig.xml
                        freetype.xml imlib.xml imlib2.xml lcms.xml
                        libmng.xml libpng.xml libtiff.xml svgalib.xml
  Log:
  Chapter 9 updated
  
  Revision  Changes    Path
  1.22      +2 -2      ALFS/profiles/BLFS/BLFS.xml
  
  Index: BLFS.xml
  ===================================================================
  RCS file: /home/cvsroot/ALFS/profiles/BLFS/BLFS.xml,v
  retrieving revision 1.21
  retrieving revision 1.22
  diff -u -r1.21 -r1.22
  --- BLFS.xml	7 May 2004 03:51:41 -0000	1.21
  +++ BLFS.xml	15 May 2004 07:20:24 -0000	1.22
  @@ -16,8 +16,8 @@
   %files;
   
   <!ENTITY % general_entities SYSTEM "general.ent">
  -<!ENTITY % system_entities  SYSTEM "system.ent">
   <!ENTITY % package_entities SYSTEM "packages.ent">
  +<!ENTITY % system_entities  SYSTEM "system.ent">
   
   %general_entities;
   %package_entities;
  @@ -125,12 +125,12 @@
   
   <stage name="Chapter 9 (Graphics and Font Libraries)">
   
  -    &lcms;
       &libjpeg;
       &libpng;
       &libtiff;
       &libungif;
       &libmng;
  +    &lcms;
       &freetype;
       &fontconfig;
       &imlib;
  
  
  
  1.30      +22 -21    ALFS/profiles/BLFS/packages.ent
  
  Index: packages.ent
  ===================================================================
  RCS file: /home/cvsroot/ALFS/profiles/BLFS/packages.ent,v
  retrieving revision 1.29
  retrieving revision 1.30
  diff -u -r1.29 -r1.30
  --- packages.ent	7 May 2004 03:51:41 -0000	1.29
  +++ packages.ent	15 May 2004 07:20:24 -0000	1.30
  @@ -184,10 +184,6 @@
   
   <!--************* packages for chapter 9 *************-->
   
  -<!ENTITY lcms-version   "1.12">
  -<!ENTITY lcms-package   "lcms-1.12.tar.gz">
  -<!ENTITY lcms-directory "lcms-1.12">
  -
   <!ENTITY libjpeg-version   "6b">
   <!ENTITY libjpeg-package   "jpegsrc.v6b.tar.gz">
   <!ENTITY libjpeg-directory "jpeg-6b">
  @@ -196,6 +192,8 @@
   <!ENTITY libpng-package   "libpng-1.2.5.tar.gz">
   <!ENTITY libpng-directory "libpng-1.2.5">
   
  +<!ENTITY libpng-patch     "libpng-1.2.5-link-to-proper-libs.patch">
  +
   <!ENTITY libtiff-version   "3.6.1">
   <!ENTITY libtiff-package   "tiff-v3.6.1.tar.gz">
   <!ENTITY libtiff-directory "tiff-v3.6.1">
  @@ -206,20 +204,23 @@
   
   <!ENTITY libungif-patch     "libungif-4.1.0b1-va_start.patch">
   
  -<!ENTITY libmng-version   "1.0.6">
  -<!ENTITY libmng-package   "libmng-1.0.6.tar.gz">
  -<!ENTITY libmng-directory "libmng-1.0.6">
  -
  -<!ENTITY freetype-version   "2.1.5">
  -<!ENTITY freetype-package   "freetype-2.1.5.tar.bz2">
  -<!ENTITY freetype-directory "freetype-2.1.5">
  -
  -<!ENTITY freetype-patch1     "freetype-2.1.5-ahhint.patch">
  -<!ENTITY freetype-patch2     "freetype-2.1.5-bytecode-interpreter.patch">
  -
  -<!ENTITY fontconfig-version   "2.2.1">
  -<!ENTITY fontconfig-package   "fontconfig-2.2.1.tar.gz">
  -<!ENTITY fontconfig-directory "fontconfig-2.2.1">
  +<!ENTITY libmng-version   "1.0.7">
  +<!ENTITY libmng-package   "libmng-1.0.7.tar.gz">
  +<!ENTITY libmng-directory "libmng-1.0.7">
  +
  +<!ENTITY lcms-version   "1.12">
  +<!ENTITY lcms-package   "lcms-1.12.tar.gz">
  +<!ENTITY lcms-directory "lcms-1.12">
  +
  +<!ENTITY freetype-version   "2.1.7">
  +<!ENTITY freetype-package   "freetype-2.1.7.tar.bz2">
  +<!ENTITY freetype-directory "freetype-2.1.7">
  +
  +<!ENTITY freetype-patch     "freetype-2.1.5-bytecode-interpreter.patch">
  +
  +<!ENTITY fontconfig-version   "2.2.2">
  +<!ENTITY fontconfig-package   "fontconfig-2.2.2.tar.gz">
  +<!ENTITY fontconfig-directory "fontconfig-2.2.2">
   
   <!ENTITY imlib-version   "1.9.14">
   <!ENTITY imlib-package   "imlib-1.9.14.tar.gz">
  @@ -235,9 +236,9 @@
   
   <!ENTITY svgalib-patch     "svgalib-1.4.3-gcc3-1.patch">
   
  -<!ENTITY directfb-version   "0.9.19">
  -<!ENTITY directfb-package   "DirectFB-0.9.19.tar.gz">
  -<!ENTITY directfb-directory "DirectFB-0.9.19">
  +<!ENTITY directfb-version   "0.9.20">
  +<!ENTITY directfb-package   "DirectFB-0.9.20.tar.gz">
  +<!ENTITY directfb-directory "DirectFB-0.9.20">
   
   <!ENTITY directfb-extra-version   "0.9.16">
   <!ENTITY directfb-extra-package   "DirectFB-extra-0.9.16.tar.gz">
  
  
  
  1.21      +1 -4      ALFS/profiles/BLFS/system.ent
  
  Index: system.ent
  ===================================================================
  RCS file: /home/cvsroot/ALFS/profiles/BLFS/system.ent,v
  retrieving revision 1.20
  retrieving revision 1.21
  diff -u -r1.20 -r1.21
  --- system.ent	7 May 2004 03:39:23 -0000	1.20
  +++ system.ent	15 May 2004 07:20:24 -0000	1.21
  @@ -1,5 +1,3 @@
  -
  -
   <!-- chapter 3 -->
   <!ENTITY configusers SYSTEM "./chapter03/configusers.xml">
   <!ENTITY issue     SYSTEM "./chapter03/issue.xml">
  @@ -11,7 +9,6 @@
   <!ENTITY netfs     SYSTEM "./chapter03/netfs.xml">
   <!ENTITY compressman   SYSTEM "./chapter03/maninfo.xml">
   
  -
   <!-- chapter 4 -->
   <!ENTITY cracklib  SYSTEM "./chapter04/cracklib.xml">
   <!ENTITY shadow    SYSTEM "./chapter04/shadow.xml">
  @@ -60,12 +57,12 @@
   <!ENTITY libpcap    SYSTEM "./chapter08/libpcap.xml">
   
   <!-- chapter 9 -->
  -<!ENTITY lcms       SYSTEM "./chapter09/lcms.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 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">
  
  
  
  1.3       +2 -7      ALFS/profiles/BLFS/chapter09/directfb.xml
  
  Index: directfb.xml
  ===================================================================
  RCS file: /home/cvsroot/ALFS/profiles/BLFS/chapter09/directfb.xml,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- directfb.xml	19 Nov 2003 23:06:34 -0000	1.2
  +++ directfb.xml	15 May 2004 07:20:24 -0000	1.3
  @@ -48,20 +48,15 @@
   			<base>&build_dir;/&directfb-extra-directory;</base>
   		</stageinfo>
   
  -<!-- DOES NOT WORK YET - NEEDS TO COMPILE AVI BEFORE 
  -
   		<configure>
  -		        <param>-     -prefix=/usr</param>
  +		        <param>--prefix=/usr</param>
   		</configure>
   
   		<make />
   
  -		<make >
  +		<make>
   			<param>install</param>
   		</make>
  -
  --->
  -
   	</stage>
   
   	<stage name="Clean-up.">
  
  
  
  1.2       +2 -0      ALFS/profiles/BLFS/chapter09/fontconfig.xml
  
  Index: fontconfig.xml
  ===================================================================
  RCS file: /home/cvsroot/ALFS/profiles/BLFS/chapter09/fontconfig.xml,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- fontconfig.xml	8 Mar 2004 20:08:36 -0000	1.1
  +++ fontconfig.xml	15 May 2004 07:20:24 -0000	1.2
  @@ -3,6 +3,8 @@
           <packageinfo>
   	        <requires><name>freetype</name></requires>
   	        <requires><name>expat</name></requires>
  +
  +		<utilizes><name>docbook-utils</name></utilizes>
   	</packageinfo>
   
   	<stage name="Unpacking a package.">
  
  
  
  1.2       +3 -22     ALFS/profiles/BLFS/chapter09/freetype.xml
  
  Index: freetype.xml
  ===================================================================
  RCS file: /home/cvsroot/ALFS/profiles/BLFS/chapter09/freetype.xml,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- freetype.xml	8 Mar 2004 20:08:36 -0000	1.1
  +++ freetype.xml	15 May 2004 07:20:24 -0000	1.2
  @@ -6,11 +6,7 @@
   			<destination>&build_dir;</destination>
   		</unpack>
   		<copy>
  -		        <source>&packages_dir;/&freetype-patch1;</source>
  -			<destination>&build_dir;</destination>
  -		</copy>
  -		<copy>
  -		        <source>&packages_dir;/&freetype-patch2;</source>
  +		        <source>&packages_dir;/&freetype-patch;</source>
   			<destination>&build_dir;</destination>
   		</copy>
   	</stage>
  @@ -23,23 +19,9 @@
   		<patch>
   			<param>-N</param>
   			<param>-p1</param>
  -			<param>-i ../&freetype-patch1;</param>
  +			<param>-i ../&freetype-patch;</param>
   		</patch>
   
  -		<patch>
  -			<param>-N</param>
  -			<param>-p1</param>
  -			<param>-i ../&freetype-patch2;</param>
  -		</patch>
  -
  -		<search_replace
  -		    base = "&build_dir;/&freetype-directory;/include/freetype/config">
  -		    <file>ftoption.h</file>
  -		    <find>/* #define  TT_CONFIG_OPTION_BYTECODE_INTERPRETER */</find>
  -		    <replace>#define  TT_CONFIG_OPTION_BYTECODE_INTERPRETER</replace>
  -		</search_replace>
  -
  -
   		<configure>
   			<param>--prefix=/usr</param>
   		</configure>
  @@ -56,8 +38,7 @@
   
   	<stage name="Clean-up.">
   		<remove>&build_dir;/&freetype-directory;</remove>
  -		<remove>&build_dir;/&freetype-patch1;</remove>
  -		<remove>&build_dir;/&freetype-patch2;</remove>
  +		<remove>&build_dir;/&freetype-patch;</remove>
   	</stage>
   
   </package>
  
  
  
  1.3       +0 -5      ALFS/profiles/BLFS/chapter09/imlib.xml
  
  Index: imlib.xml
  ===================================================================
  RCS file: /home/cvsroot/ALFS/profiles/BLFS/chapter09/imlib.xml,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- imlib.xml	19 Nov 2003 23:06:34 -0000	1.2
  +++ imlib.xml	15 May 2004 07:20:24 -0000	1.3
  @@ -1,12 +1,7 @@
   <package name="imlib" version="&imlib-version;">
   
           <packageinfo>
  -                <requires><name>xfree86</name></requires>
  -                <requires><name>libjpeg</name></requires>
  -                <requires><name>libtiff</name></requires>
                   <requires><name>libungif</name></requires>
  -                <requires><name>libpng</name></requires>
  -                <requires><name>glib</name></requires>
                   <requires><name>gtk+</name></requires>
           </packageinfo>
   
  
  
  
  1.3       +1 -3      ALFS/profiles/BLFS/chapter09/imlib2.xml
  
  Index: imlib2.xml
  ===================================================================
  RCS file: /home/cvsroot/ALFS/profiles/BLFS/chapter09/imlib2.xml,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- imlib2.xml	19 Nov 2003 23:06:34 -0000	1.2
  +++ imlib2.xml	15 May 2004 07:20:24 -0000	1.3
  @@ -1,11 +1,9 @@
   <package name="imlib2" version="&imlib2-version;">
   
           <packageinfo>
  -                <requires><name>freetype</name></requires>
  +		<requires><name>xfree</name></requires>
                   <requires><name>libjpeg</name></requires>
  -                <requires><name>libpng</name></requires>
   
  -		<utilizes><name>xfree</name></utilizes>
   		<utilizes><name>libtiff</name></utilizes>
   		<utilizes><name>libungif</name></utilizes>
           </packageinfo>
  
  
  
  1.3       +1 -1      ALFS/profiles/BLFS/chapter09/lcms.xml
  
  Index: lcms.xml
  ===================================================================
  RCS file: /home/cvsroot/ALFS/profiles/BLFS/chapter09/lcms.xml,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- lcms.xml	19 Nov 2003 23:06:34 -0000	1.2
  +++ lcms.xml	15 May 2004 07:20:24 -0000	1.3
  @@ -1,10 +1,10 @@
  -
   <package name="lcms" version="&lcms-version;">
   
           <packageinfo>
                   <utilizes><name>libtiff</name></utilizes>
                   <utilizes><name>libjpeg</name></utilizes>
                   <utilizes><name>python</name></utilizes>
  +                <utilizes><name>swig</name></utilizes>
           </packageinfo>
   
           <stage name="Unpacking a package">
  
  
  
  1.3       +0 -4      ALFS/profiles/BLFS/chapter09/libmng.xml
  
  Index: libmng.xml
  ===================================================================
  RCS file: /home/cvsroot/ALFS/profiles/BLFS/chapter09/libmng.xml,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- libmng.xml	7 Jan 2004 21:07:48 -0000	1.2
  +++ libmng.xml	15 May 2004 07:20:24 -0000	1.3
  @@ -21,11 +21,7 @@
   
   		<configure>
   		    <param>--prefix=/usr</param>
  -		    <param>--with-zlib</param>
  -		    <param>--with-jpeg</param>
  -		    <param>--with-lcms</param>
   		</configure>
  -
   
   		<make />
   
  
  
  
  1.3       +12 -0     ALFS/profiles/BLFS/chapter09/libpng.xml
  
  Index: libpng.xml
  ===================================================================
  RCS file: /home/cvsroot/ALFS/profiles/BLFS/chapter09/libpng.xml,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- libpng.xml	19 Nov 2003 23:06:34 -0000	1.2
  +++ libpng.xml	15 May 2004 07:20:24 -0000	1.3
  @@ -5,6 +5,10 @@
   			<archive>&packages_dir;/&libpng-package;</archive>
   			<destination>&build_dir;</destination>
   		</unpack>
  +		<copy>
  +		        <source>&packages_dir;/&libpng-patch;</source>
  +			<destination>&build_dir;</destination>
  +		</copy>
   	</stage>
   
   	<stage name="Installing a package.">
  @@ -12,6 +16,13 @@
   			<base>&build_dir;/&libpng-directory;</base>
   		</stageinfo>
   
  +		<patch>
  +			<param>-N</param>
  +			<param>-p1</param>
  +			<param>-i ../&libpng-patch;</param>
  +		</patch>
  +
  +
   		<make>
   		        <param>prefix=/usr</param>
   		        <param>ZLIBINC=/usr/include</param>
  @@ -30,6 +41,7 @@
   
   	<stage name="Clean-up.">
   		<remove>&build_dir;/&libpng-directory;</remove>
  +		<remove>&build_dir;/&libpng-patch;</remove>
   	</stage>
   
   
  
  
  
  1.3       +6 -0      ALFS/profiles/BLFS/chapter09/libtiff.xml
  
  Index: libtiff.xml
  ===================================================================
  RCS file: /home/cvsroot/ALFS/profiles/BLFS/chapter09/libtiff.xml,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- libtiff.xml	19 Nov 2003 23:06:34 -0000	1.2
  +++ libtiff.xml	15 May 2004 07:20:24 -0000	1.3
  @@ -1,5 +1,9 @@
   <package name="libtiff" version="&libtiff-version;">
   
  +        <packageinfo>
  +                <utilizes><name>libjpeg</name></utilizes>
  +        </packageinfo>
  +
   	<stage name="Unpacking a package.">
   		<unpack>
   			<archive>&packages_dir;/&libtiff-package;</archive>
  @@ -16,6 +20,8 @@
   			<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>
   		</configure>
   
   		<make/>
  
  
  
  1.3       +1 -1      ALFS/profiles/BLFS/chapter09/svgalib.xml
  
  Index: svgalib.xml
  ===================================================================
  RCS file: /home/cvsroot/ALFS/profiles/BLFS/chapter09/svgalib.xml,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- svgalib.xml	19 Nov 2003 23:06:34 -0000	1.2
  +++ svgalib.xml	15 May 2004 07:20:24 -0000	1.3
  @@ -1,5 +1,5 @@
  -
   <package name="svgalib" version="&svgalib-version;">
  +
           <stage name="Unpacking a package">
   		<unpack>
   			<archive>&packages_dir;/&svgalib-package;</archive>
  
  
  



More information about the alfs-log mailing list