From 26a94ab06fccbfcf8e04c43837a132f9f87cda3e Mon Sep 17 00:00:00 2001 From: Glenn Randers-Pehrson Date: Wed, 13 Aug 2014 19:47:37 -0500 Subject: [PATCH] [libpng16] Imported from libpng-1.6.13rc01.tar --- ANNOUNCE | 29 +++++++++++++++-------------- CHANGES | 13 +++++++------ CMakeLists.txt | 2 +- LICENSE | 4 ++-- README | 2 +- arm/arm_init.c | 2 +- configure.ac | 4 ++-- libpng-manual.txt | 8 ++++---- libpng.3 | 21 +++++++++++---------- libpngpf.3 | 4 ++-- png.5 | 2 +- png.c | 6 +++--- png.h | 23 ++++++++++++----------- pngconf.h | 2 +- pngtest.c | 2 +- projects/vstudio/readme.txt | 2 +- projects/vstudio/zlib.props | 2 +- scripts/README.txt | 10 +++++----- scripts/def.dfn | 2 +- scripts/libpng-config-head.in | 2 +- scripts/libpng.pc.in | 2 +- scripts/makefile.32sunu | 4 ++-- scripts/makefile.64sunu | 4 ++-- scripts/makefile.hp64 | 2 +- scripts/makefile.hpux | 2 +- scripts/makefile.ne12bsd | 2 +- scripts/makefile.netbsd | 2 +- scripts/makefile.openbsd | 2 +- scripts/pnglibconf.h.prebuilt | 4 ++-- scripts/symbols.def | 2 +- 30 files changed, 86 insertions(+), 82 deletions(-) diff --git a/ANNOUNCE b/ANNOUNCE index c7289ba85..41cb2ab16 100644 --- a/ANNOUNCE +++ b/ANNOUNCE @@ -1,4 +1,4 @@ -Libpng 1.6.13beta05 - August 8, 2014 +Libpng 1.6.13rc01 - August 14, 2014 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. @@ -8,20 +8,20 @@ Files available for download: Source files with LF line endings (for Unix/Linux) and with a "configure" script - 1.6.13beta05.tar.xz (LZMA-compressed, recommended) - 1.6.13beta05.tar.gz + 1.6.13rc01.tar.xz (LZMA-compressed, recommended) + 1.6.13rc01.tar.gz Source files with CRLF line endings (for Windows), without the "configure" script - lp1613b05.7z (LZMA-compressed, recommended) - lp1613b05.zip + lp1613r01.7z (LZMA-compressed, recommended) + lp1613r01.zip Other information: - 1.6.13beta05-README.txt - 1.6.13beta05-LICENSE.txt - libpng-1.6.13beta05-*.asc (armored detached GPG signatures) + 1.6.13rc01-README.txt + 1.6.13rc01-LICENSE.txt + libpng-1.6.13rc01-*.asc (armored detached GPG signatures) Changes since the last public release (1.6.13): @@ -51,13 +51,14 @@ Version 1.6.13beta03 [August 3, 2014] symbolic link into it (SourceForge bug report #226 by Rolf Timmermans). Version 1.6.13beta04 [August 8, 2014] - Added opinion about the ECCN (Export Control Classification Number) for - libpng being EAR99 to README - Eliminated use of "$<" in makefiles, when copying $PNGLIBCONF_H_PREBUILT. - This does not work on some versions of make; bug introduced in libpng - version 1.6.11. + Added opinion that the ECCN (Export Control Classification Number) for + libpng is EAR99 to the README file. + Eliminated use of "$<" in makefile explicit rules, when copying + $PNGLIBCONF_H_PREBUILT. This does not work on some versions of make; + bug introduced in libpng version 1.6.11. -Version 1.6.13beta05 [August 8, 2014] +Version 1.6.13rc01 [August 14, 2014] + Made "ccopts" agree with "CFLAGS" in scripts/makefile.hp* and makefile.*sunu Send comments/corrections/commendations to png-mng-implement at lists.sf.net (subscription required; visit diff --git a/CHANGES b/CHANGES index 7b63983e3..ba039025d 100644 --- a/CHANGES +++ b/CHANGES @@ -4966,13 +4966,14 @@ Version 1.6.13beta03 [August 3, 2014] symbolic link into it (SourceForge bug report #226 by Rolf Timmermans). Version 1.6.13beta04 [August 8, 2014] - Added opinion about the ECCN (Export Control Classification Number) for - libpng being EAR99 to README - Eliminated use of "$<" in makefiles, when copying $PNGLIBCONF_H_PREBUILT. - This does not work on some versions of make; bug introduced in libpng - version 1.6.11. + Added opinion that the ECCN (Export Control Classification Number) for + libpng is EAR99 to the README file. + Eliminated use of "$<" in makefile explicit rules, when copying + $PNGLIBCONF_H_PREBUILT. This does not work on some versions of make; + bug introduced in libpng version 1.6.11. -Version 1.6.13beta05 [August 8, 2014] +Version 1.6.13rc01 [August 14, 2014] + Made "ccopts" agree with "CFLAGS" in scripts/makefile.hp* and makefile.*sunu Send comments/corrections/commendations to png-mng-implement at lists.sf.net (subscription required; visit diff --git a/CMakeLists.txt b/CMakeLists.txt index 30d451d52..4b2a75271 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -253,7 +253,7 @@ endif(NOT WIN32 OR CYGWIN OR MINGW) # SET UP LINKS if(PNG_SHARED) set_target_properties(${PNG_LIB_NAME} PROPERTIES -# VERSION 16.${PNGLIB_RELEASE}.1.6.13beta05 +# VERSION 16.${PNGLIB_RELEASE}.1.6.13rc01 VERSION 16.${PNGLIB_RELEASE}.0 SOVERSION 16 CLEAN_DIRECT_OUTPUT 1) diff --git a/LICENSE b/LICENSE index 34f4537c0..dfccd3a53 100644 --- a/LICENSE +++ b/LICENSE @@ -10,7 +10,7 @@ this sentence. This code is released under the libpng license. -libpng versions 1.2.6, August 15, 2004, through 1.6.13beta05, August 8, 2014, are +libpng versions 1.2.6, August 15, 2004, through 1.6.13rc01, August 14, 2014, are Copyright (c) 2004, 2006-2014 Glenn Randers-Pehrson, and are distributed according to the same disclaimer and license as libpng-1.2.5 with the following individual added to the list of Contributing Authors @@ -108,4 +108,4 @@ certification mark of the Open Source Initiative. Glenn Randers-Pehrson glennrp at users.sourceforge.net -August 8, 2014 +August 14, 2014 diff --git a/README b/README index 5edc05d6a..e2b41832c 100644 --- a/README +++ b/README @@ -1,4 +1,4 @@ -README for libpng version 1.6.13beta05 - August 8, 2014 (shared library 16.0) +README for libpng version 1.6.13rc01 - August 14, 2014 (shared library 16.0) See the note about version numbers near the top of png.h See INSTALL for instructions on how to install libpng. diff --git a/arm/arm_init.c b/arm/arm_init.c index a672eaebb..b0e929bc1 100644 --- a/arm/arm_init.c +++ b/arm/arm_init.c @@ -3,7 +3,7 @@ * * Copyright (c) 2014 Glenn Randers-Pehrson * Written by Mans Rullgard, 2011. - * Last changed in libpng 1.6.10 [(PENDING RELEASE)] + * Last changed in libpng 1.6.10 [March 6, 2014] * * This code is released under the libpng license. * For conditions of distribution and use, see the disclaimer diff --git a/configure.ac b/configure.ac index 6e159e0ca..be71ff93e 100644 --- a/configure.ac +++ b/configure.ac @@ -18,7 +18,7 @@ AC_PREREQ([2.68]) dnl Version number stuff here: -AC_INIT([libpng],[1.6.13beta05],[png-mng-implement@lists.sourceforge.net]) +AC_INIT([libpng],[1.6.13rc01],[png-mng-implement@lists.sourceforge.net]) AC_CONFIG_MACRO_DIR([scripts]) # libpng does not follow GNU file name conventions (hence 'foreign') @@ -39,7 +39,7 @@ dnl automake, so the following is not necessary (and is not defined anyway): dnl AM_PREREQ([1.11.2]) dnl stop configure from automagically running automake -PNGLIB_VERSION=1.6.13beta05 +PNGLIB_VERSION=1.6.13rc01 PNGLIB_MAJOR=1 PNGLIB_MINOR=6 PNGLIB_RELEASE=13 diff --git a/libpng-manual.txt b/libpng-manual.txt index 33cfe0f97..f257a659b 100644 --- a/libpng-manual.txt +++ b/libpng-manual.txt @@ -1,6 +1,6 @@ libpng-manual.txt - A description on how to use and modify libpng - libpng version 1.6.13beta05 - August 8, 2014 + libpng version 1.6.13rc01 - August 14, 2014 Updated and distributed by Glenn Randers-Pehrson Copyright (c) 1998-2014 Glenn Randers-Pehrson @@ -11,7 +11,7 @@ libpng-manual.txt - A description on how to use and modify libpng Based on: - libpng versions 0.97, January 1998, through 1.6.13beta05 - August 8, 2014 + libpng versions 0.97, January 1998, through 1.6.13rc01 - August 14, 2014 Updated and distributed by Glenn Randers-Pehrson Copyright (c) 1998-2014 Glenn Randers-Pehrson @@ -5276,13 +5276,13 @@ Other rules can be inferred by inspecting the libpng source. XVI. Y2K Compliance in libpng -August 8, 2014 +August 14, 2014 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.6.13beta05 are Y2K compliant. It is my belief that earlier +upward through 1.6.13rc01 are Y2K compliant. It is my belief that earlier versions were also Y2K compliant. Libpng only has two year fields. One is a 2-byte unsigned integer diff --git a/libpng.3 b/libpng.3 index 3b5f5735a..20cd3d122 100644 --- a/libpng.3 +++ b/libpng.3 @@ -1,6 +1,6 @@ -.TH LIBPNG 3 "August 8, 2014" +.TH LIBPNG 3 "August 14, 2014" .SH NAME -libpng \- Portable Network Graphics (PNG) Reference Library 1.6.13beta05 +libpng \- Portable Network Graphics (PNG) Reference Library 1.6.13rc01 .SH SYNOPSIS \fB #include \fP @@ -504,7 +504,7 @@ Following is a copy of the libpng-manual.txt file that accompanies libpng. .SH LIBPNG.TXT libpng-manual.txt - A description on how to use and modify libpng - libpng version 1.6.13beta05 - August 8, 2014 + libpng version 1.6.13rc01 - August 14, 2014 Updated and distributed by Glenn Randers-Pehrson Copyright (c) 1998-2014 Glenn Randers-Pehrson @@ -515,7 +515,7 @@ libpng-manual.txt - A description on how to use and modify libpng Based on: - libpng versions 0.97, January 1998, through 1.6.13beta05 - August 8, 2014 + libpng versions 0.97, January 1998, through 1.6.13rc01 - August 14, 2014 Updated and distributed by Glenn Randers-Pehrson Copyright (c) 1998-2014 Glenn Randers-Pehrson @@ -5780,13 +5780,13 @@ Other rules can be inferred by inspecting the libpng source. .SH XVI. Y2K Compliance in libpng -August 8, 2014 +August 14, 2014 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.6.13beta05 are Y2K compliant. It is my belief that earlier +upward through 1.6.13rc01 are Y2K compliant. It is my belief that earlier versions were also Y2K compliant. Libpng only has two year fields. One is a 2-byte unsigned integer @@ -6025,7 +6025,8 @@ the first widely used release: 1.6.11 16 10611 16.so.16.11[.0] 1.6.12rc01 16 10612 16.so.16.12[.0] 1.6.12 16 10612 16.so.16.12[.0] - 1.6.13beta01-05 16 10613 16.so.16.13[.0] + 1.6.13beta01-04 16 10613 16.so.16.13[.0] + 1.6.13rc01 16 10613 16.so.16.13[.0] Henceforth the source version will match the shared-library minor and patch numbers; the shared-library major version number will be @@ -6082,7 +6083,7 @@ possible without all of you. Thanks to Frank J. T. Wojcik for helping with the documentation. -Libpng version 1.6.13beta05 - August 8, 2014: +Libpng version 1.6.13rc01 - August 14, 2014: Initially created in 1995 by Guy Eric Schalnat, then of Group 42, Inc. Currently maintained by Glenn Randers-Pehrson (glennrp at users.sourceforge.net). @@ -6105,7 +6106,7 @@ this sentence. This code is released under the libpng license. -libpng versions 1.2.6, August 15, 2004, through 1.6.13beta05, August 8, 2014, are +libpng versions 1.2.6, August 15, 2004, through 1.6.13rc01, August 14, 2014, are Copyright (c) 2004,2006-2014 Glenn Randers-Pehrson, and are distributed according to the same disclaimer and license as libpng-1.2.5 with the following individual added to the list of Contributing Authors @@ -6204,7 +6205,7 @@ certification mark of the Open Source Initiative. Glenn Randers-Pehrson glennrp at users.sourceforge.net -August 8, 2014 +August 14, 2014 .\" end of man page diff --git a/libpngpf.3 b/libpngpf.3 index b962452d3..cebac3bf3 100644 --- a/libpngpf.3 +++ b/libpngpf.3 @@ -1,6 +1,6 @@ -.TH LIBPNGPF 3 "August 8, 2014" +.TH LIBPNGPF 3 "August 14, 2014" .SH NAME -libpng \- Portable Network Graphics (PNG) Reference Library 1.6.13beta05 +libpng \- Portable Network Graphics (PNG) Reference Library 1.6.13rc01 (private functions) .SH SYNOPSIS \fB#include \fI"pngpriv.h" diff --git a/png.5 b/png.5 index f56af5388..447435c98 100644 --- a/png.5 +++ b/png.5 @@ -1,4 +1,4 @@ -.TH PNG 5 "August 8, 2014" +.TH PNG 5 "August 14, 2014" .SH NAME png \- Portable Network Graphics (PNG) format .SH DESCRIPTION diff --git a/png.c b/png.c index 0fabb6d0d..2b7ab4a3b 100644 --- a/png.c +++ b/png.c @@ -14,7 +14,7 @@ #include "pngpriv.h" /* Generate a compiler error if there is an old png.h in the search path. */ -typedef png_libpng_version_1_6_13beta05 Your_png_h_is_not_version_1_6_13beta05; +typedef png_libpng_version_1_6_13rc01 Your_png_h_is_not_version_1_6_13rc01; /* Tells libpng that we have already handled the first "num_bytes" bytes * of the PNG file signature. If the PNG data is embedded into another @@ -773,13 +773,13 @@ png_get_copyright(png_const_structrp png_ptr) #else # ifdef __STDC__ return PNG_STRING_NEWLINE \ - "libpng version 1.6.13beta05 - August 8, 2014" PNG_STRING_NEWLINE \ + "libpng version 1.6.13rc01 - August 14, 2014" PNG_STRING_NEWLINE \ "Copyright (c) 1998-2014 Glenn Randers-Pehrson" PNG_STRING_NEWLINE \ "Copyright (c) 1996-1997 Andreas Dilger" PNG_STRING_NEWLINE \ "Copyright (c) 1995-1996 Guy Eric Schalnat, Group 42, Inc." \ PNG_STRING_NEWLINE; # else - return "libpng version 1.6.13beta05 - August 8, 2014\ + return "libpng version 1.6.13rc01 - August 14, 2014\ Copyright (c) 1998-2014 Glenn Randers-Pehrson\ Copyright (c) 1996-1997 Andreas Dilger\ Copyright (c) 1995-1996 Guy Eric Schalnat, Group 42, Inc."; diff --git a/png.h b/png.h index 4cc339487..8f1fdec37 100644 --- a/png.h +++ b/png.h @@ -1,7 +1,7 @@ /* png.h - header file for PNG reference library * - * libpng version 1.6.13beta05 - August 8, 2014 + * libpng version 1.6.13rc01 - August 14, 2014 * Copyright (c) 1998-2014 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.) @@ -11,7 +11,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.6.13beta05 - August 8, 2014: Glenn + * libpng versions 0.97, January 1998, through 1.6.13rc01 - August 14, 2014: Glenn * See also "Contributing Authors", below. * * Note about libpng version numbers: @@ -200,7 +200,8 @@ * 1.6.11 16 10611 16.so.16.11[.0] * 1.6.12rc01-03 16 10612 16.so.16.12[.0] * 1.6.12 16 10612 16.so.16.12[.0] - * 1.6.13beta01-05 16 10613 16.so.16.13[.0] + * 1.6.13beta01-04 16 10613 16.so.16.13[.0] + * 1.6.13rc01 16 10613 16.so.16.13[.0] * * Henceforth the source version will match the shared-library major * and minor numbers; the shared-library major version number will be @@ -232,7 +233,7 @@ * * This code is released under the libpng license. * - * libpng versions 1.2.6, August 15, 2004, through 1.6.13beta05, August 8, 2014, are + * libpng versions 1.2.6, August 15, 2004, through 1.6.13rc01, August 14, 2014, are * Copyright (c) 2004, 2006-2014 Glenn Randers-Pehrson, and are * distributed according to the same disclaimer and license as libpng-1.2.5 * with the following individual added to the list of Contributing Authors: @@ -344,13 +345,13 @@ * Y2K compliance in libpng: * ========================= * - * August 8, 2014 + * August 14, 2014 * * 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.6.13beta05 are Y2K compliant. It is my belief that + * upward through 1.6.13rc01 are Y2K compliant. It is my belief that * earlier versions were also Y2K compliant. * * Libpng only has two year fields. One is a 2-byte unsigned integer @@ -412,9 +413,9 @@ */ /* Version information for png.h - this should match the version in png.c */ -#define PNG_LIBPNG_VER_STRING "1.6.13beta05" +#define PNG_LIBPNG_VER_STRING "1.6.13rc01" #define PNG_HEADER_VERSION_STRING \ - " libpng version 1.6.13beta05 - August 8, 2014\n" + " libpng version 1.6.13rc01 - August 14, 2014\n" #define PNG_LIBPNG_VER_SONUM 16 #define PNG_LIBPNG_VER_DLLNUM 16 @@ -428,7 +429,7 @@ * PNG_LIBPNG_VER_STRING, omitting any leading zero: */ -#define PNG_LIBPNG_VER_BUILD 05 +#define PNG_LIBPNG_VER_BUILD 01 /* Release Status */ #define PNG_LIBPNG_BUILD_ALPHA 1 @@ -445,7 +446,7 @@ #define PNG_LIBPNG_BUILD_SPECIAL 32 /* Cannot be OR'ed with PNG_LIBPNG_BUILD_PRIVATE */ -#define PNG_LIBPNG_BUILD_BASE_TYPE PNG_LIBPNG_BUILD_BETA +#define PNG_LIBPNG_BUILD_BASE_TYPE PNG_LIBPNG_BUILD_RC /* Careful here. At one time, Guy wanted to use 082, but that would be octal. * We must not include leading zeros. @@ -558,7 +559,7 @@ extern "C" { /* This triggers a compiler error in png.c, if png.c and png.h * do not agree upon the version number. */ -typedef char* png_libpng_version_1_6_13beta05; +typedef char* png_libpng_version_1_6_13rc01; /* Basic control structions. Read libpng-manual.txt or libpng.3 for more info. * diff --git a/pngconf.h b/pngconf.h index 70b110b00..6daf9509f 100644 --- a/pngconf.h +++ b/pngconf.h @@ -1,7 +1,7 @@ /* pngconf.h - machine configurable file for libpng * - * libpng version 1.6.13beta05 - August 8, 2014 + * libpng version 1.6.13rc01 - August 14, 2014 * * Copyright (c) 1998-2014 Glenn Randers-Pehrson * (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger) diff --git a/pngtest.c b/pngtest.c index acbbd7c48..e67c6cab5 100644 --- a/pngtest.c +++ b/pngtest.c @@ -1991,4 +1991,4 @@ main(void) #endif /* Generate a compiler error if there is an old png.h in the search path. */ -typedef png_libpng_version_1_6_13beta05 Your_png_h_is_not_version_1_6_13beta05; +typedef png_libpng_version_1_6_13rc01 Your_png_h_is_not_version_1_6_13rc01; diff --git a/projects/vstudio/readme.txt b/projects/vstudio/readme.txt index dc247f1ba..b16e6c68b 100644 --- a/projects/vstudio/readme.txt +++ b/projects/vstudio/readme.txt @@ -1,7 +1,7 @@ VisualStudio instructions -libpng version 1.6.13beta05 - August 8, 2014 +libpng version 1.6.13rc01 - August 14, 2014 Copyright (c) 1998-2010 Glenn Randers-Pehrson diff --git a/projects/vstudio/zlib.props b/projects/vstudio/zlib.props index 815433165..4b6d84624 100644 --- a/projects/vstudio/zlib.props +++ b/projects/vstudio/zlib.props @@ -2,7 +2,7 @@