Imported from libpng-1.2.15beta6.tar
diff --git a/ANNOUNCE b/ANNOUNCE
index 4842220..0c30bd7 100644
--- a/ANNOUNCE
+++ b/ANNOUNCE
@@ -1,5 +1,5 @@
-Libpng 1.2.15beta5 - December 8, 2006
+Libpng 1.2.15beta6 - December 14, 2006
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,32 +9,32 @@
Source files with LF line endings (for Unix/Linux) and with a
"configure" script
- libpng-1.2.15beta5.tar.gz
- libpng-1.2.15beta5.tar.bz2
+ libpng-1.2.15beta6.tar.gz
+ libpng-1.2.15beta6.tar.bz2
Source files with LF line endings (for Unix/Linux) without the
"configure" script
- libpng-1.2.15beta5-no-config.tar.gz
- libpng-1.2.15beta5-no-config.tar.bz2
+ libpng-1.2.15beta6-no-config.tar.gz
+ libpng-1.2.15beta6-no-config.tar.bz2
Source files with CRLF line endings (for Windows), without the
"configure" script
- lp1215b05.zip
- lp1215b05.tar.bz2
+ lp1215b06.zip
+ lp1215b06.tar.bz2
Project files
- libpng-1.2.15beta5-project-netware.zip
- libpng-1.2.15beta5-project-wince.zip
+ libpng-1.2.15beta6-project-netware.zip
+ libpng-1.2.15beta6-project-wince.zip
Other information:
- libpng-1.2.15beta5-README.txt
- libpng-1.2.15beta5-KNOWNBUGS.txt
- libpng-1.2.15beta5-LICENSE.txt
- libpng-1.2.15beta5-Y2K-compliance.txt
+ libpng-1.2.15beta6-README.txt
+ libpng-1.2.15beta6-KNOWNBUGS.txt
+ libpng-1.2.15beta6-LICENSE.txt
+ libpng-1.2.15beta6-Y2K-compliance.txt
Changes since the last public release (1.2.14):
@@ -48,14 +48,17 @@
version 1.2.15beta3 [December 4, 2006]
Add "png_bytep" typecast to profile while calculating length in pngwutil.c
-version 1.2.15beta4 [November 7, 2006]
+version 1.2.15beta4 [December 7, 2006]
Added scripts/CMakeLists.txt
Changed PNG_NO_ASSEMBLER_CODE to PNG_NO_MMX_CODE in scripts, like 1.4.0beta
-version 1.2.15beta5 [December 8, 2006]
+version 1.2.15beta5 [December 7, 2996]
Changed some instances of PNG_ASSEMBER_* to PNG_MMX_* in pnggccrd.c
Revised scripts/CMakeLists.txt
+version 1.2.15beta6 [December 14, 2006]
+ Revised scripts/CMakeLists.txt and configure.ac
+
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 bda781d..0aac85e 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1654,10 +1654,13 @@
Added scripts/CMakeLists.txt
Changed PNG_NO_ASSEMBLER_CODE to PNG_NO_MMX_CODE in scripts, like 1.4.0beta
-version 1.2.15beta5 [December 8, 2006]
+version 1.2.15beta5 [December 7, 2006]
Changed some instances of PNG_ASSEMBER_* to PNG_MMX_* in pnggccrd.c
Revised scripts/CMakeLists.txt
+version 1.2.15beta6 [December 14, 2006]
+ Revised scripts/CMakeLists.txt and configure.ac
+
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/INSTALL b/INSTALL
index d4ffe7d..9aa826a 100644
--- a/INSTALL
+++ b/INSTALL
@@ -1,5 +1,5 @@
-Installing libpng version 1.2.15beta5 - December 8, 2006
+Installing libpng version 1.2.15beta6 - December 14, 2006
On Unix/Linux and similar systems, you can simply type
@@ -44,7 +44,7 @@
correspond to the version of zlib that's installed.
You can rename the directories that you downloaded (they
-might be called "libpng-1.2.15beta5" or "lpng109" and "zlib-1.2.1"
+might be called "libpng-1.2.15beta6" or "lpng109" and "zlib-1.2.1"
or "zlib121") so that you have directories called "zlib" and "libpng".
Your directory structure should look like this:
@@ -101,11 +101,11 @@
CMakeLists.txt => "cmake" script
makefile.std => Generic UNIX makefile (cc, creates static libpng.a)
makefile.elf => Linux/ELF makefile symbol versioning,
- gcc, creates libpng12.so.0.1.2.15beta5)
+ gcc, creates libpng12.so.0.1.2.15beta6)
makefile.linux => Linux/ELF makefile
- (gcc, creates libpng12.so.0.1.2.15beta5)
+ (gcc, creates libpng12.so.0.1.2.15beta6)
makefile.gcmmx => Linux/ELF makefile
- (gcc, creates libpng12.so.0.1.2.15beta5,
+ (gcc, creates libpng12.so.0.1.2.15beta6,
uses assembler code tuned for Intel MMX platform)
makefile.gcc => Generic makefile (gcc, creates static libpng.a)
makefile.knr => Archaic UNIX Makefile that converts files with
@@ -128,12 +128,12 @@
makefile.openbsd => OpenBSD makefile
makefile.sgi => Silicon Graphics IRIX makefile (cc, creates static lib)
makefile.sggcc => Silicon Graphics (gcc,
- creates libpng12.so.0.1.2.15beta5)
+ creates libpng12.so.0.1.2.15beta6)
makefile.sunos => Sun makefile
makefile.solaris => Solaris 2.X makefile (gcc,
- creates libpng12.so.0.1.2.15beta5)
+ creates libpng12.so.0.1.2.15beta6)
makefile.so9 => Solaris 9 makefile (gcc,
- creates libpng12.so.0.1.2.15beta5)
+ creates libpng12.so.0.1.2.15beta6)
makefile.32sunu => Sun Ultra 32-bit makefile
makefile.64sunu => Sun Ultra 64-bit makefile
makefile.sco => For SCO OSr5 ELF and Unixware 7 with Native cc
diff --git a/KNOWNBUG b/KNOWNBUG
index 7bd510c..70d11fd 100644
--- a/KNOWNBUG
+++ b/KNOWNBUG
@@ -1,5 +1,5 @@
-Known bugs in libpng version 1.2.15beta5
+Known bugs in libpng version 1.2.15beta6
1. April 22, 2001: pnggccrd.c has been reported to crash on NetBSD when
reading interlaced PNG files, when assembler code is enabled but running
diff --git a/LICENSE b/LICENSE
index ff5daab..e304364 100644
--- a/LICENSE
+++ b/LICENSE
@@ -8,7 +8,7 @@
If you modify libpng you may insert additional notices immediately following
this sentence.
-libpng versions 1.2.6, August 15, 2004, through 1.2.15beta5, December 8, 2006, are
+libpng versions 1.2.6, August 15, 2004, through 1.2.15beta6, December 14, 2006, are
Copyright (c) 2004, 2006 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
@@ -106,4 +106,4 @@
Glenn Randers-Pehrson
glennrp at users.sourceforge.net
-December 8, 2006
+December 14, 2006
diff --git a/Makefile.am b/Makefile.am
index 3fe6253..74180f4 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -8,7 +8,7 @@
# -version-number settings below so that the new values have
# the correct major part (first field).
-PNGLIB_BASENAME= libpng@PNGLIB_MAJOR@
+PNGLIB_BASENAME= libpng@PNGLIB_MAJOR@@PNGLIB_MINOR@
# libpng does not follow GNU file name conventions
AUTOMAKE_OPTIONS = foreign
@@ -104,7 +104,7 @@
libpng.vers: libpng.sym
rm -f $@ $@.new
- $(ECHO) PNG@PNGLIB_MAJOR@_0 '{global:' > $@.new
+ $(ECHO) PNG@PNGLIB_MAJOR@@PNGLIB_MINOR@_0 '{global:' > $@.new
$(SED) s/$$/\;/ libpng.sym >> $@.new
$(ECHO) 'local: *; };' >> $@.new
mv $@.new $@
diff --git a/Makefile.in b/Makefile.in
index a63ad63..63108be 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -266,7 +266,7 @@
sharedstatedir = @sharedstatedir@
sysconfdir = @sysconfdir@
target_alias = @target_alias@
-PNGLIB_BASENAME = libpng@PNGLIB_MAJOR@
+PNGLIB_BASENAME = libpng@PNGLIB_MAJOR@@PNGLIB_MINOR@
# libpng does not follow GNU file name conventions
AUTOMAKE_OPTIONS = foreign
@@ -1253,7 +1253,7 @@
libpng.vers: libpng.sym
rm -f $@ $@.new
- $(ECHO) PNG@PNGLIB_MAJOR@_0 '{global:' > $@.new
+ $(ECHO) PNG@PNGLIB_MAJOR@@PNGLIB_MINOR@_0 '{global:' > $@.new
$(SED) s/$$/\;/ libpng.sym >> $@.new
$(ECHO) 'local: *; };' >> $@.new
mv $@.new $@
diff --git a/README b/README
index bde9309..cf9771e 100644
--- a/README
+++ b/README
@@ -1,4 +1,4 @@
-README for libpng version 1.2.15beta5 - December 8, 2006 (shared library 12.0)
+README for libpng version 1.2.15beta6 - December 14, 2006 (shared library 12.0)
See the note about version numbers near the top of png.h
See INSTALL for instructions on how to install libpng.
@@ -190,11 +190,11 @@
descrip.mms => VMS makefile for MMS or MMK
makefile.std => Generic UNIX makefile (cc, creates static libpng.a)
makefile.elf => Linux/ELF makefile symbol versioning,
- gcc, creates libpng12.so.0.1.2.15beta5)
+ gcc, creates libpng12.so.0.1.2.15beta6)
makefile.linux => Linux/ELF makefile
- (gcc, creates libpng12.so.0.1.2.15beta5)
+ (gcc, creates libpng12.so.0.1.2.15beta6)
makefile.gcmmx => Linux/ELF makefile
- (gcc, creates libpng12.so.0.1.2.15beta5,
+ (gcc, creates libpng12.so.0.1.2.15beta6,
uses assembler code tuned for Intel MMX platform)
makefile.gcc => Generic makefile (gcc, creates static libpng.a)
makefile.knr => Archaic UNIX Makefile that converts files with
@@ -216,12 +216,12 @@
makefile.openbsd => OpenBSD makefile
makefile.sgi => Silicon Graphics IRIX (cc, creates static lib)
makefile.sggcc => Silicon Graphics
- (gcc, creates libpng12.so.0.1.2.15beta5)
+ (gcc, creates libpng12.so.0.1.2.15beta6)
makefile.sunos => Sun makefile
makefile.solaris => Solaris 2.X makefile
- (gcc, creates libpng12.so.0.1.2.15beta5)
+ (gcc, creates libpng12.so.0.1.2.15beta6)
makefile.so9 => Solaris 9 makefile
- (gcc, creates libpng12.so.0.1.2.15beta5)
+ (gcc, creates libpng12.so.0.1.2.15beta6)
makefile.32sunu => Sun Ultra 32-bit makefile
makefile.64sunu => Sun Ultra 64-bit makefile
makefile.sco => For SCO OSr5 ELF and Unixware 7 with Native cc
diff --git a/Y2KINFO b/Y2KINFO
index be89d37..255bff7 100644
--- a/Y2KINFO
+++ b/Y2KINFO
@@ -1,13 +1,13 @@
Y2K compliance in libpng:
=========================
- December 8, 2006
+ December 14, 2006
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.2.15beta5 are Y2K compliant. It is my belief that earlier
+ upward through 1.2.15beta6 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
diff --git a/config.h.in b/config.h.in
index 89c260d..9c0c877 100644
--- a/config.h.in
+++ b/config.h.in
@@ -12,10 +12,6 @@
/* Define to 1 if you have the `z' library (-lz). */
#undef HAVE_LIBZ
-/* Define to 1 if your system has a GNU libc compatible `malloc' function, and
- to 0 otherwise. */
-#undef HAVE_MALLOC
-
/* Define to 1 if you have the <malloc.h> header file. */
#undef HAVE_MALLOC_H
@@ -79,8 +75,5 @@
/* Define to empty if `const' does not conform to ANSI C. */
#undef const
-/* Define to rpl_malloc if the replacement function should be used. */
-#undef malloc
-
-/* Define to `unsigned' if <sys/types.h> does not define. */
+/* Define to `unsigned int' if <sys/types.h> does not define. */
#undef size_t
diff --git a/configure b/configure
index 56962b1..3d43916 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.61 for libpng 1.2.15beta5.
+# Generated by GNU Autoconf 2.61 for libpng 1.2.15beta6.
#
# Report bugs to <png-mng-implement@lists.sourceforge.net>.
#
@@ -728,8 +728,8 @@
# Identity of this package.
PACKAGE_NAME='libpng'
PACKAGE_TARNAME='libpng'
-PACKAGE_VERSION='1.2.15beta5'
-PACKAGE_STRING='libpng 1.2.15beta5'
+PACKAGE_VERSION='1.2.15beta6'
+PACKAGE_STRING='libpng 1.2.15beta6'
PACKAGE_BUGREPORT='png-mng-implement@lists.sourceforge.net'
ac_unique_file="pngget.c"
@@ -1404,7 +1404,7 @@
# 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.2.15beta5 to adapt to many kinds of systems.
+\`configure' configures libpng 1.2.15beta6 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1474,7 +1474,7 @@
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of libpng 1.2.15beta5:";;
+ short | recursive ) echo "Configuration of libpng 1.2.15beta6:";;
esac
cat <<\_ACEOF
@@ -1584,7 +1584,7 @@
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-libpng configure 1.2.15beta5
+libpng configure 1.2.15beta6
generated by GNU Autoconf 2.61
Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
@@ -1598,7 +1598,7 @@
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.2.15beta5, which was
+It was created by libpng $as_me 1.2.15beta6, which was
generated by GNU Autoconf 2.61. Invocation command line was
$ $0 $@
@@ -2268,7 +2268,7 @@
# Define the identity of the package.
PACKAGE='libpng'
- VERSION='1.2.15beta5'
+ VERSION='1.2.15beta6'
cat >>confdefs.h <<_ACEOF
@@ -2439,9 +2439,9 @@
-PNGLIB_VERSION=1.2.15beta5
-PNGLIB_MAJOR=12
-PNGLIB_MINOR=15
+PNGLIB_VERSION=1.2.15beta6
+PNGLIB_MAJOR=1
+PNGLIB_MINOR=2
@@ -21116,7 +21116,7 @@
# 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.2.15beta5, which was
+This file was extended by libpng $as_me 1.2.15beta6, which was
generated by GNU Autoconf 2.61. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -21169,7 +21169,7 @@
_ACEOF
cat >>$CONFIG_STATUS <<_ACEOF
ac_cs_version="\\
-libpng config.status 1.2.15beta5
+libpng config.status 1.2.15beta6
configured by $0, generated by GNU Autoconf 2.61,
with options \\"`echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\"
diff --git a/configure.ac b/configure.ac
index d006f81..786ddf5 100644
--- a/configure.ac
+++ b/configure.ac
@@ -18,14 +18,14 @@
dnl Version number stuff here:
-AC_INIT([libpng], [1.2.15beta5], [png-mng-implement@lists.sourceforge.net])
+AC_INIT([libpng], [1.2.15beta6], [png-mng-implement@lists.sourceforge.net])
AM_INIT_AUTOMAKE
dnl stop configure from automagically running automake
AM_MAINTAINER_MODE
-PNGLIB_VERSION=1.2.15beta5
-PNGLIB_MAJOR=12
-PNGLIB_MINOR=15
+PNGLIB_VERSION=1.2.15beta6
+PNGLIB_MAJOR=1
+PNGLIB_MINOR=2
dnl End of version number stuff
diff --git a/libpng.3 b/libpng.3
index 045ba2e..d888cd4 100644
--- a/libpng.3
+++ b/libpng.3
@@ -1,6 +1,6 @@
-.TH LIBPNG 3 "December 8, 2006"
+.TH LIBPNG 3 "December 14, 2006"
.SH NAME
-libpng \- Portable Network Graphics (PNG) Reference Library 1.2.15beta5
+libpng \- Portable Network Graphics (PNG) Reference Library 1.2.15beta6
.SH SYNOPSIS
\fB
#include <png.h>\fP
@@ -410,7 +410,7 @@
.SH LIBPNG.TXT
libpng.txt - A description on how to use and modify libpng
- libpng version 1.2.15beta5 - December 8, 2006
+ libpng version 1.2.15beta6 - December 14, 2006
Updated and distributed by Glenn Randers-Pehrson
<glennrp at users.sourceforge.net>
Copyright (c) 1998-2005 Glenn Randers-Pehrson
@@ -3327,13 +3327,13 @@
.SH IX. Y2K Compliance in libpng
-December 8, 2006
+December 14, 2006
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.2.15beta5 are Y2K compliant. It is my belief that earlier
+upward through 1.2.15beta6 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
@@ -3506,7 +3506,7 @@
1.2.14beta1-2 13 10214 12.so.0.14[.0]
1.0.22rc1 10 10022 10.so.0.22[.0]
1.2.14rc1 13 10214 12.so.0.14[.0]
- 1.2.15beta1-5 13 10215 12.so.0.15[.0]
+ 1.2.15beta1-6 13 10215 12.so.0.15[.0]
Henceforth the source version will match the shared-library minor
and patch numbers; the shared-library major version number will be
@@ -3562,7 +3562,7 @@
Thanks to Frank J. T. Wojcik for helping with the documentation.
-Libpng version 1.2.15beta5 - December 8, 2006:
+Libpng version 1.2.15beta6 - December 14, 2006:
Initially created in 1995 by Guy Eric Schalnat, then of Group 42, Inc.
Currently maintained by Glenn Randers-Pehrson (glennrp at users.sourceforge.net).
@@ -3583,7 +3583,7 @@
If you modify libpng you may insert additional notices immediately following
this sentence.
-libpng versions 1.2.6, August 15, 2004, through 1.2.15beta5, December 8, 2006, are
+libpng versions 1.2.6, August 15, 2004, through 1.2.15beta6, December 14, 2006, are
Copyright (c) 2004-2006 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
@@ -3682,7 +3682,7 @@
Glenn Randers-Pehrson
glennrp at users.sourceforge.net
-December 8, 2006
+December 14, 2006
.\" end of man page
diff --git a/libpng.txt b/libpng.txt
index e2e68a6..60e6e64 100644
--- a/libpng.txt
+++ b/libpng.txt
@@ -1,6 +1,6 @@
libpng.txt - A description on how to use and modify libpng
- libpng version 1.2.15beta5 - December 8, 2006
+ libpng version 1.2.15beta6 - December 14, 2006
Updated and distributed by Glenn Randers-Pehrson
<glennrp at users.sourceforge.net>
Copyright (c) 1998-2005 Glenn Randers-Pehrson
@@ -2917,13 +2917,13 @@
IX. Y2K Compliance in libpng
-December 8, 2006
+December 14, 2006
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.2.15beta5 are Y2K compliant. It is my belief that earlier
+upward through 1.2.15beta6 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/libpngpf.3 b/libpngpf.3
index 459c130..9148061 100644
--- a/libpngpf.3
+++ b/libpngpf.3
@@ -1,6 +1,6 @@
-.TH LIBPNGPF 3 "December 8, 2006"
+.TH LIBPNGPF 3 "December 14, 2006"
.SH NAME
-libpng \- Portable Network Graphics (PNG) Reference Library 1.2.15beta5
+libpng \- Portable Network Graphics (PNG) Reference Library 1.2.15beta6
(private functions)
.SH SYNOPSIS
\fB#include <png.h>\fP
diff --git a/png.5 b/png.5
index 3ff0749..4aac01e 100644
--- a/png.5
+++ b/png.5
@@ -1,4 +1,4 @@
-.TH PNG 5 "December 8, 2006"
+.TH PNG 5 "December 14, 2006"
.SH NAME
png \- Portable Network Graphics (PNG) format
.SH DESCRIPTION
diff --git a/png.c b/png.c
index 88b10e7..ab97bc2 100644
--- a/png.c
+++ b/png.c
@@ -13,7 +13,7 @@
#include "png.h"
/* Generate a compiler error if there is an old png.h in the search path. */
-typedef version_1_2_15beta5 Your_png_h_is_not_version_1_2_15beta5;
+typedef version_1_2_15beta6 Your_png_h_is_not_version_1_2_15beta6;
/* Version information for C files. This had better match the version
* string defined in png.h. */
@@ -701,7 +701,7 @@
png_get_copyright(png_structp png_ptr)
{
if (&png_ptr != NULL) /* silence compiler warning about unused png_ptr */
- return ((png_charp) "\n libpng version 1.2.15beta5 - December 8, 2006\n\
+ return ((png_charp) "\n libpng version 1.2.15beta6 - December 14, 2006\n\
Copyright (c) 1998-2006 Glenn Randers-Pehrson\n\
Copyright (c) 1996-1997 Andreas Dilger\n\
Copyright (c) 1995-1996 Guy Eric Schalnat, Group 42, Inc.\n");
diff --git a/png.h b/png.h
index ef290b7..5738d16 100644
--- a/png.h
+++ b/png.h
@@ -1,7 +1,7 @@
/* png.h - header file for PNG reference library
*
- * libpng version 1.2.15beta5 - December 8, 2006
+ * libpng version 1.2.15beta6 - December 14, 2006
* Copyright (c) 1998-2006 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.)
@@ -9,7 +9,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.2.15beta5 - December 8, 2006: Glenn
+ * libpng versions 0.97, January 1998, through 1.2.15beta6 - December 14, 2006: Glenn
* See also "Contributing Authors", below.
*
* Note about libpng version numbers:
@@ -134,7 +134,7 @@
* 1.2.14rc1 13 10214 12.so.0.14[.0]
* 1.0.22 10 10022 10.so.0.22[.0]
* 1.2.14 13 10214 12.so.0.14[.0]
- * 1.2.15beta1-5 13 10215 12.so.0.15[.0]
+ * 1.2.15beta1-6 13 10215 12.so.0.15[.0]
*
* Henceforth the source version will match the shared-library major
* and minor numbers; the shared-library major version number will be
@@ -164,7 +164,7 @@
* If you modify libpng you may insert additional notices immediately following
* this sentence.
*
- * libpng versions 1.2.6, August 15, 2004, through 1.2.15beta5, December 8, 2006, are
+ * libpng versions 1.2.6, August 15, 2004, through 1.2.15beta6, December 14, 2006, are
* Copyright (c) 2004, 2006 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:
@@ -276,13 +276,13 @@
* Y2K compliance in libpng:
* =========================
*
- * December 8, 2006
+ * December 14, 2006
*
* 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.2.15beta5 are Y2K compliant. It is my belief that earlier
+ * upward through 1.2.15beta6 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
@@ -338,9 +338,9 @@
*/
/* Version information for png.h - this should match the version in png.c */
-#define PNG_LIBPNG_VER_STRING "1.2.15beta5"
+#define PNG_LIBPNG_VER_STRING "1.2.15beta6"
#define PNG_HEADER_VERSION_STRING \
- " libpng version 1.2.15beta5 - December 8, 2006 (header)\n"
+ " libpng version 1.2.15beta6 - December 14, 2006 (header)\n"
#define PNG_LIBPNG_VER_SONUM 0
#define PNG_LIBPNG_VER_DLLNUM 13
@@ -352,7 +352,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 5
+#define PNG_LIBPNG_VER_BUILD 6
/* Release Status */
#define PNG_LIBPNG_BUILD_ALPHA 1
@@ -1386,7 +1386,7 @@
/* 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_2_15beta5;
+typedef png_structp version_1_2_15beta6;
typedef png_struct FAR * FAR * png_structpp;
diff --git a/pngconf.h b/pngconf.h
index 3f64fa2..0b02194 100644
--- a/pngconf.h
+++ b/pngconf.h
@@ -1,7 +1,7 @@
/* pngconf.h - machine configurable file for libpng
*
- * libpng version 1.2.15beta5 - December 8, 2006
+ * libpng version 1.2.15beta6 - December 14, 2006
* For conditions of distribution and use, see copyright notice in png.h
* Copyright (c) 1998-2005 Glenn Randers-Pehrson
* (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger)
diff --git a/pngtest.c b/pngtest.c
index a46b010..790a1ec 100644
--- a/pngtest.c
+++ b/pngtest.c
@@ -1549,4 +1549,4 @@
}
/* Generate a compiler error if there is an old png.h in the search path. */
-typedef version_1_2_15beta5 your_png_h_is_not_version_1_2_15beta5;
+typedef version_1_2_15beta6 your_png_h_is_not_version_1_2_15beta6;
diff --git a/scripts/CMakeLists.txt b/scripts/CMakeLists.txt
index 0d8e3d0..9f93bbd 100644
--- a/scripts/CMakeLists.txt
+++ b/scripts/CMakeLists.txt
@@ -1,147 +1,193 @@
-project(libpng)
+project(PNG)
-SET(PNG_VER_MAJOR 1)
-SET(PNG_VER_MINOR 2)
-SET(PNG_VER_PATCH 15)
+set(PNGLIB_MAJOR 1)
+set(PNGLIB_MINOR 2)
+set(PNGLIB_RELEASE 15)
+set(PNGLIB_NAME libpng${PNGLIB_MAJOR}${PNGLIB_MINOR})
+set(PNGLIB_VERSION ${PNGLIB_MAJOR}.${PNGLIB_MINOR}.${PNGLIB_RELEASE})
# needed packages
find_package(ZLIB REQUIRED)
+if(NOT WIN32)
+ find_library(M_LIBRARY
+ NAMES m
+ PATHS /usr/lib /usr/local/lib
+ )
+ if(NOT M_LIBRARY)
+ message(STATUS "math library 'libm' not found - floating point support disabled")
+ endif(NOT M_LIBRARY)
+else(NOT WIN32)
+ # not needed on windows
+ set(M_LIBRARY "")
+endif(NOT WIN32)
-# command line options
+# COMMAND LINE OPTIONS
option(PNG_SHARED "Build shared lib" YES)
option(PNG_TESTS "Build pngtest" YES)
+option(PNG_NO_CONSOLE_IO "FIXME" YES)
+option(PNG_NO_STDIO "FIXME" YES)
+option(PNG_DEBUG "Build with debug output" YES)
+option(PNGARG "FIXME" YES)
#TODO:
-# PNG_NO_CONSOLE_IO
-# PNG_NO_STDIO
# PNG_CONSOLE_IO_SUPPORTED
-# PNGARG
-# some others :)
+# maybe needs improving, but currently I don't know when we can enable what :)
set(png_asm_tmp "OFF")
if(NOT WIN32)
- find_program(uname_executable NAMES uname PATHS /bin /usr/bin /usr/local/bin)
- if(uname_executable)
- EXEC_PROGRAM(${uname_executable} ARGS --machine OUTPUT_VARIABLE uname_output)
- if("uname_output" MATCHES "^.*i[1-9]86.*$")
- set(png_asm_tmp "ON")
- else("uname_output" MATCHES "^.*i[1-9]86.*$")
- set(png_asm_tmp "OFF")
- endif("uname_output" MATCHES "^.*i[1-9]86.*$")
- endif(uname_executable)
+ find_program(uname_executable NAMES uname PATHS /bin /usr/bin /usr/local/bin)
+ if(uname_executable)
+ EXEC_PROGRAM(${uname_executable} ARGS --machine OUTPUT_VARIABLE uname_output)
+ if("uname_output" MATCHES "^.*i[1-9]86.*$")
+ set(png_asm_tmp "ON")
+ else("uname_output" MATCHES "^.*i[1-9]86.*$")
+ set(png_asm_tmp "OFF")
+ endif("uname_output" MATCHES "^.*i[1-9]86.*$")
+ endif(uname_executable)
endif(NOT WIN32)
option(PNG_MMX "Use MMX assembler code (x86 only)" ${png_asm_tmp})
-
+# SET LIBNAME
# msvc does not append 'lib' - do it here to have consistent name
if(MSVC)
- set(PNG_LIB_NAME lib)
+ set(PNG_LIB_NAME lib)
endif(MSVC)
-#set(PNG_LIB_NAME ${PNG_LIB_NAME}png-${PNG_VER_MAJOR}.${PNG_VER_MINOR})
-set(PNG_LIB_NAME ${PNG_LIB_NAME}png)
+set(PNG_LIB_NAME ${PNG_LIB_NAME}png${PNGLIB_MAJOR}${PNGLIB_MINOR})
# to distinguish between debug and release lib
set(CMAKE_DEBUG_POSTFIX "d")
# append _static to static lib
if(NOT PNG_SHARED)
- set(PNG_LIB_NAME ${PNG_LIB_NAME}_static)
+ set(PNG_LIB_NAME ${PNG_LIB_NAME}_static)
endif(NOT PNG_SHARED)
-# our sources
+# OUR SOURCES
set(libpng_sources
- png.h
- pngconf.h
- png.c
- pngerror.c
- pngget.c
- pngmem.c
- pngpread.c
- pngread.c
- pngrio.c
- pngrtran.c
- pngrutil.c
- pngset.c
- pngtrans.c
- pngwio.c
- pngwrite.c
- pngwtran.c
- pngwutil.c
+ png.h
+ pngconf.h
+ png.c
+ pngerror.c
+ pngget.c
+ pngmem.c
+ pngpread.c
+ pngread.c
+ pngrio.c
+ pngrtran.c
+ pngrutil.c
+ pngset.c
+ pngtrans.c
+ pngwio.c
+ pngwrite.c
+ pngwtran.c
+ pngwutil.c
)
set(pngtest_sources
- pngtest.c
+ pngtest.c
)
-# Some needed definitions
+# SOME NEEDED DEFINITIONS
add_definitions(-DZLIB_DLL)
if(MSVC)
- add_definitions(-DPNG_USE_PNGVCRD -DPNG_NO_MODULEDEF -D_CRT_SECURE_NO_DEPRECATE)
- set(libpng_sources ${libpng_sources}
- pngvcrd.c
- )
+ add_definitions(-DPNG_USE_PNGVCRD -DPNG_NO_MODULEDEF -D_CRT_SECURE_NO_DEPRECATE)
+ set(libpng_sources ${libpng_sources}
+ pngvcrd.c
+ )
else(MSVC)
- add_definitions(-DPNG_USE_PNGGCCRD -DPNG_USE_GLOBAL_ARRAYS)
- set(libpng_sources ${libpng_sources}
- pnggccrd.c
- )
+ add_definitions(-DPNG_USE_PNGGCCRD)
+ set(libpng_sources ${libpng_sources}
+ pnggccrd.c
+ )
endif(MSVC)
-if(NOT PNG_MMX)
- add_definitions(-DPNG_NO_MMX_CODE)
-endif(NOT PNG_MMX)
+if(NOT MSVC)
+ if(NOT PNG_MMX)
+ add_definitions(-DLIBPNG_NO_MMX)
+ endif(NOT PNG_MMX)
+else(NOT MSVC)
+ # maybe add this to pngconf.h ?
+ add_definitions(-DPNG_MMX_CODE_SUPPORTED)
+endif(NOT MSVC)
-if(NOT WIN32)
- find_library(M_LIBRARY
- NAMES m
- PATHS /usr/lib /usr/local/lib
- )
-endif(NOT WIN32)
-# now build our target
-include_directories(${CMAKE_SOURCE_DIR} ${ZLIB_INCLUDE_DIR})
+if(PNG_CONSOLE_IO_SUPPORTED)
+ add_definitions(-DPNG_CONSOLE_IO_SUPPORTED)
+endif(PNG_CONSOLE_IO_SUPPORTED)
+
+if(PNG_NO_CONSOLE_IO)
+ add_definitions(-DPNG_NO_CONSOLE_IO)
+endif(PNG_NO_CONSOLE_IO)
+
+if(PNG_NO_STDIO)
+ add_definitions(-DPNG_NO_STDIO)
+endif(PNG_NO_STDIO)
+
+if(PNG_DEBUG)
+ add_definitions(-DPNG_DEBUG)
+endif(PNG_DEBUG)
+
+if(NOT M_LIBRARY)
+ add_definitions(-DPNG_NO_FLOATING_POINT_SUPPORTED)
+endif(NOT M_LIBRARY)
+
+# NOW BUILD OUR TARGET
+include_directories(${PNG_SOURCE_DIR} ${ZLIB_INCLUDE_DIR})
if(PNG_SHARED)
- add_library(${PNG_LIB_NAME} SHARED ${libpng_sources})
+ add_library(${PNG_LIB_NAME} SHARED ${libpng_sources})
else(PNG_SHARED)
- add_library(STATIC ${libpng_sources})
+ add_library(STATIC ${libpng_sources})
endif(PNG_SHARED)
target_link_libraries(${PNG_LIB_NAME} ${ZLIB_LIBRARY} ${M_LIBRARY})
if(PNG_SHARED AND WIN32)
- set_target_properties(${PNG_LIB_NAME} PROPERTIES DEFINE_SYMBOL PNG_BUILD_DLL)
+ set_target_properties(${PNG_LIB_NAME} PROPERTIES DEFINE_SYMBOL PNG_BUILD_DLL)
endif(PNG_SHARED AND WIN32)
if(PNG_TESTS)
# does not work with msvc due to png_lib_ver issue
- add_executable(pngtest ${pngtest_sources})
- target_link_libraries(pngtest ${PNG_LIB_NAME})
-# add_test(pngtest ${CMAKE_SOURCE_DIR}/pngtest.png)
+ add_executable(pngtest ${pngtest_sources})
+ target_link_libraries(pngtest ${PNG_LIB_NAME})
+# add_test(pngtest ${PNG_SOURCE_DIR}/pngtest.png)
endif(PNG_TESTS)
-# install
-install_targets(/bin ${PNG_LIB_NAME})
-install(FILES libpng.so libpng.a DESTINATION lib)
-install(FILES png.h pngconf.h DESTINATION include)
-install(FILES libpng.3 libpngpf.3 DESTINATION man/man3)
+# CREATE PKGCONFIG FILES
+# we use the same files like ./configure, so we have to set its vars
+set(prefix ${CMAKE_INSTALL_PREFIX}/bin)
+set(exec_prefix ${CMAKE_INSTALL_PREFIX}/bin)
+set(libdir ${CMAKE_INSTALL_PREFIX}/lib)
+set(includedir ${CMAKE_INSTALL_PREFIX}/include)
+
+configure_file(${PNG_SOURCE_DIR}/scripts/libpng.pc.in ${PNG_BINARY_DIR}/libpng.pc)
+configure_file(${PNG_SOURCE_DIR}/scripts/libpng-config.in ${PNG_BINARY_DIR}/libpng-config)
+configure_file(${PNG_SOURCE_DIR}/scripts/libpng.pc.in ${PNG_BINARY_DIR}/${PNGLIB_NAME}.pc)
+configure_file(${PNG_SOURCE_DIR}/scripts/libpng-config.in ${PNG_BINARY_DIR}/${PNGLIB_NAME}-config)
+
+# INSTALL
+install_targets(/lib ${PNG_LIB_NAME})
+install(FILES png.h pngconf.h DESTINATION include)
+install(FILES png.h pngconf.h DESTINATION include/${PNGLIB_NAME})
+install(FILES libpng.3 libpngpf.3 DESTINATION man/man3)
+install(FILES ${PNG_BINARY_DIR}/libpng.pc DESTINATION lib/pkgconfig)
+install(FILES ${PNG_BINARY_DIR}/libpng-config DESTINATION bin)
+install(FILES ${PNG_BINARY_DIR}/${PNGLIB_NAME}.pc DESTINATION lib/pkgconfig)
+install(FILES ${PNG_BINARY_DIR}/${PNGLIB_NAME}-config DESTINATION bin)
+
# what's with libpng.txt and all the extra files?
-# uninstall
+# UNINSTALL
# do we need this?
-# dist
+# DIST
# do we need this?
# to create msvc import lib for mingw compiled shared lib
# pexports libpng.dll > libpng.def
# lib /def:libpng.def /machine:x86
-
-
-
-
diff --git a/scripts/libpng-config-head.in b/scripts/libpng-config-head.in
index 583ae61..e2be30a 100755
--- a/scripts/libpng-config-head.in
+++ b/scripts/libpng-config-head.in
@@ -8,7 +8,7 @@
# Modeled after libxml-config.
-version=1.2.15beta5
+version=1.2.15beta6
prefix=""
libdir=""
libs=""
diff --git a/scripts/libpng-config.in b/scripts/libpng-config.in
index 3861aad..2c5f9cf 100755
--- a/scripts/libpng-config.in
+++ b/scripts/libpng-config.in
@@ -12,9 +12,9 @@
prefix="@prefix@"
exec_prefix="@exec_prefix@"
libdir="@libdir@"
-includedir="@includedir@/libpng@PNGLIB_MAJOR@"
-libs="-lpng@PNGLIB_MAJOR@"
-all_libs="-lpng@PNGLIB_MAJOR@ -lz -lm"
+includedir="@includedir@/libpng@PNGLIB_MAJOR@@PNGLIB_MINOR@"
+libs="-lpng@PNGLIB_MAJOR@@PNGLIB_MINOR@"
+all_libs="-lpng@PNGLIB_MAJOR@@PNGLIB_MINOR@ -lz -lm"
I_opts="-I${includedir}"
L_opts="-L${libdir}"
R_opts=""
diff --git a/scripts/libpng.pc-configure.in b/scripts/libpng.pc-configure.in
index d8226ce..7f4bc58 100644
--- a/scripts/libpng.pc-configure.in
+++ b/scripts/libpng.pc-configure.in
@@ -5,6 +5,6 @@
Name: libpng
Description: Loads and saves PNG files
-Version: 1.2.15beta5
+Version: 1.2.15beta6
Libs: -L${libdir} -lpng12
Cflags: -I${includedir} @LIBPNG_NO_MMX@
diff --git a/scripts/libpng.pc.in b/scripts/libpng.pc.in
index ae40cb8..b687f75 100644
--- a/scripts/libpng.pc.in
+++ b/scripts/libpng.pc.in
@@ -5,6 +5,6 @@
Name: libpng
Description: Loads and saves PNG files
-Version: 1.2.15beta5
+Version: 1.2.15beta6
Libs: -L${libdir} -lpng12
Cflags: -I${includedir}
diff --git a/scripts/makefile.32sunu b/scripts/makefile.32sunu
index 7e34c56..1ab78b7 100644
--- a/scripts/makefile.32sunu
+++ b/scripts/makefile.32sunu
@@ -8,7 +8,7 @@
# Library name:
LIBNAME=libpng12
PNGMAJ = 0
-PNGMIN = 1.2.15beta5
+PNGMIN = 1.2.15beta6
PNGVER = $(PNGMAJ).$(PNGMIN)
# Shared library names:
diff --git a/scripts/makefile.64sunu b/scripts/makefile.64sunu
index 6a16e76..31e8f6c 100644
--- a/scripts/makefile.64sunu
+++ b/scripts/makefile.64sunu
@@ -8,7 +8,7 @@
# Library name:
LIBNAME=libpng12
PNGMAJ = 0
-PNGMIN = 1.2.15beta5
+PNGMIN = 1.2.15beta6
PNGVER = $(PNGMAJ).$(PNGMIN)
# Shared library names:
diff --git a/scripts/makefile.aix b/scripts/makefile.aix
index 8fb1c57..db2203c 100644
--- a/scripts/makefile.aix
+++ b/scripts/makefile.aix
@@ -20,7 +20,7 @@
LIBNAME=libpng12
PNGMAJ = 0
-PNGMIN = 1.2.15beta5
+PNGMIN = 1.2.15beta6
PNGVER = $(PNGMAJ).$(PNGMIN)
prefix=/usr/local
diff --git a/scripts/makefile.beos b/scripts/makefile.beos
index 560b508..8416f99 100644
--- a/scripts/makefile.beos
+++ b/scripts/makefile.beos
@@ -8,7 +8,7 @@
# Library name:
LIBNAME=libpng12
PNGMAJ = 0
-PNGMIN = 1.2.15beta5
+PNGMIN = 1.2.15beta6
PNGVER = $(PNGMAJ).$(PNGMIN)
# Shared library names:
diff --git a/scripts/makefile.cygwin b/scripts/makefile.cygwin
index c14904c..7ebdfe9 100644
--- a/scripts/makefile.cygwin
+++ b/scripts/makefile.cygwin
@@ -80,7 +80,7 @@
LIBNAME = libpng12
PNGMAJ = 0
CYGDLL = 12
-PNGMIN = 1.2.15beta5
+PNGMIN = 1.2.15beta6
PNGVER = $(PNGMAJ).$(PNGMIN)
SHAREDLIB=cygpng$(CYGDLL).dll
diff --git a/scripts/makefile.darwin b/scripts/makefile.darwin
index a873391..8e32acc 100644
--- a/scripts/makefile.darwin
+++ b/scripts/makefile.darwin
@@ -19,7 +19,7 @@
# Library name:
LIBNAME = libpng12
PNGMAJ = 0
-PNGMIN = 1.2.15beta5
+PNGMIN = 1.2.15beta6
PNGVER = $(PNGMAJ).$(PNGMIN)
# Shared library names:
diff --git a/scripts/makefile.dec b/scripts/makefile.dec
index 2d97eed..e4678d9 100644
--- a/scripts/makefile.dec
+++ b/scripts/makefile.dec
@@ -5,7 +5,7 @@
# Library name:
PNGMAJ = 0
-PNGMIN = 1.2.15beta5
+PNGMIN = 1.2.15beta6
PNGVER = $(PNGMAJ).$(PNGMIN)
LIBNAME = libpng12
diff --git a/scripts/makefile.elf b/scripts/makefile.elf
index c183604..aba5a3b 100644
--- a/scripts/makefile.elf
+++ b/scripts/makefile.elf
@@ -12,7 +12,7 @@
# Library name:
LIBNAME = libpng12
PNGMAJ = 0
-PNGMIN = 1.2.15beta5
+PNGMIN = 1.2.15beta6
PNGVER = $(PNGMAJ).$(PNGMIN)
# Shared library names:
diff --git a/scripts/makefile.gcmmx b/scripts/makefile.gcmmx
index 2bbcac7..e74a8fc 100644
--- a/scripts/makefile.gcmmx
+++ b/scripts/makefile.gcmmx
@@ -16,7 +16,7 @@
# Library name:
LIBNAME = libpng12
PNGMAJ = 0
-PNGMIN = 1.2.15beta5
+PNGMIN = 1.2.15beta6
PNGVER = $(PNGMAJ).$(PNGMIN)
# Shared library names:
diff --git a/scripts/makefile.hp64 b/scripts/makefile.hp64
index 46023d3..c29cc1f 100644
--- a/scripts/makefile.hp64
+++ b/scripts/makefile.hp64
@@ -18,7 +18,7 @@
# Library name:
LIBNAME = libpng12
PNGMAJ = 0
-PNGMIN = 1.2.15beta5
+PNGMIN = 1.2.15beta6
PNGVER = $(PNGMAJ).$(PNGMIN)
# Shared library names:
diff --git a/scripts/makefile.hpgcc b/scripts/makefile.hpgcc
index ab8ef84..0829307 100644
--- a/scripts/makefile.hpgcc
+++ b/scripts/makefile.hpgcc
@@ -8,7 +8,7 @@
# Library name:
LIBNAME = libpng12
PNGMAJ = 0
-PNGMIN = 1.2.15beta5
+PNGMIN = 1.2.15beta6
PNGVER = $(PNGMAJ).$(PNGMIN)
# Shared library names:
diff --git a/scripts/makefile.hpux b/scripts/makefile.hpux
index d5aa451..16737f5 100644
--- a/scripts/makefile.hpux
+++ b/scripts/makefile.hpux
@@ -18,7 +18,7 @@
# Library name:
LIBNAME = libpng12
PNGMAJ = 0
-PNGMIN = 1.2.15beta5
+PNGMIN = 1.2.15beta6
PNGVER = $(PNGMAJ).$(PNGMIN)
# Shared library names:
diff --git a/scripts/makefile.linux b/scripts/makefile.linux
index 08256be..fbf5bbf 100644
--- a/scripts/makefile.linux
+++ b/scripts/makefile.linux
@@ -6,7 +6,7 @@
# Library name:
LIBNAME = libpng12
PNGMAJ = 0
-PNGMIN = 1.2.15beta5
+PNGMIN = 1.2.15beta6
PNGVER = $(PNGMAJ).$(PNGMIN)
# Shared library names:
diff --git a/scripts/makefile.mingw b/scripts/makefile.mingw
index c7e7df6..9ccd064 100644
--- a/scripts/makefile.mingw
+++ b/scripts/makefile.mingw
@@ -76,7 +76,7 @@
LIBNAME = libpng12
PNGMAJ = 0
MINGDLL = 12
-PNGMIN = 1.2.15beta5
+PNGMIN = 1.2.15beta6
PNGVER = $(PNGMAJ).$(PNGMIN)
SHAREDLIB=libpng$(MINGDLL).dll
diff --git a/scripts/makefile.ne12bsd b/scripts/makefile.ne12bsd
index cfb4439..4fc4149 100644
--- a/scripts/makefile.ne12bsd
+++ b/scripts/makefile.ne12bsd
@@ -13,7 +13,7 @@
LIB= png12
SHLIB_MAJOR= 0
-SHLIB_MINOR= 1.2.15beta5
+SHLIB_MINOR= 1.2.15beta6
SRCS= pnggccrd.c png.c pngset.c pngget.c pngrutil.c pngtrans.c pngwutil.c \
pngread.c pngrio.c pngwio.c pngwrite.c pngrtran.c \
pngwtran.c pngmem.c pngerror.c pngpread.c
diff --git a/scripts/makefile.netbsd b/scripts/makefile.netbsd
index 956fad0..7e640a3 100644
--- a/scripts/makefile.netbsd
+++ b/scripts/makefile.netbsd
@@ -13,7 +13,7 @@
LIB= png
SHLIB_MAJOR= 3
-SHLIB_MINOR= 1.2.15beta5
+SHLIB_MINOR= 1.2.15beta6
SRCS= pnggccrd.c png.c pngset.c pngget.c pngrutil.c pngtrans.c pngwutil.c \
pngread.c pngrio.c pngwio.c pngwrite.c pngrtran.c \
pngwtran.c pngmem.c pngerror.c pngpread.c
diff --git a/scripts/makefile.openbsd b/scripts/makefile.openbsd
index 19c3586..c94a8d7 100644
--- a/scripts/makefile.openbsd
+++ b/scripts/makefile.openbsd
@@ -7,7 +7,7 @@
MANDIR= ${PREFIX}/man/cat
SHLIB_MAJOR= 0
-SHLIB_MINOR= 1.2.15beta5
+SHLIB_MINOR= 1.2.15beta6
LIB= png
SRCS= png.c pngerror.c pnggccrd.c pngget.c pngmem.c pngpread.c \
diff --git a/scripts/makefile.sco b/scripts/makefile.sco
index af8b9d5..25de058 100644
--- a/scripts/makefile.sco
+++ b/scripts/makefile.sco
@@ -9,7 +9,7 @@
# Library name:
LIBNAME = libpng12
PNGMAJ = 0
-PNGMIN = 1.2.15beta5
+PNGMIN = 1.2.15beta6
PNGVER = $(PNGMAJ).$(PNGMIN)
# Shared library names:
diff --git a/scripts/makefile.sggcc b/scripts/makefile.sggcc
index b61f553..0c56aae 100644
--- a/scripts/makefile.sggcc
+++ b/scripts/makefile.sggcc
@@ -6,7 +6,7 @@
# Library name:
LIBNAME=libpng12
PNGMAJ = 0
-PNGMIN = 1.2.15beta5
+PNGMIN = 1.2.15beta6
PNGVER = $(PNGMAJ).$(PNGMIN)
# Shared library names:
diff --git a/scripts/makefile.sgi b/scripts/makefile.sgi
index 6683353..75da1c6 100644
--- a/scripts/makefile.sgi
+++ b/scripts/makefile.sgi
@@ -6,7 +6,7 @@
# Library name:
LIBNAME=libpng12
PNGMAJ = 0
-PNGMIN = 1.2.15beta5
+PNGMIN = 1.2.15beta6
PNGVER = $(PNGMAJ).$(PNGMIN)
# Shared library names:
diff --git a/scripts/makefile.so9 b/scripts/makefile.so9
index cf4f13f..80b069e 100644
--- a/scripts/makefile.so9
+++ b/scripts/makefile.so9
@@ -8,7 +8,7 @@
# Library name:
PNGMAJ = 0
-PNGMIN = 1.2.15beta5
+PNGMIN = 1.2.15beta6
PNGVER = $(PNGMAJ).$(PNGMIN)
LIBNAME = libpng12
diff --git a/scripts/makefile.solaris b/scripts/makefile.solaris
index b879170..f69c54c 100644
--- a/scripts/makefile.solaris
+++ b/scripts/makefile.solaris
@@ -8,7 +8,7 @@
# Library name:
LIBNAME = libpng12
PNGMAJ = 0
-PNGMIN = 1.2.15beta5
+PNGMIN = 1.2.15beta6
PNGVER = $(PNGMAJ).$(PNGMIN)
# Shared library names:
diff --git a/scripts/pngos2.def b/scripts/pngos2.def
index 6812454..e3ee1b9 100644
--- a/scripts/pngos2.def
+++ b/scripts/pngos2.def
@@ -2,7 +2,7 @@
; PNG.LIB module definition file for OS/2
;----------------------------------------
-; Version 1.2.15beta5
+; Version 1.2.15beta6
LIBRARY PNG
DESCRIPTION "PNG image compression library for OS/2"
diff --git a/scripts/pngw32.def b/scripts/pngw32.def
index 7c0bf2b..d2296fd 100644
--- a/scripts/pngw32.def
+++ b/scripts/pngw32.def
@@ -5,7 +5,7 @@
LIBRARY
EXPORTS
-;Version 1.2.15beta5
+;Version 1.2.15beta6
png_build_grayscale_palette @1
png_check_sig @2
png_chunk_error @3
