# HG changeset patch
# User John Donoghue <john.donoghue@ieee.org>
# Date 1404066398 14400
# Node ID a98f4ebb8a3c8e31b7534419affac6e860d01d6e
# Parent  9e2ff7672dc2c12a8a86cd546cb356b864cca267
update imlbase, openexr

* src/dist-files.mk: remove ilmbase-1-gcc45-include.patch  ilmbase-2-osx-cxxflags.patch

* src/ilmbase-2-osx-cxxflags.patch: deleted,

* src/ilmbase-1-gcc45-include.patc: deleted.

* src/imlbase.mk: update to 2.1.0

* src/openexr.mk: update to 2.1.0

diff -r 9e2ff7672dc2 -r a98f4ebb8a3c dist-files.mk
--- a/dist-files.mk	Sat Jun 28 17:41:59 2014 -0400
+++ b/dist-files.mk	Sun Jun 29 14:26:38 2014 -0400
@@ -161,8 +161,6 @@
   hunspell.mk \
   id3lib-1-win32.patch \
   id3lib.mk \
-  ilmbase-1-gcc45-include.patch \
-  ilmbase-2-osx-cxxflags.patch \
   ilmbase.mk \
   imagemagick.mk \
   intltool.mk \
diff -r 9e2ff7672dc2 -r a98f4ebb8a3c src/ilmbase-1-gcc45-include.patch
--- a/src/ilmbase-1-gcc45-include.patch	Sat Jun 28 17:41:59 2014 -0400
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,16 +0,0 @@
-This file is part of MXE.
-See index.html for further information.
-
-This patch has been taken from:
-http://cvs.savannah.gnu.org/viewvc/IlmBase/Imath/ImathMatrix.h?root=openexr&r1=1.7&r2=1.8&view=patch
-
---- a/Imath/ImathMatrix.h      2010/07/16 22:48:40     1.7
-+++ b/Imath/ImathMatrix.h      2010/08/04 21:01:38     1.8
-@@ -51,6 +51,7 @@
- 
- #include <iostream>
- #include <iomanip>
-+#include <string.h>
- 
- #if (defined _WIN32 || defined _WIN64) && defined _MSC_VER
- // suppress exception specification warnings
diff -r 9e2ff7672dc2 -r a98f4ebb8a3c src/ilmbase-2-osx-cxxflags.patch
--- a/src/ilmbase-2-osx-cxxflags.patch	Sat Jun 28 17:41:59 2014 -0400
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,18 +0,0 @@
-This file is part of MXE.
-See index.html for further information.
-
-This patch has been taken from http://lists.nongnu.org/archive/html/openexr-devel/2010-08/msg00011.html
-
-Here, we just patch configure to save an autoconf
-
-diff -ur ilmbase-1.0.2.orig/configure ilmbase-1.0.2/configure
---- ilmbase-1.0.2.orig/configure	2010-07-23 11:13:13.000000000 +1000
-+++ ilmbase-1.0.2/configure	2010-09-27 00:01:17.000000000 +1000
-@@ -20374,7 +20374,6 @@
- 
- case "$host" in
- *darwin*)
--    CXXFLAGS="$CXXFLAGS -Wno-long-double"
- 
-         # Check whether --enable-osx-arch or --disable-osx-arch was given.
- if test "${enable_osx_arch+set}" = set; then
diff -r 9e2ff7672dc2 -r a98f4ebb8a3c src/ilmbase.mk
--- a/src/ilmbase.mk	Sat Jun 28 17:41:59 2014 -0400
+++ b/src/ilmbase.mk	Sun Jun 29 14:26:38 2014 -0400
@@ -3,8 +3,8 @@
 
 PKG             := ilmbase
 $(PKG)_IGNORE   :=
-$(PKG)_VERSION  := 1.0.2
-$(PKG)_CHECKSUM := fe6a910a90cde80137153e25e175e2b211beda36
+$(PKG)_VERSION  := 2.1.0
+$(PKG)_CHECKSUM := 306d76e7a2ac619c2f641f54b59dd95576525192
 $(PKG)_SUBDIR   := ilmbase-$($(PKG)_VERSION)
 $(PKG)_FILE     := ilmbase-$($(PKG)_VERSION).tar.gz
 $(PKG)_URL      := http://download.savannah.nongnu.org/releases/openexr/$($(PKG)_FILE)
diff -r 9e2ff7672dc2 -r a98f4ebb8a3c src/openexr-1-disable-zlib_winapi.patch
--- a/src/openexr-1-disable-zlib_winapi.patch	Sat Jun 28 17:41:59 2014 -0400
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,25 +0,0 @@
-This file is part of MXE.
-See index.html for further information.
-
-diff -urN a/IlmImf/ImfPxr24Compressor.cpp b/IlmImf/ImfPxr24Compressor.cpp
---- a/IlmImf/ImfPxr24Compressor.cpp	2010-07-17 01:11:52.000000000 +0200
-+++ b/IlmImf/ImfPxr24Compressor.cpp	2011-09-21 23:41:28.130452657 +0200
-@@ -62,7 +62,6 @@
- //	string of bytes is compressed with zlib.
- //
- //-----------------------------------------------------------------------------
--#define ZLIB_WINAPI 
- 
- #include <ImfPxr24Compressor.h>
- #include <ImfHeader.h>
-diff -urN a/IlmImf/ImfZipCompressor.cpp b/IlmImf/ImfZipCompressor.cpp
---- a/IlmImf/ImfZipCompressor.cpp	2010-07-17 01:11:52.000000000 +0200
-+++ b/IlmImf/ImfZipCompressor.cpp	2011-09-21 23:42:01.154288691 +0200
-@@ -39,7 +39,6 @@
- //	class ZipCompressor
- //
- //-----------------------------------------------------------------------------
--#define ZLIB_WINAPI
- 
- #include <ImfZipCompressor.h>
- #include <ImfCheckedArithmetic.h>
diff -r 9e2ff7672dc2 -r a98f4ebb8a3c src/openexr.mk
--- a/src/openexr.mk	Sat Jun 28 17:41:59 2014 -0400
+++ b/src/openexr.mk	Sun Jun 29 14:26:38 2014 -0400
@@ -3,8 +3,8 @@
 
 PKG             := openexr
 $(PKG)_IGNORE   :=
-$(PKG)_VERSION  := 1.7.0
-$(PKG)_CHECKSUM := 91d0d4e69f06de956ec7e0710fc58ec0d4c4dc2b
+$(PKG)_VERSION  := 2.1.0
+$(PKG)_CHECKSUM := 4a3db5ea527856145844556e0ee349f45ed4cbc7
 $(PKG)_SUBDIR   := openexr-$($(PKG)_VERSION)
 $(PKG)_FILE     := openexr-$($(PKG)_VERSION).tar.gz
 $(PKG)_URL      := http://download.savannah.nongnu.org/releases/openexr/$($(PKG)_FILE)