diff options
| author | Glenn Randers-Pehrson <glennrp at users.sourceforge.net> | 2002-08-23 23:07:42 -0500 |
|---|---|---|
| committer | Glenn Randers-Pehrson <glennrp at users.sourceforge.net> | 2009-04-06 16:07:27 -0500 |
| commit | 51d9250c88aa62f3aaf7c1f72209513035066074 (patch) | |
| tree | 45b89c43d5e0a1a06712d2d9350e933b44f7ab59 | |
| parent | 8a7df0024b3498735b23ad36ef3c0b36c4db9a9b (diff) | |
| download | libpng-51d9250c88aa62f3aaf7c1f72209513035066074.tar.gz | |
Imported from libpng-1.2.5rc1.tarv1.2.5rc1
61 files changed, 213 insertions, 196 deletions
@@ -1,5 +1,5 @@ -Libpng 1.2.5beta2 - August 16, 2002 +Libpng 1.2.5rc1 - August 24, 2002 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. @@ -17,10 +17,12 @@ version 1.2.5beta1 [August 6, 2002] Prevent png_ptr->pass from exceeding 7 in png_push_finish_row(). Updated makefile.hggcc Updated png.c and pnggccrd.c handling of return from png_mmx_support() -version 1.2.5beta2 [August 16, 2002] +version 1.2.5beta2 [August 15, 2002] Only issue png_warning() about "Too much data" in pngpread.c when avail_in is nonzero. Updated makefiles to install a separate libpng.so.3 with its own rpath. +version 1.2.5rc1 [August 24, 2002] + Revised makefiles to not remove previous minor versions of shared libraries. Send comments/corrections/commendations to png-implement@ccrc.wustl.edu or to randeg@alum.rpi.edu @@ -1144,10 +1144,10 @@ version 1.2.4beta3 [June 28, 2002] Added "test-installed" target to makefile.32sunu, makefile.64sunu, makefile.beos, makefile.darwin, makefile.dec, makefile.macosx, makefile.solaris, makefile.hpux, makefile.hpgcc, and makefile.so9. -version 1.2.4rc1 [July 2, 2002] +version 1.2.4rc1 and 1.0.14rc1 [July 2, 2002] Added "test-installed" target to makefile.cygwin and makefile.sco. Revised pnggccrd.c to be able to back out version 1.0.x via PNG_1_0_X macro. -version 1.2.4 [July 8, 2002] +version 1.2.4 and 1.0.14 [July 8, 2002] Changed png_warning() to png_error() when width is too large to process. version 1.2.4patch01 [July 20, 2002] Revised makefile.cygwin to use DLL number 12 instead of 13. @@ -1160,10 +1160,12 @@ version 1.2.5beta1 [August 6, 2002] Prevent png_ptr->pass from exceeding 7 in png_push_finish_row(). Updated makefile.hpgcc Updated png.c and pnggccrd.c handling of return from png_mmx_support() -version 1.2.5beta2 [August 16, 2002] +version 1.2.5beta2 [August 15, 2002] Only issue png_warning() about "Too much data" in pngpread.c when avail_in is nonzero. Updated makefiles to install a separate libpng.so.3 with its own rpath. +version 1.2.5rc1 and 1.0.15rc1 [August 24, 2002] + Revised makefiles to not remove previous minor versions of shared libraries. Send comments/corrections/commendations to png-implement@ccrc.wustl.edu or to randeg@alum.rpi.edu @@ -1,5 +1,5 @@ -Installing libpng version 1.2.5beta2 - August 16, 2002 +Installing libpng version 1.2.5rc1 - August 24, 2002 Before installing libpng, you must first install zlib. zlib can usually be found wherever you got libpng. zlib can be @@ -10,7 +10,7 @@ zlib.h and zconf.h include files that correspond to the version of zlib that's installed. You can rename the directories that you downloaded (they -might be called "libpng-1.2.5beta2" or "lpng109" and "zlib-1.1.4" +might be called "libpng-1.2.5rc1" or "lpng109" and "zlib-1.1.4" or "zlib114") so that you have directories called "zlib" and "libpng". Your directory structure should look like this: @@ -68,8 +68,8 @@ The files that are presently available in the scripts directory include makefile.std => Generic UNIX makefile (cc, creates static libpng.a) - makefile.linux => Linux/ELF makefile (gcc, creates libpng12.so.0.1.2.5beta2) - makefile.gcmmx => Linux/ELF makefile (gcc, creates libpng12.so.0.1.2.5beta2, + makefile.linux => Linux/ELF makefile (gcc, creates libpng12.so.0.1.2.5rc1) + makefile.gcmmx => Linux/ELF makefile (gcc, creates libpng12.so.0.1.2.5rc1, uses assembler code tuned for Intel MMX platform) makefile.gcc => Generic makefile (gcc, creates static libpng.a) makefile.knr => Archaic UNIX Makefile that converts files with @@ -90,10 +90,10 @@ include makefile.ne0bsd => NetBSD/cc makefile, uses PNGGCCRD, makes libpng0.so makefile.openbsd => OpenBSD makefile makefile.sgi => Silicon Graphics IRIX makefile (cc, creates static lib) - makefile.sggcc => Silicon Graphics (gcc, creates libpng12.so.0.1.2.5beta2) + makefile.sggcc => Silicon Graphics (gcc, creates libpng12.so.0.1.2.5rc1) makefile.sunos => Sun makefile - makefile.solaris => Solaris 2.X makefile (gcc, creates libpng12.so.0.1.2.5beta2) - makefile.so9 => Solaris 9 makefile (gcc, creates libpng12.so.0.1.2.5beta2) + makefile.solaris => Solaris 2.X makefile (gcc, creates libpng12.so.0.1.2.5rc1) + makefile.so9 => Solaris 9 makefile (gcc, creates libpng12.so.0.1.2.5rc1) makefile.32sunu => Sun Ultra 32-bit makefile makefile.64sunu => Sun Ultra 64-bit makefile makefile.sco => For SCO OSr5 ELF and Unixware 7 with Native cc @@ -158,9 +158,9 @@ in the scripts directory when you run "make", "make install", or mangle.in => Function-decoration macros added to png.h by the makefiles. makefile.linux => Linux/ELF makefile - (gcc, creates libpng12m.so.0.1.2.5beta2) + (gcc, creates libpng12m.so.0.1.2.5rc1) makefile.gcmmx => Linux/ELF makefile (gcc, creates - libpng12.so.0m.1.2.5beta2, uses assembler code + libpng12.so.0m.1.2.5rc1, uses assembler code tuned for Intel MMX platform) makefile.sgi => Silicon Graphics (cc, creates libpng12m.so) makefile.sggcc => Silicon Graphics (gcc, creates libpng12m.so) @@ -1,5 +1,5 @@ -Known bugs in libpng version 1.2.5beta2 +Known bugs in libpng version 1.2.5rc1 1. April 22, 2001: pnggccrd.c has been reported to crash on NetBSD when reading interlaced PNG files, when assembler code is enabled but running @@ -8,7 +8,7 @@ COPYRIGHT NOTICE, DISCLAIMER, and LICENSE: If you modify libpng you may insert additional notices immediately following this sentence. -libpng versions 1.0.7, July 1, 2000, through 1.2.5beta2, August 16, 2002, are +libpng versions 1.0.7, July 1, 2000, through 1.2.5rc1, August 24, 2002, are Copyright (c) 2000-2002 Glenn Randers-Pehrson and are distributed according to the same disclaimer and license as libpng-1.0.6 with the following individuals added to the list of Contributing Authors @@ -99,4 +99,4 @@ certification mark of the Open Source Initiative. Glenn Randers-Pehrson randeg@alum.rpi.edu -August 16, 2002 +August 24, 2002 @@ -1,4 +1,4 @@ -README for libpng 1.2.5beta2 - August 16, 2002 (shared library 12.0) +README for libpng 1.2.5rc1 - August 24, 2002 (shared library 12.0) See the note about version numbers near the top of png.h See INSTALL for instructions on how to install libpng. @@ -187,9 +187,9 @@ Files in this distribution: descrip.mms => VMS makefile for MMS or MMK makefile.std => Generic UNIX makefile (cc, creates static libpng.a) makefile.linux => Linux/ELF makefile - (gcc, creates libpng12.so.0.1.2.5beta2) + (gcc, creates libpng12.so.0.1.2.5rc1) makefile.gcmmx => Linux/ELF makefile (gcc, creates - libpng12.so.0.1.2.5beta2, uses assembler code + libpng12.so.0.1.2.5rc1, uses assembler code tuned for Intel MMX platform) makefile.gcc => Generic makefile (gcc, creates static libpng.a) makefile.knr => Archaic UNIX Makefile that converts files with @@ -210,12 +210,12 @@ Files in this distribution: makefile.ne0bsd => NetBSD/cc makefile, PNGGCCRD, makes libpng0.so makefile.openbsd => OpenBSD makefile makefile.sgi => Silicon Graphics IRIX (cc, creates static lib) - makefile.sggcc => Silicon Graphics (gcc, creates libpng12.so.0.1.2.5beta2) + makefile.sggcc => Silicon Graphics (gcc, creates libpng12.so.0.1.2.5rc1) makefile.sunos => Sun makefile makefile.solaris => Solaris 2.X makefile - (gcc, creates libpng12.so.0.1.2.5beta2) + (gcc, creates libpng12.so.0.1.2.5rc1) makefile.so9 => Solaris 9 makefile - (gcc, creates libpng12.so.0.1.2.5beta2) + (gcc, creates libpng12.so.0.1.2.5rc1) makefile.32sunu => Sun Ultra 32-bit makefile makefile.64sunu => Sun Ultra 64-bit makefile makefile.sco => For SCO OSr5 ELF and Unixware 7 with Native cc @@ -248,9 +248,9 @@ Files in this distribution: mangle.in => Function-decoration macros added to png.h by the makefiles. makefile.linux => Linux/ELF makefile - (gcc, creates libpng12m.so.0.1.2.5beta2) + (gcc, creates libpng12m.so.0.1.2.5rc1) makefile.gcmmx => Linux/ELF makefile (gcc, creates - libpng12.so.0m.1.2.5beta2, uses assembler code + libpng12.so.0m.1.2.5rc1, uses assembler code tuned for Intel MMX platform) makefile.sgi => Silicon Graphics (cc, creates libpng12m.so) makefile.sggcc => Silicon Graphics (gcc, creates libpng12m.so) @@ -1,13 +1,13 @@ Y2K compliance in libpng: ========================= - August 16, 2002 + August 24, 2002 Since the PNG Development group is an ad-hoc body, we can't make an official declaration. This is your unofficial assurance that libpng from version 0.71 and - upward through 1.2.5beta2 are Y2K compliant. It is my belief that earlier + upward through 1.2.5rc1 are Y2K compliant. It is my belief that earlier versions were also Y2K compliant. Libpng only has three year fields. One is a 2-byte unsigned integer @@ -1,5 +1,5 @@ echo " - There is no \"configure\" script for Libpng-1.2.5beta2. Instead, please + There is no \"configure\" script for Libpng-1.2.5rc1. Instead, please copy the appropriate makefile for your system from the \"scripts\" directory. Read the INSTALL file for more details. " @@ -1,6 +1,6 @@ -.TH LIBPNG 3 "August 16, 2002" +.TH LIBPNG 3 "August 24, 2002" .SH NAME -libpng \- Portable Network Graphics (PNG) Reference Library 1.2.5beta2 +libpng \- Portable Network Graphics (PNG) Reference Library 1.2.5rc1 .SH SYNOPSIS \fI\fB @@ -791,7 +791,7 @@ Following is a copy of the libpng.txt file that accompanies libpng. .SH LIBPNG.TXT libpng.txt - A description on how to use and modify libpng - libpng version 1.2.5beta2 - August 16, 2002 + libpng version 1.2.5rc1 - August 24, 2002 Updated and distributed by Glenn Randers-Pehrson <randeg@alum.rpi.edu> Copyright (c) 1998-2002 Glenn Randers-Pehrson @@ -3641,13 +3641,13 @@ application: .SH IX. Y2K Compliance in libpng -August 16, 2002 +August 24, 2002 Since the PNG Development group is an ad-hoc body, we can't make an official declaration. This is your unofficial assurance that libpng from version 0.71 and -upward through 1.2.5beta2 are Y2K compliant. It is my belief that earlier +upward through 1.2.5rc1 are Y2K compliant. It is my belief that earlier versions were also Y2K compliant. Libpng only has three year fields. One is a 2-byte unsigned integer that @@ -3840,7 +3840,7 @@ possible without all of you. Thanks to Frank J. T. Wojcik for helping with the documentation. -Libpng version 1.2.5beta2 - August 16, 2002: +Libpng version 1.2.5rc1 - August 24, 2002: Initially created in 1995 by Guy Eric Schalnat, then of Group 42, Inc. Currently maintained by Glenn Randers-Pehrson (randeg@alum.rpi.edu). @@ -3857,7 +3857,7 @@ included in the libpng distribution, the latter shall prevail.) If you modify libpng you may insert additional notices immediately following this sentence. -libpng versions 1.0.7, July 1, 2000, through 1.2.5beta2, August 16, 2002, are +libpng versions 1.0.7, July 1, 2000, through 1.2.5rc1, August 24, 2002, are Copyright (c) 2000-2002 Glenn Randers-Pehrson, and are distributed according to the same disclaimer and license as libpng-1.0.6 with the following individuals added to the list of Contributing Authors @@ -3949,7 +3949,7 @@ certification mark of the Open Source Initiative. Glenn Randers-Pehrson randeg@alum.rpi.edu -August 16, 2002 +August 24, 2002 .\" end of man page diff --git a/libpng.txt b/libpng.txt index 7a41edefb..276231cd2 100644 --- a/libpng.txt +++ b/libpng.txt @@ -1,6 +1,6 @@ libpng.txt - A description on how to use and modify libpng - libpng version 1.2.5beta2 - August 16, 2002 + libpng version 1.2.5rc1 - August 24, 2002 Updated and distributed by Glenn Randers-Pehrson <randeg@alum.rpi.edu> Copyright (c) 1998-2002 Glenn Randers-Pehrson @@ -2850,13 +2850,13 @@ application: IX. Y2K Compliance in libpng -August 16, 2002 +August 24, 2002 Since the PNG Development group is an ad-hoc body, we can't make an official declaration. This is your unofficial assurance that libpng from version 0.71 and -upward through 1.2.5beta2 are Y2K compliant. It is my belief that earlier +upward through 1.2.5rc1 are Y2K compliant. It is my belief that earlier versions were also Y2K compliant. Libpng only has three year fields. One is a 2-byte unsigned integer that diff --git a/libpngpf.3 b/libpngpf.3 index 899426c7a..bdce1d21e 100644 --- a/libpngpf.3 +++ b/libpngpf.3 @@ -1,6 +1,6 @@ -.TH LIBPNGPF 3 "August 16, 2002" +.TH LIBPNGPF 3 "August 24, 2002" .SH NAME -libpng \- Portable Network Graphics (PNG) Reference Library 1.2.5beta2 +libpng \- Portable Network Graphics (PNG) Reference Library 1.2.5rc1 (private functions) .SH SYNOPSIS \fB#include <png.h>\fP @@ -1,4 +1,4 @@ -.TH PNG 5 "August 16, 2002" +.TH PNG 5 "August 24, 2002" .SH NAME png \- Portable Network Graphics (PNG) format .SH DESCRIPTION @@ -1,7 +1,7 @@ /* png.c - location for general purpose libpng functions * - * libpng version 1.2.5beta2 - August 16, 2002 + * libpng version 1.2.5rc1 - August 24, 2002 * Copyright (c) 1998-2002 Glenn Randers-Pehrson * (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger) * (Version 0.88 Copyright (c) 1995, 1996 Guy Eric Schalnat, Group 42, Inc.) @@ -13,14 +13,14 @@ #include "png.h" /* Generate a compiler error if there is an old png.h in the search path. */ -typedef version_1_2_5beta2 Your_png_h_is_not_version_1_2_5beta2; +typedef version_1_2_5rc1 Your_png_h_is_not_version_1_2_5rc1; /* Version information for C files. This had better match the version * string defined in png.h. */ #ifdef PNG_USE_GLOBAL_ARRAYS /* png_libpng_ver was changed to a function in version 1.0.5c */ -const char png_libpng_ver[18] = "1.2.5beta2"; +const char png_libpng_ver[18] = "1.2.5rc1"; /* png_sig was changed to a function in version 1.0.5c */ /* Place to hold the signature string for a PNG file. */ @@ -136,7 +136,7 @@ png_check_sig(png_bytep sig, int num) /* Function to allocate memory for zlib and clear it to 0. */ #ifdef PNG_1_0_X -void PNGAPI +voidpf PNGAPI #else voidpf /* private */ #endif @@ -671,7 +671,7 @@ png_charp PNGAPI png_get_copyright(png_structp png_ptr) { if (png_ptr != NULL || png_ptr == NULL) /* silence compiler warning */ - return ((png_charp) "\n libpng version 1.2.5beta2 - August 16, 2002\n\ + return ((png_charp) "\n libpng version 1.2.5rc1 - August 24, 2002\n\ Copyright (c) 1998-2002 Glenn Randers-Pehrson\n\ Copyright (c) 1996-1997 Andreas Dilger\n\ Copyright (c) 1995-1996 Guy Eric Schalnat, Group 42, Inc.\n"); @@ -689,8 +689,8 @@ png_get_libpng_ver(png_structp png_ptr) { /* Version of *.c files used when building libpng */ if(png_ptr != NULL) /* silence compiler warning about unused png_ptr */ - return((png_charp) "1.2.5beta2"); - return((png_charp) "1.2.5beta2"); + return((png_charp) "1.2.5rc1"); + return((png_charp) "1.2.5rc1"); } png_charp PNGAPI @@ -1,6 +1,6 @@ /* png.h - header file for PNG reference library * - * libpng version 1.2.5beta2 - August 16, 2002 + * libpng version 1.2.5rc1 - August 24, 2002 * Copyright (c) 1998-2002 Glenn Randers-Pehrson * (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger) * (Version 0.88 Copyright (c) 1995, 1996 Guy Eric Schalnat, Group 42, Inc.) @@ -8,7 +8,7 @@ * Authors and maintainers: * libpng versions 0.71, May 1995, through 0.88, January 1996: Guy Schalnat * libpng versions 0.89c, June 1996, through 0.96, May 1997: Andreas Dilger - * libpng versions 0.97, January 1998, through 1.2.5beta2 - August 16, 2002: Glenn + * libpng versions 0.97, January 1998, through 1.2.5rc1 - August 24, 2002: Glenn * See also "Contributing Authors", below. * * Note about libpng version numbers: @@ -93,7 +93,8 @@ * 1.2.4rc1 13 10204 12.so.0.1.2.4rc1 * 1.0.14 10 10014 10.so.0.1.0.14 * 1.2.4 13 10204 12.so.0.1.2.4 - * 1.2.5beta1,2 13 10205 12.so.0.1.2.5beta1,2 + * 1.2.5beta1-2 13 10205 12.so.0.1.2.5beta1-2 + * 1.0.15rc1 10 10015 10.so.0.1.0.15rc1 * * Henceforth the source version will match the shared-library major * and minor numbers; the shared-library major version number will be @@ -123,7 +124,7 @@ * If you modify libpng you may insert additional notices immediately following * this sentence. * - * libpng versions 1.0.7, July 1, 2000, through 1.2.5beta2, August 16, 2002, are + * libpng versions 1.0.7, July 1, 2000, through 1.2.5rc1, August 24, 2002, are * Copyright (c) 2000-2002 Glenn Randers-Pehrson, and are * distributed according to the same disclaimer and license as libpng-1.0.6 * with the following individuals added to the list of Contributing Authors @@ -228,13 +229,13 @@ * Y2K compliance in libpng: * ========================= * - * August 16, 2002 + * August 24, 2002 * * Since the PNG Development group is an ad-hoc body, we can't make * an official declaration. * * This is your unofficial assurance that libpng from version 0.71 and - * upward through 1.2.5beta2 are Y2K compliant. It is my belief that earlier + * upward through 1.2.5rc1 are Y2K compliant. It is my belief that earlier * versions were also Y2K compliant. * * Libpng only has three year fields. One is a 2-byte unsigned integer @@ -290,7 +291,7 @@ */ /* Version information for png.h - this should match the version in png.c */ -#define PNG_LIBPNG_VER_STRING "1.2.5beta2" +#define PNG_LIBPNG_VER_STRING "1.2.5rc1" #define PNG_LIBPNG_VER_SONUM 0 #define PNG_LIBPNG_VER_DLLNUM %DLLNUM% @@ -302,7 +303,7 @@ /* This should match the numeric part of the final component of * PNG_LIBPNG_VER_STRING, omitting any leading zero: */ -#define PNG_LIBPNG_VER_BUILD 2 +#define PNG_LIBPNG_VER_BUILD 1 #define PNG_LIBPNG_BUILD_ALPHA 1 #define PNG_LIBPNG_BUILD_BETA 2 @@ -310,7 +311,7 @@ #define PNG_LIBPNG_BUILD_STABLE 4 #define PNG_LIBPNG_BUILD_TYPEMASK 7 #define PNG_LIBPNG_BUILD_PATCH 8 /* Can be OR'ed with STABLE only */ -#define PNG_LIBPNG_BUILD_TYPE 2 +#define PNG_LIBPNG_BUILD_TYPE 3 /* Careful here. At one time, Guy wanted to use 082, but that would be octal. * We must not include leading zeros. @@ -1280,9 +1281,9 @@ struct png_struct_def /* This prevents a compiler error in png.c if png.c and png.h are both at - version 1.2.5beta2 + version 1.2.5rc1 */ -typedef png_structp version_1_2_5beta2; +typedef png_structp version_1_2_5rc1; typedef png_struct FAR * FAR * png_structpp; @@ -2422,7 +2423,7 @@ extern PNG_EXPORT(void,png_set_strip_error_numbers) PNGARG((png_structp /* Maintainer: Put new public prototypes here ^, in libpng.3, and project defs */ #define PNG_HEADER_VERSION_STRING \ - " libpng version 1.2.5beta2 - August 16, 2002 (header)\n" + " libpng version 1.2.5rc1 - August 24, 2002 (header)\n" #ifdef PNG_READ_COMPOSITE_NODIV_SUPPORTED /* With these routines we avoid an integer divide, which will be slower on diff --git a/pngasmrd.h b/pngasmrd.h index 592ea3c5f..0bfabc16c 100644 --- a/pngasmrd.h +++ b/pngasmrd.h @@ -1,6 +1,6 @@ /* pngasmrd.h - assembler version of utilities to read a PNG file * - * libpng 1.2.5beta2 - August 16, 2002 + * libpng 1.2.5rc1 - August 24, 2002 * For conditions of distribution and use, see copyright notice in png.h * Copyright (c) 2002 Glenn Randers-Pehrson * @@ -1,6 +1,6 @@ /* pngconf.h - machine configurable file for libpng * - * libpng 1.2.5beta2 - August 16, 2002 + * libpng 1.2.5rc1 - August 24, 2002 * For conditions of distribution and use, see copyright notice in png.h * Copyright (c) 1998-2002 Glenn Randers-Pehrson * (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger) diff --git a/pngerror.c b/pngerror.c index e2e7bf420..7456764fe 100644 --- a/pngerror.c +++ b/pngerror.c @@ -1,7 +1,7 @@ /* pngerror.c - stub functions for i/o and memory allocation * - * libpng 1.2.5beta2 - August 16, 2002 + * libpng 1.2.5rc1 - August 24, 2002 * For conditions of distribution and use, see copyright notice in png.h * Copyright (c) 1998-2002 Glenn Randers-Pehrson * (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger) diff --git a/pnggccrd.c b/pnggccrd.c index 8d43138ec..427f51435 100644 --- a/pnggccrd.c +++ b/pnggccrd.c @@ -6,7 +6,7 @@ * and http://www.intel.com/drg/pentiumII/appnotes/923/923.htm * for Intel's performance analysis of the MMX vs. non-MMX code. * - * libpng version 1.2.5beta2 - August 16, 2002 + * libpng version 1.2.5rc1 - August 24, 2002 * For conditions of distribution and use, see copyright notice in png.h * Copyright (c) 1998-2002 Glenn Randers-Pehrson * Copyright (c) 1998, Intel Corporation @@ -5075,7 +5075,9 @@ png_read_filter_row(png_structp png_ptr, png_row_infop row_info, png_bytep if (_mmx_supported == 2) { /* this should have happened in png_init_mmx_flags() already */ +#if !defined(PNG_1_0_X) png_warning(png_ptr, "asm_flags may not have been initialized"); +#endif png_mmx_support(); } #endif /* PNG_ASSEMBLER_CODE_SUPPORTED */ @@ -1,7 +1,7 @@ /* pngget.c - retrieval of values from info struct * - * libpng 1.2.5beta2 - August 16, 2002 + * libpng 1.2.5rc1 - August 24, 2002 * For conditions of distribution and use, see copyright notice in png.h * Copyright (c) 1998-2002 Glenn Randers-Pehrson * (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger) @@ -1,7 +1,7 @@ /* pngmem.c - stub functions for memory allocation * - * libpng 1.2.5beta2 - August 16, 2002 + * libpng 1.2.5rc1 - August 24, 2002 * For conditions of distribution and use, see copyright notice in png.h * Copyright (c) 1998-2002 Glenn Randers-Pehrson * (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger) diff --git a/pngpread.c b/pngpread.c index 5dd916816..b3a1104c5 100644 --- a/pngpread.c +++ b/pngpread.c @@ -1,7 +1,7 @@ /* pngpread.c - read a png file in push mode * - * libpng 1.2.5beta2 - August 16, 2002 + * libpng 1.2.5rc1 - August 24, 2002 * For conditions of distribution and use, see copyright notice in png.h * Copyright (c) 1998-2002 Glenn Randers-Pehrson * (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger) @@ -1,7 +1,7 @@ /* pngread.c - read a PNG file * - * libpng 1.2.5beta2 - August 16, 2002 + * libpng 1.2.5rc1 - August 24, 2002 * For conditions of distribution and use, see copyright notice in png.h * Copyright (c) 1998-2002 Glenn Randers-Pehrson * (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger) @@ -789,7 +789,7 @@ png_read_row(png_structp png_ptr, png_bytep row, png_bytep dsp_row) * not called png_set_interlace_handling(), the display_row buffer will * be ignored, so pass NULL to it. * - * [*] png_handle_alpha() does not exist yet, as of libpng version 1.2.5beta2 + * [*] png_handle_alpha() does not exist yet, as of libpng version 1.2.5rc1 */ void PNGAPI @@ -837,7 +837,7 @@ png_read_rows(png_structp png_ptr, png_bytepp row, * only call this function once. If you desire to have an image for * each pass of a interlaced image, use png_read_rows() instead. * - * [*] png_handle_alpha() does not exist yet, as of libpng version 1.2.5beta2 + * [*] png_handle_alpha() does not exist yet, as of libpng version 1.2.5rc1 */ void PNGAPI png_read_image(png_structp png_ptr, png_bytepp image) @@ -1,7 +1,7 @@ /* pngrio.c - functions for data input * - * libpng 1.2.5beta2 - August 16, 2002 + * libpng 1.2.5rc1 - August 24, 2002 * For conditions of distribution and use, see copyright notice in png.h * Copyright (c) 1998-2002 Glenn Randers-Pehrson * (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger) diff --git a/pngrtran.c b/pngrtran.c index ad5bd3e29..1a343f041 100644 --- a/pngrtran.c +++ b/pngrtran.c @@ -1,7 +1,7 @@ /* pngrtran.c - transforms the data in a row for PNG readers * - * libpng 1.2.5beta2 - August 16, 2002 + * libpng 1.2.5rc1 - August 24, 2002 * For conditions of distribution and use, see copyright notice in png.h * Copyright (c) 1998-2002 Glenn Randers-Pehrson * (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger) diff --git a/pngrutil.c b/pngrutil.c index 375ce17fe..103dda008 100644 --- a/pngrutil.c +++ b/pngrutil.c @@ -1,7 +1,7 @@ /* pngrutil.c - utilities to read a PNG file * - * libpng 1.2.5beta2 - August 16, 2002 + * libpng 1.2.5rc1 - August 24, 2002 * For conditions of distribution and use, see copyright notice in png.h * Copyright (c) 1998-2002 Glenn Randers-Pehrson * (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger) @@ -1,7 +1,7 @@ /* pngset.c - storage of image information into info struct * - * libpng 1.2.5beta2 - August 16, 2002 + * libpng 1.2.5rc1 - August 24, 2002 * For conditions of distribution and use, see copyright notice in png.h * Copyright (c) 1998-2002 Glenn Randers-Pehrson * (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger) @@ -1,7 +1,7 @@ /* pngtest.c - a simple test program to test libpng * - * libpng 1.2.5beta2 - August 16, 2002 + * libpng 1.2.5rc1 - August 24, 2002 * For conditions of distribution and use, see copyright notice in png.h * Copyright (c) 1998-2002 Glenn Randers-Pehrson * (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger) @@ -1538,4 +1538,4 @@ main(int argc, char *argv[]) } /* Generate a compiler error if there is an old png.h in the search path. */ -typedef version_1_2_5beta2 your_png_h_is_not_version_1_2_5beta2; +typedef version_1_2_5rc1 your_png_h_is_not_version_1_2_5rc1; diff --git a/pngtrans.c b/pngtrans.c index f80a7e86f..a71933d3a 100644 --- a/pngtrans.c +++ b/pngtrans.c @@ -1,7 +1,7 @@ /* pngtrans.c - transforms the data in a row (used by both readers and writers) * - * libpng 1.2.5beta2 - August 16, 2002 + * libpng 1.2.5rc1 - August 24, 2002 * For conditions of distribution and use, see copyright notice in png.h * Copyright (c) 1998-2002 Glenn Randers-Pehrson * (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger) @@ -2,7 +2,7 @@ * * For Intel x86 CPU and Microsoft Visual C++ compiler * - * libpng version 1.2.5beta2 - August 16, 2002 + * libpng version 1.2.5rc1 - August 24, 2002 * For conditions of distribution and use, see copyright notice in png.h * Copyright (c) 1998-2002 Glenn Randers-Pehrson * Copyright (c) 1998, Intel Corporation @@ -1,7 +1,7 @@ /* pngwio.c - functions for data output * - * libpng 1.2.5beta2 - August 16, 2002 + * libpng 1.2.5rc1 - August 24, 2002 * For conditions of distribution and use, see copyright notice in png.h * Copyright (c) 1998-2002 Glenn Randers-Pehrson * (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger) diff --git a/pngwrite.c b/pngwrite.c index da9897016..113f0911e 100644 --- a/pngwrite.c +++ b/pngwrite.c @@ -1,7 +1,7 @@ /* pngwrite.c - general routines to write a PNG file * - * libpng 1.2.5beta2 - August 16, 2002 + * libpng 1.2.5rc1 - August 24, 2002 * For conditions of distribution and use, see copyright notice in png.h * Copyright (c) 1998-2002 Glenn Randers-Pehrson * (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger) diff --git a/pngwtran.c b/pngwtran.c index 0162551fe..8799b4e16 100644 --- a/pngwtran.c +++ b/pngwtran.c @@ -1,7 +1,7 @@ /* pngwtran.c - transforms the data in a row for PNG writers * - * libpng 1.2.5beta2 - August 16, 2002 + * libpng 1.2.5rc1 - August 24, 2002 * For conditions of distribution and use, see copyright notice in png.h * Copyright (c) 1998-2002 Glenn Randers-Pehrson * (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger) diff --git a/pngwutil.c b/pngwutil.c index bfc1f7758..9296db8cc 100644 --- a/pngwutil.c +++ b/pngwutil.c @@ -1,7 +1,7 @@ /* pngwutil.c - utilities to write a PNG file * - * libpng 1.2.5beta2 - August 16, 2002 + * libpng 1.2.5rc1 - August 24, 2002 * For conditions of distribution and use, see copyright notice in png.h * Copyright (c) 1998-2002 Glenn Randers-Pehrson * (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger) diff --git a/projects/msvc/README.txt b/projects/msvc/README.txt index c55d52f77..4f115da1f 100644 --- a/projects/msvc/README.txt +++ b/projects/msvc/README.txt @@ -1,5 +1,5 @@ Microsoft Developer Studio Build File, Format Version 6.00 for -libpng 1.2.5beta2 (August 16, 2002) and zlib +libpng 1.2.5rc1 (August 24, 2002) and zlib Copyright (C) 2000 Simon-Pierre Cadieux For conditions of distribution and use, see copyright notice in png.h diff --git a/projects/msvc/png32ms.def b/projects/msvc/png32ms.def index c00ebde9a..23f86d45f 100644 --- a/projects/msvc/png32ms.def +++ b/projects/msvc/png32ms.def @@ -6,7 +6,7 @@ LIBRARY DESCRIPTION "PNG image compression library for Windows" EXPORTS -;Version 1.2.5beta2 +;Version 1.2.5rc1 png_build_grayscale_palette @1 png_check_sig @2 png_chunk_error @3 diff --git a/projects/netware.txt b/projects/netware.txt index 55e7f993a..6b80ec97b 100644 --- a/projects/netware.txt +++ b/projects/netware.txt @@ -1,6 +1,6 @@ A set of project files is available for Netware. Get -libpng-1.2.5beta2-project-netware.zip from a libpng distribution +libpng-1.2.5rc1-project-netware.zip from a libpng distribution site such as http://libpng.sourceforge.net Put the zip file in this directory (projects) and then run -"unzip -a libpng-1.2.5beta2-project-netware.zip" +"unzip -a libpng-1.2.5rc1-project-netware.zip" diff --git a/projects/wince.txt b/projects/wince.txt index d23719967..63d4aac77 100644 --- a/projects/wince.txt +++ b/projects/wince.txt @@ -1,6 +1,6 @@ A set of project files is available for WinCE. Get -libpng-1.2.5beta2-project-wince.zip from a libpng distribution +libpng-1.2.5rc1-project-wince.zip from a libpng distribution site such as http://libpng.sourceforge.net Put the zip file in this directory (projects) and then run -"unzip -a libpng-1.2.5beta2-project-wince.zip" +"unzip -a libpng-1.2.5rc1-project-wince.zip" diff --git a/scripts/libpng-config-head.in b/scripts/libpng-config-head.in index 35e365701..ec1af3570 100755 --- a/scripts/libpng-config-head.in +++ b/scripts/libpng-config-head.in @@ -8,7 +8,7 @@ # Modeled after libxml-config. -version=1.2.5beta2 +version=1.2.5rc1 prefix="" cppflags="" cflags="" diff --git a/scripts/libpng.pc.in b/scripts/libpng.pc.in index 3bd96a164..90362f385 100644 --- a/scripts/libpng.pc.in +++ b/scripts/libpng.pc.in @@ -6,6 +6,6 @@ includedir=${exec_prefix}/include Name: libpng12 Description: Loads and saves PNG files -Version: 1.2.5beta2 +Version: 1.2.5rc1 Libs: -L${libdir} -lpng12 -lz -lm Cflags: -I${includedir}/libpng12 diff --git a/scripts/makefile.32sunu b/scripts/makefile.32sunu index d5634bb8f..9b30f2c7f 100644 --- a/scripts/makefile.32sunu +++ b/scripts/makefile.32sunu @@ -33,7 +33,7 @@ RANLIB=echo LIBNAME=libpng12 PNGMAJ = 0 -PNGMIN = 1.2.5beta2 +PNGMIN = 1.2.5rc1 PNGVER = $(PNGMAJ).$(PNGMIN) INCPATH=$(prefix)/include @@ -137,17 +137,17 @@ install-static: install-headers libpng.a install-shared: install-headers $(LIBNAME).so.$(PNGVER) libpng.pc \ libpng.so.3 -@if [ ! -d $(DL) ]; then mkdir $(DL); fi - -@/bin/rm -f $(DL)/$(LIBNAME).so.$(PNGMAJ)* $(DL)/$(LIBNAME).so + -@/bin/rm -f $(DL)/$(LIBNAME).so.$(PNGVER)* $(DL)/$(LIBNAME).so -@/bin/rm -f $(DL)/libpng.so -@/bin/rm -f $(DL)/libpng.so.3 - -@/bin/rm -f $(DL)/libpng.so.3.* + -@/bin/rm -f $(DL)/libpng.so.3.$(PNGVER)* cp $(LIBNAME).so.$(PNGVER) $(DL) cp libpng.so.3.$(PNGMIN) $(DL) chmod 755 $(DL)/$(LIBNAME).so.$(PNGVER) chmod 755 $(DL)/libpng.so.3.$(PNGMIN) (cd $(DL); \ - ln -f -s $(LIBNAME).so.$(PNGVER) libpng.so; \ ln -f -s libpng.so.3.$(PNGMIN) libpng.so.3; \ + ln -f -s libpng.so.3 libpng.so; \ ln -f -s $(LIBNAME).so.$(PNGVER) $(LIBNAME).so.$(PNGMAJ); \ ln -f -s $(LIBNAME).so.$(PNGMAJ) $(LIBNAME).so) -@if [ ! -d $(DL)/pkgconfig ]; then mkdir $(DL)/pkgconfig @@ -191,9 +191,10 @@ test-installed: ./pngtesti pngtest.png clean: - /bin/rm -f *.o libpng.a pngtest pngtesti pngout.png libpng.pc \ + /bin/rm -f *.o libpng.a pngtest pngtesti pngout.png \ libpng-config $(LIBNAME).so $(LIBNAME).so.$(PNGMAJ)* \ - libpng.so.3.$(PNGMIN) + libpng.so.3.$(PNGMIN) \ + libpng.pc DOCS = ANNOUNCE CHANGES INSTALL KNOWNBUG LICENSE README TODO Y2KINFO writelock: diff --git a/scripts/makefile.64sunu b/scripts/makefile.64sunu index c680e090e..b7b9a11cc 100644 --- a/scripts/makefile.64sunu +++ b/scripts/makefile.64sunu @@ -33,7 +33,7 @@ RANLIB=echo LIBNAME=libpng12 PNGMAJ = 0 -PNGMIN = 1.2.5beta2 +PNGMIN = 1.2.5rc1 PNGVER = $(PNGMAJ).$(PNGMIN) INCPATH=$(prefix)/include @@ -137,17 +137,17 @@ install-static: install-headers libpng.a install-shared: install-headers $(LIBNAME).so.$(PNGVER) libpng.pc \ libpng.so.3.$(PNGMIN) -@if [ ! -d $(DL) ]; then mkdir $(DL); fi - -@/bin/rm -f $(DL)/$(LIBNAME).so.$(PNGMAJ)* $(DL)/$(LIBNAME).so + -@/bin/rm -f $(DL)/$(LIBNAME).so.$(PNGMAJ).$(PNGVER)* $(DL)/$(LIBNAME).so -@/bin/rm -f $(DL)/libpng.so -@/bin/rm -f $(DL)/libpng.so.3 - -@/bin/rm -f $(DL)/libpng.so.3.* + -@/bin/rm -f $(DL)/libpng.so.3.$(PNGVER)* cp $(LIBNAME).so.$(PNGVER) $(DL) cp libpng.so.3.$(PNGMIN) $(DL) chmod 755 $(DL)/$(LIBNAME).so.$(PNGVER) chmod 755 $(DL)/libpng.so.3.$(PNGMIN) (cd $(DL); \ - ln -f -s $(LIBNAME).so.$(PNGVER) libpng.so; \ ln -f -s libpng.so.3.$(PNGMIN) libpng.so.3; \ + ln -f -s libpng.so.3 libpng.so; \ ln -f -s $(LIBNAME).so.$(PNGVER) $(LIBNAME).so.$(PNGMAJ); \ ln -f -s $(LIBNAME).so.$(PNGMAJ) $(LIBNAME).so) -@if [ ! -d $(DL)/pkgconfig ]; then mkdir $(DL)/pkgconfig; fi @@ -191,9 +191,10 @@ test-installed: ./pngtesti pngtest.png clean: - /bin/rm -f *.o libpng.a pngtest pngtesti pngout.png libpng.pc \ + /bin/rm -f *.o libpng.a pngtest pngtesti pngout.png \ libpng-config $(LIBNAME).so $(LIBNAME).so.$(PNGMAJ)* \ - libpng.so.3.$(PNGMIN) + libpng.so.3.$(PNGMIN) \ + libpng.pc DOCS = ANNOUNCE CHANGES INSTALL KNOWNBUG LICENSE README TODO Y2KINFO writelock: diff --git a/scripts/makefile.aix b/scripts/makefile.aix index e7ac89cc7..167fedb61 100644 --- a/scripts/makefile.aix +++ b/scripts/makefile.aix @@ -17,7 +17,7 @@ RANLIB = ranlib RM = rm -f PNGMAJ = 0 -PNGMIN = 1.2.5beta2 +PNGMIN = 1.2.5rc1 PNGVER = $(PNGMAJ).$(PNGMIN) prefix=/usr/local diff --git a/scripts/makefile.beos b/scripts/makefile.beos index 2d148ca37..b85154dc5 100644 --- a/scripts/makefile.beos +++ b/scripts/makefile.beos @@ -12,7 +12,7 @@ ZLIBLIB=/usr/local/lib ZLIBINC=/usr/local/include PNGMAJ = 0 -PNGMIN = 1.2.5beta2 +PNGMIN = 1.2.5rc1 PNGVER = $(PNGMAJ).$(PNGMIN) ALIGN= @@ -124,17 +124,17 @@ install-static: install-headers libpng.a install-shared: install-headers $(LIBNAME).so.$(PNGVER) libpng.pc \ libpng.so.3.$(PNGMIN) -@if [ ! -d $(DL) ]; then mkdir $(DL); fi - -@/bin/rm -f $(DL)/$(LIBNAME).so.$(PNGMAJ)* $(DL)/$(LIBNAME).so + -@/bin/rm -f $(DL)/$(LIBNAME).so.$(PNGVER)* $(DL)/$(LIBNAME).so -@/bin/rm -f $(DL)/libpng.so -@/bin/rm -f $(DL)/libpng.so.3 - -@/bin/rm -f $(DL)/libpng.so.3.* + -@/bin/rm -f $(DL)/libpng.so.3.$(PNGMIN)* cp $(LIBNAME).so.$(PNGVER) $(DL) cp libpng.so.3.$(PNGMIN) $(DL) chmod 755 $(DL)/$(LIBNAME).so.$(PNGVER) chmod 755 $(DL)/libpng.so.3.$(PNGMIN) (cd $(DL); \ - ln -sf $(LIBNAME).so.$(PNGVER) libpng.so; \ ln -sf libpng.so.3.$(PNGMIN) libpng.so.3; \ + ln -sf libpng.so.3 libpng.so; \ ln -sf $(LIBNAME).so.$(PNGVER) $(LIBNAME).so.$(PNGMAJ); \ ln -sf $(LIBNAME).so.$(PNGMAJ) $(LIBNAME).so) -@if [ ! -d $(DL)/pkgconfig ]; then mkdir $(DL)/pkgconfig; fi @@ -176,9 +176,10 @@ test-installed: ./pngtesti pngtest.png clean: - /bin/rm -f *.o libpng.a pngtest pngout.png libpng.pc libpng-config \ + /bin/rm -f *.o libpng.a pngtest pngout.png libpng-config \ $(LIBNAME).so $(LIBNAME).so.$(PNGMAJ)* pngtesti \ - libpng.so.3.$(PNGMIN) + libpng.so.3.$(PNGMIN) \ + libpng.pc # DO NOT DELETE THIS LINE -- make depend depends on it. diff --git a/scripts/makefile.cygwin b/scripts/makefile.cygwin index 71de272a0..5c761cb8b 100644 --- a/scripts/makefile.cygwin +++ b/scripts/makefile.cygwin @@ -79,7 +79,7 @@ CFLAGS= $(strip $(MINGW_CCFLAGS) $(addprefix -I,$(ZLIBINC)) \ LIBNAME = libpng12 PNGMAJ = 0 CYGDLL = 12 -PNGMIN = 1.2.5beta2 +PNGMIN = 1.2.5rc1 PNGVER = $(PNGMAJ).$(PNGMIN) SHAREDLIB=cygpng$(CYGDLL).dll diff --git a/scripts/makefile.darwin b/scripts/makefile.darwin index 26a01d740..c48bbb741 100644 --- a/scripts/makefile.darwin +++ b/scripts/makefile.darwin @@ -23,7 +23,7 @@ LDFLAGS=-L. -L$(ZLIBLIB) -lpng12 -lz RANLIB=ranlib PNGMAJ = 0 -PNGMIN = 1.2.5beta2 +PNGMIN = 1.2.5rc1 PNGVER = $(PNGMAJ).$(PNGMIN) LIBNAME = libpng12 @@ -123,18 +123,18 @@ install-static: install-headers libpng.a install-shared: install-headers $(LIBNAME).dylib libpng.pc \ libpng.3.$(PNGMIN).dylib -@if [ ! -d $(DL) ]; then mkdir $(DL); fi - -@/bin/rm -f $(DL)/$(LIBNAME).$(PNGMAJ)*.dylib + -@/bin/rm -f $(DL)/$(LIBNAME).$(PNGVER)*.dylib -@/bin/rm -f $(DL)/$(LIBNAME).dylib -@/bin/rm -f $(DL)/libpng.dylib -@/bin/rm -f $(DL)/libpng.3.dylib - -@/bin/rm -f $(DL)/libpng.3.*.dylib + -@/bin/rm -f $(DL)/libpng.3.$(PNGMIN)*.dylib cp $(LIBNAME).$(PNGVER).dylib $(DL) cp libpng.3.$(PNGMIN).dylib $(DL) chmod 755 $(DL)/$(LIBNAME).$(PNGVER).dylib chmod 755 $(DL)/libpng.3.$(PNGMIN).dylib (cd $(DL); \ - ln -sf $(LIBNAME).$(PNGVER).dylib libpng.dylib; \ ln -sf libpng.3.$(PNGMIN).dylib libpng.3.dylib; \ + ln -sf libpng.3.dylib libpng.dylib; \ ln -sf $(LIBNAME).$(PNGVER).dylib $(LIBNAME).$(PNGMAJ).dylib; \ ln -sf $(LIBNAME).$(PNGMAJ).dylib $(LIBNAME).dylib) -@if [ ! -d $(DL)/pkgconfig ]; then mkdir $(DL)/pkgconfig; fi @@ -176,8 +176,9 @@ test-installed: ./pngtesti pngtest.png clean: - rm -f *.o libpng.a pngtest pngout.png libpng.pc libpng-config \ - $(LIBNAME).*dylib pngtesti libpng.3.$(PNGMIN).dylib + rm -f *.o libpng.a pngtest pngout.png libpng-config \ + libpng.3.$(PNGMIN).dylib \ + libpng.pc $(LIBNAME).*dylib pngtesti DOCS = ANNOUNCE CHANGES INSTALL KNOWNBUG LICENSE README TODO Y2KINFO writelock: diff --git a/scripts/makefile.dec b/scripts/makefile.dec index a005ce7ad..d14d0b038 100644 --- a/scripts/makefile.dec +++ b/scripts/makefile.dec @@ -32,7 +32,7 @@ ZLIBLIB=../zlib ZLIBINC=../zlib PNGMAJ = 0 -PNGMIN = 1.2.5beta2 +PNGMIN = 1.2.5rc1 PNGVER = $(PNGMAJ).$(PNGMIN) LIBNAME = libpng12 @@ -105,17 +105,17 @@ install-static: install-headers libpng.a install-shared: install-headers $(LIBNAME).so.$(PNGVER) libpng.pc \ libpng.so.3.$(PNGMIN) -@if [ ! -d $(DL) ]; then mkdir $(DL); fi - -@/bin/rm -f $(DL)/$(LIBNAME).so.$(PNGMAJ)* $(DL)/$(LIBNAME).so + -@/bin/rm -f $(DL)/$(LIBNAME).so.$(PNGVER)* $(DL)/$(LIBNAME).so -@/bin/rm -f $(DL)/libpng.so -@/bin/rm -f $(DL)/libpng.so.3 - -@/bin/rm -f $(DL)/libpng.so.3.* + -@/bin/rm -f $(DL)/libpng.so.3.$(PNGMIN)* cp $(LIBNAME).so.$(PNGVER) $(DL) cp libpng.so.3.$(PNGMIN) $(DL) chmod 755 $(DL)/$(LIBNAME).so.$(PNGVER) chmod 755 $(DL)/libpng.so.3.$(PNGMIN) (cd $(DL); \ - ln -sf $(LIBNAME).so.$(PNGVER) libpng.so; \ - ln -sf libpng.so.3.$(PNGMIN) libpng.so.3; \ + ln -f -s libpng.so.3.$(PNGMIN) libpng.so.3; \ + ln -f -s libpng.so.3 libpng.so; \ ln -sf $(LIBNAME).so.$(PNGVER) $(LIBNAME).so.$(PNGMAJ); \ ln -sf $(LIBNAME).so.$(PNGMAJ) $(LIBNAME).so) -@if [ ! -d $(DL)/pkgconfig ]; then mkdir $(DL)/pkgconfig; fi @@ -159,9 +159,10 @@ test-installed: ./pngtesti pngtest.png clean: - /bin/rm -f *.o libpng.a pngtest pngtesti pngout.png libpng.pc \ + /bin/rm -f *.o libpng.a pngtest pngtesti pngout.png \ libpng-config $(LIBNAME).so $(LIBNAME).so.$(PNGMAJ)* \ - libpng.so.3.$(PNGMIN) + libpng.so.3.$(PNGMIN) \ + libpng.pc # DO NOT DELETE THIS LINE -- make depend depends on it. diff --git a/scripts/makefile.gcmmx b/scripts/makefile.gcmmx index 68784daf1..54325281e 100644 --- a/scripts/makefile.gcmmx +++ b/scripts/makefile.gcmmx @@ -15,7 +15,7 @@ LIBNAME = libpng12 PNGMAJ = 0 -PNGMIN = 1.2.5beta2 +PNGMIN = 1.2.5rc1 PNGVER = $(PNGMAJ).$(PNGMIN) CC=gcc @@ -168,17 +168,17 @@ install-static: install-headers libpng.a install-shared: install-headers $(LIBNAME).so.$(PNGVER) libpng.pc \ libpng.so.3.$(PNGMIN) -@if [ ! -d $(DL) ]; then mkdir $(DL); fi - -@/bin/rm -f $(DL)/$(LIBNAME).so.$(PNGMAJ)* $(DL)/$(LIBNAME).so + -@/bin/rm -f $(DL)/$(LIBNAME).so.$(PNGVER)* $(DL)/$(LIBNAME).so -@/bin/rm -f $(DL)/libpng.so -@/bin/rm -f $(DL)/libpng.so.3 - -@/bin/rm -f $(DL)/libpng.so.3.* + -@/bin/rm -f $(DL)/libpng.so.3.$(PNGMIN)* cp $(LIBNAME).so.$(PNGVER) $(DL) cp libpng.so.3.$(PNGMIN) $(DL) chmod 755 $(DL)/$(LIBNAME).so.$(PNGVER) chmod 755 $(DL)/libpng.so.3.$(PNGMIN) (cd $(DL); \ - ln -sf $(LIBNAME).so.$(PNGVER) libpng.so; \ ln -sf libpng.so.3.$(PNGMIN) libpng.so.3; \ + ln -sf libpng.so.3 libpng.so; \ ln -sf $(LIBNAME).so.$(PNGVER) $(LIBNAME).so.$(PNGMAJ); \ ln -sf $(LIBNAME).so.$(PNGMAJ) $(LIBNAME).so) -@if [ ! -d $(DL)/pkgconfig ]; then mkdir $(DL)/pkgconfig; fi @@ -220,9 +220,10 @@ test-installed: ./pngtesti pngtest.png clean: - /bin/rm -f *.o libpng.a pngtest pngout.png libpng.pc libpng-config \ + /bin/rm -f *.o libpng.a pngtest pngout.png libpng-config \ $(LIBNAME).so $(LIBNAME).so.$(PNGMAJ)* pngtest-static pngtesti \ - libpng.so.3.$(PNGMIN) + libpng.so.3.$(PNGMIN) \ + libpng.pc DOCS = ANNOUNCE CHANGES INSTALL KNOWNBUG LICENSE README TODO Y2KINFO writelock: diff --git a/scripts/makefile.hpgcc b/scripts/makefile.hpgcc index 0d4167d01..d89154f80 100644 --- a/scripts/makefile.hpgcc +++ b/scripts/makefile.hpgcc @@ -33,7 +33,7 @@ RANLIB=ranlib #RANLIB=echo PNGMAJ = 0 -PNGMIN = 1.2.5beta2 +PNGMIN = 1.2.5rc1 PNGVER = $(PNGMAJ).$(PNGMIN) LIBNAME = libpng12 @@ -127,17 +127,17 @@ install-static: install-headers libpng.a install-shared: install-headers $(LIBNAME).sl.$(PNGVER) libpng.pc \ libpng.sl.3.$(PNGMIN) -@if [ ! -d $(DL) ]; then mkdir $(DL); fi - -@/bin/rm -f $(DL)/$(LIBNAME).sl.$(PNGMAJ)* $(DL)/$(LIBNAME).sl + -@/bin/rm -f $(DL)/$(LIBNAME).sl.$(PNGVER)* $(DL)/$(LIBNAME).sl -@/bin/rm -f $(DL)/libpng.sl -@/bin/rm -f $(DL)/libpng.sl.3 - -@/bin/rm -f $(DL)/libpng.sl.3.* + -@/bin/rm -f $(DL)/libpng.sl.3.$(PNGMIN)* cp $(LIBNAME).sl.$(PNGVER) $(DL) cp libpng.sl.3.$(PNGMIN) $(DL) chmod 755 $(DL)/$(LIBNAME).sl.$(PNGVER) chmod 755 $(DL)/libpng.sl.3.$(PNGMIN) (cd $(DL); \ - ln -sf $(LIBNAME).sl.$(PNGVER) libpng.sl; \ ln -sf libpng.sl.3.$(PNGMIN) libpng.sl.3; \ + ln -sf libpng.sl.3 libpng.sl; \ ln -sf $(LIBNAME).sl.$(PNGVER) $(LIBNAME).sl.$(PNGMAJ); \ ln -sf $(LIBNAME).sl.$(PNGMAJ) $(LIBNAME).sl) -@if [ ! -d $(DL)/pkgconfig ]; then mkdir $(DL)/pkgconfig; fi @@ -181,13 +181,10 @@ test-installed: ./pngtesti pngtest.png clean: - /bin/rm -f *.o libpng.a pngtest pngtesti pngout.png libpng.pc \ + /bin/rm -f *.o libpng.a pngtest pngtesti pngout.png \ libpng-config $(LIBNAME).sl $(LIBNAME).sl.$(PNGMAJ)* \ - libpng.sl.3.$(PNGMIN) - -clean: - /bin/rm -f *.o libpng.a $(SHAREDLIB).sl $(SHAREDLIB).sl.$(PNGMAJ)* \ - pngtest pngout.png + libpng.sl.3.$(PNGMIN) \ + libpng.pc DOCS = ANNOUNCE CHANGES INSTALL KNOWNBUG LICENSE README TODO Y2KINFO writelock: diff --git a/scripts/makefile.hpux b/scripts/makefile.hpux index fb2d37406..0828b5898 100644 --- a/scripts/makefile.hpux +++ b/scripts/makefile.hpux @@ -17,7 +17,7 @@ LDFLAGS=-L. -L$(ZLIBLIB) -lpng -lz -lm RANLIB=ranlib PNGMAJ = 0 -PNGMIN = 1.2.5beta2 +PNGMIN = 1.2.5rc1 PNGVER = $(PNGMAJ).$(PNGMIN) LIBNAME = libpng12 @@ -112,17 +112,17 @@ install-static: install-headers libpng.a install-shared: install-headers $(LIBNAME).sl.$(PNGVER) libpng.pc \ libpng.sl.3.$(PNGMIN) -@if [ ! -d $(DL) ]; then mkdir $(DL); fi - -@/bin/rm -f $(DL)/$(LIBNAME).sl.$(PNGMAJ)* $(DL)/$(LIBNAME).sl + -@/bin/rm -f $(DL)/$(LIBNAME).sl.$(PNGVER)* $(DL)/$(LIBNAME).sl -@/bin/rm -f $(DL)/libpng.sl -@/bin/rm -f $(DL)/libpng.sl.3 - -@/bin/rm -f $(DL)/libpng.sl.3.* + -@/bin/rm -f $(DL)/libpng.sl.3.$(PNGMIN)* cp $(LIBNAME).sl.$(PNGVER) $(DL) cp libpng.sl.3.$(PNGMIN) $(DL) chmod 755 $(DL)/$(LIBNAME).sl.$(PNGVER) chmod 755 $(DL)/libpng.sl.3.$(PNGMIN) (cd $(DL); \ - ln -sf $(LIBNAME).sl.$(PNGVER) libpng.sl; \ ln -sf libpng.sl.3.$(PNGMIN) libpng.sl.3; \ + ln -sf libpng.sl.3 libpng.sl; \ ln -sf $(LIBNAME).sl.$(PNGVER) $(LIBNAME).sl.$(PNGMAJ); \ ln -sf $(LIBNAME).sl.$(PNGMAJ) $(LIBNAME).sl) -@if [ ! -d $(DL)/pkgconfig ]; then mkdir $(DL)/pkgconfig; fi @@ -166,9 +166,10 @@ test-installed: ./pngtesti pngtest.png clean: - /bin/rm -f *.o libpng.a pngtest pngtesti pngout.png libpng.pc \ + /bin/rm -f *.o libpng.a pngtest pngtesti pngout.png \ libpng-config $(LIBNAME).sl $(LIBNAME).sl.$(PNGMAJ)* \ - libpng.sl.3.$(PNGMIN) + libpng.sl.3.$(PNGMIN) \ + libpng.pc DOCS = ANNOUNCE CHANGES INSTALL KNOWNBUG LICENSE README TODO Y2KINFO writelock: diff --git a/scripts/makefile.linux b/scripts/makefile.linux index 08eb82cff..5c9c233c6 100644 --- a/scripts/makefile.linux +++ b/scripts/makefile.linux @@ -5,7 +5,7 @@ LIBNAME = libpng12 PNGMAJ = 0 -PNGMIN = 1.2.5beta2 +PNGMIN = 1.2.5rc1 PNGVER = $(PNGMAJ).$(PNGMIN) CC=gcc @@ -141,17 +141,17 @@ install-static: install-headers libpng.a install-shared: install-headers $(LIBNAME).so.$(PNGVER) libpng.pc \ libpng.so.3.$(PNGMIN) -@if [ ! -d $(DL) ]; then mkdir $(DL); fi - -@/bin/rm -f $(DL)/$(LIBNAME).so.$(PNGMAJ)* $(DL)/$(LIBNAME).so + -@/bin/rm -f $(DL)/$(LIBNAME).so.$(PNGVER)* $(DL)/$(LIBNAME).so -@/bin/rm -f $(DL)/libpng.so -@/bin/rm -f $(DL)/libpng.so.3 - -@/bin/rm -f $(DL)/libpng.so.3.* + -@/bin/rm -f $(DL)/libpng.so.3.$(PNGMIN)* cp $(LIBNAME).so.$(PNGVER) $(DL) cp libpng.so.3.$(PNGMIN) $(DL) chmod 755 $(DL)/$(LIBNAME).so.$(PNGVER) chmod 755 $(DL)/libpng.so.3.$(PNGMIN) (cd $(DL); \ - ln -sf $(LIBNAME).so.$(PNGVER) libpng.so; \ ln -sf libpng.so.3.$(PNGMIN) libpng.so.3; \ + ln -sf libpng.so.3 libpng.so; \ ln -sf $(LIBNAME).so.$(PNGVER) $(LIBNAME).so.$(PNGMAJ); \ ln -sf $(LIBNAME).so.$(PNGMAJ) $(LIBNAME).so) -@if [ ! -d $(DL)/pkgconfig ]; then mkdir $(DL)/pkgconfig; fi @@ -193,9 +193,10 @@ test-installed: ./pngtesti pngtest.png clean: - /bin/rm -f *.o libpng.a pngtest pngout.png libpng.pc libpng-config \ + /bin/rm -f *.o libpng.a pngtest pngout.png libpng-config \ $(LIBNAME).so $(LIBNAME).so.$(PNGMAJ)* pngtest-static pngtesti \ - libpng.so.3.$(PNGMIN) + libpng.so.3.$(PNGMIN) \ + libpng.pc DOCS = ANNOUNCE CHANGES INSTALL KNOWNBUG LICENSE README TODO Y2KINFO writelock: diff --git a/scripts/makefile.macosx b/scripts/makefile.macosx index f874b2170..d2402d99c 100644 --- a/scripts/makefile.macosx +++ b/scripts/makefile.macosx @@ -17,7 +17,7 @@ ZLIBINC=../zlib CC=cc PNGMAJ = 0 -PNGMIN = 1.2.5beta2 +PNGMIN = 1.2.5rc1 PNGVER = $(PNGMAJ).$(PNGMIN) CFLAGS=-fno-common -I$(ZLIBINC) -O # -g -DPNG_DEBUG=5 @@ -108,16 +108,19 @@ install-shared: install-headers $(LIBNAME).$(PNGVER).$(SHAREDLIB_POSTFIX) \ libpng.pc libpng.3.$(PNGMIN).$(SHAREDLIB_POSTFIX) -@if [ ! -d $(DL) ]; then mkdir $(DL); fi -@/bin/rm -f \ - $(DL)/$(LIBNAME).$(PNGMAJ)*.$(SHAREDLIB_POSTFIX) + $(DL)/$(LIBNAME).$(PNGVER)*.$(SHAREDLIB_POSTFIX) -@/bin/rm -f $(DL)/$(LIBNAME).$(SHAREDLIB_POSTFIX) -@/bin/rm -f libpng.$(SHARED_POSTFIX) -@/bin/rm -f libpng.3.$(SHARED_POSTFIX) - -@/bin/rm -f libpng.3.*.$(SHARED_POSTFIX) + -@/bin/rm -f libpng.3.$(PNGMIN)*.$(SHARED_POSTFIX) cp libpng.3.$(PNGMIN).$(SHAREDLIB_POSTFIX) $(DL) cp $(LIBNAME).$(PNGVER).$(SHAREDLIB_POSTFIX) $(DL) chmod 755 $(DL)/$(LIBNAME).$(PNGVER).$(SHAREDLIB_POSTFIX) chmod 755 $(DL)/libpng.3.$(PNGMIN).$(SHAREDLIB_POSTFIX) (cd $(DL); \ + ln -f -s libpng.3.$(PNGMIN).$(SHARED_POSTFIX) \ + libpng.3.$(SHARED_POSTFIX); \ + ln -f -s libpng.3.$(SHARED_POSTFIX) libpng.$(SHARED_POSTFIX); \ ln -f -s $(LIBNAME).$(PNGVER).$(SHARED_POSTFIX) \ libpng.$(SHARED_POSTFIX); \ ln -f -s libpng.3.$(PNGMIN).$(SHARED_POSTFIX) \ @@ -165,10 +168,11 @@ test-installed: ./pngtesti pngtest.png clean: - rm -f *.o libpng.a pngtest pngout.png libpng.pc libpng-config \ + rm -f *.o libpng.a pngtest pngout.png libpng-config \ $(LIBNAME).$(PNGVER).$(SHAREDLIB_POSTFIX) \ $(LIBNAME).$(SHAREDLIB_POSTFIX) \ - libpng.3.$(PNGMIN).$(SHAREDLIB_POSTFIX) + libpng.3.$(PNGMIN).$(SHAREDLIB_POSTFIX) \ + libpng.pc DOCS = ANNOUNCE CHANGES INSTALL KNOWNBUG LICENSE README TODO Y2KINFO writelock: diff --git a/scripts/makefile.ne12bsd b/scripts/makefile.ne12bsd index 0d5b154c1..e35bdd6f8 100644 --- a/scripts/makefile.ne12bsd +++ b/scripts/makefile.ne12bsd @@ -13,7 +13,7 @@ INCSDIR=${LOCALBASE}/include/libpng12 LIB= png12 SHLIB_MAJOR= 0 -SHLIB_MINOR= 1.2.5beta2 +SHLIB_MINOR= 1.2.5rc1 SRCS= pnggccrd.c png.c pngset.c pngget.c pngrutil.c pngtrans.c pngwutil.c \ pngread.c pngrio.c pngwio.c pngwrite.c pngrtran.c \ pngwtran.c pngmem.c pngerror.c pngpread.c diff --git a/scripts/makefile.netbsd b/scripts/makefile.netbsd index b358de204..ef51d5e46 100644 --- a/scripts/makefile.netbsd +++ b/scripts/makefile.netbsd @@ -13,7 +13,7 @@ INCSDIR=${LOCALBASE}/include/libpng LIB= png SHLIB_MAJOR= 3 -SHLIB_MINOR= 1.2.5beta2 +SHLIB_MINOR= 1.2.5rc1 SRCS= pnggccrd.c png.c pngset.c pngget.c pngrutil.c pngtrans.c pngwutil.c \ pngread.c pngrio.c pngwio.c pngwrite.c pngrtran.c \ pngwtran.c pngmem.c pngerror.c pngpread.c diff --git a/scripts/makefile.openbsd b/scripts/makefile.openbsd index f548d2303..668afded0 100644 --- a/scripts/makefile.openbsd +++ b/scripts/makefile.openbsd @@ -7,7 +7,7 @@ LIBDIR= ${PREFIX}/lib MANDIR= ${PREFIX}/man/cat SHLIB_MAJOR= 0 -SHLIB_MINOR= 1.2.5beta2 +SHLIB_MINOR= 1.2.5rc1 LIB= png SRCS= png.c pngerror.c pnggccrd.c pngget.c pngmem.c pngpread.c \ diff --git a/scripts/makefile.sco b/scripts/makefile.sco index e05e047f2..11561035d 100644 --- a/scripts/makefile.sco +++ b/scripts/makefile.sco @@ -24,7 +24,7 @@ LDFLAGS=-L. -L$(ZLIBLIB) -lpng12 -lz -lm RANLIB=echo PNGMAJ = 0 -PNGMIN = 1.2.5beta2 +PNGMIN = 1.2.5rc1 PNGVER = $(PNGMAJ).$(PNGMIN) LIBNAME = libpng12 @@ -119,17 +119,17 @@ install-static: install-headers libpng.a install-shared: install-headers $(LIBNAME).so.$(PNGVER) libpng.pc \ libpng.so.3.$(PNGMIN) -@if [ ! -d $(DL) ]; then mkdir $(DL); fi - -@/bin/rm -f $(DL)/$(LIBNAME).so.$(PNGMAJ)* $(DL)/$(LIBNAME).so + -@/bin/rm -f $(DL)/$(LIBNAME).so.$(PNGVER)* $(DL)/$(LIBNAME).so -@/bin/rm -f $(DL)/libpng.so -@/bin/rm -f $(DL)/libpng.so.3 - -@/bin/rm -f $(DL)/libpng.so.3.* + -@/bin/rm -f $(DL)/libpng.so.3.$(PNGMIN)* cp $(LIBNAME).so.$(PNGVER) $(DL) cp libpng.so.3.$(PNGMIN) $(DL) chmod 755 $(DL)/$(LIBNAME).so.$(PNGVER) chmod 755 $(DL)/libpng.so.3.$(PNGMIN) (cd $(DL); \ - ln -f -s $(LIBNAME).so.$(PNGVER) libpng.so; \ ln -f -s libpng.so.3.$(PNGMIN) libpng.so.3; \ + ln -f -s libpng.so.3 libpng.so; \ ln -f -s $(LIBNAME).so.$(PNGVER) $(LIBNAME).so.$(PNGMAJ); \ ln -f -s $(LIBNAME).so.$(PNGMAJ) $(LIBNAME).so) -@if [ ! -d $(DL)/pkgconfig ]; then mkdir $(DL)/pkgconfig; fi @@ -171,13 +171,10 @@ test-installed: ./pngtesti pngtest.png clean: - /bin/rm -f *.o libpng.a pngtest pngout.png libpng.pc libpng-config \ + /bin/rm -f *.o libpng.a pngtest pngout.png libpng-config \ $(LIBNAME).so $(LIBNAME).so.$(PNGMAJ)* pngtest-static pngtesti \ - libpng.so.3.$(PNGMIN) - - -clean: - /bin/rm -f *.o libpng.a $(LIBNAME).so $(LIBNAME).so.$(PNGMAJ)* pngtest pngout.png + libpng.so.3.$(PNGMIN) \ + libpng.pc DOCS = ANNOUNCE CHANGES INSTALL KNOWNBUG LICENSE README TODO Y2KINFO writelock: diff --git a/scripts/makefile.sggcc b/scripts/makefile.sggcc index 156fb1427..df2afd6f3 100644 --- a/scripts/makefile.sggcc +++ b/scripts/makefile.sggcc @@ -18,7 +18,7 @@ ZLIBINC=../zlib LIBNAME=libpng12 PNGMAJ = 0 -PNGMIN = 1.2.5beta2 +PNGMIN = 1.2.5rc1 PNGVER = $(PNGMAJ).$(PNGMIN) CC=gcc @@ -124,17 +124,17 @@ install-static: install-headers libpng.a install-shared: install-headers $(LIBNAME).so.$(PNGVER) libpng.pc \ libpng.so.3.$(PNGMIN) -@if [ ! -d $(DL) ]; then mkdir $(DL); fi - -@/bin/rm -f $(DL)/$(LIBNAME).so.$(PNGMAJ)* $(DL)/$(LIBNAME).so + -@/bin/rm -f $(DL)/$(LIBNAME).so.$(PNGVER)* $(DL)/$(LIBNAME).so -@/bin/rm -f $(DL)/libpng.so -@/bin/rm -f $(DL)/libpng.so.3 - -@/bin/rm -f $(DL)/libpng.so.3.* + -@/bin/rm -f $(DL)/libpng.so.3.$(PNGMIN)* cp $(LIBNAME).so.$(PNGVER) $(DL) cp libpng.so.3.$(PNGMIN) $(DL) chmod 755 $(DL)/$(LIBNAME).so.$(PNGVER) chmod 755 $(DL)/libpng.so.3.$(PNGMIN) (cd $(DL); \ - ln -sf $(LIBNAME).so.$(PNGVER) libpng.so; \ ln -sf libpng.so.3.$(PNGMIN) libpng.so.3; \ + ln -sf libpng.so.3 libpng.so; \ ln -sf $(LIBNAME).so.$(PNGVER) $(LIBNAME).so.$(PNGMAJ); \ ln -sf $(LIBNAME).so.$(PNGMAJ) $(LIBNAME).so) -@if [ ! -d $(DL)/pkgconfig ]; then mkdir $(DL)/pkgconfig; fi @@ -179,8 +179,9 @@ test-installed: clean: rm -f *.o libpng.a pngtest pngtesti pngout.png libpng.pc libpng-config \ - $(LIBNAME).so $(LIBNAME).so.$(PNGMAJ)* so_locations \ - libpng.so.3.$(PNGMIN) + $(LIBNAME).so $(LIBNAME).so.$(PNGMAJ)* \ + libpng.so.3.$(PNGMIN) \ + so_locations DOCS = ANNOUNCE CHANGES INSTALL KNOWNBUG LICENSE README TODO Y2KINFO writelock: diff --git a/scripts/makefile.sgi b/scripts/makefile.sgi index df67042e2..cad97a365 100644 --- a/scripts/makefile.sgi +++ b/scripts/makefile.sgi @@ -5,7 +5,7 @@ LIBNAME=libpng12 PNGMAJ = 0 -PNGMIN = 1.2.5beta2 +PNGMIN = 1.2.5rc1 PNGVER = $(PNGMAJ).$(PNGMIN) # Where make install puts libpng.a, libpng12.so, and libpng12/png.h @@ -128,17 +128,17 @@ install-static: install-headers libpng.a install-shared: install-headers $(LIBNAME).so.$(PNGVER) libpng.pc \ libpng.so.3.$(PNGMIN) -@if [ ! -d $(DL) ]; then mkdir $(DL); fi - -@/bin/rm -f $(DL)/$(LIBNAME).so.$(PNGMAJ)* $(DL)/$(LIBNAME).so + -@/bin/rm -f $(DL)/$(LIBNAME).so.$(PNGVER)* $(DL)/$(LIBNAME).so -@/bin/rm -f $(DL)/libpng.so -@/bin/rm -f $(DL)/libpng.so.3 - -@/bin/rm -f $(DL)/libpng.so.3.* + -@/bin/rm -f $(DL)/libpng.so.3.$(PNGMIN)* cp $(LIBNAME).so.$(PNGVER) $(DL) cp libpng.so.3.$(PNGMIN) $(DL) chmod 755 $(DL)/$(LIBNAME).so.$(PNGVER) chmod 755 $(DL)/libpng.so.3.$(PNGMIN) (cd $(DL); \ - ln -sf $(LIBNAME).so.$(PNGVER) libpng.so; \ ln -sf libpng.so.3.$(PNGMIN) libpng.so.3; \ + ln -sf libpng.so.3 libpng.so; \ ln -sf $(LIBNAME).so.$(PNGVER) $(LIBNAME).so.$(PNGMAJ); \ ln -sf $(LIBNAME).so.$(PNGMAJ) $(LIBNAME).so) -@if [ ! -d $(DL)/pkgconfig ]; then mkdir $(DL)/pkgconfig; fi @@ -183,8 +183,9 @@ test-installed: clean: rm -f *.o libpng.a pngtest pngtesti pngout.png libpng.pc libpng-config \ - $(LIBNAME).so $(LIBNAME).so.$(PNGMAJ)* so_locations \ - libpng.so.3.$(PNGMIN) + $(LIBNAME).so $(LIBNAME).so.$(PNGMAJ)* \ + libpng.so.3.$(PNGMIN) \ + so_locations DOCS = ANNOUNCE CHANGES INSTALL KNOWNBUG LICENSE README TODO Y2KINFO writelock: diff --git a/scripts/makefile.so9 b/scripts/makefile.so9 index b95c7b5a5..7046d533c 100644 --- a/scripts/makefile.so9 +++ b/scripts/makefile.so9 @@ -34,7 +34,7 @@ LDFLAGS=-L. -R. -L$(ZLIBLIB) -R$(ZLIBLIB) -lpng12 -lz -lm RANLIB=echo PNGMAJ = 0 -PNGMIN = 1.2.5beta2 +PNGMIN = 1.2.5rc1 PNGVER = $(PNGMAJ).$(PNGMIN) LIBNAME = libpng12 @@ -139,17 +139,17 @@ install-static: install-headers libpng.a install-shared: install-headers $(LIBNAME).so.$(PNGVER) libpng.pc \ libpng.so.3.$(PNGMIN) -@if [ ! -d $(DL) ]; then mkdir $(DL); fi - -@/bin/rm -f $(DL)/$(LIBNAME).so.$(PNGMAJ)* $(DL)/$(LIBNAME).so + -@/bin/rm -f $(DL)/$(LIBNAME).so.$(PNGVER)* $(DL)/$(LIBNAME).so -@/bin/rm -f $(DL)/libpng.so -@/bin/rm -f $(DL)/libpng.so.3 - -@/bin/rm -f $(DL)/libpng.so.3.* + -@/bin/rm -f $(DL)/libpng.so.3.$(PNGMIN)* cp $(LIBNAME).so.$(PNGVER) $(DL) cp libpng.so.3.$(PNGMIN) $(DL) chmod 755 $(DL)/$(LIBNAME).so.$(PNGVER) chmod 755 $(DL)/libpng.so.3.$(PNGMIN) (cd $(DL); \ - ln -f -s $(LIBNAME).so.$(PNGVER) libpng.so; \ ln -f -s libpng.so.3.$(PNGMIN) libpng.so.3; \ + ln -f -s libpng.so.3 libpng.so; \ ln -f -s $(LIBNAME).so.$(PNGVER) $(LIBNAME).so.$(PNGMAJ); \ ln -f -s $(LIBNAME).so.$(PNGMAJ) $(LIBNAME).so) -@if [ ! -d $(DL)/pkgconfig ]; then mkdir $(DL)/pkgconfig; fi @@ -193,9 +193,10 @@ test-installed: ./pngtesti pngtest.png clean: - /bin/rm -f *.o libpng.a pngtest pngtesti pngout.png libpng.pc \ + /bin/rm -f *.o libpng.a pngtest pngtesti pngout.png \ libpng-config $(LIBNAME).so $(LIBNAME).so.$(PNGMAJ)* \ - libpng.so.3.$(PNGMIN) + libpng.so.3.$(PNGMIN) \ + libpng.pc DOCS = ANNOUNCE CHANGES INSTALL KNOWNBUG LICENSE README TODO Y2KINFO writelock: diff --git a/scripts/makefile.solaris b/scripts/makefile.solaris index 915f9d615..0e02a3769 100644 --- a/scripts/makefile.solaris +++ b/scripts/makefile.solaris @@ -30,7 +30,7 @@ LDFLAGS=-L. -R. -L$(ZLIBLIB) -R$(ZLIBLIB) -lpng12 -lz -lm RANLIB=echo PNGMAJ = 0 -PNGMIN = 1.2.5beta2 +PNGMIN = 1.2.5rc1 PNGVER = $(PNGMAJ).$(PNGMIN) LIBNAME = libpng12 @@ -136,17 +136,17 @@ install-static: install-headers libpng.a install-shared: install-headers $(LIBNAME).so.$(PNGVER) libpng.pc \ libpng.so.3.$(PNGMIN) -@if [ ! -d $(DL) ]; then mkdir $(DL); fi - -@/bin/rm -f $(DL)/$(LIBNAME).so.$(PNGMAJ)* $(DL)/$(LIBNAME).so + -@/bin/rm -f $(DL)/$(LIBNAME).so.$(PNGVER)* $(DL)/$(LIBNAME).so -@/bin/rm -f $(DL)/libpng.so -@/bin/rm -f $(DL)/libpng.so.3 - -@/bin/rm -f $(DL)/libpng.so.3.* + -@/bin/rm -f $(DL)/libpng.so.3.$(PNGMIN)* cp $(LIBNAME).so.$(PNGVER) $(DL) cp libpng.so.3.$(PNGMIN) $(DL) chmod 755 $(DL)/$(LIBNAME).so.$(PNGVER) chmod 755 $(DL)/libpng.so.3.$(PNGMIN) (cd $(DL); \ - ln -f -s $(LIBNAME).so.$(PNGVER) libpng.so; \ ln -f -s libpng.so.3.$(PNGMIN) libpng.so.3; \ + ln -f -s libpng.so.3 libpng.so; \ ln -f -s $(LIBNAME).so.$(PNGVER) $(LIBNAME).so; \ ln -f -s $(LIBNAME).so.$(PNGVER) $(LIBNAME).so.$(PNGMAJ)) -@if [ ! -d $(DL)/pkgconfig ]; then mkdir $(DL)/pkgconfig; fi @@ -190,9 +190,10 @@ test-installed: ./pngtesti pngtest.png clean: - /bin/rm -f *.o libpng.a pngtest pngtesti pngout.png libpng.pc \ + /bin/rm -f *.o libpng.a pngtest pngtesti pngout.png \ libpng-config $(LIBNAME).so $(LIBNAME).so.$(PNGMAJ)* \ - libpng.so.3.$(PNGMIN) + libpng.so.3.$(PNGMIN) \ + libpng.pc DOCS = ANNOUNCE CHANGES INSTALL KNOWNBUG LICENSE README TODO Y2KINFO writelock: diff --git a/scripts/pngdef.pas b/scripts/pngdef.pas index e481edc33..c9b9ff861 100644 --- a/scripts/pngdef.pas +++ b/scripts/pngdef.pas @@ -7,7 +7,7 @@ unit pngdef; interface const - PNG_LIBPNG_VER_STRING = '1.2.5beta2'; + PNG_LIBPNG_VER_STRING = '1.2.5rc1'; PNG_LIBPNG_VER = 10205; type diff --git a/scripts/pngos2.def b/scripts/pngos2.def index d6189631a..bb542a6b9 100644 --- a/scripts/pngos2.def +++ b/scripts/pngos2.def @@ -2,7 +2,7 @@ ; PNG.LIB module definition file for OS/2 ;---------------------------------------- -; Version 1.2.5beta2 +; Version 1.2.5rc1 LIBRARY PNG DESCRIPTION "PNG image compression library for OS/2" |