From 7ae451f5277b9b101dee392768af0fc2ae6ee6a5 Mon Sep 17 00:00:00 2001 From: Glenn Randers-Pehrson Date: Mon, 16 Sep 2013 11:19:34 -0500 Subject: [PATCH] [libpng16] Bump version to 1.6.7beta01 --- ANNOUNCE | 21 +++++++++++---------- CHANGES | 4 +++- CMakeLists.txt | 4 ++-- LICENSE | 2 +- README | 2 +- arm/arm_init.c | 2 +- configure.ac | 6 +++--- libpng-manual.txt | 6 +++--- libpng.3 | 13 +++++++------ libpngpf.3 | 2 +- png.c | 6 +++--- png.h | 23 ++++++++++++----------- pngconf.h | 2 +- pngrtran.c | 2 +- pngrutil.c | 2 +- pngtest.c | 2 +- projects/vstudio/readme.txt | 2 +- projects/vstudio/zlib.props | 2 +- scripts/README.txt | 12 ++++++------ scripts/def.dfn | 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 +- 30 files changed, 72 insertions(+), 67 deletions(-) diff --git a/ANNOUNCE b/ANNOUNCE index 063cce6fa..7dd3b6368 100644 --- a/ANNOUNCE +++ b/ANNOUNCE @@ -1,31 +1,32 @@ -Libpng 1.6.6 - September 16, 2013 +Libpng 1.6.7beta01 - September 16, 2013 -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.6.6.tar.xz (LZMA-compressed, recommended) - libpng-1.6.6.tar.gz + 1.6.7beta01.tar.xz (LZMA-compressed, recommended) + 1.6.7beta01.tar.gz Source files with CRLF line endings (for Windows), without the "configure" script - lpng166.7z (LZMA-compressed, recommended) - lpng166.zip + lp167b01.7z (LZMA-compressed, recommended) + lp167b01.zip Other information: - libpng-1.6.6-README.txt - libpng-1.6.6-LICENSE.txt + 1.6.7beta01-README.txt + 1.6.7beta01-LICENSE.txt Gnupg/*.asc (PGP armored detached signatures) -Changes since the last public release (1.6.5): +Changes since the last public release (1.6.6): - Removed two stray lines of code from arm/arm_init.c, again. +Version 1.6.7 [September 16, 2013] Send comments/corrections/commendations to png-mng-implement at lists.sf.net (subscription required; visit diff --git a/CHANGES b/CHANGES index cca2ae2ec..b46115dc3 100644 --- a/CHANGES +++ b/CHANGES @@ -4637,9 +4637,11 @@ Version 1.6.4 [September 12, 2013] Version 1.6.5 [September 14, 2013] Removed two stray lines of code from arm/arm_init.c. -Version 1.6.6beta01 [September 16, 2013] +Version 1.6.6 [September 16, 2013] Removed two stray lines of code from arm/arm_init.c, again. +Version 1.6.7beta01 [September 16, 2013] + 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 48f6501eb..34a9a9112 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -16,7 +16,7 @@ enable_testing() set(PNGLIB_MAJOR 1) set(PNGLIB_MINOR 6) -set(PNGLIB_RELEASE 6) +set(PNGLIB_RELEASE 7) set(PNGLIB_NAME libpng${PNGLIB_MAJOR}${PNGLIB_MINOR}) set(PNGLIB_VERSION ${PNGLIB_MAJOR}.${PNGLIB_MINOR}.${PNGLIB_RELEASE}) @@ -252,7 +252,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.6 +# VERSION 16.${PNGLIB_RELEASE}.1.6.7beta01 VERSION 16.${PNGLIB_RELEASE}.0 SOVERSION 16 CLEAN_DIRECT_OUTPUT 1) diff --git a/LICENSE b/LICENSE index 75308d7eb..03a590348 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.6, September 16, 2013, are +libpng versions 1.2.6, August 15, 2004, through 1.6.7beta01, September 16, 2013, are Copyright (c) 2004, 2006-2013 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 f71a50d1f..a83c5e205 100644 --- a/README +++ b/README @@ -1,4 +1,4 @@ -README for libpng version 1.6.6 - September 16, 2013 (shared library 16.0) +README for libpng version 1.6.7beta01 - September 16, 2013 (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 a8def9aeb..8f3377545 100644 --- a/arm/arm_init.c +++ b/arm/arm_init.c @@ -3,7 +3,7 @@ * * Copyright (c) 2013 Glenn Randers-Pehrson * Written by Mans Rullgard, 2011. - * Last changed in libpng 1.6.5 [September 16, 2013] + * Last changed in libpng 1.6.6 [September 16, 2013] * * 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 baedb3adf..05c89eac0 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.6],[png-mng-implement@lists.sourceforge.net]) +AC_INIT([libpng],[1.6.7beta01],[png-mng-implement@lists.sourceforge.net]) AC_CONFIG_MACRO_DIR([scripts]) # libpng does not follow GNU file name conventions (hence 'foreign') @@ -39,10 +39,10 @@ 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.6 +PNGLIB_VERSION=1.6.7beta01 PNGLIB_MAJOR=1 PNGLIB_MINOR=6 -PNGLIB_RELEASE=6 +PNGLIB_RELEASE=7 dnl End of version number stuff diff --git a/libpng-manual.txt b/libpng-manual.txt index 8326258d8..a9a75c5de 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.6 - September 16, 2013 + libpng version 1.6.7beta01 - September 16, 2013 Updated and distributed by Glenn Randers-Pehrson Copyright (c) 1998-2013 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.6 - September 16, 2013 + libpng versions 0.97, January 1998, through 1.6.7beta01 - September 16, 2013 Updated and distributed by Glenn Randers-Pehrson Copyright (c) 1998-2013 Glenn Randers-Pehrson @@ -5235,7 +5235,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.6 are Y2K compliant. It is my belief that earlier +upward through 1.6.7beta01 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 c5ed17a7f..0c509c0ae 100644 --- a/libpng.3 +++ b/libpng.3 @@ -1,6 +1,6 @@ .TH LIBPNG 3 "September 16, 2013" .SH NAME -libpng \- Portable Network Graphics (PNG) Reference Library 1.6.6 +libpng \- Portable Network Graphics (PNG) Reference Library 1.6.7beta01 .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.6 - September 16, 2013 + libpng version 1.6.7beta01 - September 16, 2013 Updated and distributed by Glenn Randers-Pehrson Copyright (c) 1998-2013 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.6 - September 16, 2013 + libpng versions 0.97, January 1998, through 1.6.7beta01 - September 16, 2013 Updated and distributed by Glenn Randers-Pehrson Copyright (c) 1998-2013 Glenn Randers-Pehrson @@ -5740,7 +5740,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.6 are Y2K compliant. It is my belief that earlier +upward through 1.6.7beta01 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 @@ -5962,6 +5962,7 @@ the first widely used release: 1.6.4 16 10604 16.so.16.4[.0] 1.6.5 16 10605 16.so.16.5[.0] 1.6.6 16 10606 16.so.16.6[.0] + 1.6.7beta01 16 10607 16.so.16.7[.0] Henceforth the source version will match the shared-library minor and patch numbers; the shared-library major version number will be @@ -6018,7 +6019,7 @@ possible without all of you. Thanks to Frank J. T. Wojcik for helping with the documentation. -Libpng version 1.6.6 - September 16, 2013: +Libpng version 1.6.7beta01 - September 16, 2013: Initially created in 1995 by Guy Eric Schalnat, then of Group 42, Inc. Currently maintained by Glenn Randers-Pehrson (glennrp at users.sourceforge.net). @@ -6041,7 +6042,7 @@ this sentence. This code is released under the libpng license. -libpng versions 1.2.6, August 15, 2004, through 1.6.6, September 16, 2013, are +libpng versions 1.2.6, August 15, 2004, through 1.6.7beta01, September 16, 2013, are Copyright (c) 2004,2006-2007 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 fc414055d..cf99d3c8c 100644 --- a/libpngpf.3 +++ b/libpngpf.3 @@ -1,6 +1,6 @@ .TH LIBPNGPF 3 "September 16, 2013" .SH NAME -libpng \- Portable Network Graphics (PNG) Reference Library 1.6.6 +libpng \- Portable Network Graphics (PNG) Reference Library 1.6.7beta01 (private functions) .SH SYNOPSIS \fB#include \fI"pngpriv.h" diff --git a/png.c b/png.c index 050039548..68109a9fb 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_6 Your_png_h_is_not_version_1_6_6; +typedef png_libpng_version_1_6_7beta01 Your_png_h_is_not_version_1_6_7beta01; /* 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 @@ -768,13 +768,13 @@ png_get_copyright(png_const_structrp png_ptr) #else # ifdef __STDC__ return PNG_STRING_NEWLINE \ - "libpng version 1.6.6 - September 16, 2013" PNG_STRING_NEWLINE \ + "libpng version 1.6.7beta01 - September 16, 2013" PNG_STRING_NEWLINE \ "Copyright (c) 1998-2013 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.6 - September 16, 2013\ + return "libpng version 1.6.7beta01 - September 16, 2013\ Copyright (c) 1998-2013 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 71c2ab675..0af7aa6a0 100644 --- a/png.h +++ b/png.h @@ -1,7 +1,7 @@ /* png.h - header file for PNG reference library * - * libpng version 1.6.6 - September 16, 2013 + * libpng version 1.6.7beta01 - September 16, 2013 * Copyright (c) 1998-2013 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.6 - September 16, 2013: Glenn + * libpng versions 0.97, January 1998, through 1.6.7beta01 - September 16, 2013: Glenn * See also "Contributing Authors", below. * * Note about libpng version numbers: @@ -183,6 +183,7 @@ * 1.6.4 16 10604 16.so.16.4[.0] * 1.6.5 16 10605 16.so.16.5[.0] * 1.6.6 16 10606 16.so.16.6[.0] + * 1.6.7beta01 16 10607 16.so.16.7[.0] * * Henceforth the source version will match the shared-library major * and minor numbers; the shared-library major version number will be @@ -214,7 +215,7 @@ * * This code is released under the libpng license. * - * libpng versions 1.2.6, August 15, 2004, through 1.6.6, September 16, 2013, are + * libpng versions 1.2.6, August 15, 2004, through 1.6.7beta01, September 16, 2013, are * Copyright (c) 2004, 2006-2013 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: @@ -332,7 +333,7 @@ * an official declaration. * * This is your unofficial assurance that libpng from version 0.71 and - * upward through 1.6.6 are Y2K compliant. It is my belief that + * upward through 1.6.7beta01 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 @@ -392,9 +393,9 @@ */ /* Version information for png.h - this should match the version in png.c */ -#define PNG_LIBPNG_VER_STRING "1.6.6" +#define PNG_LIBPNG_VER_STRING "1.6.7beta01" #define PNG_HEADER_VERSION_STRING \ - " libpng version 1.6.6 - September 16, 2013\n" + " libpng version 1.6.7beta01 - September 16, 2013\n" #define PNG_LIBPNG_VER_SONUM 16 #define PNG_LIBPNG_VER_DLLNUM 16 @@ -402,13 +403,13 @@ /* These should match the first 3 components of PNG_LIBPNG_VER_STRING: */ #define PNG_LIBPNG_VER_MAJOR 1 #define PNG_LIBPNG_VER_MINOR 6 -#define PNG_LIBPNG_VER_RELEASE 6 +#define PNG_LIBPNG_VER_RELEASE 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 0 +#define PNG_LIBPNG_VER_BUILD 01 /* Release Status */ #define PNG_LIBPNG_BUILD_ALPHA 1 @@ -425,7 +426,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. @@ -433,7 +434,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 10606 /* 1.6.6 */ +#define PNG_LIBPNG_VER 10607 /* 1.6.7 */ /* Library configuration: these options cannot be changed after * the library has been built. @@ -538,7 +539,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_6; +typedef char* png_libpng_version_1_6_7beta01; /* Basic control structions. Read libpng-manual.txt or libpng.3 for more info. * diff --git a/pngconf.h b/pngconf.h index 4bd807f27..bc763747f 100644 --- a/pngconf.h +++ b/pngconf.h @@ -1,7 +1,7 @@ /* pngconf.h - machine configurable file for libpng * - * libpng version 1.6.6 - September 16, 2013 + * libpng version 1.6.7beta01 - September 16, 2013 * * Copyright (c) 1998-2013 Glenn Randers-Pehrson * (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger) diff --git a/pngrtran.c b/pngrtran.c index 5c6bbd316..812d6b8d7 100644 --- a/pngrtran.c +++ b/pngrtran.c @@ -1,7 +1,7 @@ /* pngrtran.c - transforms the data in a row for PNG readers * - * Last changed in libpng 1.6.4 [September 16, 2013] + * Last changed in libpng 1.6.4 [(PENDING RELEASE)] * Copyright (c) 1998-2013 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.) diff --git a/pngrutil.c b/pngrutil.c index a0d324f5a..8ad299f4d 100644 --- a/pngrutil.c +++ b/pngrutil.c @@ -1,7 +1,7 @@ /* pngrutil.c - utilities to read a PNG file * - * Last changed in libpng 1.6.4 [September 16, 2013] + * Last changed in libpng 1.6.4 [(PENDING RELEASE)] * Copyright (c) 1998-2013 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.) diff --git a/pngtest.c b/pngtest.c index 299115523..ffc8139fa 100644 --- a/pngtest.c +++ b/pngtest.c @@ -1968,4 +1968,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_6 Your_png_h_is_not_version_1_6_6; +typedef png_libpng_version_1_6_7beta01 Your_png_h_is_not_version_1_6_7beta01; diff --git a/projects/vstudio/readme.txt b/projects/vstudio/readme.txt index 06148c1b3..344a44d7d 100644 --- a/projects/vstudio/readme.txt +++ b/projects/vstudio/readme.txt @@ -1,7 +1,7 @@ VisualStudio instructions -libpng version 1.6.6 - September 16, 2013 +libpng version 1.6.7beta01 - September 16, 2013 Copyright (c) 1998-2010 Glenn Randers-Pehrson diff --git a/projects/vstudio/zlib.props b/projects/vstudio/zlib.props index 9ab58e925..fb52eac6f 100644 --- a/projects/vstudio/zlib.props +++ b/projects/vstudio/zlib.props @@ -2,7 +2,7 @@