From f2b8961f5869d8d0b1419ce6d69aa0160dfe3a46 Mon Sep 17 00:00:00 2001 From: Glenn Randers-Pehrson Date: Thu, 14 Nov 2013 12:56:50 -0600 Subject: [PATCH] [libpng16] Bump version to 1.6.8beta01 --- ANNOUNCE | 33 +++++++++++++++++++++++++-------- CHANGES | 2 ++ CMakeLists.txt | 4 ++-- LICENSE | 2 +- README | 2 +- configure.ac | 6 +++--- libpng-manual.txt | 6 +++--- libpng.3 | 13 +++++++------ libpngpf.3 | 2 +- png.c | 6 +++--- png.h | 25 +++++++++++++------------ pngconf.h | 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 +- 27 files changed, 83 insertions(+), 62 deletions(-) diff --git a/ANNOUNCE b/ANNOUNCE index b29489ab5..6797e8fea 100644 --- a/ANNOUNCE +++ b/ANNOUNCE @@ -1,30 +1,32 @@ -Libpng 1.6.7 - November 14, 2013 +Libpng 1.6.8beta01 - November 14, 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.7.tar.xz (LZMA-compressed, recommended) - libpng-1.6.7.tar.gz + 1.6.8beta01.tar.xz (LZMA-compressed, recommended) + 1.6.8beta01.tar.gz Source files with CRLF line endings (for Windows), without the "configure" script - lpng167.7z (LZMA-compressed, recommended) - lpng167.zip + lp168b01.7z (LZMA-compressed, recommended) + lp168b01.zip Other information: - libpng-1.6.7-README.txt - libpng-1.6.7-LICENSE.txt + 1.6.8beta01-README.txt + 1.6.8beta01-LICENSE.txt Gnupg/*.asc (PGP armored detached signatures) Changes since the last public release (1.6.6): +Version 1.6.7beta01 [September 30, 2013] Revised unknown chunk code to correct several bugs in the NO_SAVE_/NO_WRITE combination Allow HANDLE_AS_UNKNOWN to work when other options are configured off. Also @@ -43,6 +45,8 @@ Changes since the last public release (1.6.6): if SAVE_UNKNOWN was not available but did nothing since the callback was never implemented. Merged pngunknown.c with 1.7 version and back ported 1.7 improvements/fixes + +Version 1.6.7beta02 [October 12, 2013] Made changes for compatibility with automake 1.14: 1) Added the 'compile' program to the list of programs that must be cleaned in autogen.sh @@ -67,12 +71,16 @@ Changes since the last public release (1.6.6): condition ? string-literal : string-literal). Make autogen.sh work with automake 1.13 as well as 1.14. Do this by always removing the 1.14 'compile' script but never checking for it. + +Version 1.6.7beta03 [October 19, 2013] Added ARMv8 support (James Yu ). Added file arm/filter_neon_intrinsics.c; enable with -mfpu=neon. Revised pngvalid to generate size images with as many filters as it can manage, limited by the number of rows. Cleaned up ARM NEON compilation handling. The tests are now in pngpriv.h and detect the broken GCC compilers. + +Version 1.6.7beta04 [October 26, 2013] Allow clang derived from older GCC versions to use ARM intrinsics. This causes all clang builds that use -mfpu=neon to use the intrinsics code, not the assembler code. This has only been tested on iOS 7. It may be @@ -81,9 +89,18 @@ Changes since the last public release (1.6.6): or intrinsics to be turned on at compile time during the build by defining PNG_ARM_NEON_IMPLEMENTATION to the correct value (2 or 1). This macro is undefined by default and the build type is selected in pngpriv.h. + +Version 1.6.7rc01 [November 2, 2013] + No changes. + +Version 1.6.7rc02 [November 7, 2013] Fixed #include in filter_neon_intrinsics.c and ctype macros. The ctype char checking macros take an unsigned char argument, not a signed char. +Version 1.6.7 [November 14, 2013] + +Version 1.6.8beta01 [November 14, 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/CHANGES b/CHANGES index bde9a92e3..77c3bd107 100644 --- a/CHANGES +++ b/CHANGES @@ -4713,6 +4713,8 @@ Version 1.6.7rc02 [November 7, 2013] Version 1.6.7 [November 14, 2013] +Version 1.6.8beta01 [November 14, 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 4b4e74c07..180fcfab9 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -16,7 +16,7 @@ enable_testing() set(PNGLIB_MAJOR 1) set(PNGLIB_MINOR 6) -set(PNGLIB_RELEASE 7) +set(PNGLIB_RELEASE 8) 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.7 +# VERSION 16.${PNGLIB_RELEASE}.1.6.8beta01 VERSION 16.${PNGLIB_RELEASE}.0 SOVERSION 16 CLEAN_DIRECT_OUTPUT 1) diff --git a/LICENSE b/LICENSE index b1b97ea57..28641220e 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.7, November 14, 2013, are +libpng versions 1.2.6, August 15, 2004, through 1.6.8beta01, November 14, 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 80fc574ad..eb079a465 100644 --- a/README +++ b/README @@ -1,4 +1,4 @@ -README for libpng version 1.6.7 - November 14, 2013 (shared library 16.0) +README for libpng version 1.6.8beta01 - November 14, 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/configure.ac b/configure.ac index 28200c3f6..a2bfb904d 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.7],[png-mng-implement@lists.sourceforge.net]) +AC_INIT([libpng],[1.6.8beta01],[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.7 +PNGLIB_VERSION=1.6.8beta01 PNGLIB_MAJOR=1 PNGLIB_MINOR=6 -PNGLIB_RELEASE=7 +PNGLIB_RELEASE=8 dnl End of version number stuff diff --git a/libpng-manual.txt b/libpng-manual.txt index bb1702f48..750eb3bc2 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.7 - November 14, 2013 + libpng version 1.6.8beta01 - November 14, 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.7 - November 14, 2013 + libpng versions 0.97, January 1998, through 1.6.8beta01 - November 14, 2013 Updated and distributed by Glenn Randers-Pehrson Copyright (c) 1998-2013 Glenn Randers-Pehrson @@ -5238,7 +5238,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.7 are Y2K compliant. It is my belief that earlier +upward through 1.6.8beta01 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 9a7bdf0f9..4c33aacee 100644 --- a/libpng.3 +++ b/libpng.3 @@ -1,6 +1,6 @@ .TH LIBPNG 3 "November 14, 2013" .SH NAME -libpng \- Portable Network Graphics (PNG) Reference Library 1.6.7 +libpng \- Portable Network Graphics (PNG) Reference Library 1.6.8beta01 .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.7 - November 14, 2013 + libpng version 1.6.8beta01 - November 14, 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.7 - November 14, 2013 + libpng versions 0.97, January 1998, through 1.6.8beta01 - November 14, 2013 Updated and distributed by Glenn Randers-Pehrson Copyright (c) 1998-2013 Glenn Randers-Pehrson @@ -5743,7 +5743,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.7 are Y2K compliant. It is my belief that earlier +upward through 1.6.8beta01 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 @@ -5968,6 +5968,7 @@ the first widely used release: 1.6.7beta01-04 16 10607 16.so.16.7[.0] 1.6.7rc01-02 16 10607 16.so.16.7[.0] 1.6.7 16 10607 16.so.16.7[.0] + 1.6.8beta01 16 10608 16.so.16.8[.0] Henceforth the source version will match the shared-library minor and patch numbers; the shared-library major version number will be @@ -6024,7 +6025,7 @@ possible without all of you. Thanks to Frank J. T. Wojcik for helping with the documentation. -Libpng version 1.6.7 - November 14, 2013: +Libpng version 1.6.8beta01 - November 14, 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). @@ -6047,7 +6048,7 @@ this sentence. This code is released under the libpng license. -libpng versions 1.2.6, August 15, 2004, through 1.6.7, November 14, 2013, are +libpng versions 1.2.6, August 15, 2004, through 1.6.8beta01, November 14, 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 62ed7812c..d50804563 100644 --- a/libpngpf.3 +++ b/libpngpf.3 @@ -1,6 +1,6 @@ .TH LIBPNGPF 3 "November 14, 2013" .SH NAME -libpng \- Portable Network Graphics (PNG) Reference Library 1.6.7 +libpng \- Portable Network Graphics (PNG) Reference Library 1.6.8beta01 (private functions) .SH SYNOPSIS \fB#include \fI"pngpriv.h" diff --git a/png.c b/png.c index efcc6eead..198f3e4a9 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_7 Your_png_h_is_not_version_1_6_7; +typedef png_libpng_version_1_6_8beta01 Your_png_h_is_not_version_1_6_8beta01; /* 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.7 - November 14, 2013" PNG_STRING_NEWLINE \ + "libpng version 1.6.8beta01 - November 14, 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.7 - November 14, 2013\ + return "libpng version 1.6.8beta01 - November 14, 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 527392738..43c882048 100644 --- a/png.h +++ b/png.h @@ -1,7 +1,7 @@ /* png.h - header file for PNG reference library * - * libpng version 1.6.7 - November 14, 2013 + * libpng version 1.6.8beta01 - November 14, 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.7 - November 14, 2013: Glenn + * libpng versions 0.97, January 1998, through 1.6.8beta01 - November 14, 2013: Glenn * See also "Contributing Authors", below. * * Note about libpng version numbers: @@ -184,8 +184,9 @@ * 1.6.5 16 10605 16.so.16.5[.0] * 1.6.6 16 10606 16.so.16.6[.0] * 1.6.7beta01-04 16 10607 16.so.16.7[.0] - * 1.6.7rc01-02 16 10607 16.so.16.7[.0] + * 1.6.7rc01-03 16 10607 16.so.16.7[.0] * 1.6.7 16 10607 16.so.16.7[.0] + * 1.6.8beta01 16 10608 16.so.16.8[.0] * * Henceforth the source version will match the shared-library major * and minor numbers; the shared-library major version number will be @@ -217,7 +218,7 @@ * * This code is released under the libpng license. * - * libpng versions 1.2.6, August 15, 2004, through 1.6.7, November 14, 2013, are + * libpng versions 1.2.6, August 15, 2004, through 1.6.8beta01, November 14, 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: @@ -335,7 +336,7 @@ * an official declaration. * * This is your unofficial assurance that libpng from version 0.71 and - * upward through 1.6.7 are Y2K compliant. It is my belief that + * upward through 1.6.8beta01 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 @@ -395,9 +396,9 @@ */ /* Version information for png.h - this should match the version in png.c */ -#define PNG_LIBPNG_VER_STRING "1.6.7" +#define PNG_LIBPNG_VER_STRING "1.6.8beta01" #define PNG_HEADER_VERSION_STRING \ - " libpng version 1.6.7 - November 14, 2013\n" + " libpng version 1.6.8beta01 - November 14, 2013\n" #define PNG_LIBPNG_VER_SONUM 16 #define PNG_LIBPNG_VER_DLLNUM 16 @@ -405,13 +406,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 7 +#define PNG_LIBPNG_VER_RELEASE 8 /* 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 @@ -428,7 +429,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. @@ -436,7 +437,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 10607 /* 1.6.7 */ +#define PNG_LIBPNG_VER 10608 /* 1.6.8 */ /* Library configuration: these options cannot be changed after * the library has been built. @@ -541,7 +542,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_7; +typedef char* png_libpng_version_1_6_8beta01; /* Basic control structions. Read libpng-manual.txt or libpng.3 for more info. * diff --git a/pngconf.h b/pngconf.h index 8064194c0..fd19c9827 100644 --- a/pngconf.h +++ b/pngconf.h @@ -1,7 +1,7 @@ /* pngconf.h - machine configurable file for libpng * - * libpng version 1.6.7 - November 14, 2013 + * libpng version 1.6.8beta01 - November 14, 2013 * * 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 c3fe3204d..4f0515b9d 100644 --- a/pngtest.c +++ b/pngtest.c @@ -1970,4 +1970,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_7 Your_png_h_is_not_version_1_6_7; +typedef png_libpng_version_1_6_8beta01 Your_png_h_is_not_version_1_6_8beta01; diff --git a/projects/vstudio/readme.txt b/projects/vstudio/readme.txt index c8b1736b0..d32a26996 100644 --- a/projects/vstudio/readme.txt +++ b/projects/vstudio/readme.txt @@ -1,7 +1,7 @@ VisualStudio instructions -libpng version 1.6.7 - November 14, 2013 +libpng version 1.6.8beta01 - November 14, 2013 Copyright (c) 1998-2010 Glenn Randers-Pehrson diff --git a/projects/vstudio/zlib.props b/projects/vstudio/zlib.props index c55d70ce1..36c3f748b 100644 --- a/projects/vstudio/zlib.props +++ b/projects/vstudio/zlib.props @@ -2,7 +2,7 @@