Changes 2.2.0:

* DreamWorks Lossy Compression A new high quality, high performance lossy compression codec contributed by DreamWorks Animation. This codec allows control over variable lossiness to balance visual quality and file size. This contribution also includes performance improvements that speed up the PIZ codec.
* IlmImfUtil A new library intended to aid in development of image file manipulation utilities that support the many types of OpenEXR images.

7 files changed, 43 insertions, 40 deletions

diff --git a/graphics/ilmbase/Makefile b/graphics/ilmbase/Makefile
index e72edb160da..1e418639642 100644
--- a/graphics/ilmbase/Makefile
+++ b/graphics/ilmbase/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.14 2013/12/09 11:39:20 adam Exp $
+# $NetBSD: Makefile,v 1.15 2014/08/11 19:42:33 adam Exp $
 
-DISTNAME=	ilmbase-2.1.0
+DISTNAME=	ilmbase-2.2.0
 CATEGORIES=	graphics
 MASTER_SITES=	http://download.savannah.nongnu.org/releases/openexr/
 
diff --git a/graphics/ilmbase/distinfo b/graphics/ilmbase/distinfo
index ca1a4312124..6e942690abc 100644
--- a/graphics/ilmbase/distinfo
+++ b/graphics/ilmbase/distinfo
@@ -1,11 +1,10 @@
-$NetBSD: distinfo,v 1.11 2013/12/26 15:59:27 tron Exp $
+$NetBSD: distinfo,v 1.12 2014/08/11 19:42:33 adam Exp $
 
-SHA1 (ilmbase-2.1.0.tar.gz) = 306d76e7a2ac619c2f641f54b59dd95576525192
-RMD160 (ilmbase-2.1.0.tar.gz) = a5f44efcbd2994973ee1c2baa32c357c1ea257da
-Size (ilmbase-2.1.0.tar.gz) = 557552 bytes
+SHA1 (ilmbase-2.2.0.tar.gz) = 70d864bc704f276942cb10479f2cb98646ce6ad4
+RMD160 (ilmbase-2.2.0.tar.gz) = b1adb0c96eff6b3554ddaf8f8bafe2cba8c114e3
+Size (ilmbase-2.2.0.tar.gz) = 525289 bytes
 SHA1 (patch-Iex_IexBaseExc.cpp) = 5bf551e1eacffa8dc3ec1c5643e5bfd5f8fc5701
 SHA1 (patch-Iex_IexThrowErrnoExc.cpp) = 1a4206619320a2a95378b7c2db14fde20b0ffd71
 SHA1 (patch-Imath_ImathFun.h) = 79ab60ada8cecd52e5b16fadbded82492d79a1df
-SHA1 (patch-Imath_ImathMatrixAlgo.cpp) = 60903837bcd01a5b50cbee60a86ee83e93321051
 SHA1 (patch-aa) = 97e7c7347cc6b4f3e11e7d0692c78b7322e06a7f
 SHA1 (patch-ab) = 1e39351d9513e10e3745c188612f9daf41253234
diff --git a/graphics/ilmbase/patches/patch-Imath_ImathMatrixAlgo.cpp b/graphics/ilmbase/patches/patch-Imath_ImathMatrixAlgo.cpp
deleted file mode 100644
index b6088a8f247..00000000000
--- a/graphics/ilmbase/patches/patch-Imath_ImathMatrixAlgo.cpp
+++ /dev/null
@@ -1,14 +0,0 @@
-$NetBSD: patch-Imath_ImathMatrixAlgo.cpp,v 1.1 2013/12/26 15:59:27 tron Exp $
-
-Fix build with SunStudio compiler under Solaris.
-
---- Imath/ImathMatrixAlgo.cpp.orig	2013-06-18 20:51:38.000000000 +0100
-+++ Imath/ImathMatrixAlgo.cpp	2013-12-26 15:22:33.000000000 +0000
-@@ -44,6 +44,7 @@
- 
- #include "ImathMatrixAlgo.h"
- #include <cmath>
-+#include <algorithm>
- 
- #if defined(OPENEXR_DLL)
-     #define EXPORT_CONST __declspec(dllexport)
diff --git a/graphics/openexr/Makefile b/graphics/openexr/Makefile
index 2d38549275f..26971a43820 100644
--- a/graphics/openexr/Makefile
+++ b/graphics/openexr/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.31 2014/04/10 06:21:18 obache Exp $
+# $NetBSD: Makefile,v 1.32 2014/08/11 19:42:46 adam Exp $
 
-DISTNAME=	openexr-2.1.0
-PKGREVISION=	1
+DISTNAME=	openexr-2.2.0
 CATEGORIES=	graphics
 MASTER_SITES=	http://download.savannah.nongnu.org/releases/openexr/
 
diff --git a/graphics/openexr/PLIST b/graphics/openexr/PLIST
index f5d7ba01bb9..7aa04a02789 100644
--- a/graphics/openexr/PLIST
+++ b/graphics/openexr/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.10 2013/12/09 11:39:20 adam Exp $
+@comment $NetBSD: PLIST,v 1.11 2014/08/11 19:42:46 adam Exp $
 bin/exrenvmap
 bin/exrheader
 bin/exrmakepreview
@@ -94,6 +94,7 @@ include/OpenEXR/ImfWav.h
 include/OpenEXR/ImfXdr.h
 include/OpenEXR/OpenEXRConfig.h
 lib/libIlmImf.la
+lib/libIlmImfUtil.la
 lib/pkgconfig/OpenEXR.pc
 share/aclocal/openexr.m4
 share/doc/OpenEXR-${PKGVERSION}/MultiViewOpenEXR.pdf
diff --git a/graphics/openexr/distinfo b/graphics/openexr/distinfo
index 2b6eb54062b..a6211ab0847 100644
--- a/graphics/openexr/distinfo
+++ b/graphics/openexr/distinfo
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.22 2013/12/09 11:39:20 adam Exp $
+$NetBSD: distinfo,v 1.23 2014/08/11 19:42:46 adam Exp $
 
-SHA1 (openexr-2.1.0.tar.gz) = 4a3db5ea527856145844556e0ee349f45ed4cbc7
-RMD160 (openexr-2.1.0.tar.gz) = b0e1da47e8691d514db02f07f7c085a21a148755
-Size (openexr-2.1.0.tar.gz) = 13680816 bytes
+SHA1 (openexr-2.2.0.tar.gz) = d09a68c4443b7a12a0484c073adaef348b44cb92
+RMD160 (openexr-2.2.0.tar.gz) = a825ed42e731da3bc39f25ce2a310712a5b0f956
+Size (openexr-2.2.0.tar.gz) = 14489661 bytes
 SHA1 (patch-IlmImf_ImfSystemSpecific.h) = f36d049085e42beabcf5f7af5354009391a1f9f2
-SHA1 (patch-aa) = 14b3472ec55a2c35aaa31b832414ee8677c58220
+SHA1 (patch-aa) = 08b38d81338fc755c321911a9ffa3cccb53e99f3
 SHA1 (patch-ab) = 0efe7155350e1976d1d7bad9da8b1a037fd84572
diff --git a/graphics/openexr/patches/patch-aa b/graphics/openexr/patches/patch-aa
index 7e8d62b27f6..e76790be4a4 100644
--- a/graphics/openexr/patches/patch-aa
+++ b/graphics/openexr/patches/patch-aa
@@ -1,11 +1,11 @@
-$NetBSD: patch-aa,v 1.8 2013/07/31 18:26:07 adam Exp $
+$NetBSD: patch-aa,v 1.9 2014/08/11 19:42:46 adam Exp $
 
 Shell portability fix: see
 https://savannah.nongnu.org/bugs/index.php?22222
 
---- configure.orig	2013-07-12 00:09:23.000000000 +0000
+--- configure.orig	2014-08-10 04:48:26.000000000 +0000
 +++ configure
-@@ -15664,7 +15664,7 @@ else
+@@ -15660,7 +15660,7 @@ else
  fi
  
  
@@ -14,7 +14,25 @@ https://savannah.nongnu.org/bugs/index.php?22222
  
  
  
-@@ -17689,7 +17689,7 @@ LIB_SUFFIX=""
+@@ -17631,7 +17631,7 @@ fi
+ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+ { $as_echo "$as_me:$LINENO: result: $gcc_inline_asm_avx" >&5
+ $as_echo "$gcc_inline_asm_avx" >&6; }
+-if test "x${gcc_inline_asm_avx}" == xyes ; then
++if test "x${gcc_inline_asm_avx}" = xyes ; then
+     cat >>confdefs.h <<\_ACEOF
+ #define OPENEXR_IMF_HAVE_GCC_INLINE_ASM_AVX 1
+ _ACEOF
+@@ -17689,7 +17689,7 @@ fi
+ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+ { $as_echo "$as_me:$LINENO: result: $sysconf_nproc" >&5
+ $as_echo "$sysconf_nproc" >&6; }
+-if test "x${sysconf_nproc}" == xyes ; then
++if test "x${sysconf_nproc}" = xyes ; then
+     cat >>confdefs.h <<\_ACEOF
+ #define OPENEXR_IMF_HAVE_SYSCONF_NPROCESSORS_ONLN 1
+ _ACEOF
+@@ -17816,7 +17816,7 @@ LIB_SUFFIX=""
  lib_suffix_valid="no"
  
  lib_namespace="Imf"
@@ -23,16 +41,16 @@ https://savannah.nongnu.org/bugs/index.php?22222
      cat >>confdefs.h <<_ACEOF
  #define OPENEXR_IMF_INTERNAL_NAMESPACE Imf_${OPENEXR_VERSION_API}
  _ACEOF
-@@ -17702,7 +17702,7 @@ _ACEOF
+@@ -17829,7 +17829,7 @@ _ACEOF
      lib_namespace="Imf_${OPENEXR_VERSION_API}"
-     LIB_SUFFIX="Imf_${OPENEXR_VERSION_API}"
+     LIB_SUFFIX="${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
-@@ -17725,7 +17725,7 @@ _ACEOF
+@@ -17852,7 +17852,7 @@ _ACEOF
  fi
  
  
@@ -41,7 +59,7 @@ https://savannah.nongnu.org/bugs/index.php?22222
  LIB_SUFFIX_DASH="-${LIB_SUFFIX}"
  
   if true; then
-@@ -17760,7 +17760,7 @@ else
+@@ -17887,7 +17887,7 @@ else
  fi
  
  
@@ -50,7 +68,7 @@ https://savannah.nongnu.org/bugs/index.php?22222
      { $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
-@@ -17768,7 +17768,7 @@ $as_echo "$as_me: WARNING: Enabling 'cus
+@@ -17895,7 +17895,7 @@ $as_echo "$as_me: WARNING: Enabling 'cus
  _ACEOF
  
      usr_namespace="Imf"
@@ -59,7 +77,7 @@ https://savannah.nongnu.org/bugs/index.php?22222
      cat >>confdefs.h <<_ACEOF
  #define OPENEXR_IMF_NAMESPACE Imf
  _ACEOF
-@@ -20498,7 +20498,7 @@ enable large stack optimizations        
+@@ -20626,7 +20628,7 @@ enable large stack optimizations        
  internal library namespace                      $lib_namespace
  user-client namespace                           $usr_namespace" >&6; }