From dea53bb4602af033bade12b040c7abc4ec8c8220 Mon Sep 17 00:00:00 2001 From: Glenn Randers-Pehrson Date: Sat, 19 Dec 2015 09:29:51 -0600 Subject: [PATCH] [libpng16] Bump version to 1.6.21beta04 --- ANNOUNCE | 18 ++++++++++-------- CHANGES | 2 ++ CMakeLists.txt | 2 +- LICENSE | 4 ++-- README | 2 +- configure.ac | 4 ++-- libpng-manual.txt | 6 +++--- libpng.3 | 18 +++++++++--------- libpngpf.3 | 4 ++-- png.5 | 2 +- png.c | 6 +++--- png.h | 20 ++++++++++---------- pngconf.h | 2 +- pngtest.c | 2 +- projects/vstudio/readme.txt | 2 +- projects/vstudio/zlib.props | 2 +- scripts/README.txt | 10 +++++----- scripts/def.c | 2 +- scripts/libpng-config-head.in | 2 +- scripts/libpng.pc.in | 2 +- scripts/makefile.ne12bsd | 2 +- scripts/makefile.netbsd | 2 +- scripts/makefile.openbsd | 2 +- scripts/pnglibconf.h.prebuilt | 4 ++-- scripts/symbols.def | 2 +- 25 files changed, 64 insertions(+), 60 deletions(-) diff --git a/ANNOUNCE b/ANNOUNCE index 6cfa39f2a..93a981035 100644 --- a/ANNOUNCE +++ b/ANNOUNCE @@ -1,4 +1,4 @@ -Libpng 1.6.21beta03 - December 18, 2015 +Libpng 1.6.21beta04 - December 19, 2015 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.21beta03.tar.xz (LZMA-compressed, recommended) - 1.6.21beta03.tar.gz + 1.6.21beta04.tar.xz (LZMA-compressed, recommended) + 1.6.21beta04.tar.gz Source files with CRLF line endings (for Windows), without the "configure" script - /scratch/glennrp/Libpng16/lp1621b03.7z (LZMA-compressed, recommended) - /scratch/glennrp/Libpng16/lp1621b03.zip + /scratch/glennrp/Libpng16/lp1621b04.7z (LZMA-compressed, recommended) + /scratch/glennrp/Libpng16/lp1621b04.zip Other information: - 1.6.21beta03-README.txt - 1.6.21beta03-LICENSE.txt - libpng-1.6.21beta03-*.asc (armored detached GPG signatures) + 1.6.21beta04-README.txt + 1.6.21beta04-LICENSE.txt + libpng-1.6.21beta04-*.asc (armored detached GPG signatures) Changes since the last public release (1.6.20): @@ -51,6 +51,8 @@ Version 1.6.21beta03 [December 18, 2015] This changes pngvalid to use BE random numbers; this used to produce errors but these should not be fixed as a result of the previous changes. +Version 1.6.21beta04 [December 19, 2015] + 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 e86493c2a..c6c7ae463 100644 --- a/CHANGES +++ b/CHANGES @@ -5472,6 +5472,8 @@ Version 1.6.21beta03 [December 18, 2015] This changes pngvalid to use BE random numbers; this used to produce errors but these should not be fixed as a result of the previous changes. +Version 1.6.21beta04 [December 19, 2015] + 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/CMakeLists.txt b/CMakeLists.txt index 9fdac3a9f..85bb4f43e 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -261,7 +261,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.21beta03 +# VERSION 16.${PNGLIB_RELEASE}.1.6.21beta04 VERSION 16.${PNGLIB_RELEASE}.0 SOVERSION 16 CLEAN_DIRECT_OUTPUT 1) diff --git a/LICENSE b/LICENSE index d31715d71..731bf6bae 100644 --- a/LICENSE +++ b/LICENSE @@ -10,7 +10,7 @@ this sentence. This code is released under the libpng license. -libpng versions 1.0.7, July 1, 2000, through 1.6.21beta03, December 18, 2015, are +libpng versions 1.0.7, July 1, 2000, through 1.6.21beta04, December 19, 2015, are Copyright (c) 2000-2002, 2004, 2006-2015 Glenn Randers-Pehrson, are derived from libpng-1.0.6, and are distributed according to the same disclaimer and license as libpng-1.0.6 with the following individuals @@ -109,4 +109,4 @@ the additional disclaimers inserted at version 1.0.7. Glenn Randers-Pehrson glennrp at users.sourceforge.net -December 18, 2015 +December 19, 2015 diff --git a/README b/README index 6120ccb55..b969f3d46 100644 --- a/README +++ b/README @@ -1,4 +1,4 @@ -README for libpng version 1.6.21beta03 - December 18, 2015 (shared library 16.0) +README for libpng version 1.6.21beta04 - December 19, 2015 (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/configure.ac b/configure.ac index aadd11268..3382a60a5 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.21beta03],[png-mng-implement@lists.sourceforge.net]) +AC_INIT([libpng],[1.6.21beta04],[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.21beta03 +PNGLIB_VERSION=1.6.21beta04 PNGLIB_MAJOR=1 PNGLIB_MINOR=6 PNGLIB_RELEASE=21 diff --git a/libpng-manual.txt b/libpng-manual.txt index 53c996b45..9a24084ee 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.21beta03 - December 18, 2015 + libpng version 1.6.21beta04 - December 19, 2015 Updated and distributed by Glenn Randers-Pehrson Copyright (c) 1998-2015 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.21beta03 - December 18, 2015 + libpng versions 0.97, January 1998, through 1.6.21beta04 - December 19, 2015 Updated and distributed by Glenn Randers-Pehrson Copyright (c) 1998-2015 Glenn Randers-Pehrson @@ -5324,7 +5324,7 @@ 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.21beta03 are Y2K compliant. It is my belief that earlier +upward through 1.6.21beta04 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 f59ec7895..db7ed3cfb 100644 --- a/libpng.3 +++ b/libpng.3 @@ -1,6 +1,6 @@ -.TH LIBPNG 3 "December 18, 2015" +.TH LIBPNG 3 "December 19, 2015" .SH NAME -libpng \- Portable Network Graphics (PNG) Reference Library 1.6.21beta03 +libpng \- Portable Network Graphics (PNG) Reference Library 1.6.21beta04 .SH SYNOPSIS \fB #include \fP @@ -508,7 +508,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.21beta03 - December 18, 2015 + libpng version 1.6.21beta04 - December 19, 2015 Updated and distributed by Glenn Randers-Pehrson Copyright (c) 1998-2015 Glenn Randers-Pehrson @@ -519,7 +519,7 @@ libpng-manual.txt - A description on how to use and modify libpng Based on: - libpng versions 0.97, January 1998, through 1.6.21beta03 - December 18, 2015 + libpng versions 0.97, January 1998, through 1.6.21beta04 - December 19, 2015 Updated and distributed by Glenn Randers-Pehrson Copyright (c) 1998-2015 Glenn Randers-Pehrson @@ -5832,7 +5832,7 @@ 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.21beta03 are Y2K compliant. It is my belief that earlier +upward through 1.6.21beta04 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 @@ -5934,7 +5934,7 @@ the first widely used release: ... 1.5.23 15 10523 15.so.15.23[.0] ... - 1.6.20 16 10620 16.so.16.20[.0] + 1.6.21 16 10621 16.so.16.21[.0] Henceforth the source version will match the shared-library minor and patch numbers; the shared-library major version number will be @@ -5990,7 +5990,7 @@ possible without all of you. Thanks to Frank J. T. Wojcik for helping with the documentation. -Libpng version 1.6.21beta03 - December 18, 2015: +Libpng version 1.6.21beta04 - December 19, 2015: Initially created in 1995 by Guy Eric Schalnat, then of Group 42, Inc. Currently maintained by Glenn Randers-Pehrson (glennrp at users.sourceforge.net). @@ -6015,7 +6015,7 @@ this sentence. This code is released under the libpng license. -libpng versions 1.0.7, July 1, 2000, through 1.6.21beta03, December 18, 2015, are +libpng versions 1.0.7, July 1, 2000, through 1.6.21beta04, December 19, 2015, are Copyright (c) 2000-2002, 2004, 2006-2015 Glenn Randers-Pehrson, are derived from libpng-1.0.6, and are distributed according to the same disclaimer and license as libpng-1.0.6 with the following individuals @@ -6114,7 +6114,7 @@ the additional disclaimers inserted at version 1.0.7. Glenn Randers-Pehrson glennrp at users.sourceforge.net -December 18, 2015 +December 19, 2015 .\" end of man page diff --git a/libpngpf.3 b/libpngpf.3 index 795b118c2..e67369992 100644 --- a/libpngpf.3 +++ b/libpngpf.3 @@ -1,6 +1,6 @@ -.TH LIBPNGPF 3 "December 18, 2015" +.TH LIBPNGPF 3 "December 19, 2015" .SH NAME -libpng \- Portable Network Graphics (PNG) Reference Library 1.6.21beta03 +libpng \- Portable Network Graphics (PNG) Reference Library 1.6.21beta04 (private functions) .SH SYNOPSIS \fB#include \fI"pngpriv.h" diff --git a/png.5 b/png.5 index a64034b38..d6d004805 100644 --- a/png.5 +++ b/png.5 @@ -1,4 +1,4 @@ -.TH PNG 5 "December 18, 2015" +.TH PNG 5 "December 19, 2015" .SH NAME png \- Portable Network Graphics (PNG) format .SH DESCRIPTION diff --git a/png.c b/png.c index 1bfded431..48b1896fc 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_21beta03 Your_png_h_is_not_version_1_6_21beta03; +typedef png_libpng_version_1_6_21beta04 Your_png_h_is_not_version_1_6_21beta04; /* 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 @@ -775,7 +775,7 @@ png_get_copyright(png_const_structrp png_ptr) #else # ifdef __STDC__ return PNG_STRING_NEWLINE \ - "libpng version 1.6.21beta03 - December 18, 2015" PNG_STRING_NEWLINE \ + "libpng version 1.6.21beta04 - December 19, 2015" PNG_STRING_NEWLINE \ "Copyright (c) 1998-2015 Glenn Randers-Pehrson" PNG_STRING_NEWLINE \ "Copyright (c) 1998-2002,2004,2006-2015 Glenn Randers-Pehrson" \ PNG_STRING_NEWLINE \ @@ -783,7 +783,7 @@ png_get_copyright(png_const_structrp png_ptr) "Copyright (c) 1995-1996 Guy Eric Schalnat, Group 42, Inc." \ PNG_STRING_NEWLINE; # else - return "libpng version 1.6.21beta03 - December 18, 2015\ + return "libpng version 1.6.21beta04 - December 19, 2015\ Copyright (c) 1998-2002,2004,2006-2015 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 c5d065685..a8870796d 100644 --- a/png.h +++ b/png.h @@ -1,7 +1,7 @@ /* png.h - header file for PNG reference library * - * libpng version 1.6.21beta03, December 18, 2015 + * libpng version 1.6.21beta04, December 19, 2015 * * Copyright (c) 1998-2002,2004,2006-2015 Glenn Randers-Pehrson * (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger) @@ -12,7 +12,7 @@ * Authors and maintainers: * libpng versions 0.71, May 1995, through 0.88, January 1996: Guy Schalnat * libpng versions 0.89, June 1996, through 0.96, May 1997: Andreas Dilger - * libpng versions 0.97, January 1998, through 1.6.21beta03, December 18, 2015: + * libpng versions 0.97, January 1998, through 1.6.21beta04, December 19, 2015: * Glenn Randers-Pehrson. * See also "Contributing Authors", below. */ @@ -25,7 +25,7 @@ * * This code is released under the libpng license. * - * libpng versions 1.0.7, July 1, 2000, through 1.6.21beta03, December 18, 2015, are + * libpng versions 1.0.7, July 1, 2000, through 1.6.21beta04, December 19, 2015, are * Copyright (c) 2000-2002, 2004, 2006-2015 Glenn Randers-Pehrson, are * derived from libpng-1.0.6, and are distributed according to the same * disclaimer and license as libpng-1.0.6 with the following individuals @@ -186,7 +186,7 @@ * ... * 1.5.23 15 10523 15.so.15.23[.0] * ... - * 1.6.20 16 10620 16.so.16.20[.0] + * 1.6.21 16 10621 16.so.16.21[.0] * * Henceforth the source version will match the shared-library major * and minor numbers; the shared-library major version number will be @@ -214,13 +214,13 @@ * Y2K compliance in libpng: * ========================= * - * December 18, 2015 + * December 19, 2015 * * 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.21beta03 are Y2K compliant. It is my belief that + * upward through 1.6.21beta04 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 @@ -282,9 +282,9 @@ */ /* Version information for png.h - this should match the version in png.c */ -#define PNG_LIBPNG_VER_STRING "1.6.21beta03" +#define PNG_LIBPNG_VER_STRING "1.6.21beta04" #define PNG_HEADER_VERSION_STRING \ - " libpng version 1.6.21beta03 - December 18, 2015\n" + " libpng version 1.6.21beta04 - December 19, 2015\n" #define PNG_LIBPNG_VER_SONUM 16 #define PNG_LIBPNG_VER_DLLNUM 16 @@ -298,7 +298,7 @@ * PNG_LIBPNG_VER_STRING, omitting any leading zero: */ -#define PNG_LIBPNG_VER_BUILD 03 +#define PNG_LIBPNG_VER_BUILD 04 /* Release Status */ #define PNG_LIBPNG_BUILD_ALPHA 1 @@ -433,7 +433,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_21beta03; +typedef char* png_libpng_version_1_6_21beta04; /* Basic control structions. Read libpng-manual.txt or libpng.3 for more info. * diff --git a/pngconf.h b/pngconf.h index dfc541dfe..9345d736c 100644 --- a/pngconf.h +++ b/pngconf.h @@ -1,7 +1,7 @@ /* pngconf.h - machine configurable file for libpng * - * libpng version 1.6.21beta03, December 18, 2015 + * libpng version 1.6.21beta04, December 19, 2015 * * Copyright (c) 1998-2002,2004,2006-2015 Glenn Randers-Pehrson * (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger) diff --git a/pngtest.c b/pngtest.c index fd80aac83..5901b962e 100644 --- a/pngtest.c +++ b/pngtest.c @@ -2070,4 +2070,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_21beta03 Your_png_h_is_not_version_1_6_21beta03; +typedef png_libpng_version_1_6_21beta04 Your_png_h_is_not_version_1_6_21beta04; diff --git a/projects/vstudio/readme.txt b/projects/vstudio/readme.txt index ed747427a..38e1f5af7 100644 --- a/projects/vstudio/readme.txt +++ b/projects/vstudio/readme.txt @@ -1,7 +1,7 @@ VisualStudio instructions -libpng version 1.6.21beta03 - December 18, 2015 +libpng version 1.6.21beta04 - December 19, 2015 Copyright (c) 1998-2010 Glenn Randers-Pehrson diff --git a/projects/vstudio/zlib.props b/projects/vstudio/zlib.props index b797b2e8a..c575e1802 100644 --- a/projects/vstudio/zlib.props +++ b/projects/vstudio/zlib.props @@ -2,7 +2,7 @@