r3183 - in trunk: BOOK BOOK/general/graphlib BOOK/introduction/welcome patches

igor at linuxfromscratch.org igor at linuxfromscratch.org
Tue Jan 4 06:25:47 PST 2005


Author: igor
Date: 2005-01-04 07:25:46 -0700 (Tue, 04 Jan 2005)
New Revision: 3183

Added:
   trunk/patches/libpng-1.2.8-link_to_proper_libs-1.patch
Removed:
   trunk/patches/libpng-1.2.7-link_to_proper_libs-1.patch
Modified:
   trunk/BOOK/general.ent
   trunk/BOOK/general/graphlib/libpng.xml
   trunk/BOOK/introduction/welcome/changelog.xml
Log:
Updated to libpng-1.2.8.

Modified: trunk/BOOK/general/graphlib/libpng.xml
===================================================================
--- trunk/BOOK/general/graphlib/libpng.xml	2005-01-04 10:43:16 UTC (rev 3182)
+++ trunk/BOOK/general/graphlib/libpng.xml	2005-01-04 14:25:46 UTC (rev 3183)
@@ -6,10 +6,10 @@
 
 <!ENTITY libpng-download-http "http://prdownloads.sourceforge.net/libpng/libpng-&libpng-version;.tar.bz2">
 <!ENTITY libpng-download-ftp " ">
-<!ENTITY libpng-md5 "21030102f99f81c37276403e5956d198">
-<!ENTITY libpng-size "371 KB">
+<!ENTITY libpng-md5 "00cea4539bea4bd34cbf8b82ff9589cd">
+<!ENTITY libpng-size "376 KB">
 <!ENTITY libpng-buildsize "5.6 MB">
-<!ENTITY libpng-time "0.2 SBU">
+<!ENTITY libpng-time "0.14 SBU">
 
 ]>
 
@@ -36,7 +36,7 @@
 url="&libpng-download-ftp;"/></para></listitem>
 <listitem><para>MD5 Sum: &libpng-md5;</para></listitem>
 <listitem><para>Download size: &libpng-size;</para></listitem>
-<listitem><para>Estimated Disk space required:
+<listitem><para>Estimated disk space required:
 &libpng-buildsize;</para></listitem>
 <listitem><para>Estimated build time:
 &libpng-time;</para></listitem></itemizedlist>

Modified: trunk/BOOK/general.ent
===================================================================
--- trunk/BOOK/general.ent	2005-01-04 10:43:16 UTC (rev 3182)
+++ trunk/BOOK/general.ent	2005-01-04 14:25:46 UTC (rev 3183)
@@ -86,7 +86,7 @@
                                      
 <!-- Chapter 9 -->                   
 <!ENTITY libjpeg-version              "6b">
-<!ENTITY libpng-version               "1.2.7">
+<!ENTITY libpng-version               "1.2.8">
 <!ENTITY libtiff-version              "3.7.0">
 <!ENTITY libungif-version             "4.1.3">
 <!ENTITY giflib-version               "4.1.3">

Modified: trunk/BOOK/introduction/welcome/changelog.xml
===================================================================
--- trunk/BOOK/introduction/welcome/changelog.xml	2005-01-04 10:43:16 UTC (rev 3182)
+++ trunk/BOOK/introduction/welcome/changelog.xml	2005-01-04 14:25:46 UTC (rev 3183)
@@ -22,6 +22,9 @@
 
 <itemizedlist>
 
+<listitem><para>January 4th, 2004 [igor]: Updated to
+libpng-1.2.8.</para></listitem>
+
 <listitem><para>January 3rd, 2004 [randy]: Updated to GnuCash-1.8.10;
 added a patch to the Guppi instructions.</para></listitem>
 

Deleted: trunk/patches/libpng-1.2.7-link_to_proper_libs-1.patch
===================================================================
--- trunk/patches/libpng-1.2.7-link_to_proper_libs-1.patch	2005-01-04 10:43:16 UTC (rev 3182)
+++ trunk/patches/libpng-1.2.7-link_to_proper_libs-1.patch	2005-01-04 14:25:46 UTC (rev 3183)
@@ -1,60 +0,0 @@
-Submitted By: Bruce Dubbs <bdubbs at linuxfromscratch.org>
-Date: 2004-08-05
-Initial Package Version: 1.2.6
-Origin: http://blfs-bugs.linuxfromscratch.org/show_bug.cgi?id=644
-Description: libpng is not linked against libz and libm. This causes problems
-for packages that try to link against libpng without including "-lz -lm" in
-the linker flags.
-
-$LastChangedBy: igor $
-$Date: 2004-10-06 03:32:45 +0200 (Wed, 06 Oct 2004) $
-
-diff -ur libpng-1.2.6rc1.orig/scripts/libpng.pc.in libpng-1.2.6rc1/scripts/libpng.pc.in
---- libpng-1.2.6rc1.orig/scripts/libpng.pc.in	2002-10-03 06:32:33.000000000 -0500
-+++ libpng-1.2.6rc1/scripts/libpng.pc.in	2004-03-14 10:29:13.000000000 -0600
-@@ -7,5 +7,5 @@
- Name: libpng12
- Description: Loads and saves PNG files
- Version: 1.2.7
--Libs: -L${libdir} -lpng12 -lz -lm
-+Libs: -L${libdir} -lpng12
- Cflags: -I${includedir}/libpng12
-diff -ur libpng-1.2.6rc1.orig/scripts/makefile.linux libpng-1.2.6rc1/scripts/makefile.linux
---- libpng-1.2.6rc1.orig/scripts/makefile.linux	2002-10-03 06:32:34.000000000 -0500
-+++ libpng-1.2.6rc1/scripts/makefile.linux	2004-03-14 10:31:21.000000000 -0600
-@@ -34,8 +34,9 @@
- CFLAGS=-I$(ZLIBINC) -Wall -O3 -funroll-loops \
- 	$(ALIGN) # $(WARNMORE) -g -DPNG_DEBUG=5
- 
--LDFLAGS=-L. -Wl,-rpath,. -L$(ZLIBLIB) -Wl,-rpath,$(ZLIBLIB) -lpng12 -lz -lm
--LDFLAGS_A=-L$(ZLIBLIB) -Wl,-rpath,$(ZLIBLIB) libpng.a -lz -lm
-+LIBS=-lz -lm
-+LDFLAGS=-L. -Wl,-rpath,. -L$(ZLIBLIB) -Wl,-rpath,$(ZLIBLIB) -lpng12
-+LDFLAGS_A=-L$(ZLIBLIB) -Wl,-rpath,$(ZLIBLIB) libpng.a $(LIBS)
- 
- RANLIB=ranlib
- #RANLIB=echo
-@@ -86,7 +87,7 @@
- 	echo I_opts=\"-I$(INCPATH)/$(LIBNAME)\"; \
- 	echo L_opts=\"-L$(LIBPATH)\"; \
- 	echo R_opts=\"-Wl,-rpath,$(LIBPATH)\"; \
--	echo libs=\"-lpng12 -lz -lm\"; \
-+	echo libs=\"-lpng12\"; \
- 	cat scripts/libpng-config-body.in ) > libpng-config
- 	chmod +x libpng-config
- 
-@@ -99,12 +100,12 @@
- $(LIBNAME).so.$(PNGVER): $(OBJSDLL)
- 	$(CC) -shared -Wl,-soname,$(LIBNAME).so.$(PNGMAJ) \
- 	-o $(LIBNAME).so.$(PNGVER) \
--	$(OBJSDLL)
-+	$(OBJSDLL) $(LIBS)
- 
- libpng.so.3.$(PNGMIN): $(OBJSDLL)
- 	$(CC) -shared -Wl,-soname,libpng.so.3 \
- 	-o libpng.so.3.$(PNGMIN) \
--	$(OBJSDLL)
-+	$(OBJSDLL) $(LIBS)
- 
- pngtest: pngtest.o $(LIBNAME).so
- 	$(CC) -o pngtest $(CFLAGS) pngtest.o $(LDFLAGS)

Added: trunk/patches/libpng-1.2.8-link_to_proper_libs-1.patch
===================================================================
--- trunk/patches/libpng-1.2.8-link_to_proper_libs-1.patch	2005-01-04 10:43:16 UTC (rev 3182)
+++ trunk/patches/libpng-1.2.8-link_to_proper_libs-1.patch	2005-01-04 14:25:46 UTC (rev 3183)
@@ -0,0 +1,47 @@
+--- libpng-1.2.8/scripts/libpng.pc.in.orig	2005-01-04 14:06:54.182100728 +0000
++++ libpng-1.2.8/scripts/libpng.pc.in	2005-01-04 14:07:19.108311368 +0000
+@@ -7,5 +7,5 @@
+ Name: libpng12
+ Description: Loads and saves PNG files
+ Version: 1.2.8
+-Libs: -L${libdir} -lpng12 -lz -lm
++Libs: -L${libdir} -lpng12
+ Cflags: -I${includedir}/libpng12
+--- libpng-1.2.8/scripts/makefile.linux.orig	2005-01-04 14:07:37.875458328 +0000
++++ libpng-1.2.8/scripts/makefile.linux	2005-01-04 14:11:03.918135080 +0000
+@@ -34,8 +34,9 @@
+ CFLAGS=-I$(ZLIBINC) -Wall -O3 -funroll-loops \
+ 	$(ALIGN) # $(WARNMORE) -g -DPNG_DEBUG=5
+ 
+-LDFLAGS=-L. -Wl,-rpath,. -L$(ZLIBLIB) -Wl,-rpath,$(ZLIBLIB) -lpng12 -lz -lm
+-LDFLAGS_A=-L$(ZLIBLIB) -Wl,-rpath,$(ZLIBLIB) libpng.a -lz -lm
++LIBS=-lz -lm
++LDFLAGS=-L. -Wl,-rpath,. -L$(ZLIBLIB) -Wl,-rpath,$(ZLIBLIB) -lpng12
++LDFLAGS_A=-L$(ZLIBLIB) -Wl,-rpath,$(ZLIBLIB) libpng.a $(LIBS)
+ 
+ RANLIB=ranlib
+ #RANLIB=echo
+@@ -86,7 +87,7 @@
+ 	echo I_opts=\"-I$(INCPATH)/$(LIBNAME)\"; \
+ 	echo L_opts=\"-L$(LIBPATH)\"; \
+ 	echo R_opts=\"-Wl,-rpath,$(LIBPATH)\"; \
+-	echo libs=\"-lpng12 -lz -lm\"; \
++	echo libs=\"-lpng12\"; \
+ 	cat scripts/libpng-config-body.in ) > libpng-config
+ 	chmod +x libpng-config
+ 
+@@ -99,12 +100,12 @@
+ $(LIBNAME).so.$(PNGVER): $(OBJSDLL)
+ 	$(CC) -shared -Wl,-soname,$(LIBNAME).so.$(PNGMAJ) \
+ 	-o $(LIBNAME).so.$(PNGVER) \
+-	$(OBJSDLL)
++	$(OBJSDLL) $(LIBS)
+ 
+ libpng.so.3.$(PNGMIN): $(OBJSDLL)
+ 	$(CC) -shared -Wl,-soname,libpng.so.3 \
+ 	-o libpng.so.3.$(PNGMIN) \
+-	$(OBJSDLL)
++	$(OBJSDLL) $(LIBS)
+ 
+ pngtest: pngtest.o $(LIBNAME).so
+ 	$(CC) -o pngtest $(CFLAGS) pngtest.o $(LDFLAGS)




More information about the blfs-book mailing list