Thu Feb 6 18:24:11 2014 UTC ()
Update to 1.6.9, getting rid of the final two patches after discussion
with very helpful upstream.

Changes:

Version 1.6.9beta01 [December 26, 2013]
  Bookkeeping: Moved functions around (no changes). Moved transform
    function definitions before the place where they are called so that
    they can be masde static. Move the intrapixel functions and the
    grayscale palette builder out of the png?tran.c files. The latter
    isn't a transform function and is no longer used internally, and the
    former MNG specific functions are better placed in pngread/pngwrite.c
  Made transform implementation functions static. This makes the internal
    functions called by png_do_{read|write}_transformations static. On an
    x86-64 DLL build (Gentoo Linux) this reduces the size of the text
    segment of the DLL by 1208 bytes, about 0.6%. It also simplifies
    maintenance by removing the declarations from pngpriv.h and allowing
    easier changes to the internal interfaces.
  Rebuilt configure scripts with automake-1.14.1 and autoconf-2.69
    in the tar distributions.

Version 1.6.9beta02 [January 1, 2014]
  Added checks for libpng 1.5 to pngvalid.c.  This supports the use of
    this version of pngvalid in libpng 1.5
  Merged with pngvalid.c from libpng-1.7 changes to create a single
    pngvalid.c
  Removed #error macro from contrib/tools/pngfix.c (Thomas Klausner).
  Merged pngrio.c, pngtrans.c, pngwio.c, and pngerror.c with libpng-1.7.0
  Merged libpng-1.7.0 changes to make no-interlace configurations work
    with test programs.
  Revised pngvalid.c to support libpng 1.5, which does not support the
    PNG_MAXIMUM_INFLATE_WINDOW option, so #define it out when appropriate in
    pngvalid.c
  Allow unversioned links created on install to be disabled in configure.
    In configure builds 'make install' changes/adds links like png.h
    and libpng.a to point to the newly installed, versioned, files (e.g.
    libpng17/png.h and libpng17.a). Three new configure options and some
    rearrangement of Makefile.am allow creation of these links to be disabled.

Version 1.6.9beta03 [January 10, 2014]
  Removed potentially misleading warning from png_check_IHDR().

Version 1.6.9beta04 [January 20, 2014]
  Updated scripts/makefile.* to use CPPFLAGS (Cosmin).
  Added clang attribute support (Cosmin).

Version 1.6.9rc01 [January 28, 2014]
  No changes.

Version 1.6.9rc02 [January 30, 2014]
  Quiet an uninitialized memory warning from VC2013 in png_get_png().

Version 1.6.9 [February 6, 2014]


(wiz)
diff -r1.166 -r1.167 pkgsrc/graphics/png/Makefile
diff -r1.111 -r1.112 pkgsrc/graphics/png/distinfo
diff -r1.33 -r0 pkgsrc/graphics/png/patches/patch-aa
diff -r1.1 -r0 pkgsrc/graphics/png/patches/patch-contrib_tools_pngfix.c

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

--- pkgsrc/graphics/png/Makefile 2013/12/31 17:27:48 1.166
+++ pkgsrc/graphics/png/Makefile 2014/02/06 18:24:11 1.167
@@ -1,30 +1,36 @@ @@ -1,30 +1,36 @@
1# $NetBSD: Makefile,v 1.166 2013/12/31 17:27:48 wiz Exp $ 1# $NetBSD: Makefile,v 1.167 2014/02/06 18:24:11 wiz Exp $
2 2
3DISTNAME= libpng-1.6.8 3DISTNAME= libpng-1.6.9
4PKGNAME= ${DISTNAME:S/lib//} 4PKGNAME= ${DISTNAME:S/lib//}
5CATEGORIES= graphics 5CATEGORIES= graphics
6MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=libpng/} \ 6MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=libpng/} \
7 ftp://ftp.fu-berlin.de/unix/graphics/png/src/libpng16/ 7 ftp://ftp.fu-berlin.de/unix/graphics/png/src/libpng16/
8EXTRACT_SUFX= .tar.xz 8EXTRACT_SUFX= .tar.xz
9 9
10MAINTAINER= wiz@NetBSD.org 10MAINTAINER= wiz@NetBSD.org
11HOMEPAGE= http://www.libpng.org/pub/png/libpng.html 11HOMEPAGE= http://www.libpng.org/pub/png/libpng.html
12COMMENT= Library for manipulating PNG images 12COMMENT= Library for manipulating PNG images
13LICENSE= zlib 13LICENSE= zlib
14 14
15PKG_INSTALLATION_TYPES= overwrite pkgviews 15PKG_INSTALLATION_TYPES= overwrite pkgviews
16 16
17GNU_CONFIGURE= yes 17GNU_CONFIGURE= yes
 18# do not create libpng.la
 19CONFIGURE_ARGS+= --disable-unversioned-links
 20# but do install png.h outside include/libpng$VERSION for now
 21# until pkgsrc is fixed to use libpng-config or the pc file everywhere
 22INSTALL_TARGET= install install-header-links
 23
18PKGCONFIG_OVERRIDE= scripts/libpng.pc.in libpng.pc.in 24PKGCONFIG_OVERRIDE= scripts/libpng.pc.in libpng.pc.in
19TEST_TARGET= check 25TEST_TARGET= check
20USE_LIBTOOL= yes 26USE_LIBTOOL= yes
21 27
22CPPFLAGS+= -DPNG_USER_CHUNK_CACHE_MAX=128 -DPNG_USER_CHUNK_MALLOC_MAX=8000000 28CPPFLAGS+= -DPNG_USER_CHUNK_CACHE_MAX=128 -DPNG_USER_CHUNK_MALLOC_MAX=8000000
23 29
24.include "../../mk/bsd.prefs.mk" 30.include "../../mk/bsd.prefs.mk"
25# keep this in sync with the same code in buildlink3.mk 31# keep this in sync with the same code in buildlink3.mk
26.if ${MACHINE_ARCH} != "i386" && ${MACHINE_ARCH} != "x86_64" 32.if ${MACHINE_ARCH} != "i386" && ${MACHINE_ARCH} != "x86_64"
27CPPFLAGS+= -DPNG_NO_ASSEMBLER_CODE 33CPPFLAGS+= -DPNG_NO_ASSEMBLER_CODE
28.endif 34.endif
29 35
30SUBST_CLASSES+= rpathfix 36SUBST_CLASSES+= rpathfix

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

--- pkgsrc/graphics/png/distinfo 2013/12/31 17:27:48 1.111
+++ pkgsrc/graphics/png/distinfo 2014/02/06 18:24:11 1.112
@@ -1,7 +1,5 @@ @@ -1,7 +1,5 @@
1$NetBSD: distinfo,v 1.111 2013/12/31 17:27:48 wiz Exp $ 1$NetBSD: distinfo,v 1.112 2014/02/06 18:24:11 wiz Exp $
2 2
3SHA1 (libpng-1.6.8.tar.xz) = acdb0a45d80c90b39b56a41075003d4726f3558c 3SHA1 (libpng-1.6.9.tar.xz) = fe5b37a01a2a056a26f1a6661dc45e026ad86c88
4RMD160 (libpng-1.6.8.tar.xz) = 691ade61deb47f19c88998795b1c3e3489716c4e 4RMD160 (libpng-1.6.9.tar.xz) = 04d6049f1d2705fe53fdeb333d80c68d87412c2f
5Size (libpng-1.6.8.tar.xz) = 876172 bytes 5Size (libpng-1.6.9.tar.xz) = 885824 bytes
6SHA1 (patch-aa) = 080c890ee48923db959fcdeeb12e4a5a27845138 
7SHA1 (patch-contrib_tools_pngfix.c) = 76d84ef9db87cb3e04e33c94a442110b2ab115da 

File Deleted: pkgsrc/graphics/png/patches/Attic/patch-aa

File Deleted: pkgsrc/graphics/png/patches/Attic/patch-contrib_tools_pngfix.c