Thu Dec 26 15:59:27 2013 UTC ()
Fix build with SunStudio compiler under Solaris.


(tron)
diff -r1.10 -r1.11 pkgsrc/graphics/ilmbase/distinfo
diff -r0 -r1.1 pkgsrc/graphics/ilmbase/patches/patch-Iex_IexBaseExc.cpp
diff -r0 -r1.1 pkgsrc/graphics/ilmbase/patches/patch-Imath_ImathMatrixAlgo.cpp
cvs diff -r1.10 -r1.11 pkgsrc/graphics/ilmbase/Attic/distinfo (expand / switch to unified diff)

--- pkgsrc/graphics/ilmbase/Attic/distinfo 2013/12/09 11:39:20 1.10
+++ pkgsrc/graphics/ilmbase/Attic/distinfo 2013/12/26 15:59:27 1.11
@@ -1,9 +1,11 @@ @@ -1,9 +1,11 @@
1$NetBSD: distinfo,v 1.10 2013/12/09 11:39:20 adam Exp $ 1$NetBSD: distinfo,v 1.11 2013/12/26 15:59:27 tron Exp $
2 2
3SHA1 (ilmbase-2.1.0.tar.gz) = 306d76e7a2ac619c2f641f54b59dd95576525192 3SHA1 (ilmbase-2.1.0.tar.gz) = 306d76e7a2ac619c2f641f54b59dd95576525192
4RMD160 (ilmbase-2.1.0.tar.gz) = a5f44efcbd2994973ee1c2baa32c357c1ea257da 4RMD160 (ilmbase-2.1.0.tar.gz) = a5f44efcbd2994973ee1c2baa32c357c1ea257da
5Size (ilmbase-2.1.0.tar.gz) = 557552 bytes 5Size (ilmbase-2.1.0.tar.gz) = 557552 bytes
 6SHA1 (patch-Iex_IexBaseExc.cpp) = 5bf551e1eacffa8dc3ec1c5643e5bfd5f8fc5701
6SHA1 (patch-Iex_IexThrowErrnoExc.cpp) = 1a4206619320a2a95378b7c2db14fde20b0ffd71 7SHA1 (patch-Iex_IexThrowErrnoExc.cpp) = 1a4206619320a2a95378b7c2db14fde20b0ffd71
7SHA1 (patch-Imath_ImathFun.h) = 79ab60ada8cecd52e5b16fadbded82492d79a1df 8SHA1 (patch-Imath_ImathFun.h) = 79ab60ada8cecd52e5b16fadbded82492d79a1df
 9SHA1 (patch-Imath_ImathMatrixAlgo.cpp) = 60903837bcd01a5b50cbee60a86ee83e93321051
8SHA1 (patch-aa) = 97e7c7347cc6b4f3e11e7d0692c78b7322e06a7f 10SHA1 (patch-aa) = 97e7c7347cc6b4f3e11e7d0692c78b7322e06a7f
9SHA1 (patch-ab) = 1e39351d9513e10e3745c188612f9daf41253234 11SHA1 (patch-ab) = 1e39351d9513e10e3745c188612f9daf41253234
File Added: pkgsrc/graphics/ilmbase/patches/Attic/patch-Iex_IexBaseExc.cpp
$NetBSD: patch-Iex_IexBaseExc.cpp,v 1.1 2013/12/26 15:59:27 tron Exp $

Fix build with C compilers other GCC.

--- Iex/IexBaseExc.cpp.orig	2013-10-15 23:55:09.000000000 +0100
+++ Iex/IexBaseExc.cpp	2013-12-26 15:17:54.000000000 +0000
@@ -149,8 +149,10 @@
 void
 iex_debugTrap()
 {
+#ifdef __GNUC__
     // how to in Linux?
     if (0 != ::getenv("IEXDEBUGTHROW"))
         __builtin_trap();
+#endif
 }
 #endif
File Added: pkgsrc/graphics/ilmbase/patches/Attic/patch-Imath_ImathMatrixAlgo.cpp
$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)