Bump PKGREVISION for libpng shlib name change.

Also add some patches to remove use of deprecated symbols and fix other
problems when looking for or compiling against libpng-1.4.x.

4 files changed, 81 insertions, 4 deletions

diff --git a/graphics/pdiff/Makefile b/graphics/pdiff/Makefile
index 8d3276e836c..0a824be2ef0 100644
--- a/graphics/pdiff/Makefile
+++ b/graphics/pdiff/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.9 2010/01/18 09:59:06 wiz Exp $
+# $NetBSD: Makefile,v 1.10 2010/06/13 22:44:40 wiz Exp $
 #
 
 DISTNAME=		PerceptualDiff-1.0.1
 PKGNAME=		pdiff-1.0.1
-PKGREVISION=		2
+PKGREVISION=		3
 CATEGORIES=		graphics
 MASTER_SITES=		${MASTER_SITE_SOURCEFORGE:=pdiff/}
 
@@ -17,6 +17,7 @@ PKG_DESTDIR_SUPPORT=	user-destdir
 USE_LANGUAGES=		c c++
 USE_CMAKE=		yes
 
-.include "../../graphics/png/buildlink3.mk"
+# not compatible with png>=1.4
+#.include "../../graphics/png/buildlink3.mk"
 .include "../../graphics/tiff/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/graphics/pdiff/distinfo b/graphics/pdiff/distinfo
index 620d77412fb..ead7a8ed6cd 100644
--- a/graphics/pdiff/distinfo
+++ b/graphics/pdiff/distinfo
@@ -1,6 +1,8 @@
-$NetBSD: distinfo,v 1.3 2007/03/24 20:17:57 heinz Exp $
+$NetBSD: distinfo,v 1.4 2010/06/13 22:44:40 wiz Exp $
 
 SHA1 (PerceptualDiff-1.0.1.tar.gz) = 301d703e7d3c474b663a4abcd63d81500d073be9
 RMD160 (PerceptualDiff-1.0.1.tar.gz) = a2931d55b7efa66b907f9002d9380f2f8a088534
 Size (PerceptualDiff-1.0.1.tar.gz) = 32344 bytes
+SHA1 (patch-aa) = bb10324121c3c8051a1517438ffe87075787c3a5
 SHA1 (patch-ab) = f8cc81b1cfdcc7658216d354a917232ec285c64e
+SHA1 (patch-ac) = 28fe818975fe6dd747b4a2a4e45d315a96998ec3
diff --git a/graphics/pdiff/patches/patch-aa b/graphics/pdiff/patches/patch-aa
new file mode 100644
index 00000000000..f44585b0da1
--- /dev/null
+++ b/graphics/pdiff/patches/patch-aa
@@ -0,0 +1,42 @@
+$NetBSD: patch-aa,v 1.3 2010/06/13 22:44:40 wiz Exp $
+
+Not compatible with png-1.4.
+
+--- CompareArgs.cpp.orig	2007-03-16 06:17:17.000000000 +0000
++++ CompareArgs.cpp
+@@ -35,8 +35,6 @@ static const char *usage =
+ \t-gamma g       : Value to convert rgb into linear space (default 2.2)\n\
+ \t-luminance l   : White luminance (default 100.0 cdm^-2)\n\
+ \t-output o.ppm  : Write difference to the file o.ppm\n\
+-\n\
+-\n Note: Input files can also be in the PNG format\
+ \n";
+ 
+ CompareArgs::CompareArgs()
+@@ -69,26 +67,18 @@ bool CompareArgs::Parse_Args(int argc, c
+ 		if (i == 1) {
+ 			ImgA = RGBAImage::ReadTiff(argv[1]);
+ 			if (!ImgA) {
+-				ImgA = RGBAImage::ReadPNG(argv[1]);
+-				if (!ImgA)
+-				{
+ 					ErrorStr = "FAIL: Cannot open ";
+ 					ErrorStr += argv[1];
+ 					ErrorStr += "\n";
+ 					return false;
+-				}
+ 			}
+ 		} else if (i == 2) {			
+ 			ImgB = RGBAImage::ReadTiff(argv[2]);
+ 			if (!ImgB) {
+-				ImgB = RGBAImage::ReadPNG(argv[2]);
+-				if (!ImgB)
+-				{
+ 					ErrorStr = "FAIL: Cannot open ";
+ 					ErrorStr += argv[2];
+ 					ErrorStr += "\n";
+ 					return false;
+-				}
+ 			}
+ 		} else {
+ 			if (strstr(argv[i], "-fov")) {
diff --git a/graphics/pdiff/patches/patch-ac b/graphics/pdiff/patches/patch-ac
new file mode 100644
index 00000000000..dfb825c9687
--- /dev/null
+++ b/graphics/pdiff/patches/patch-ac
@@ -0,0 +1,32 @@
+$NetBSD: patch-ac,v 1.1 2010/06/13 22:44:40 wiz Exp $
+
+Not compatible with png-1.4.
+
+--- RGBAImage.cpp.orig	2007-03-16 06:17:17.000000000 +0000
++++ RGBAImage.cpp
+@@ -15,7 +15,9 @@ if not, write to the Free Software Found
+ */
+ 
+ #include "RGBAImage.h"
++#if 0
+ #include "png.h"
++#endif
+ #include "tiff.h"
+ #include "tiffio.h"
+ 
+@@ -54,6 +56,7 @@ RGBAImage* RGBAImage::ReadTiff(char *fil
+ 	return fimg;
+ }
+ 
++#if 0
+ // This portion was written by Scott Corley
+ RGBAImage* RGBAImage::ReadPNG(char *filename)
+ {
+@@ -117,6 +120,7 @@ RGBAImage* RGBAImage::ReadPNG(char *file
+ 	png_destroy_read_struct(&png_ptr, &info_ptr, &end_info);
+ 	return fimg;
+ }
++#endif
+ 		   
+ bool RGBAImage::WritePPM()
+ {