summaryrefslogtreecommitdiff
path: root/graphics
diff options
context:
space:
mode:
Diffstat (limited to 'graphics')
-rw-r--r--graphics/pdiff/Makefile21
-rw-r--r--graphics/pdiff/distinfo9
-rw-r--r--graphics/pdiff/patches/patch-aa13
3 files changed, 23 insertions, 20 deletions
diff --git a/graphics/pdiff/Makefile b/graphics/pdiff/Makefile
index 857e82a10d9..210f2f718d8 100644
--- a/graphics/pdiff/Makefile
+++ b/graphics/pdiff/Makefile
@@ -1,11 +1,10 @@
-# $NetBSD: Makefile,v 1.3 2007/02/22 19:30:04 wiz Exp $
+# $NetBSD: Makefile,v 1.4 2007/02/23 17:39:51 wiz Exp $
#
-DISTNAME= pdiff0.9b-src
-PKGNAME= pdiff-0.9b
+DISTNAME= PerceptualDiff-1.0
+PKGNAME= pdiff-1.0
CATEGORIES= graphics
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=pdiff/}
-EXTRACT_SUFX= .zip
MAINTAINER= heinz@NetBSD.org
HOMEPAGE= http://pdiff.sourceforge.net/
@@ -13,13 +12,8 @@ COMMENT= Image comparison through perceptually based image metric
PKG_INSTALLATION_TYPES= overwrite pkgviews
-EXTRACT_OPTS+= -d pdiff
-
-WRKSRC= ${WRKDIR}/pdiff
USE_LANGUAGES= c c++
-BUILD_DEPENDS+= cmake>=2:../../devel/cmake
-
OPSYSVARS+= LIBTIFFNAME
LIBTIFFNAME.*= libtiff.so
LIBTIFFNAME.Darwin= libtiff.dylib
@@ -28,16 +22,11 @@ CMAKEFLAGS.pdiff+= -DCMAKE_INSTALL_PREFIX:PATH=${PREFIX}
CMAKEFLAGS.pdiff+= -DTIFF_INCLUDE_DIR:PATH=${BUILDLINK_PREFIX.tiff}/include
CMAKEFLAGS.pdiff+= -DTIFF_LIBRARY:PATH=${BUILDLINK_PREFIX.tiff}/lib/${LIBTIFFNAME}
-post-extract:
- ${MV} ${WRKSRC}/compareargs.cpp ${WRKSRC}/CompareArgs.cpp
- ${MV} ${WRKSRC}/metric.cpp ${WRKSRC}/Metric.cpp
-
do-configure:
cd ${WRKSRC} && ${SETENV} ${CONFIGURE_ENV} \
${LOCALBASE}/bin/cmake ${CMAKEFLAGS.pdiff} .
-do-install:
- ${INSTALL_PROGRAM} ${WRKSRC}/perceptualdiff ${PREFIX}/bin/.
-
+.include "../../devel/cmake/buildlink3.mk"
+.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 f95534f8f65..6419ad969a5 100644
--- a/graphics/pdiff/distinfo
+++ b/graphics/pdiff/distinfo
@@ -1,5 +1,6 @@
-$NetBSD: distinfo,v 1.1.1.1 2006/06/10 19:53:54 heinz Exp $
+$NetBSD: distinfo,v 1.2 2007/02/23 17:39:51 wiz Exp $
-SHA1 (pdiff0.9b-src.zip) = 4769fbca93450586c4d19f131c40c23efe4da50e
-RMD160 (pdiff0.9b-src.zip) = e5cca72b83bbf82f51723ca9729b74e18ee0452f
-Size (pdiff0.9b-src.zip) = 19802 bytes
+SHA1 (PerceptualDiff-1.0.tar.gz) = cde6dbe41e9fc017ac3a4d8d912af2ed5223f34a
+RMD160 (PerceptualDiff-1.0.tar.gz) = 669d69ac70aa6b5272a64a82160d21c955ddc631
+Size (PerceptualDiff-1.0.tar.gz) = 15534 bytes
+SHA1 (patch-aa) = 0301ff6b0f081fd481b0320f10e34aaa3e6b9966
diff --git a/graphics/pdiff/patches/patch-aa b/graphics/pdiff/patches/patch-aa
new file mode 100644
index 00000000000..ed62eac036b
--- /dev/null
+++ b/graphics/pdiff/patches/patch-aa
@@ -0,0 +1,13 @@
+$NetBSD: patch-aa,v 1.1 2007/02/23 17:39:51 wiz Exp $
+
+--- RGBAImage.cpp.orig 2007-01-19 09:39:04.000000000 +0000
++++ RGBAImage.cpp
+@@ -114,7 +114,7 @@ RGBAImage* RGBAImage::ReadPNG(char *file
+ }
+ }
+
+- png_read_destroy(png_ptr, info_ptr, end_info);
++ png_destroy_read_struct(&png_ptr, &info_ptr, &end_info);
+ return fimg;
+ }
+