From ad183638526d54c95269824269c369b466a6e004 Mon Sep 17 00:00:00 2001 From: Glenn Randers-Pehrson Date: Fri, 6 Aug 2010 07:00:08 -0500 Subject: [PATCH] [devel] Bump to version libpng-1.5.0beta41 --- ANNOUNCE | 18 ++++++++------- CHANGES | 2 ++ CMakeLists.txt | 2 +- INSTALL | 4 ++-- LICENSE | 2 +- README | 2 +- configure | 22 +++++++++---------- configure.ac | 4 ++-- ...-1.5.0beta40.txt => libpng-1.5.0beta41.txt | 8 +++---- libpng.3 | 16 +++++++------- libpngpf.3 | 2 +- png.c | 6 ++--- png.h | 16 +++++++------- pngconf.h | 2 +- pngpriv.h | 2 +- pngtest.c | 2 +- projects/vstudio/readme.txt | 2 +- projects/vstudio/zlib.props | 2 +- scripts/README.txt | 12 +++++----- 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 | 2 +- scripts/pngwin.def | 2 +- scripts/symbols.def | 2 +- 27 files changed, 73 insertions(+), 69 deletions(-) rename libpng-1.5.0beta40.txt => libpng-1.5.0beta41.txt (99%) diff --git a/ANNOUNCE b/ANNOUNCE index 22ec5026b..0f7dca010 100644 --- a/ANNOUNCE +++ b/ANNOUNCE @@ -1,5 +1,5 @@ -Libpng 1.5.0beta40 - August 6, 2010 +Libpng 1.5.0beta41 - August 6, 2010 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. @@ -9,20 +9,20 @@ Files available for download: Source files with LF line endings (for Unix/Linux) and with a "configure" script - 1.5.0beta40.tar.xz (LZMA-compressed, recommended) - 1.5.0beta40.tar.gz - 1.5.0beta40.tar.bz2 + 1.5.0beta41.tar.xz (LZMA-compressed, recommended) + 1.5.0beta41.tar.gz + 1.5.0beta41.tar.bz2 Source files with CRLF line endings (for Windows), without the "configure" script - lp150b40.zip - lp150b40.7z + lp150b41.zip + lp150b41.7z Other information: - 1.5.0beta40-README.txt - 1.5.0beta40-LICENSE.txt + 1.5.0beta41-README.txt + 1.5.0beta41-LICENSE.txt Changes since the last public release (1.4.1): @@ -339,6 +339,8 @@ version 1.5.0beta40 [August 6, 2010] Removed png_mem_ #defines; they are no longer used. Added the sRGB chunk to pngtest.png +version 1.5.0beta41 [August 6, 2010] + 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 ff0c3af6d..e6cb5a7a9 100644 --- a/CHANGES +++ b/CHANGES @@ -2821,6 +2821,8 @@ version 1.5.0beta40 [August 6, 2010] Removed png_mem_ #defines; they are no longer used. Added the sRGB chunk to pngtest.png +version 1.5.0beta41 [August 6, 2010] + projects/vstudio now builds and runs all tests (pngvalid added), however the DLL builds are probably not useful as there seems to be no way to avoid dependency on the VC runtime in the DLL case. diff --git a/CMakeLists.txt b/CMakeLists.txt index 51c464b15..1ec86b991 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -207,7 +207,7 @@ configure_file(${CMAKE_CURRENT_SOURCE_DIR}/libpng-config.in # SET UP LINKS if(PNG_SHARED) set_target_properties(${PNG_LIB_NAME} PROPERTIES -# VERSION 15.${PNGLIB_RELEASE}.1.5.0beta40 +# VERSION 15.${PNGLIB_RELEASE}.1.5.0beta41 VERSION 15.${PNGLIB_RELEASE}.0 SOVERSION 15 CLEAN_DIRECT_OUTPUT 1) diff --git a/INSTALL b/INSTALL index d1fe8090c..259136672 100644 --- a/INSTALL +++ b/INSTALL @@ -1,5 +1,5 @@ -Installing libpng version 1.5.0beta40 - August 6, 2010 +Installing libpng version 1.5.0beta41 - August 6, 2010 On Unix/Linux and similar systems, you can simply type @@ -46,7 +46,7 @@ to have access to the zlib.h and zconf.h include files that correspond to the version of zlib that's installed. You can rename the directories that you downloaded (they -might be called "libpng-1.5.0beta40" or "libpng15" and "zlib-1.2.3" +might be called "libpng-1.5.0beta41" or "libpng15" and "zlib-1.2.3" or "zlib123") so that you have directories called "zlib" and "libpng". Your directory structure should look like this: diff --git a/LICENSE b/LICENSE index 43a66c909..b2f44a28d 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.0beta40, August 6, 2010, are +libpng versions 1.2.6, August 15, 2004, through 1.5.0beta41, August 6, 2010, are Copyright (c) 2004, 2006-2010 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 18a7d7b44..54bb88338 100644 --- a/README +++ b/README @@ -1,4 +1,4 @@ -README for libpng version 1.5.0beta40 - August 6, 2010 (shared library 15.0) +README for libpng version 1.5.0beta41 - August 6, 2010 (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 ddd3c1dda..a80248ac3 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.65 for libpng 1.5.0beta40. +# Generated by GNU Autoconf 2.65 for libpng 1.5.0beta41. # # Report bugs to . # @@ -701,8 +701,8 @@ MAKEFLAGS= # Identity of this package. PACKAGE_NAME='libpng' PACKAGE_TARNAME='libpng' -PACKAGE_VERSION='1.5.0beta40' -PACKAGE_STRING='libpng 1.5.0beta40' +PACKAGE_VERSION='1.5.0beta41' +PACKAGE_STRING='libpng 1.5.0beta41' PACKAGE_BUGREPORT='png-mng-implement@lists.sourceforge.net' PACKAGE_URL='' @@ -1432,7 +1432,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.0beta40 to adapt to many kinds of systems. +\`configure' configures libpng 1.5.0beta41 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1502,7 +1502,7 @@ fi if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of libpng 1.5.0beta40:";; + short | recursive ) echo "Configuration of libpng 1.5.0beta41:";; esac cat <<\_ACEOF @@ -1607,7 +1607,7 @@ fi test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -libpng configure 1.5.0beta40 +libpng configure 1.5.0beta41 generated by GNU Autoconf 2.65 Copyright (C) 2009 Free Software Foundation, Inc. @@ -2032,7 +2032,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.0beta40, which was +It was created by libpng $as_me 1.5.0beta41, which was generated by GNU Autoconf 2.65. Invocation command line was $ $0 $@ @@ -2840,7 +2840,7 @@ fi # Define the identity of the package. PACKAGE='libpng' - VERSION='1.5.0beta40' + VERSION='1.5.0beta41' cat >>confdefs.h <<_ACEOF @@ -2904,7 +2904,7 @@ fi -PNGLIB_VERSION=1.5.0beta40 +PNGLIB_VERSION=1.5.0beta41 PNGLIB_MAJOR=1 PNGLIB_MINOR=5 PNGLIB_RELEASE=0 @@ -12119,7 +12119,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.0beta40, which was +This file was extended by libpng $as_me 1.5.0beta41, which was generated by GNU Autoconf 2.65. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -12185,7 +12185,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.0beta40 +libpng config.status 1.5.0beta41 configured by $0, generated by GNU Autoconf 2.65, with options \\"\$ac_cs_config\\" diff --git a/configure.ac b/configure.ac index 9877d818b..4c383c11c 100644 --- a/configure.ac +++ b/configure.ac @@ -18,12 +18,12 @@ AC_PREREQ(2.59) dnl Version number stuff here: -AC_INIT([libpng], [1.5.0beta40], [png-mng-implement@lists.sourceforge.net]) +AC_INIT([libpng], [1.5.0beta41], [png-mng-implement@lists.sourceforge.net]) AM_INIT_AUTOMAKE dnl stop configure from automagically running automake AM_MAINTAINER_MODE -PNGLIB_VERSION=1.5.0beta40 +PNGLIB_VERSION=1.5.0beta41 PNGLIB_MAJOR=1 PNGLIB_MINOR=5 PNGLIB_RELEASE=0 diff --git a/libpng-1.5.0beta40.txt b/libpng-1.5.0beta41.txt similarity index 99% rename from libpng-1.5.0beta40.txt rename to libpng-1.5.0beta41.txt index 02fb6a595..0a950fc49 100644 --- a/libpng-1.5.0beta40.txt +++ b/libpng-1.5.0beta41.txt @@ -1,6 +1,6 @@ libpng.txt - A description on how to use and modify libpng - libpng version 1.5.0beta40 - August 6, 2010 + libpng version 1.5.0beta41 - August 6, 2010 Updated and distributed by Glenn Randers-Pehrson Copyright (c) 1998-2010 Glenn Randers-Pehrson @@ -11,7 +11,7 @@ libpng.txt - A description on how to use and modify libpng Based on: - libpng versions 0.97, January 1998, through 1.5.0beta40 - August 6, 2010 + libpng versions 0.97, January 1998, through 1.5.0beta41 - August 6, 2010 Updated and distributed by Glenn Randers-Pehrson Copyright (c) 1998-2010 Glenn Randers-Pehrson @@ -940,7 +940,7 @@ things. As of libpng version 1.2.9, png_set_expand_gray_1_2_4_to_8() was added. It expands the sample depth without changing tRNS to alpha. -As of libpng version 1.5.0beta40, not all possible expansions are supported. +As of libpng version 1.5.0beta41, not all possible expansions are supported. In the following table, the 01 means grayscale with depth<8, 31 means indexed with depth<8, other numerals represent the color type, "T" means @@ -3372,7 +3372,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.0beta40 are Y2K compliant. It is my belief that earlier +upward through 1.5.0beta41 are Y2K compliant. It is my belief that earlier versions were also Y2K compliant. Libpng only has three year fields. One is a 2-byte unsigned integer that diff --git a/libpng.3 b/libpng.3 index 7a9b9f9c2..680c2311c 100644 --- a/libpng.3 +++ b/libpng.3 @@ -1,6 +1,6 @@ .TH LIBPNG 3 "August 6, 2010" .SH NAME -libpng \- Portable Network Graphics (PNG) Reference Library 1.5.0beta40 +libpng \- Portable Network Graphics (PNG) Reference Library 1.5.0beta41 .SH SYNOPSIS \fI\fB @@ -851,7 +851,7 @@ Following is a copy of the libpng.txt file that accompanies libpng. .SH LIBPNG.TXT libpng.txt - A description on how to use and modify libpng - libpng version 1.5.0beta40 - August 6, 2010 + libpng version 1.5.0beta41 - August 6, 2010 Updated and distributed by Glenn Randers-Pehrson Copyright (c) 1998-2010 Glenn Randers-Pehrson @@ -862,7 +862,7 @@ libpng.txt - A description on how to use and modify libpng Based on: - libpng versions 0.97, January 1998, through 1.5.0beta40 - August 6, 2010 + libpng versions 0.97, January 1998, through 1.5.0beta41 - August 6, 2010 Updated and distributed by Glenn Randers-Pehrson Copyright (c) 1998-2010 Glenn Randers-Pehrson @@ -1791,7 +1791,7 @@ things. As of libpng version 1.2.9, png_set_expand_gray_1_2_4_to_8() was added. It expands the sample depth without changing tRNS to alpha. -As of libpng version 1.5.0beta40, not all possible expansions are supported. +As of libpng version 1.5.0beta41, not all possible expansions are supported. In the following table, the 01 means grayscale with depth<8, 31 means indexed with depth<8, other numerals represent the color type, "T" means @@ -4223,7 +4223,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.0beta40 are Y2K compliant. It is my belief that earlier +upward through 1.5.0beta41 are Y2K compliant. It is my belief that earlier versions were also Y2K compliant. Libpng only has three year fields. One is a 2-byte unsigned integer that @@ -4402,7 +4402,7 @@ the first widely used release: 1.4.1 14 10401 14.so.14.1[.0] 1.4.2 14 10402 14.so.14.2[.0] 1.4.3 14 10403 14.so.14.3[.0] - 1.5.0beta01-40 15 10500 15.so.15.0[.0] + 1.5.0beta01-41 15 10500 15.so.15.0[.0] Henceforth the source version will match the shared-library minor and patch numbers; the shared-library major version number will be @@ -4459,7 +4459,7 @@ possible without all of you. Thanks to Frank J. T. Wojcik for helping with the documentation. -Libpng version 1.5.0beta40 - August 6, 2010: +Libpng version 1.5.0beta41 - August 6, 2010: Initially created in 1995 by Guy Eric Schalnat, then of Group 42, Inc. Currently maintained by Glenn Randers-Pehrson (glennrp at users.sourceforge.net). @@ -4482,7 +4482,7 @@ this sentence. This code is released under the libpng license. -libpng versions 1.2.6, August 15, 2004, through 1.5.0beta40, August 6, 2010, are +libpng versions 1.2.6, August 15, 2004, through 1.5.0beta41, August 6, 2010, 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 3cacb9908..46e181e07 100644 --- a/libpngpf.3 +++ b/libpngpf.3 @@ -1,6 +1,6 @@ .TH LIBPNGPF 3 "August 6, 2010" .SH NAME -libpng \- Portable Network Graphics (PNG) Reference Library 1.5.0beta40 +libpng \- Portable Network Graphics (PNG) Reference Library 1.5.0beta41 (private functions) .SH SYNOPSIS \fB#include \fI"pngpriv.h" diff --git a/png.c b/png.c index 30e1d178a..f45fb91b5 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 version_1_5_0beta40 Your_png_h_is_not_version_1_5_0beta40; +typedef version_1_5_0beta41 Your_png_h_is_not_version_1_5_0beta41; /* Version information for C files. This had better match the version * string defined in png.h. @@ -560,13 +560,13 @@ png_get_copyright(png_structp png_ptr) #else # ifdef __STDC__ return ((png_charp) PNG_STRING_NEWLINE \ - "libpng version 1.5.0beta40 - August 6, 2010" PNG_STRING_NEWLINE \ + "libpng version 1.5.0beta41 - August 6, 2010" PNG_STRING_NEWLINE \ "Copyright (c) 1998-2010 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 ((png_charp) "libpng version 1.5.0beta40 - August 6, 2010\ + return ((png_charp) "libpng version 1.5.0beta41 - August 6, 2010\ Copyright (c) 1998-2010 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 437e17ed1..218914b5d 100644 --- a/png.h +++ b/png.h @@ -1,7 +1,7 @@ /* png.h - header file for PNG reference library * - * libpng version 1.5.0beta40 - August 6, 2010 + * libpng version 1.5.0beta41 - August 6, 2010 * Copyright (c) 1998-2010 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.0beta40 - August 6, 2010: Glenn + * libpng versions 0.97, January 1998, through 1.5.0beta41 - August 6, 2010: Glenn * See also "Contributing Authors", below. * * Note about libpng version numbers: @@ -172,7 +172,7 @@ * * This code is released under the libpng license. * - * libpng versions 1.2.6, August 15, 2004, through 1.5.0beta40, August 6, 2010, are + * libpng versions 1.2.6, August 15, 2004, through 1.5.0beta41, August 6, 2010, are * Copyright (c) 2004, 2006-2010 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: @@ -290,7 +290,7 @@ * an official declaration. * * This is your unofficial assurance that libpng from version 0.71 and - * upward through 1.5.0beta40 are Y2K compliant. It is my belief that + * upward through 1.5.0beta41 are Y2K compliant. It is my belief that * earlier versions were also Y2K compliant. * * Libpng only has three year fields. One is a 2-byte unsigned integer @@ -346,9 +346,9 @@ */ /* Version information for png.h - this should match the version in png.c */ -#define PNG_LIBPNG_VER_STRING "1.5.0beta40" +#define PNG_LIBPNG_VER_STRING "1.5.0beta41" #define PNG_HEADER_VERSION_STRING \ - " libpng version 1.5.0beta40 - August 6, 2010\n" + " libpng version 1.5.0beta41 - August 6, 2010\n" #define PNG_LIBPNG_VER_SONUM 15 #define PNG_LIBPNG_VER_DLLNUM 15 @@ -361,7 +361,7 @@ * PNG_LIBPNG_VER_STRING, omitting any leading zero: */ -#define PNG_LIBPNG_VER_BUILD 40 +#define PNG_LIBPNG_VER_BUILD 41 /* Release Status */ #define PNG_LIBPNG_BUILD_ALPHA 1 @@ -858,7 +858,7 @@ typedef PNG_CALLBACK(void, *png_free_ptr, (png_structp, png_voidp),); /* This triggers a compiler error in png.c, if png.c and png.h * do not agree upon the version number. */ -typedef png_structp version_1_5_0beta40; +typedef png_structp version_1_5_0beta41; typedef png_struct FAR * FAR * png_structpp; diff --git a/pngconf.h b/pngconf.h index 8522dca5d..eccc5d00a 100644 --- a/pngconf.h +++ b/pngconf.h @@ -1,7 +1,7 @@ /* pngconf.h - machine configurable file for libpng * - * libpng version 1.5.0beta40 - August 6, 2010 + * libpng version 1.5.0beta41 - August 6, 2010 * * Copyright (c) 1998-2010 Glenn Randers-Pehrson * (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger) diff --git a/pngpriv.h b/pngpriv.h index 8d3b9df9b..e8e9870ba 100644 --- a/pngpriv.h +++ b/pngpriv.h @@ -1,7 +1,7 @@ /* pngpriv.h - private declarations for use inside libpng * - * libpng version 1.5.0beta40 - August 6, 2010 + * libpng version 1.5.0beta41 - August 6, 2010 * For conditions of distribution and use, see copyright notice in png.h * Copyright (c) 1998-2010 Glenn Randers-Pehrson * (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger) diff --git a/pngtest.c b/pngtest.c index 655646aa7..fe4245dcf 100644 --- a/pngtest.c +++ b/pngtest.c @@ -1728,4 +1728,4 @@ main(int argc, char *argv[]) } /* Generate a compiler error if there is an old png.h in the search path. */ -typedef version_1_5_0beta40 your_png_h_is_not_version_1_5_0beta40; +typedef version_1_5_0beta41 your_png_h_is_not_version_1_5_0beta41; diff --git a/projects/vstudio/readme.txt b/projects/vstudio/readme.txt index 87c1ada65..8c444bf39 100644 --- a/projects/vstudio/readme.txt +++ b/projects/vstudio/readme.txt @@ -1,7 +1,7 @@ VisualStudio instructions -libpng version 1.5.0beta40 - August 6, 2010 +libpng version 1.5.0beta41 - August 6, 2010 Copyright (c) 1998-2010 Glenn Randers-Pehrson diff --git a/projects/vstudio/zlib.props b/projects/vstudio/zlib.props index 01482e1ba..353a9db5f 100644 --- a/projects/vstudio/zlib.props +++ b/projects/vstudio/zlib.props @@ -2,7 +2,7 @@