Add missing includes. Don't use forward defines of the STL.

5 files changed, 56 insertions, 3 deletions

diff --git a/graphics/openimageio/Makefile b/graphics/openimageio/Makefile
index d473489bac1..471e9231fcd 100644
--- a/graphics/openimageio/Makefile
+++ b/graphics/openimageio/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2013/05/09 07:39:11 adam Exp $
+# $NetBSD: Makefile,v 1.11 2013/05/09 13:58:54 joerg Exp $
 
 OIIOVER=	1.1.7
 DISTNAME=	oiio-Release-${OIIOVER}
@@ -25,9 +25,10 @@ CMAKE_ARGS+=		-DILMBASE_HOME:STRING=${BUILDLINK_PREFIX.ilmbase}
 CMAKE_ARGS+=		-DOPENJPEG_HOME:STRING=${BUILDLINK_PREFIX.openjpeg15}
 CMAKE_ARGS+=		-DOPENEXR_HOME:STRING=${BUILDLINK_PREFIX.openexr}
 
-post-patch:
+pre-install:
 	${RM} -f ${WRKSRC}/include/tbb/tbb_machine.h.orig
 	${RM} -f ${WRKSRC}/include/tbb/tbb_misc.h.orig
+	${RM} -f ${WRKSRC}/include/tbb/tbb_exception.h.orig
 
 .include "../../devel/boost-libs/buildlink3.mk"
 .include "../../devel/hdf5/buildlink3.mk"
diff --git a/graphics/openimageio/distinfo b/graphics/openimageio/distinfo
index 2f4e6f551c9..bf53f3d468d 100644
--- a/graphics/openimageio/distinfo
+++ b/graphics/openimageio/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.4 2013/02/27 15:19:02 ryoon Exp $
+$NetBSD: distinfo,v 1.5 2013/05/09 13:58:54 joerg Exp $
 
 SHA1 (oiio-Release-1.1.7.tar.gz) = 435286ffad18169fd615cd33d95c2b49d3e4ec17
 RMD160 (oiio-Release-1.1.7.tar.gz) = dfe15e32ff0c821165079bf517cf11dd87146ccc
@@ -8,8 +8,11 @@ SHA1 (patch-cmake_modules_FindOpenJpeg.cmake) = 20d15c8ee0a25ab631ed39910b6e441d
 SHA1 (patch-cmake_oiio__macros.cmake) = 016c4792c1dc85a903477f4c72af26577e1b2bb9
 SHA1 (patch-cmake_platform.cmake) = bb3ef743bdb04a76efcabb745af62473205e01ae
 SHA1 (patch-dpx.imageio_libdpx_DPXColorConverter.cpp) = 595415e7e2897798df76474dd906e25cdf3a929e
+SHA1 (patch-include_pugixml.hpp) = 242a95507b970c3cef94099d49fc2326b79bd23b
+SHA1 (patch-include_tbb_tbb__exception.h) = b2e98d44666d8a113dd6f21f2300ffdd8af3e20c
 SHA1 (patch-include_tbb_tbb__machine.h) = 7d9a196397315e0d39dd2f16139e011ab84c5630
 SHA1 (patch-include_tbb_tbb__misc.h) = 27995a9cdb72b182e352b2a649756af2d60fec86
 SHA1 (patch-libutil_sysutil.cpp) = b7484aef56ea239bae20faba1f04c14907557485
 SHA1 (patch-make_detectplatform.mk) = a399f09b9280109519a829dbacc1b924a074f4cc
+SHA1 (patch-psd.imageio_psdinput.cpp) = 234d617fb02b094e418ad3480888e51a1ec8f3d1
 SHA1 (patch-ptex.imageio_ptex_PtexPlatform.h) = 3c32f95181cfcf8c0e67249a4d04f7ea14a5e122
diff --git a/graphics/openimageio/patches/patch-include_pugixml.hpp b/graphics/openimageio/patches/patch-include_pugixml.hpp
new file mode 100644
index 00000000000..61b529e541e
--- /dev/null
+++ b/graphics/openimageio/patches/patch-include_pugixml.hpp
@@ -0,0 +1,24 @@
+$NetBSD: patch-include_pugixml.hpp,v 1.1 2013/05/09 13:58:54 joerg Exp $
+
+--- include/pugixml.hpp.orig	2013-02-21 17:10:46.000000000 +0000
++++ include/pugixml.hpp
+@@ -18,6 +18,11 @@
+ #include "version.h"
+ 
+ #ifndef PUGIXML_NO_STL
++#include <iterator>
++#include <string>
++#include <istream>
++#include <ostream>
++#if 0
+ namespace std
+ {
+ 	struct bidirectional_iterator_tag;
+@@ -45,6 +50,7 @@ namespace std
+ #endif
+ }
+ #endif
++#endif
+ 
+ // Macro for deprecated features
+ #ifndef PUGIXML_DEPRECATED
diff --git a/graphics/openimageio/patches/patch-include_tbb_tbb__exception.h b/graphics/openimageio/patches/patch-include_tbb_tbb__exception.h
new file mode 100644
index 00000000000..9e7daaf9d68
--- /dev/null
+++ b/graphics/openimageio/patches/patch-include_tbb_tbb__exception.h
@@ -0,0 +1,12 @@
+$NetBSD: patch-include_tbb_tbb__exception.h,v 1.1 2013/05/09 13:58:54 joerg Exp $
+
+--- include/tbb/tbb_exception.h.orig	2013-02-21 17:10:46.000000000 +0000
++++ include/tbb/tbb_exception.h
+@@ -30,6 +30,7 @@
+ #define __TBB_exception_H
+ 
+ #include "tbb_stddef.h"
++#include <new>
+ #include <stdexcept>
+ 
+ #if __TBB_EXCEPTIONS && !defined(__EXCEPTIONS) && !defined(_CPPUNWIND) && !defined(__SUNPRO_CC)
diff --git a/graphics/openimageio/patches/patch-psd.imageio_psdinput.cpp b/graphics/openimageio/patches/patch-psd.imageio_psdinput.cpp
new file mode 100644
index 00000000000..4846e53a0e1
--- /dev/null
+++ b/graphics/openimageio/patches/patch-psd.imageio_psdinput.cpp
@@ -0,0 +1,13 @@
+$NetBSD: patch-psd.imageio_psdinput.cpp,v 1.1 2013/05/09 13:58:54 joerg Exp $
+
+--- psd.imageio/psdinput.cpp.orig	2013-02-21 17:10:46.000000000 +0000
++++ psd.imageio/psdinput.cpp
+@@ -328,7 +328,7 @@ private:
+         // For debugging, numeric_cast will throw if precision is lost:
+         // value = boost::numeric_cast<TVariable>(buffer);
+         value = buffer;
+-        return m_file;
++        return m_file.good();
+     }
+ 
+     int read_pascal_string (std::string &s, uint16_t mod_padding);