pkgsrc-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[pkgsrc/trunk]: pkgsrc/graphics/png Update to 1.5.1beta01:



details:   https://anonhg.NetBSD.org/pkgsrc/rev/8db2bdb2c865
branches:  trunk
changeset: 584114:8db2bdb2c865
user:      wiz <wiz%pkgsrc.org@localhost>
date:      Thu Jan 13 13:27:21 2011 +0000

description:
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.

diffstat:

 graphics/png/Makefile         |   5 +++--
 graphics/png/PLIST            |  14 ++++++++------
 graphics/png/buildlink3.mk    |   6 +++---
 graphics/png/distinfo         |  11 +++++------
 graphics/png/patches/patch-aa |   8 ++++----
 graphics/png/patches/patch-ae |  18 ------------------
 6 files changed, 23 insertions(+), 39 deletions(-)

diffs (136 lines):

diff -r 7cf06149d893 -r 8db2bdb2c865 graphics/png/Makefile
--- a/graphics/png/Makefile     Thu Jan 13 13:25:56 2011 +0000
+++ b/graphics/png/Makefile     Thu Jan 13 13:27:21 2011 +0000
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.126 2010/12/10 12:37:26 wiz Exp $
+# $NetBSD: Makefile,v 1.127 2011/01/13 13:27:21 wiz Exp $
 
-DISTNAME=      libpng-1.4.5
+DISTNAME=      libpng-1.5.1beta01
 PKGNAME=       ${DISTNAME:S/lib//}
 CATEGORIES=    graphics
 MASTER_SITES=  ${MASTER_SITE_SOURCEFORGE:=libpng/} \
@@ -10,6 +10,7 @@
 MAINTAINER=    wiz%NetBSD.org@localhost
 HOMEPAGE=      http://www.libpng.org/pub/png/libpng.html
 COMMENT=       Library for manipulating PNG images
+LICENSE=       png-license
 
 PKG_INSTALLATION_TYPES=        overwrite pkgviews
 PKG_DESTDIR_SUPPORT=   user-destdir
diff -r 7cf06149d893 -r 8db2bdb2c865 graphics/png/PLIST
--- a/graphics/png/PLIST        Thu Jan 13 13:25:56 2011 +0000
+++ b/graphics/png/PLIST        Thu Jan 13 13:27:21 2011 +0000
@@ -1,13 +1,15 @@
-@comment $NetBSD: PLIST,v 1.12 2010/06/13 22:42:10 wiz Exp $
+@comment $NetBSD: PLIST,v 1.13 2011/01/13 13:27:21 wiz Exp $
 bin/libpng-config
-bin/libpng14-config
-include/libpng14/png.h
-include/libpng14/pngconf.h
+bin/libpng15-config
+include/libpng15/png.h
+include/libpng15/pngconf.h
+include/libpng15/pnglibconf.h
 include/png.h
 include/pngconf.h
-lib/libpng14.la
+include/pnglibconf.h
+lib/libpng15.la
 lib/pkgconfig/libpng.pc
-lib/pkgconfig/libpng14.pc
+lib/pkgconfig/libpng15.pc
 man/man3/libpng.3
 man/man3/libpngpf.3
 man/man5/png.5
diff -r 7cf06149d893 -r 8db2bdb2c865 graphics/png/buildlink3.mk
--- a/graphics/png/buildlink3.mk        Thu Jan 13 13:25:56 2011 +0000
+++ b/graphics/png/buildlink3.mk        Thu Jan 13 13:27:21 2011 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.24 2010/06/13 22:42:10 wiz Exp $
+# $NetBSD: buildlink3.mk,v 1.25 2011/01/13 13:27:21 wiz Exp $
 
 BUILDLINK_TREE+=       png
 
@@ -6,7 +6,7 @@
 PNG_BUILDLINK3_MK:=
 
 BUILDLINK_API_DEPENDS.png+=    png>=1.2.4
-BUILDLINK_ABI_DEPENDS.png+=    png>=1.4.2
+BUILDLINK_ABI_DEPENDS.png+=    png>=1.5.0
 BUILDLINK_PKGSRCDIR.png?=      ../../graphics/png
 
 # keep this in sync with the same code in Makefile
@@ -19,7 +19,7 @@
 # instead of installing symlinks. Work around this with buildlink
 # magic: packages outside pkgsrc will need to be converted to
 # one of the proper methods or fail.
-BUILDLINK_TRANSFORM+=  l:png:png14
+BUILDLINK_TRANSFORM+=  l:png:png15
 
 .include "../../devel/zlib/buildlink3.mk"
 .endif # PNG_BUILDLINK3_MK
diff -r 7cf06149d893 -r 8db2bdb2c865 graphics/png/distinfo
--- a/graphics/png/distinfo     Thu Jan 13 13:25:56 2011 +0000
+++ b/graphics/png/distinfo     Thu Jan 13 13:27:21 2011 +0000
@@ -1,8 +1,7 @@
-$NetBSD: distinfo,v 1.71 2010/12/10 12:37:26 wiz Exp $
+$NetBSD: distinfo,v 1.72 2011/01/13 13:27:22 wiz Exp $
 
-SHA1 (libpng-1.4.5.tar.bz2) = 58005bee4a3452f2a3406b07910912f1266cde59
-RMD160 (libpng-1.4.5.tar.bz2) = 4a498d6949a956031677b1cca95dc89dae7aedcf
-Size (libpng-1.4.5.tar.bz2) = 680469 bytes
-SHA1 (patch-aa) = 35c0fc773bb04ba097e87d89c7f8eb960e7f509a
+SHA1 (libpng-1.5.1beta01.tar.bz2) = 3edd379cfae7240c93022347b4dbdef9744443f7
+RMD160 (libpng-1.5.1beta01.tar.bz2) = 68d0ee37a70426a5caf35172f97f6aec846d3ef3
+Size (libpng-1.5.1beta01.tar.bz2) = 763444 bytes
+SHA1 (patch-aa) = 0c4f4e594798384079a0ce2ee5d7a45e16366b12
 SHA1 (patch-ac) = 0cb275bda71dcd72d5cf0986ac488bccf40ad2c5
-SHA1 (patch-ae) = cdf43d98edbed290e0b0333c18483158648f5451
diff -r 7cf06149d893 -r 8db2bdb2c865 graphics/png/patches/patch-aa
--- a/graphics/png/patches/patch-aa     Thu Jan 13 13:25:56 2011 +0000
+++ b/graphics/png/patches/patch-aa     Thu Jan 13 13:27:21 2011 +0000
@@ -1,12 +1,12 @@
-$NetBSD: patch-aa,v 1.29 2010/09/24 08:58:41 wiz Exp $
+$NetBSD: patch-aa,v 1.30 2011/01/13 13:27:22 wiz Exp $
 
 Don't install compat links to libpng. Programs should use
 the pkg-config or libpng-config scripts to get the correct png library
 name.
 
---- Makefile.in.orig   2010-09-23 12:18:43.000000000 +0000
+--- Makefile.in.orig   2011-01-06 13:02:45.000000000 +0000
 +++ Makefile.in
-@@ -1242,14 +1242,6 @@ install-data-hook:
+@@ -1342,14 +1342,6 @@ install-data-hook:
  install-exec-hook:
        cd $(DESTDIR)$(bindir); rm -f libpng-config
        cd $(DESTDIR)$(bindir); $(LN_S) $(PNGLIB_BASENAME)-config libpng-config
@@ -20,4 +20,4 @@
 -      done
  
  uninstall-hook:
-       cd $(DESTDIR)$(includedir); rm -f png.h pngconf.h
+       cd $(DESTDIR)$(includedir); rm -f png.h pngconf.h pnglibconf.h
diff -r 7cf06149d893 -r 8db2bdb2c865 graphics/png/patches/patch-ae
--- a/graphics/png/patches/patch-ae     Thu Jan 13 13:25:56 2011 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,18 +0,0 @@
-$NetBSD: patch-ae,v 1.10 2010/09/24 08:58:41 wiz Exp $
-
-Instead of random text that may or may not make compilers error
-out, use #warning.
-
---- pngconf.h.orig     2009-05-07 16:05:28.000000000 +0000
-+++ pngconf.h
-@@ -332,8 +332,8 @@
-        /* If you encounter a compiler error here, see the explanation
-         * near the end of INSTALL.
-         */
--           __pngconf.h__ in libpng already includes setjmp.h;
--           __dont__ include it again.;
-+#warning           __pngconf.h__ in libpng already includes setjmp.h;
-+#warning           __dont__ include it again.;
- #      endif
- #    endif /* __linux__ */
- #  endif /* PNG_SKIP_SETJMP_CHECK */



Home | Main Index | Thread Index | Old Index