Thu Jan 13 13:27:22 2011 UTC ()
Update to 1.5.1beta01:

1.5.1beta01 contains a security fix for 1.5.0.

The current public release, libpng 1.5.0, continues the evolution
of the libpng API, finally hiding the contents of the venerable
and hoary png_struct and png_info data structures inside private
(i.e., non-installed) header files. (Apps that compiled with libpng
1.4 without warnings about deprecated features should happily
compile with 1.5, too.) It also includes a new, more thorough test
program (pngvalid.c), a new pnglibconf.h header file that tracks
what features were enabled or disabled when libpng was built, and
huge thanks to John Bowler, who did most of the work. Complete
differences relative to libpng 1.4.x are detailed at
http://www.libpng.org/pub/png/src/libpng-1.4.x-to-1.5.x-summary.txt .

Since the shlib name changed, next up: PKGREVISION++ all across pkgsrc.


(wiz)
diff -r1.126 -r1.127 pkgsrc/graphics/png/Makefile
diff -r1.12 -r1.13 pkgsrc/graphics/png/PLIST
diff -r1.24 -r1.25 pkgsrc/graphics/png/buildlink3.mk
diff -r1.71 -r1.72 pkgsrc/graphics/png/distinfo
diff -r1.29 -r1.30 pkgsrc/graphics/png/patches/patch-aa
diff -r1.10 -r0 pkgsrc/graphics/png/patches/patch-ae
cvs diff -r1.126 -r1.127 pkgsrc/graphics/png/Makefile (expand / switch to unified diff)

--- pkgsrc/graphics/png/Makefile 2010/12/10 12:37:26 1.126
+++ pkgsrc/graphics/png/Makefile 2011/01/13 13:27:21 1.127
@@ -1,25 +1,26 @@ @@ -1,25 +1,26 @@
1# $NetBSD: Makefile,v 1.126 2010/12/10 12:37:26 wiz Exp $ 1# $NetBSD: Makefile,v 1.127 2011/01/13 13:27:21 wiz Exp $
2 2
3DISTNAME= libpng-1.4.5 3DISTNAME= libpng-1.5.1beta01
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/ 7 ftp://ftp.fu-berlin.de/unix/graphics/png/src/
8EXTRACT_SUFX= .tar.bz2 8EXTRACT_SUFX= .tar.bz2
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= png-license
13 14
14PKG_INSTALLATION_TYPES= overwrite pkgviews 15PKG_INSTALLATION_TYPES= overwrite pkgviews
15PKG_DESTDIR_SUPPORT= user-destdir 16PKG_DESTDIR_SUPPORT= user-destdir
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
22.include "../../mk/bsd.prefs.mk" 23.include "../../mk/bsd.prefs.mk"
23# keep this in sync with the same code in buildlink3.mk 24# keep this in sync with the same code in buildlink3.mk
24.if ${MACHINE_ARCH} != "i386" && ${MACHINE_ARCH} != "x86_64" 25.if ${MACHINE_ARCH} != "i386" && ${MACHINE_ARCH} != "x86_64"
25CPPFLAGS+= -DPNG_NO_ASSEMBLER_CODE 26CPPFLAGS+= -DPNG_NO_ASSEMBLER_CODE
cvs diff -r1.12 -r1.13 pkgsrc/graphics/png/PLIST (expand / switch to unified diff)

--- pkgsrc/graphics/png/PLIST 2010/06/13 22:42:10 1.12
+++ pkgsrc/graphics/png/PLIST 2011/01/13 13:27:21 1.13
@@ -1,13 +1,15 @@ @@ -1,13 +1,15 @@
1@comment $NetBSD: PLIST,v 1.12 2010/06/13 22:42:10 wiz Exp $ 1@comment $NetBSD: PLIST,v 1.13 2011/01/13 13:27:21 wiz Exp $
2bin/libpng-config 2bin/libpng-config
3bin/libpng14-config 3bin/libpng15-config
4include/libpng14/png.h 4include/libpng15/png.h
5include/libpng14/pngconf.h 5include/libpng15/pngconf.h
 6include/libpng15/pnglibconf.h
6include/png.h 7include/png.h
7include/pngconf.h 8include/pngconf.h
8lib/libpng14.la 9include/pnglibconf.h
 10lib/libpng15.la
9lib/pkgconfig/libpng.pc 11lib/pkgconfig/libpng.pc
10lib/pkgconfig/libpng14.pc 12lib/pkgconfig/libpng15.pc
11man/man3/libpng.3 13man/man3/libpng.3
12man/man3/libpngpf.3 14man/man3/libpngpf.3
13man/man5/png.5 15man/man5/png.5
cvs diff -r1.24 -r1.25 pkgsrc/graphics/png/buildlink3.mk (expand / switch to unified diff)

--- pkgsrc/graphics/png/buildlink3.mk 2010/06/13 22:42:10 1.24
+++ pkgsrc/graphics/png/buildlink3.mk 2011/01/13 13:27:21 1.25
@@ -1,27 +1,27 @@ @@ -1,27 +1,27 @@
1# $NetBSD: buildlink3.mk,v 1.24 2010/06/13 22:42:10 wiz Exp $ 1# $NetBSD: buildlink3.mk,v 1.25 2011/01/13 13:27:21 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.4.2 9BUILDLINK_ABI_DEPENDS.png+= png>=1.5.0
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:png14 22BUILDLINK_TRANSFORM+= l:png:png15
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.71 -r1.72 pkgsrc/graphics/png/distinfo (expand / switch to unified diff)

--- pkgsrc/graphics/png/distinfo 2010/12/10 12:37:26 1.71
+++ pkgsrc/graphics/png/distinfo 2011/01/13 13:27:22 1.72
@@ -1,8 +1,7 @@ @@ -1,8 +1,7 @@
1$NetBSD: distinfo,v 1.71 2010/12/10 12:37:26 wiz Exp $ 1$NetBSD: distinfo,v 1.72 2011/01/13 13:27:22 wiz Exp $
2 2
3SHA1 (libpng-1.4.5.tar.bz2) = 58005bee4a3452f2a3406b07910912f1266cde59 3SHA1 (libpng-1.5.1beta01.tar.bz2) = 3edd379cfae7240c93022347b4dbdef9744443f7
4RMD160 (libpng-1.4.5.tar.bz2) = 4a498d6949a956031677b1cca95dc89dae7aedcf 4RMD160 (libpng-1.5.1beta01.tar.bz2) = 68d0ee37a70426a5caf35172f97f6aec846d3ef3
5Size (libpng-1.4.5.tar.bz2) = 680469 bytes 5Size (libpng-1.5.1beta01.tar.bz2) = 763444 bytes
6SHA1 (patch-aa) = 35c0fc773bb04ba097e87d89c7f8eb960e7f509a 6SHA1 (patch-aa) = 0c4f4e594798384079a0ce2ee5d7a45e16366b12
7SHA1 (patch-ac) = 0cb275bda71dcd72d5cf0986ac488bccf40ad2c5 7SHA1 (patch-ac) = 0cb275bda71dcd72d5cf0986ac488bccf40ad2c5
8SHA1 (patch-ae) = cdf43d98edbed290e0b0333c18483158648f5451 
cvs diff -r1.29 -r1.30 pkgsrc/graphics/png/patches/Attic/patch-aa (expand / switch to unified diff)

--- pkgsrc/graphics/png/patches/Attic/patch-aa 2010/09/24 08:58:41 1.29
+++ pkgsrc/graphics/png/patches/Attic/patch-aa 2011/01/13 13:27:22 1.30
@@ -1,23 +1,23 @@ @@ -1,23 +1,23 @@
1$NetBSD: patch-aa,v 1.29 2010/09/24 08:58:41 wiz Exp $ 1$NetBSD: patch-aa,v 1.30 2011/01/13 13:27:22 wiz Exp $
2 2
3Don't install compat links to libpng. Programs should use 3Don't install compat links to libpng. Programs should use
4the pkg-config or libpng-config scripts to get the correct png library 4the pkg-config or libpng-config scripts to get the correct png library
5name. 5name.
6 6
7--- Makefile.in.orig 2010-09-23 12:18:43.000000000 +0000 7--- Makefile.in.orig 2011-01-06 13:02:45.000000000 +0000
8+++ Makefile.in 8+++ Makefile.in
9@@ -1242,14 +1242,6 @@ install-data-hook: 9@@ -1342,14 +1342,6 @@ install-data-hook:
10 install-exec-hook: 10 install-exec-hook:
11 cd $(DESTDIR)$(bindir); rm -f libpng-config 11 cd $(DESTDIR)$(bindir); rm -f libpng-config
12 cd $(DESTDIR)$(bindir); $(LN_S) $(PNGLIB_BASENAME)-config libpng-config 12 cd $(DESTDIR)$(bindir); $(LN_S) $(PNGLIB_BASENAME)-config libpng-config
13- @set -x;\ 13- @set -x;\
14- cd $(DESTDIR)$(libdir);\ 14- cd $(DESTDIR)$(libdir);\
15- for ext in a la so so.@PNGLIB_MAJOR@@PNGLIB_MINOR@.@PNGLIB_RELEASE@ sl dylib dll.a; do\ 15- for ext in a la so so.@PNGLIB_MAJOR@@PNGLIB_MINOR@.@PNGLIB_RELEASE@ sl dylib dll.a; do\
16- rm -f libpng.$$ext;\ 16- rm -f libpng.$$ext;\
17- if test -f $(PNGLIB_BASENAME).$$ext; then\ 17- if test -f $(PNGLIB_BASENAME).$$ext; then\
18- $(LN_S) $(PNGLIB_BASENAME).$$ext libpng.$$ext;\ 18- $(LN_S) $(PNGLIB_BASENAME).$$ext libpng.$$ext;\
19- fi;\ 19- fi;\
20- done 20- done
21  21
22 uninstall-hook: 22 uninstall-hook:
23 cd $(DESTDIR)$(includedir); rm -f png.h pngconf.h 23 cd $(DESTDIR)$(includedir); rm -f png.h pngconf.h pnglibconf.h
File Deleted: pkgsrc/graphics/png/patches/Attic/patch-ae