Version 2.0.1

        * Temporarily turning off optimisation code path
        * Added additional tests for future optimisation refactoring
        * Fixes for StringVectors
        * Additional checks for type mismatches
        * Fix for Composite Deep Scanline

5 files changed, 29 insertions, 29 deletions

diff --git a/graphics/openexr/Makefile b/graphics/openexr/Makefile
index 9318040f587..4c60469b05e 100644
--- a/graphics/openexr/Makefile
+++ b/graphics/openexr/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.28 2013/05/09 07:59:54 adam Exp $
+# $NetBSD: Makefile,v 1.29 2013/07/31 18:26:07 adam Exp $
 
-DISTNAME=	openexr-2.0.0
+DISTNAME=	openexr-2.0.1
 CATEGORIES=	graphics
 MASTER_SITES=	http://download.savannah.nongnu.org/releases/openexr/
 
diff --git a/graphics/openexr/PLIST b/graphics/openexr/PLIST
index bf0a5bd7df0..0b583a211b7 100644
--- a/graphics/openexr/PLIST
+++ b/graphics/openexr/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.8 2013/05/08 17:49:11 adam Exp $
+@comment $NetBSD: PLIST,v 1.9 2013/07/31 18:26:07 adam Exp $
 bin/exrenvmap
 bin/exrheader
 bin/exrmakepreview
@@ -107,10 +107,10 @@ share/doc/OpenEXR-${PKGVERSION}/examples/generalInterfaceTiledExamples.h
 share/doc/OpenEXR-${PKGVERSION}/examples/lowLevelIoExamples.cpp
 share/doc/OpenEXR-${PKGVERSION}/examples/lowLevelIoExamples.h
 share/doc/OpenEXR-${PKGVERSION}/examples/main.cpp
+share/doc/OpenEXR-${PKGVERSION}/examples/namespaceAlias.h
 share/doc/OpenEXR-${PKGVERSION}/examples/previewImageExamples.cpp
 share/doc/OpenEXR-${PKGVERSION}/examples/previewImageExamples.h
 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/buildlink3.mk b/graphics/openexr/buildlink3.mk
index 2acc13660f7..0d2130e59a4 100644
--- a/graphics/openexr/buildlink3.mk
+++ b/graphics/openexr/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.11 2013/05/09 07:39:11 adam Exp $
+# $NetBSD: buildlink3.mk,v 1.12 2013/07/31 18:26:07 adam Exp $
 
 BUILDLINK_TREE+=	openexr
 
@@ -6,7 +6,7 @@ BUILDLINK_TREE+=	openexr
 OPENEXR_BUILDLINK3_MK:=
 
 BUILDLINK_API_DEPENDS.openexr+=	openexr>=1.6.1
-BUILDLINK_ABI_DEPENDS.openexr?=	openexr>=2.0.0
+BUILDLINK_ABI_DEPENDS.openexr+=	openexr>=2.0.0
 BUILDLINK_PKGSRCDIR.openexr?=	../../graphics/openexr
 
 PTHREAD_OPTS+=	require
diff --git a/graphics/openexr/distinfo b/graphics/openexr/distinfo
index fa56f9e9ef2..33f031ca596 100644
--- a/graphics/openexr/distinfo
+++ b/graphics/openexr/distinfo
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.20 2013/07/04 06:25:23 dholland Exp $
+$NetBSD: distinfo,v 1.21 2013/07/31 18:26:07 adam Exp $
 
-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 (openexr-2.0.1.tar.gz) = 22589e11d090a01b5c3117e7e0b7bbb8301184b6
+RMD160 (openexr-2.0.1.tar.gz) = e0c13393574c18beb449e01b2f54d353fb94eb24
+Size (openexr-2.0.1.tar.gz) = 12609335 bytes
 SHA1 (patch-IlmImf_ImfSystemSpecific.h) = f36d049085e42beabcf5f7af5354009391a1f9f2
-SHA1 (patch-aa) = e8a6349203327937923367995a6721a5159ac7cf
+SHA1 (patch-aa) = 14b3472ec55a2c35aaa31b832414ee8677c58220
 SHA1 (patch-ab) = df9a5ceea5702c08265ea884813c965122241802
diff --git a/graphics/openexr/patches/patch-aa b/graphics/openexr/patches/patch-aa
index 4b44421a6d6..7e8d62b27f6 100644
--- a/graphics/openexr/patches/patch-aa
+++ b/graphics/openexr/patches/patch-aa
@@ -1,20 +1,20 @@
-$NetBSD: patch-aa,v 1.7 2013/05/08 17:49:11 adam Exp $
+$NetBSD: patch-aa,v 1.8 2013/07/31 18:26:07 adam Exp $
 
 Shell portability fix: see
 https://savannah.nongnu.org/bugs/index.php?22222
 
---- configure.orig	2013-03-14 17:03:39.000000000 +0000
+--- configure.orig	2013-07-12 00:09:23.000000000 +0000
 +++ configure
-@@ -18981,7 +18981,7 @@ else
-   multithread=yes
- fi;
+@@ -15664,7 +15664,7 @@ else
+ fi
+ 
  
 -if test x$PKG_CONFIG == xno && test "x${multithread}" != xno ; then
 +if test x$PKG_CONFIG = xno && test "x${multithread}" != xno ; then
  
  
  
-@@ -20980,7 +20980,7 @@ LIB_SUFFIX=""
+@@ -17689,7 +17689,7 @@ LIB_SUFFIX=""
  lib_suffix_valid="no"
  
  lib_namespace="Imf"
@@ -23,7 +23,7 @@ https://savannah.nongnu.org/bugs/index.php?22222
      cat >>confdefs.h <<_ACEOF
  #define OPENEXR_IMF_INTERNAL_NAMESPACE Imf_${OPENEXR_VERSION_API}
  _ACEOF
-@@ -20993,7 +20993,7 @@ _ACEOF
+@@ -17702,7 +17702,7 @@ _ACEOF
      lib_namespace="Imf_${OPENEXR_VERSION_API}"
      LIB_SUFFIX="Imf_${OPENEXR_VERSION_API}"
      lib_suffix_valid="yes"
@@ -32,7 +32,7 @@ https://savannah.nongnu.org/bugs/index.php?22222
      cat >>confdefs.h <<_ACEOF
  #define OPENEXR_IMF_INTERNAL_NAMESPACE Imf
  _ACEOF
-@@ -21016,7 +21016,7 @@ _ACEOF
+@@ -17725,7 +17725,7 @@ _ACEOF
  fi
  
  
@@ -40,17 +40,17 @@ https://savannah.nongnu.org/bugs/index.php?22222
 +if test "x${lib_suffix_valid}" = xyes ; then
  LIB_SUFFIX_DASH="-${LIB_SUFFIX}"
  
+  if true; then
+@@ -17760,7 +17760,7 @@ else
+ fi
  
-@@ -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;}
+     { $as_echo "$as_me:$LINENO: WARNING: Enabling 'custom user namespace' requires an additional argument, reverting to 'Imf'" >&5
+ $as_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 
+@@ -17768,7 +17768,7 @@ $as_echo "$as_me: WARNING: Enabling 'cus
  _ACEOF
  
      usr_namespace="Imf"
@@ -59,12 +59,12 @@ https://savannah.nongnu.org/bugs/index.php?22222
      cat >>confdefs.h <<_ACEOF
  #define OPENEXR_IMF_NAMESPACE Imf
  _ACEOF
-@@ -22620,7 +22622,7 @@ enable large stack optimizations        
+@@ -20498,7 +20498,7 @@ enable large stack optimizations        
  internal library namespace                      $lib_namespace
- user-client namespace                           $usr_namespace" >&6
+ 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:
+ { $as_echo "$as_me:$LINENO: result:
  build OS X universal binaries                   $build_osxuniversal" >&5
- echo "${ECHO_T}
+ $as_echo "