Sat Feb 16 11:16:07 2013 UTC ()
Update to 1.6.0:

This release adds a "simplified API" and removes some features
that have been deprecated since libpng.1.5.x.

Changes to Libpng from version 1.5.x to 1.6.x:

A "simplified API" has been added (see documentation in png.h and a simple
example in contrib/examples/pngtopng.c).  The new publicly visible API
includes the following:

   macros:
     PNG_FORMAT_*
     PNG_IMAGE_*
   structures:
     png_control
     png_image
   read functions
     png_image_begin_read_from_file()
     png_image_begin_read_from_stdio()
     png_image_begin_read_from_memory()
     png_image_finish_read()
     png_image_free()
   write functions
     png_image_write_to_file()
     png_image_write_to_stdio()

Starting with libpng-1.6.0, you can configure libpng to prefix all exported
symbols, using the PNG_PREFIX macro.

We no longer include string.h in png.h.  The include statement has been moved
to pngpriv.h, where it is not accessible by applications.  Applications that
need access to information in string.h must add an '#include "string.h"'
directive.  It does not matter whether this is placed prior to or after
the '"#include png.h"' directive.

The following API are now DEPRECATED:
   png_info_init_3()
   png_convert_to_rfc1123() which has been replaced
     with png_convert_to_rfc1123_buffer()
   png_data_freer()
   png_malloc_default()
   png_free_default()
   png_reset_zstream()

The following has been removed:
   png_get_io_chunk_name(), which has been replaced
     with png_get_io_chunk_type().  The new
     function returns a 32-bit integer instead of
     a string.
   The png_sizeof(), png_strlen(), png_memcpy(), png_memcmp(), and
     png_memset() macros are no longer used in the libpng sources and
     have been removed.  These had already been made invisible to
applications
     (i.e., defined in the private pngpriv.h header file) since
libpng-1.5.0.

The signatures of many exported functions were changed, such that
   png_structp became png_structrp or png_const_structrp
   png_infop became png_inforp or png_const_inforp
where "rp" indicates a "restricted pointer".

Error detection in some chunks has improved; in particular the iCCP chunk
reader now does pretty complete validation of the basic format.  Some bad
profiles that were previously accepted are now rejected, in particular the
very old broken Microsoft/HP sRGB profile.

The library now issues a warning if both background processing and RGB to
gray are used when gamma correction happens. As with previous versions of
the library the results are numerically very incorrect in this case.

There are some minor arithmetic changes in some transforms such as
png_set_background(), that might be detected by certain regression tests.

Unknown chunk handling has been improved internally, without any API change.
This adds more correct option control of the unknown handling, corrects
a pre-existing bug where the per-chunk 'keep' setting is ignored, and makes
it possible to skip IDAT chunks in the sequential reader.


(wiz)
diff -r1.153 -r1.154 pkgsrc/graphics/png/Makefile
diff -r1.13 -r1.14 pkgsrc/graphics/png/PLIST
diff -r1.26 -r1.27 pkgsrc/graphics/png/buildlink3.mk
diff -r1.99 -r1.100 pkgsrc/graphics/png/distinfo

cvs diff -r1.153 -r1.154 pkgsrc/graphics/png/Makefile (expand / switch to unified diff)

--- pkgsrc/graphics/png/Makefile 2013/01/24 08:15:50 1.153
+++ pkgsrc/graphics/png/Makefile 2013/02/16 11:16:06 1.154
@@ -1,21 +1,22 @@ @@ -1,21 +1,22 @@
1# $NetBSD: Makefile,v 1.153 2013/01/24 08:15:50 wiz Exp $ 1# $NetBSD: Makefile,v 1.154 2013/02/16 11:16:06 wiz Exp $
2 2
3DISTNAME= libpng-1.5.14 3DISTNAME= libpng-1.6.0
4PKGNAME= ${DISTNAME:S/lib//} 4PKGNAME= ${DISTNAME:S/lib//}
 5PKGREVISION= 1
5CATEGORIES= graphics 6CATEGORIES= graphics
6MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=libpng/} \ 7MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=libpng/} \
7 ftp://ftp.fu-berlin.de/unix/graphics/png/src/ 8 ftp://ftp.fu-berlin.de/unix/graphics/png/src/
8EXTRACT_SUFX= .tar.bz2 9EXTRACT_SUFX= .tar.xz
9 10
10MAINTAINER= wiz@NetBSD.org 11MAINTAINER= wiz@NetBSD.org
11HOMEPAGE= http://www.libpng.org/pub/png/libpng.html 12HOMEPAGE= http://www.libpng.org/pub/png/libpng.html
12COMMENT= Library for manipulating PNG images 13COMMENT= Library for manipulating PNG images
13LICENSE= zlib 14LICENSE= zlib
14 15
15PKG_INSTALLATION_TYPES= overwrite pkgviews 16PKG_INSTALLATION_TYPES= overwrite pkgviews
16 17
17GNU_CONFIGURE= yes 18GNU_CONFIGURE= yes
18PKGCONFIG_OVERRIDE= scripts/libpng.pc.in libpng.pc.in 19PKGCONFIG_OVERRIDE= scripts/libpng.pc.in libpng.pc.in
19TEST_TARGET= check 20TEST_TARGET= check
20USE_LIBTOOL= yes 21USE_LIBTOOL= yes
21 22

cvs diff -r1.13 -r1.14 pkgsrc/graphics/png/PLIST (expand / switch to unified diff)

--- pkgsrc/graphics/png/PLIST 2011/01/13 13:27:21 1.13
+++ pkgsrc/graphics/png/PLIST 2013/02/16 11:16:06 1.14
@@ -1,15 +1,15 @@ @@ -1,15 +1,15 @@
1@comment $NetBSD: PLIST,v 1.13 2011/01/13 13:27:21 wiz Exp $ 1@comment $NetBSD: PLIST,v 1.14 2013/02/16 11:16:06 wiz Exp $
2bin/libpng-config 2bin/libpng-config
3bin/libpng15-config 3bin/libpng16-config
4include/libpng15/png.h 4include/libpng16/png.h
5include/libpng15/pngconf.h 5include/libpng16/pngconf.h
6include/libpng15/pnglibconf.h 6include/libpng16/pnglibconf.h
7include/png.h 7include/png.h
8include/pngconf.h 8include/pngconf.h
9include/pnglibconf.h 9include/pnglibconf.h
10lib/libpng15.la 10lib/libpng16.la
11lib/pkgconfig/libpng.pc 11lib/pkgconfig/libpng.pc
12lib/pkgconfig/libpng15.pc 12lib/pkgconfig/libpng16.pc
13man/man3/libpng.3 13man/man3/libpng.3
14man/man3/libpngpf.3 14man/man3/libpngpf.3
15man/man5/png.5 15man/man5/png.5

cvs diff -r1.26 -r1.27 pkgsrc/graphics/png/buildlink3.mk (expand / switch to unified diff)

--- pkgsrc/graphics/png/buildlink3.mk 2011/01/24 08:08:37 1.26
+++ pkgsrc/graphics/png/buildlink3.mk 2013/02/16 11:16:06 1.27
@@ -1,27 +1,27 @@ @@ -1,27 +1,27 @@
1# $NetBSD: buildlink3.mk,v 1.26 2011/01/24 08:08:37 adam Exp $ 1# $NetBSD: buildlink3.mk,v 1.27 2013/02/16 11:16:06 wiz Exp $
2 2
3BUILDLINK_TREE+= png 3BUILDLINK_TREE+= png
4 4
5.if !defined(PNG_BUILDLINK3_MK) 5.if !defined(PNG_BUILDLINK3_MK)
6PNG_BUILDLINK3_MK:= 6PNG_BUILDLINK3_MK:=
7 7
8BUILDLINK_API_DEPENDS.png+= png>=1.2.4 8BUILDLINK_API_DEPENDS.png+= png>=1.2.4
9BUILDLINK_ABI_DEPENDS.png+= png>=1.5.0 9BUILDLINK_ABI_DEPENDS.png+= png>=1.6.0nb1
10BUILDLINK_PKGSRCDIR.png?= ../../graphics/png 10BUILDLINK_PKGSRCDIR.png?= ../../graphics/png
11 11
12# keep this in sync with the same code in Makefile 12# keep this in sync with the same code in Makefile
13.if ${MACHINE_ARCH} != "i386" && ${MACHINE_ARCH} != "x86_64" 13.if ${MACHINE_ARCH} != "i386" && ${MACHINE_ARCH} != "x86_64"
14CPPFLAGS+= -DPNG_NO_ASSEMBLER_CODE 14CPPFLAGS+= -DPNG_NO_ASSEMBLER_CODE
15.endif 15.endif
16 16
17# Some software directly tries to link against -lpng instead of 17# Some software directly tries to link against -lpng instead of
18# using pkg-config or libpng-config to find the proper arguments 18# using pkg-config or libpng-config to find the proper arguments
19# instead of installing symlinks. Work around this with buildlink 19# instead of installing symlinks. Work around this with buildlink
20# magic: packages outside pkgsrc will need to be converted to 20# magic: packages outside pkgsrc will need to be converted to
21# one of the proper methods or fail. 21# one of the proper methods or fail.
22BUILDLINK_TRANSFORM+= l:png:png15 22BUILDLINK_TRANSFORM+= l:png:png16
23 23
24.include "../../devel/zlib/buildlink3.mk" 24.include "../../devel/zlib/buildlink3.mk"
25.endif # PNG_BUILDLINK3_MK 25.endif # PNG_BUILDLINK3_MK
26 26
27BUILDLINK_TREE+= -png 27BUILDLINK_TREE+= -png

cvs diff -r1.99 -r1.100 pkgsrc/graphics/png/distinfo (expand / switch to unified diff)

--- pkgsrc/graphics/png/distinfo 2013/01/24 08:15:50 1.99
+++ pkgsrc/graphics/png/distinfo 2013/02/16 11:16:06 1.100
@@ -1,6 +1,6 @@ @@ -1,6 +1,6 @@
1$NetBSD: distinfo,v 1.99 2013/01/24 08:15:50 wiz Exp $ 1$NetBSD: distinfo,v 1.100 2013/02/16 11:16:06 wiz Exp $
2 2
3SHA1 (libpng-1.5.14.tar.bz2) = b634cbd51698a3ddb495fa6decd074ae523c8fbf 3SHA1 (libpng-1.6.0.tar.xz) = 830123507d845d4783e81e46e912a23db3a4f13b
4RMD160 (libpng-1.5.14.tar.bz2) = a9af95e17070fe05bcb79012721f0848e00a3b7c 4RMD160 (libpng-1.6.0.tar.xz) = 919d743bb265f76bbec04e10e0565db1df10b233
5Size (libpng-1.5.14.tar.bz2) = 869823 bytes 5Size (libpng-1.6.0.tar.xz) = 825232 bytes
6SHA1 (patch-aa) = 080c890ee48923db959fcdeeb12e4a5a27845138 6SHA1 (patch-aa) = 080c890ee48923db959fcdeeb12e4a5a27845138