From 4531ded5c119267c4c6f4d2a55ffde30c9b14d72 Mon Sep 17 00:00:00 2001 From: Glenn Randers-Pehrson Date: Sun, 21 Feb 2010 23:07:13 -0600 Subject: [PATCH] [devel] Removed unused gzio.c from contrib/pngminim gather and makefile scripts This is necessary when libz is upgraded to 1.2.4 --- ANNOUNCE | 19 +++++++++++-------- CHANGES | 3 +++ contrib/pngminim/decoder/gather.sh | 2 +- contrib/pngminim/decoder/makefile | 2 +- contrib/pngminim/encoder/gather.sh | 2 +- contrib/pngminim/encoder/makefile | 2 +- contrib/pngminim/preader/gather.sh | 2 +- contrib/pngminim/preader/makefile | 2 +- 8 files changed, 20 insertions(+), 14 deletions(-) diff --git a/ANNOUNCE b/ANNOUNCE index f3a01fef7..0b71fda96 100644 --- a/ANNOUNCE +++ b/ANNOUNCE @@ -1,5 +1,5 @@ -Libpng 1.5.0beta09 - February 19, 2010 +Libpng 1.5.0beta10 - February 22, 2010 This is not intended to be a public release. It will be replaced within a few weeks by a public version or by another test version. @@ -9,20 +9,20 @@ Files available for download: Source files with LF line endings (for Unix/Linux) and with a "configure" script - 1.5.0beta09.tar.xz (LZMA-compressed, recommended) - 1.5.0beta09.tar.gz - 1.5.0beta09.tar.bz2 + 1.5.0beta10.tar.xz (LZMA-compressed, recommended) + 1.5.0beta10.tar.gz + 1.5.0beta10.tar.bz2 Source files with CRLF line endings (for Windows), without the "configure" script - lp150b09.zip - lp150b09.7z + lp150b10.zip + lp150b10.7z Other information: - 1.5.0beta09-README.txt - 1.5.0beta09-LICENSE.txt + 1.5.0beta10-README.txt + 1.5.0beta10-LICENSE.txt Changes since the last public release (1.4.1): @@ -69,6 +69,9 @@ version 1.5.0beta09 [February 19, 2010] Removed -D_ALLSOURCE from configure.ac, makefile.aix, and CMakeLists.txt. Changed the name of png_ptr->jmpbuf in pngstruct.h +version 1.5.0beta10 [February 22, 2010] + Removed unused gzio.c from contrib/pngminim gather and makefile scripts + Send comments/corrections/commendations to png-mng-implement at lists.sf.net (subscription required; visit https://lists.sourceforge.net/lists/listinfo/png-mng-implement diff --git a/CHANGES b/CHANGES index 152ec9d3f..c690944b1 100644 --- a/CHANGES +++ b/CHANGES @@ -2546,6 +2546,9 @@ version 1.5.0beta09 [February 19, 2010] Removed -D_ALLSOURCE from configure.ac, makefile.aix, and CMakeLists.txt. Changed the name of png_ptr->jmpbuf in pngstruct.h +version 1.5.0beta10 [February 22, 2010] + Removed unused gzio.c from contrib/pngminim gather and makefile scripts + Send comments/corrections/commendations to png-mng-implement at lists.sf.net (subscription required; visit https://lists.sourceforge.net/lists/listinfo/png-mng-implement diff --git a/contrib/pngminim/decoder/gather.sh b/contrib/pngminim/decoder/gather.sh index e66616ee3..264564deb 100755 --- a/contrib/pngminim/decoder/gather.sh +++ b/contrib/pngminim/decoder/gather.sh @@ -5,4 +5,4 @@ rm example.c pngtest.c pngpread.c pngw*.c # change the following 2 lines if zlib is somewhere else cp ../../../../zlib/*.h . cp ../../../../zlib/*.c . -rm minigzip.c example.c compress.c deflate.c +rm minigzip.c example.c compress.c deflate.c gz* diff --git a/contrib/pngminim/decoder/makefile b/contrib/pngminim/decoder/makefile index 13c56d16e..9ddbe14cd 100644 --- a/contrib/pngminim/decoder/makefile +++ b/contrib/pngminim/decoder/makefile @@ -15,7 +15,7 @@ O=.o L=.a E= -ZOBJS = adler32$(O) crc32$(O) gzio$(O) \ +ZOBJS = adler32$(O) crc32$(O) \ infback$(O) inffast$(O) inflate$(O) inftrees$(O) \ trees$(O) uncompr$(O) zutil$(O) diff --git a/contrib/pngminim/encoder/gather.sh b/contrib/pngminim/encoder/gather.sh index 8e6cadd15..d79cd2b85 100755 --- a/contrib/pngminim/encoder/gather.sh +++ b/contrib/pngminim/encoder/gather.sh @@ -6,4 +6,4 @@ rm example.c pngtest.c pngr*.c pngpread.c cp ../../../../zlib/*.h . cp ../../../../zlib/*.c . rm inf*.[ch] -rm minigzip.c example.c +rm minigzip.c example.c gz* diff --git a/contrib/pngminim/encoder/makefile b/contrib/pngminim/encoder/makefile index 035ecff47..b65b99d9a 100644 --- a/contrib/pngminim/encoder/makefile +++ b/contrib/pngminim/encoder/makefile @@ -14,7 +14,7 @@ O=.o L=.a E= -ZOBJS = adler32$(O) compress$(O) crc32$(O) deflate$(O) gzio$(O) \ +ZOBJS = adler32$(O) compress$(O) crc32$(O) deflate$(O) \ dummy_inflate$(O) \ trees$(O) uncompr$(O) zutil$(O) diff --git a/contrib/pngminim/preader/gather.sh b/contrib/pngminim/preader/gather.sh index 8196e91aa..4fe4231bc 100755 --- a/contrib/pngminim/preader/gather.sh +++ b/contrib/pngminim/preader/gather.sh @@ -6,4 +6,4 @@ rm example.c pngtest.c pngw*.c # change the following 2 lines if zlib is somewhere else cp ../../../../zlib/*.h . cp ../../../../zlib/*.c . -rm minigzip.c example.c compress.c deflate.c +rm minigzip.c example.c compress.c deflate.c gz* diff --git a/contrib/pngminim/preader/makefile b/contrib/pngminim/preader/makefile index 007236f93..cc4e6e521 100644 --- a/contrib/pngminim/preader/makefile +++ b/contrib/pngminim/preader/makefile @@ -31,7 +31,7 @@ O=.o L=.a E= -ZOBJS = adler32$(O) crc32$(O) gzio$(O) \ +ZOBJS = adler32$(O) crc32$(O) \ infback$(O) inffast$(O) inflate$(O) inftrees$(O) \ trees$(O) uncompr$(O) zutil$(O)