From beddd7ed536581b7236d917d57b949c8a7460507 Mon Sep 17 00:00:00 2001 From: Glenn Randers-Pehrson Date: Sun, 21 Dec 2014 22:46:41 -0600 Subject: [PATCH] [libpng15] Bump version to 1.5.22beta01 --- ANNOUNCE | 29 ++++++++++++++--------------- CHANGES | 2 ++ CMakeLists.txt | 4 ++-- LICENSE | 2 +- README | 2 +- configure | 24 ++++++++++++------------ configure.ac | 6 +++--- libpng-manual.txt | 6 +++--- libpng.3 | 13 +++++++------ libpngpf.3 | 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.c | 2 +- scripts/libpng-config-head.in | 2 +- scripts/libpng.pc.in | 2 +- scripts/makefile.cegcc | 2 +- scripts/makefile.linux | 2 +- scripts/makefile.msys | 2 +- scripts/makefile.ne12bsd | 2 +- scripts/makefile.netbsd | 2 +- scripts/makefile.openbsd | 2 +- scripts/pnglibconf.h.prebuilt | 4 ++-- scripts/symbols.def | 2 +- 28 files changed, 82 insertions(+), 79 deletions(-) diff --git a/ANNOUNCE b/ANNOUNCE index 5d1ff34b1..7843376b4 100644 --- a/ANNOUNCE +++ b/ANNOUNCE @@ -1,34 +1,33 @@ -Libpng 1.5.21 - December 22, 2014 +Libpng 1.5.22beta01 - December 22, 2014 -This is a public release of libpng, intended for use in production codes. +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. Files available for download: Source files with LF line endings (for Unix/Linux) and with a "configure" script - libpng-1.5.21.tar.xz (LZMA-compressed, recommended) - libpng-1.5.21.tar.gz - libpng-1.5.21.tar.bz2 + 1.5.22beta01.tar.xz (LZMA-compressed, recommended) + 1.5.22beta01.tar.gz + 1.5.22beta01.tar.bz2 Source files with CRLF line endings (for Windows), without the "configure" script - lpng1521.7z (LZMA-compressed, recommended) - lpng1521.zip + lp1522b01.7z (LZMA-compressed, recommended) + lp1522b01.zip Other information: - libpng-1.5.21-README.txt - libpng-1.5.21-LICENSE.txt - libpng-1.5.21-*.asc (armored detached GPG signatures) + 1.5.22beta01-README.txt + 1.5.22beta01-LICENSE.txt + libpng-1.5.22beta01-*.asc (armored detached GPG signatures) -Changes since the last public release (1.5.20): - Revised Makefile.am and scripts/*.dfn to work with MinGW/MSYS; - renamed scripts/*.dfn to scripts/*.c (Bob Friesenhahn and John Bowler). - Restored a test on width that was removed from png.c at libpng-1.6.9 - (Bug report by Alex Eubanks). +Changes since the last public release (1.5.21): + +Version 1.5.22beta01 [December 22, 2014] Send comments/corrections/commendations to png-mng-implement at lists.sf.net (subscription required; visit diff --git a/CHANGES b/CHANGES index bc4820644..c65b5094d 100644 --- a/CHANGES +++ b/CHANGES @@ -4290,6 +4290,8 @@ Version 1.5.21rc03 [December 21, 2014] Version 1.5.21 [December 22, 2014] No changes. +Version 1.5.22beta01 [December 22, 2014] + 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 3ab7b9a60..c415a3e18 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -16,7 +16,7 @@ enable_testing() set(PNGLIB_MAJOR 1) set(PNGLIB_MINOR 5) -set(PNGLIB_RELEASE 21) +set(PNGLIB_RELEASE 22) set(PNGLIB_NAME libpng${PNGLIB_MAJOR}${PNGLIB_MINOR}) set(PNGLIB_VERSION ${PNGLIB_MAJOR}.${PNGLIB_MINOR}.${PNGLIB_RELEASE}) @@ -219,7 +219,7 @@ endif(NOT WIN32 OR CYGWIN OR MINGW) # SET UP LINKS if(PNG_SHARED) set_target_properties(${PNG_LIB_NAME} PROPERTIES -# VERSION 15.${PNGLIB_RELEASE}.1.5.21 +# VERSION 15.${PNGLIB_RELEASE}.1.5.22beta01 VERSION 15.${PNGLIB_RELEASE}.0 SOVERSION 15 CLEAN_DIRECT_OUTPUT 1) diff --git a/LICENSE b/LICENSE index 3fb22d6cd..dacb6fb6c 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.5.21, December 22, 2014, are +libpng versions 1.2.6, August 15, 2004, through 1.5.22beta01, December 22, 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 diff --git a/README b/README index 4f7896002..6a0babc9a 100644 --- a/README +++ b/README @@ -1,4 +1,4 @@ -README for libpng version 1.5.21 - December 22, 2014 (shared library 15.0) +README for libpng version 1.5.22beta01 - December 22, 2014 (shared library 15.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 b/configure index be830178d..e0b49dccd 100755 --- a/configure +++ b/configure @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.69 for libpng 1.5.21. +# Generated by GNU Autoconf 2.69 for libpng 1.5.22beta01. # # Report bugs to . # @@ -590,8 +590,8 @@ MAKEFLAGS= # Identity of this package. PACKAGE_NAME='libpng' PACKAGE_TARNAME='libpng' -PACKAGE_VERSION='1.5.21' -PACKAGE_STRING='libpng 1.5.21' +PACKAGE_VERSION='1.5.22beta01' +PACKAGE_STRING='libpng 1.5.22beta01' PACKAGE_BUGREPORT='png-mng-implement@lists.sourceforge.net' PACKAGE_URL='' @@ -1351,7 +1351,7 @@ if test "$ac_init_help" = "long"; then # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures libpng 1.5.21 to adapt to many kinds of systems. +\`configure' configures libpng 1.5.22beta01 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1421,7 +1421,7 @@ fi if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of libpng 1.5.21:";; + short | recursive ) echo "Configuration of libpng 1.5.22beta01:";; esac cat <<\_ACEOF @@ -1571,7 +1571,7 @@ fi test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -libpng configure 1.5.21 +libpng configure 1.5.22beta01 generated by GNU Autoconf 2.69 Copyright (C) 2012 Free Software Foundation, Inc. @@ -1994,7 +1994,7 @@ cat >config.log <<_ACEOF This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by libpng $as_me 1.5.21, which was +It was created by libpng $as_me 1.5.22beta01, which was generated by GNU Autoconf 2.69. Invocation command line was $ $0 $@ @@ -2857,7 +2857,7 @@ fi # Define the identity of the package. PACKAGE='libpng' - VERSION='1.5.21' + VERSION='1.5.22beta01' cat >>confdefs.h <<_ACEOF @@ -2973,10 +2973,10 @@ fi -PNGLIB_VERSION=1.5.21 +PNGLIB_VERSION=1.5.22beta01 PNGLIB_MAJOR=1 PNGLIB_MINOR=5 -PNGLIB_RELEASE=21 +PNGLIB_RELEASE=22 @@ -13628,7 +13628,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by libpng $as_me 1.5.21, which was +This file was extended by libpng $as_me 1.5.22beta01, which was generated by GNU Autoconf 2.69. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -13694,7 +13694,7 @@ _ACEOF cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" ac_cs_version="\\ -libpng config.status 1.5.21 +libpng config.status 1.5.22beta01 configured by $0, generated by GNU Autoconf 2.69, with options \\"\$ac_cs_config\\" diff --git a/configure.ac b/configure.ac index 7e9becbff..299a9e8f7 100644 --- a/configure.ac +++ b/configure.ac @@ -18,15 +18,15 @@ AC_PREREQ(2.59) dnl Version number stuff here: -AC_INIT([libpng], [1.5.21], [png-mng-implement@lists.sourceforge.net]) +AC_INIT([libpng], [1.5.22beta01], [png-mng-implement@lists.sourceforge.net]) AM_INIT_AUTOMAKE([1.13 serial-tests subdir-objects]) dnl stop configure from automagically running automake AM_MAINTAINER_MODE -PNGLIB_VERSION=1.5.21 +PNGLIB_VERSION=1.5.22beta01 PNGLIB_MAJOR=1 PNGLIB_MINOR=5 -PNGLIB_RELEASE=21 +PNGLIB_RELEASE=22 dnl End of version number stuff diff --git a/libpng-manual.txt b/libpng-manual.txt index 79ce9fab2..8dcc1360c 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.5.21 - December 22, 2014 + libpng version 1.5.22beta01 - December 22, 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.5.21 - December 22, 2014 + libpng versions 0.97, January 1998, through 1.5.22beta01 - December 22, 2014 Updated and distributed by Glenn Randers-Pehrson Copyright (c) 1998-2014 Glenn Randers-Pehrson @@ -4537,7 +4537,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.5.21 are Y2K compliant. It is my belief that earlier +upward through 1.5.22beta01 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 that diff --git a/libpng.3 b/libpng.3 index fc6ca57b0..5bf49f0dd 100644 --- a/libpng.3 +++ b/libpng.3 @@ -1,6 +1,6 @@ .TH LIBPNG 3 "December 22, 2014" .SH NAME -libpng \- Portable Network Graphics (PNG) Reference Library 1.5.21 +libpng \- Portable Network Graphics (PNG) Reference Library 1.5.22beta01 .SH SYNOPSIS \fB #include \fP @@ -492,7 +492,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.5.21 - December 22, 2014 + libpng version 1.5.22beta01 - December 22, 2014 Updated and distributed by Glenn Randers-Pehrson Copyright (c) 1998-2014 Glenn Randers-Pehrson @@ -503,7 +503,7 @@ Libpng-manual.txt - A description on how to use and modify libpng Based on: - libpng versions 0.97, January 1998, through 1.5.21 - December 22, 2014 + libpng versions 0.97, January 1998, through 1.5.22beta01 - December 22, 2014 Updated and distributed by Glenn Randers-Pehrson Copyright (c) 1998-2014 Glenn Randers-Pehrson @@ -5029,7 +5029,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.5.21 are Y2K compliant. It is my belief that earlier +upward through 1.5.22beta01 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 that @@ -5273,6 +5273,7 @@ the first widely used release: 1.5.21beta01-02 15 10521 15.so.15.21[.0] 1.5.21rc01-03 15 10521 15.so.15.21[.0] 1.5.21 15 10521 15.so.15.21[.0] + 1.5.21beta01 15 10522 15.so.15.22[.0] Henceforth the source version will match the shared-library minor and patch numbers; the shared-library major version number will be @@ -5329,7 +5330,7 @@ possible without all of you. Thanks to Frank J. T. Wojcik for helping with the documentation. -Libpng version 1.5.21 - December 22, 2014: +Libpng version 1.5.22beta01 - December 22, 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). @@ -5352,7 +5353,7 @@ this sentence. This code is released under the libpng license. -libpng versions 1.2.6, August 15, 2004, through 1.5.21, December 22, 2014, are +libpng versions 1.2.6, August 15, 2004, through 1.5.22beta01, December 22, 2014, are Copyright (c) 2004,2006-20014 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 diff --git a/libpngpf.3 b/libpngpf.3 index d97592309..e0808b7e2 100644 --- a/libpngpf.3 +++ b/libpngpf.3 @@ -1,6 +1,6 @@ .TH LIBPNGPF 3 "December 22, 2014" .SH NAME -libpng \- Portable Network Graphics (PNG) Reference Library 1.5.21 +libpng \- Portable Network Graphics (PNG) Reference Library 1.5.22beta01 (private functions) .SH SYNOPSIS \fB#include \fI"pngpriv.h" diff --git a/png.c b/png.c index 5c7b1eb9b..2d643305c 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_5_21 Your_png_h_is_not_version_1_5_21; +typedef png_libpng_version_1_5_22beta01 Your_png_h_is_not_version_1_5_22beta01; /* 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 @@ -660,13 +660,13 @@ png_get_copyright(png_const_structp png_ptr) #else # ifdef __STDC__ return PNG_STRING_NEWLINE \ - "libpng version 1.5.21 - December 22, 2014" PNG_STRING_NEWLINE \ + "libpng version 1.5.22beta01 - December 22, 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.5.21 - December 22, 2014\ + return "libpng version 1.5.22beta01 - December 22, 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 ab965ee2f..4e10e027c 100644 --- a/png.h +++ b/png.h @@ -1,7 +1,7 @@ /* png.h - header file for PNG reference library * - * libpng version 1.5.21 - December 22, 2014 + * libpng version 1.5.22beta01 - December 22, 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.5.21 - December 22, 2014: Glenn + * libpng versions 0.97, January 1998, through 1.5.22beta01 - December 22, 2014: Glenn * See also "Contributing Authors", below. * * Note about libpng version numbers: @@ -205,6 +205,7 @@ * 1.5.21beta01-02 15 10521 15.so.15.21[.0] * 1.5.21rc01-03 15 10521 15.so.15.21[.0] * 1.5.21 15 10521 15.so.15.21[.0] + * 1.5.22beta01 15 10522 15.so.15.22[.0] * * Henceforth the source version will match the shared-library major * and minor numbers; the shared-library major version number will be @@ -236,7 +237,7 @@ * * This code is released under the libpng license. * - * libpng versions 1.2.6, August 15, 2004, through 1.5.21, December 22, 2014, are + * libpng versions 1.2.6, August 15, 2004, through 1.5.22beta01, December 22, 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: @@ -354,7 +355,7 @@ * an official declaration. * * This is your unofficial assurance that libpng from version 0.71 and - * upward through 1.5.21 are Y2K compliant. It is my belief that + * upward through 1.5.22beta01 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 @@ -415,9 +416,9 @@ */ /* Version information for png.h - this should match the version in png.c */ -#define PNG_LIBPNG_VER_STRING "1.5.21" +#define PNG_LIBPNG_VER_STRING "1.5.22beta01" #define PNG_HEADER_VERSION_STRING \ - " libpng version 1.5.21 - December 22, 2014\n" + " libpng version 1.5.22beta01 - December 22, 2014\n" #define PNG_LIBPNG_VER_SONUM 15 #define PNG_LIBPNG_VER_DLLNUM 15 @@ -425,13 +426,13 @@ /* These should match the first 3 components of PNG_LIBPNG_VER_STRING: */ #define PNG_LIBPNG_VER_MAJOR 1 #define PNG_LIBPNG_VER_MINOR 5 -#define PNG_LIBPNG_VER_RELEASE 21 +#define PNG_LIBPNG_VER_RELEASE 22 /* This should match the numeric part of the final component of * PNG_LIBPNG_VER_STRING, omitting any leading zero: */ -#define PNG_LIBPNG_VER_BUILD 0 +#define PNG_LIBPNG_VER_BUILD 01 /* Release Status */ #define PNG_LIBPNG_BUILD_ALPHA 1 @@ -448,7 +449,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_STABLE +#define PNG_LIBPNG_BUILD_BASE_TYPE PNG_LIBPNG_BUILD_BETA /* Careful here. At one time, Guy wanted to use 082, but that would be octal. * We must not include leading zeros. @@ -456,7 +457,7 @@ * version 1.0.0 was mis-numbered 100 instead of 10000). From * version 1.0.1 it's xxyyzz, where x=major, y=minor, z=release */ -#define PNG_LIBPNG_VER 10521 /* 1.5.21 */ +#define PNG_LIBPNG_VER 10522 /* 1.5.22 */ /* Library configuration: these options cannot be changed after * the library has been built. @@ -578,7 +579,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_5_21; +typedef char* png_libpng_version_1_5_22beta01; /* Three color definitions. The order of the red, green, and blue, (and the * exact size) is not important, although the size of the fields need to diff --git a/pngconf.h b/pngconf.h index 7e5a3f4a5..4773b7a0a 100644 --- a/pngconf.h +++ b/pngconf.h @@ -1,7 +1,7 @@ /* pngconf.h - machine configurable file for libpng * - * libpng version 1.5.21 - December 22, 2014 + * libpng version 1.5.22beta01 - December 22, 2014 * * Copyright (c) 1998-2013 Glenn Randers-Pehrson * (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger) diff --git a/pngtest.c b/pngtest.c index 1deb032d1..f93f98964 100644 --- a/pngtest.c +++ b/pngtest.c @@ -1990,4 +1990,4 @@ main(void) #endif /* Generate a compiler error if there is an old png.h in the search path. */ -typedef png_libpng_version_1_5_21 Your_png_h_is_not_version_1_5_21; +typedef png_libpng_version_1_5_22beta01 Your_png_h_is_not_version_1_5_22beta01; diff --git a/projects/vstudio/readme.txt b/projects/vstudio/readme.txt index b1bc5ed73..d26594be0 100644 --- a/projects/vstudio/readme.txt +++ b/projects/vstudio/readme.txt @@ -1,7 +1,7 @@ VisualStudio instructions -libpng version 1.5.21 - December 22, 2014 +libpng version 1.5.22beta01 - December 22, 2014 Copyright (c) 1998-2010 Glenn Randers-Pehrson diff --git a/projects/vstudio/zlib.props b/projects/vstudio/zlib.props index 842cbad97..1f4d60bdc 100644 --- a/projects/vstudio/zlib.props +++ b/projects/vstudio/zlib.props @@ -2,7 +2,7 @@