aboutsummaryrefslogtreecommitdiff
path: root/graphics/vigra
diff options
context:
space:
mode:
authorDirk Meyer <dinoex@FreeBSD.org>2012-06-01 05:26:28 +0000
committerDirk Meyer <dinoex@FreeBSD.org>2012-06-01 05:26:28 +0000
commit2b74a89bc8342f0b9b737c37d87737caf7b0ea1e (patch)
treec04604583d8be53b3ed7f10975be828c731f87cb /graphics/vigra
parent24315159daa0089f08acea4ba1b130fb6721ad5c (diff)
downloadports-2b74a89bc8342f0b9b737c37d87737caf7b0ea1e.tar.gz
ports-2b74a89bc8342f0b9b737c37d87737caf7b0ea1e.zip
Notes
Diffstat (limited to 'graphics/vigra')
-rw-r--r--graphics/vigra/Makefile4
-rw-r--r--graphics/vigra/files/patch-png.cxx20
2 files changed, 22 insertions, 2 deletions
diff --git a/graphics/vigra/Makefile b/graphics/vigra/Makefile
index 9aa8c3360d2f..7667d459e02f 100644
--- a/graphics/vigra/Makefile
+++ b/graphics/vigra/Makefile
@@ -11,7 +11,7 @@
PORTNAME= vigra
PORTVERSION= 1.7.1
-PORTREVISION= 3
+PORTREVISION= 4
CATEGORIES= graphics
MASTER_SITES= http://hci.iwr.uni-heidelberg.de/vigra/
DISTNAME= ${PORTNAME}-${PORTVERSION}-src
@@ -48,7 +48,7 @@ LIB_DEPENDS+= jpeg:${PORTSDIR}/graphics/jpeg
.endif
.if !defined(WITHOUT_VIGRA_PNG)
-LIB_DEPENDS+= png:${PORTSDIR}/graphics/png
+LIB_DEPENDS+= png15:${PORTSDIR}/graphics/png
.endif
.if !defined(WITHOUT_VIGRA_FFTW)
diff --git a/graphics/vigra/files/patch-png.cxx b/graphics/vigra/files/patch-png.cxx
new file mode 100644
index 000000000000..d6fd4f212143
--- /dev/null
+++ b/graphics/vigra/files/patch-png.cxx
@@ -0,0 +1,20 @@
+--- src/impex/png.cxx.orig 2010-12-03 18:40:34.000000000 +0100
++++ src/impex/png.cxx 2012-05-05 07:53:39.000000000 +0200
+@@ -320,7 +320,7 @@
+ #if (PNG_LIBPNG_VER > 10008) && defined(PNG_READ_iCCP_SUPPORTED)
+ char * dummyName;
+ int dummyCompType;
+- char * profilePtr;
++ png_byte * profilePtr;
+ png_uint_32 profileLen;
+ if (png_get_valid( png, info, PNG_INFO_iCCP )) {
+ png_get_iCCP(png, info, &dummyName, &dummyCompType, &profilePtr, &profileLen) ;
+@@ -592,7 +592,7 @@
+ // set icc profile
+ if (iccProfile.size() > 0) {
+ png_set_iCCP(png, info, (png_charp)("icc"), 0,
+- (png_charp)iccProfile.begin(), (png_uint_32)iccProfile.size());
++ (const png_byte *)iccProfile.begin(), (png_uint_32)iccProfile.size());
+ }
+ #endif
+