Version 2.0.0

        * Updated Documentation
        * Updated Namespacing mechanism
        * Fixes for succd & predd
        * Fixes for FPE control registers
        * Additional checks and tests on DeepImages, scanlines and tiles
        * Folded in Autodesk read optimisations for RGB(A) files
        * Updated the bootstrap scripts to use libtoolize if glibtoolize isn't available on darwin.
        * Numerous minor fixes, missing includes etc

7 files changed, 107 insertions, 64 deletions

diff --git a/graphics/openexr/Makefile b/graphics/openexr/Makefile
index 5fe4f402d60..3ed1e0abfd7 100644
--- a/graphics/openexr/Makefile
+++ b/graphics/openexr/Makefile
@@ -1,17 +1,17 @@
-# $NetBSD: Makefile,v 1.25 2012/10/06 14:11:08 asau Exp $
+# $NetBSD: Makefile,v 1.26 2013/05/08 17:49:11 adam Exp $
 
-DISTNAME=	openexr-1.7.0
+DISTNAME=	openexr-2.0.0
 CATEGORIES=	graphics
-MASTER_SITES=	http://savannah.nongnu.org/download/openexr/
+MASTER_SITES=	http://download.savannah.nongnu.org/releases/openexr/
 
 MAINTAINER=	adam@NetBSD.org
 HOMEPAGE=	http://www.openexr.com/
 COMMENT=	High dynamic-range (HDR) image file format library and tools
 LICENSE=	modified-bsd
 
-USE_TOOLS+=		gmake pkg-config
 USE_LANGUAGES=		c c++
 USE_LIBTOOL=		yes
+USE_TOOLS+=		gmake pkg-config
 GNU_CONFIGURE=		yes
 PKGCONFIG_OVERRIDE=	OpenEXR.pc.in
 TEST_TARGET=		check
diff --git a/graphics/openexr/PLIST b/graphics/openexr/PLIST
index 851adc663ea..bf0a5bd7df0 100644
--- a/graphics/openexr/PLIST
+++ b/graphics/openexr/PLIST
@@ -1,9 +1,9 @@
-@comment $NetBSD: PLIST,v 1.7 2010/12/14 09:55:56 adam Exp $
-bin/exr2aces
+@comment $NetBSD: PLIST,v 1.8 2013/05/08 17:49:11 adam Exp $
 bin/exrenvmap
 bin/exrheader
 bin/exrmakepreview
 bin/exrmaketiled
+bin/exrmultipart
 bin/exrmultiview
 bin/exrstdattr
 include/OpenEXR/ImfAcesFile.h
@@ -16,19 +16,35 @@ include/OpenEXR/ImfChannelList.h
 include/OpenEXR/ImfChannelListAttribute.h
 include/OpenEXR/ImfChromaticities.h
 include/OpenEXR/ImfChromaticitiesAttribute.h
+include/OpenEXR/ImfCompositeDeepScanLine.h
 include/OpenEXR/ImfCompression.h
 include/OpenEXR/ImfCompressionAttribute.h
 include/OpenEXR/ImfConvert.h
+include/OpenEXR/ImfDeepCompositing.h
+include/OpenEXR/ImfDeepFrameBuffer.h
+include/OpenEXR/ImfDeepScanLineInputFile.h
+include/OpenEXR/ImfDeepScanLineInputPart.h
+include/OpenEXR/ImfDeepScanLineOutputFile.h
+include/OpenEXR/ImfDeepScanLineOutputPart.h
+include/OpenEXR/ImfDeepTiledInputFile.h
+include/OpenEXR/ImfDeepTiledInputPart.h
+include/OpenEXR/ImfDeepTiledOutputFile.h
+include/OpenEXR/ImfDeepTiledOutputPart.h
 include/OpenEXR/ImfDoubleAttribute.h
 include/OpenEXR/ImfEnvmap.h
 include/OpenEXR/ImfEnvmapAttribute.h
+include/OpenEXR/ImfExport.h
 include/OpenEXR/ImfFloatAttribute.h
+include/OpenEXR/ImfForward.h
 include/OpenEXR/ImfFrameBuffer.h
 include/OpenEXR/ImfFramesPerSecond.h
+include/OpenEXR/ImfGenericInputFile.h
+include/OpenEXR/ImfGenericOutputFile.h
 include/OpenEXR/ImfHeader.h
 include/OpenEXR/ImfHuf.h
 include/OpenEXR/ImfIO.h
 include/OpenEXR/ImfInputFile.h
+include/OpenEXR/ImfInputPart.h
 include/OpenEXR/ImfInt64.h
 include/OpenEXR/ImfIntAttribute.h
 include/OpenEXR/ImfKeyCode.h
@@ -37,10 +53,17 @@ include/OpenEXR/ImfLineOrder.h
 include/OpenEXR/ImfLineOrderAttribute.h
 include/OpenEXR/ImfLut.h
 include/OpenEXR/ImfMatrixAttribute.h
+include/OpenEXR/ImfMisc.h
+include/OpenEXR/ImfMultiPartInputFile.h
+include/OpenEXR/ImfMultiPartOutputFile.h
 include/OpenEXR/ImfMultiView.h
 include/OpenEXR/ImfName.h
+include/OpenEXR/ImfNamespace.h
 include/OpenEXR/ImfOpaqueAttribute.h
 include/OpenEXR/ImfOutputFile.h
+include/OpenEXR/ImfOutputPart.h
+include/OpenEXR/ImfPartHelper.h
+include/OpenEXR/ImfPartType.h
 include/OpenEXR/ImfPixelType.h
 include/OpenEXR/ImfPreviewImage.h
 include/OpenEXR/ImfPreviewImageAttribute.h
@@ -57,7 +80,9 @@ include/OpenEXR/ImfThreading.h
 include/OpenEXR/ImfTileDescription.h
 include/OpenEXR/ImfTileDescriptionAttribute.h
 include/OpenEXR/ImfTiledInputFile.h
+include/OpenEXR/ImfTiledInputPart.h
 include/OpenEXR/ImfTiledOutputFile.h
+include/OpenEXR/ImfTiledOutputPart.h
 include/OpenEXR/ImfTiledRgbaFile.h
 include/OpenEXR/ImfTimeCode.h
 include/OpenEXR/ImfTimeCodeAttribute.h
@@ -88,3 +113,4 @@ share/doc/OpenEXR-${PKGVERSION}/examples/rgbaInterfaceExamples.cpp
 share/doc/OpenEXR-${PKGVERSION}/examples/rgbaInterfaceExamples.h
 share/doc/OpenEXR-${PKGVERSION}/examples/rgbaInterfaceTiledExamples.cpp
 share/doc/OpenEXR-${PKGVERSION}/examples/rgbaInterfaceTiledExamples.h
+share/doc/OpenEXR-2.0.0/examples/namespaceAlias.h
diff --git a/graphics/openexr/distinfo b/graphics/openexr/distinfo
index acaad45b68b..0490ca1899a 100644
--- a/graphics/openexr/distinfo
+++ b/graphics/openexr/distinfo
@@ -1,9 +1,7 @@
-$NetBSD: distinfo,v 1.18 2011/01/22 08:10:27 wiz Exp $
+$NetBSD: distinfo,v 1.19 2013/05/08 17:49:11 adam Exp $
 
-SHA1 (openexr-1.7.0.tar.gz) = 91d0d4e69f06de956ec7e0710fc58ec0d4c4dc2b
-RMD160 (openexr-1.7.0.tar.gz) = 410ae4490988067cc80324e776b52ae6a261f157
-Size (openexr-1.7.0.tar.gz) = 13542910 bytes
-SHA1 (patch-aa) = 5c0d585e623d66d60e535ce3dc84c4db845c6382
-SHA1 (patch-ab) = 7d4fdf8d36f58ea5126b8c72dae901d1d68e6a60
-SHA1 (patch-ac) = 44a777615f0d969d9c80f76aa93a8812de414560
-SHA1 (patch-ai) = 18c26a8ec227f43c4091afc59d7468700e2d50f5
+SHA1 (openexr-2.0.0.tar.gz) = 774ae69ac01bbe4443b6fa0a9b12e276d0af44f5
+RMD160 (openexr-2.0.0.tar.gz) = a8f69447bcff1d7c4881b33fdb12f61a702c2caf
+Size (openexr-2.0.0.tar.gz) = 12589533 bytes
+SHA1 (patch-aa) = e8a6349203327937923367995a6721a5159ac7cf
+SHA1 (patch-ab) = df9a5ceea5702c08265ea884813c965122241802
diff --git a/graphics/openexr/patches/patch-aa b/graphics/openexr/patches/patch-aa
index d1f04aec811..4b44421a6d6 100644
--- a/graphics/openexr/patches/patch-aa
+++ b/graphics/openexr/patches/patch-aa
@@ -1,11 +1,11 @@
-$NetBSD: patch-aa,v 1.6 2010/12/14 09:55:57 adam Exp $
+$NetBSD: patch-aa,v 1.7 2013/05/08 17:49:11 adam Exp $
 
-  - Shell portability fix: see
-    https://savannah.nongnu.org/bugs/index.php?22222
+Shell portability fix: see
+https://savannah.nongnu.org/bugs/index.php?22222
 
---- configure.orig	2007-11-30 19:18:05.000000000 +0000
+--- configure.orig	2013-03-14 17:03:39.000000000 +0000
 +++ configure
-@@ -18937,7 +18937,7 @@ else
+@@ -18981,7 +18981,7 @@ else
    multithread=yes
  fi;
  
@@ -14,3 +14,57 @@ $NetBSD: patch-aa,v 1.6 2010/12/14 09:55:57 adam Exp $
  
  
  
+@@ -20980,7 +20980,7 @@ LIB_SUFFIX=""
+ lib_suffix_valid="no"
+ 
+ lib_namespace="Imf"
+-if test "x${library_namespace_versioning}" == xyes ; then
++if test "x${library_namespace_versioning}" = xyes ; then
+     cat >>confdefs.h <<_ACEOF
+ #define OPENEXR_IMF_INTERNAL_NAMESPACE Imf_${OPENEXR_VERSION_API}
+ _ACEOF
+@@ -20993,7 +20993,7 @@ _ACEOF
+     lib_namespace="Imf_${OPENEXR_VERSION_API}"
+     LIB_SUFFIX="Imf_${OPENEXR_VERSION_API}"
+     lib_suffix_valid="yes"
+-elif test "x${library_namespace_versioning}" == xno ; then
++elif test "x${library_namespace_versioning}" = xno ; then
+     cat >>confdefs.h <<_ACEOF
+ #define OPENEXR_IMF_INTERNAL_NAMESPACE Imf
+ _ACEOF
+@@ -21016,7 +21016,7 @@ _ACEOF
+ fi
+ 
+ 
+-if test "x${lib_suffix_valid}" == xyes ; then
++if test "x${lib_suffix_valid}" = xyes ; then
+ LIB_SUFFIX_DASH="-${LIB_SUFFIX}"
+ 
+ 
+@@ -21055,7 +21055,7 @@ else
+   custom_usr_namespace=no
+ fi;
+ 
+-if test "x${custom_usr_namespace}" == xyes ; then
++if test "x${custom_usr_namespace}" = xyes ; then
+     { echo "$as_me:$LINENO: WARNING: Enabling 'custom user namespace' requires an additional argument, reverting to 'Imf'" >&5
+ echo "$as_me: WARNING: Enabling 'custom user namespace' requires an additional argument, reverting to 'Imf'" >&2;}
+     cat >>confdefs.h <<_ACEOF
+@@ -21063,7 +21063,7 @@ echo "$as_me: WARNING: Enabling 'custom 
+ _ACEOF
+ 
+     usr_namespace="Imf"
+-elif test "x${custom_usr_namespace}" == xno ; then
++elif test "x${custom_usr_namespace}" = xno ; then
+     cat >>confdefs.h <<_ACEOF
+ #define OPENEXR_IMF_NAMESPACE Imf
+ _ACEOF
+@@ -22620,7 +22622,7 @@ enable large stack optimizations        
+ internal library namespace                      $lib_namespace
+ user-client namespace                           $usr_namespace" >&6
+ 
+-if test "x$build_osxuniversal" == xyes; then
++if test "x$build_osxuniversal" = xyes; then
+ echo "$as_me:$LINENO: result:
+ build OS X universal binaries                   $build_osxuniversal" >&5
+ echo "${ECHO_T}
diff --git a/graphics/openexr/patches/patch-ab b/graphics/openexr/patches/patch-ab
index f3e9c2191ee..4d06260cc35 100644
--- a/graphics/openexr/patches/patch-ab
+++ b/graphics/openexr/patches/patch-ab
@@ -1,16 +1,16 @@
-$NetBSD: patch-ab,v 1.2 2008/02/03 03:37:33 heinz Exp $
+$NetBSD: patch-ab,v 1.3 2013/05/08 17:49:11 adam Exp $
 
-  - Shell portability fix: see
-    https://savannah.nongnu.org/bugs/index.php?22222
+Shell portability fix: see
+https://savannah.nongnu.org/bugs/index.php?22222
 
---- bootstrap.orig	2006-10-11 20:46:46.000000000 +0200
-+++ bootstrap	2006-10-11 20:46:27.000000000 +0200
-@@ -1,7 +1,7 @@
- #! /bin/sh
+--- bootstrap.orig	2013-04-09 17:07:52.000000000 +0000
++++ bootstrap
+@@ -2,7 +2,7 @@
  # If we're on OS X, use glibtoolize instead of toolize
  HOSTTYPE=`uname`
+ LIBTOOLIZE=libtoolize
 -if [ "$HOSTTYPE" == "Darwin" ]; then
 +if [ "$HOSTTYPE" = "Darwin" ]; then
-         LIBTOOLIZE=glibtoolize
- else
- 	LIBTOOLIZE=libtoolize
+ 	GLIBTOOLIZE=`which glibtoolize`
+ 	if [ "x$GLIBTOOLIZE" != "x" ]; then
+ 		LIBTOOLIZE=glibtoolize
diff --git a/graphics/openexr/patches/patch-ac b/graphics/openexr/patches/patch-ac
deleted file mode 100644
index ebd78851489..00000000000
--- a/graphics/openexr/patches/patch-ac
+++ /dev/null
@@ -1,14 +0,0 @@
-$NetBSD: patch-ac,v 1.5 2011/01/03 08:04:25 dsainty Exp $
-
-Include <cstring> to declare memcpy(), used by blurImage().
-
---- exrenvmap/blurImage.cpp.orig	2009-02-26 12:39:27.000000000 +1300
-+++ exrenvmap/blurImage.cpp	2010-12-26 12:11:57.891117560 +1300
-@@ -45,6 +45,7 @@
- #include "Iex.h"
- #include <iostream>
- #include <algorithm>
-+#include <cstring>
- 
- using namespace std;
- using namespace Imf;
diff --git a/graphics/openexr/patches/patch-ai b/graphics/openexr/patches/patch-ai
deleted file mode 100644
index a56f6d354c3..00000000000
--- a/graphics/openexr/patches/patch-ai
+++ /dev/null
@@ -1,21 +0,0 @@
-$NetBSD: patch-ai,v 1.2 2011/01/15 11:24:33 adam Exp $
-
---- IlmImf/ImfAutoArray.h.orig	2007-04-23 20:26:56.000000000 -0500
-+++ IlmImf/ImfAutoArray.h	2009-07-29 13:22:08.309288375 -0500
-@@ -45,6 +45,7 @@
- //-----------------------------------------------------------------------------
- 
- #include "OpenEXRConfig.h"
-+#include <string.h>
- 
- namespace Imf {
- 
-@@ -57,7 +57,7 @@ namespace Imf {
-     {
-       public:
- 
--	 AutoArray (): _data (new T [size]) {}
-+	 AutoArray (): _data (new T [size]) {memset(_data, 0, size * sizeof(T));}
- 	~AutoArray () {delete [] _data;}
- 
- 	operator T * ()			{return _data;}