summaryrefslogtreecommitdiff
path: root/graphics/lensfun
diff options
context:
space:
mode:
authorwiz <wiz>2013-02-16 11:18:58 +0000
committerwiz <wiz>2013-02-16 11:18:58 +0000
commite9ca876e8b0d03029ff52101028aa5764a584e75 (patch)
treed0def9b6a36a2b3df4828dbc84a89a15adffc5c1 /graphics/lensfun
parente9e70820d20f9c7b27685ca20c4e773ef049a712 (diff)
downloadpkgsrc-e9ca876e8b0d03029ff52101028aa5764a584e75.tar.gz
Recursive bump for png-1.6.
Diffstat (limited to 'graphics/lensfun')
-rw-r--r--graphics/lensfun/Makefile4
-rw-r--r--graphics/lensfun/distinfo4
-rw-r--r--graphics/lensfun/patches/patch-ac20
3 files changed, 18 insertions, 10 deletions
diff --git a/graphics/lensfun/Makefile b/graphics/lensfun/Makefile
index 31eb6994059..f8616ea4ab9 100644
--- a/graphics/lensfun/Makefile
+++ b/graphics/lensfun/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.17 2012/10/06 14:11:03 asau Exp $
+# $NetBSD: Makefile,v 1.18 2013/02/16 11:22:16 wiz Exp $
#
DISTNAME= lensfun-0.2.5
-PKGREVISION= 10
+PKGREVISION= 11
CATEGORIES= graphics
MASTER_SITES= http://download.berlios.de/lensfun/
EXTRACT_SUFX= .tar.bz2
diff --git a/graphics/lensfun/distinfo b/graphics/lensfun/distinfo
index dbbd2c0939f..606b25d7acf 100644
--- a/graphics/lensfun/distinfo
+++ b/graphics/lensfun/distinfo
@@ -1,10 +1,10 @@
-$NetBSD: distinfo,v 1.5 2011/01/20 16:48:11 wiz Exp $
+$NetBSD: distinfo,v 1.6 2013/02/16 11:22:16 wiz Exp $
SHA1 (lensfun-0.2.5.tar.bz2) = 7e8568cb131b6e2090264274483721a959f6b9bc
RMD160 (lensfun-0.2.5.tar.bz2) = 2f421cefb65d271b937e3d61f41f8536fd078971
Size (lensfun-0.2.5.tar.bz2) = 470733 bytes
SHA1 (patch-aa) = d31dd742f232aa8a75f50f14f782918ba11a8119
SHA1 (patch-ab) = 5455bda9546dce6cc5b4a73429092afdee04bd23
-SHA1 (patch-ac) = b85c98cc11a5795bede4fb22438d547ca302b38b
+SHA1 (patch-ac) = ab8ff0ff327ce313d60e17f187c4bb424c4f6455
SHA1 (patch-ad) = f9d54534d3be809e8517ec262e776c9d1785acd8
SHA1 (patch-ae) = c7f47ac5081d52244f38d0fc40795c7cb00f40e4
diff --git a/graphics/lensfun/patches/patch-ac b/graphics/lensfun/patches/patch-ac
index 4fee8b2e9de..8924d5d0727 100644
--- a/graphics/lensfun/patches/patch-ac
+++ b/graphics/lensfun/patches/patch-ac
@@ -1,10 +1,18 @@
-$NetBSD: patch-ac,v 1.3 2011/01/20 16:48:11 wiz Exp $
+$NetBSD: patch-ac,v 1.4 2013/02/16 11:22:16 wiz Exp $
-Fix build with png-1.5.
+Fix build with png-1.6.
--- libs/auxfun/image.cpp.orig 2008-05-02 06:56:04.000000000 +0000
+++ libs/auxfun/image.cpp
-@@ -94,7 +94,7 @@ bool Image::LoadPNG ()
+@@ -7,6 +7,7 @@
+ #include <zlib.h>
+ #include <png.h>
+ #include <stdlib.h>
++#include <string.h>
+ #include <unistd.h>
+ #include <math.h>
+
+@@ -94,7 +95,7 @@ bool Image::LoadPNG ()
png_init_io (png, file);
@@ -13,7 +21,7 @@ Fix build with png-1.5.
// If we get here, we had a problem reading the file
goto nomem;
-@@ -157,7 +157,7 @@ bool Image::LoadPNG ()
+@@ -157,7 +158,7 @@ bool Image::LoadPNG ()
row_pointers = new png_bytep [Height];
if (!row_pointers
@@ -22,7 +30,7 @@ Fix build with png-1.5.
{
delete [] row_pointers;
nomem:
-@@ -214,7 +214,7 @@ bool Image::SavePNG (const char *fName)
+@@ -214,7 +215,7 @@ bool Image::SavePNG (const char *fName)
}
/* Catch processing errors */
@@ -31,7 +39,7 @@ Fix build with png-1.5.
/* If we get here, we had a problem writing the file */
goto error2;
-@@ -273,10 +273,6 @@ bool Image::SavePNG (const char *fName)
+@@ -273,10 +274,6 @@ bool Image::SavePNG (const char *fName)
/* It is REQUIRED to call this to finish writing the rest of the file */
png_write_end (png, info);