aboutsummaryrefslogtreecommitdiff
path: root/graphics/visionworkbench
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/visionworkbench
parent24315159daa0089f08acea4ba1b130fb6721ad5c (diff)
downloadports-2b74a89bc8342f0b9b737c37d87737caf7b0ea1e.tar.gz
ports-2b74a89bc8342f0b9b737c37d87737caf7b0ea1e.zip
Notes
Diffstat (limited to 'graphics/visionworkbench')
-rw-r--r--graphics/visionworkbench/Makefile4
-rw-r--r--graphics/visionworkbench/files/patch-src__vw__FileIO__DiskImageResourcePNG.cc10
-rw-r--r--graphics/visionworkbench/files/patch-src__vw__FileIO__MemoryImageResourcePNG.cc11
-rw-r--r--graphics/visionworkbench/files/patch-src__vw__FileIO__PngIO.cc10
4 files changed, 33 insertions, 2 deletions
diff --git a/graphics/visionworkbench/Makefile b/graphics/visionworkbench/Makefile
index b91dacfbe347..9460c1ce7a3b 100644
--- a/graphics/visionworkbench/Makefile
+++ b/graphics/visionworkbench/Makefile
@@ -7,7 +7,7 @@
PORTNAME= visionworkbench
PORTVERSION= 2.2.0
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= graphics
MASTER_SITES= http://ti.arc.nasa.gov/m/project/nasa-vision-workbench/
DISTNAME= VisionWorkbench-${PORTVERSION}
@@ -31,7 +31,7 @@ USE_LDCONFIG= yes
USE_PYTHON= 2.4+
LIB_DEPENDS+= jpeg.11:${PORTSDIR}/graphics/jpeg
-LIB_DEPENDS+= png.6:${PORTSDIR}/graphics/png
+LIB_DEPENDS+= png15:${PORTSDIR}/graphics/png
LIB_DEPENDS+= boost_thread.4:${PORTSDIR}/devel/boost-libs
LIB_DEPENDS+= boost_python.4:${PORTSDIR}/devel/boost-python-libs
LIB_DEPENDS+= gdal:${PORTSDIR}/graphics/gdal
diff --git a/graphics/visionworkbench/files/patch-src__vw__FileIO__DiskImageResourcePNG.cc b/graphics/visionworkbench/files/patch-src__vw__FileIO__DiskImageResourcePNG.cc
new file mode 100644
index 000000000000..962b7bdbb2a0
--- /dev/null
+++ b/graphics/visionworkbench/files/patch-src__vw__FileIO__DiskImageResourcePNG.cc
@@ -0,0 +1,10 @@
+--- src/vw/FileIO/DiskImageResourcePNG.cc.orig 2011-05-13 01:00:56.000000000 +0200
++++ src/vw/FileIO/DiskImageResourcePNG.cc 2012-05-05 08:28:48.000000000 +0200
+@@ -24,6 +24,7 @@
+ #include <vw/Image/Manipulation.h>
+
+ #include <png.h>
++#include <zlib.h>
+ #include <vector>
+ #include <fstream>
+
diff --git a/graphics/visionworkbench/files/patch-src__vw__FileIO__MemoryImageResourcePNG.cc b/graphics/visionworkbench/files/patch-src__vw__FileIO__MemoryImageResourcePNG.cc
new file mode 100644
index 000000000000..786775f4ddeb
--- /dev/null
+++ b/graphics/visionworkbench/files/patch-src__vw__FileIO__MemoryImageResourcePNG.cc
@@ -0,0 +1,11 @@
+--- src/vw/FileIO/MemoryImageResourcePNG.cc.orig 2011-05-13 01:00:56.000000000 +0200
++++ src/vw/FileIO/MemoryImageResourcePNG.cc 2012-05-06 11:29:59.000000000 +0200
+@@ -11,6 +11,8 @@
+
+ namespace vw {
+
++typedef void * voidp;
++
+ class SrcMemoryImageResourcePNG::Data : public fileio::detail::PngIODecompress {
+ boost::shared_array<const uint8> m_data;
+ const uint8 * m_cur;
diff --git a/graphics/visionworkbench/files/patch-src__vw__FileIO__PngIO.cc b/graphics/visionworkbench/files/patch-src__vw__FileIO__PngIO.cc
new file mode 100644
index 000000000000..ebef892f48f0
--- /dev/null
+++ b/graphics/visionworkbench/files/patch-src__vw__FileIO__PngIO.cc
@@ -0,0 +1,10 @@
+--- src/vw/FileIO/PngIO.cc.orig 2011-05-13 01:00:56.000000000 +0200
++++ src/vw/FileIO/PngIO.cc 2012-05-06 13:36:44.000000000 +0200
+@@ -9,6 +9,7 @@
+ #include <vw/Core/Exception.h>
+ #include <vw/Core/Log.h>
+ #include <vw/Core/Settings.h>
++#include <zlib.h>
+
+ static void png_error_handler(png_structp /*png_ptr*/, png_const_charp error_msg)
+ {