diff options
| author | tron <tron@pkgsrc.org> | 2013-12-26 15:59:20 +0000 |
|---|---|---|
| committer | tron <tron@pkgsrc.org> | 2013-12-26 15:59:20 +0000 |
| commit | 79d862f2a7733873c5220e7961998d903f5389e8 (patch) | |
| tree | 86f65066c19fdbd4ffd13f5c242005e1282af8ac /graphics/ilmbase | |
| parent | 06cafd2da13c78f8b562923e0930fff45f919a66 (diff) | |
| download | pkgsrc-79d862f2a7733873c5220e7961998d903f5389e8.tar.gz | |
Fix build with SunStudio compiler under Solaris.
Diffstat (limited to 'graphics/ilmbase')
| -rw-r--r-- | graphics/ilmbase/distinfo | 4 | ||||
| -rw-r--r-- | graphics/ilmbase/patches/patch-Iex_IexBaseExc.cpp | 17 | ||||
| -rw-r--r-- | graphics/ilmbase/patches/patch-Imath_ImathMatrixAlgo.cpp | 14 |
3 files changed, 34 insertions, 1 deletions
diff --git a/graphics/ilmbase/distinfo b/graphics/ilmbase/distinfo index d2255b1ebdb..ca1a4312124 100644 --- a/graphics/ilmbase/distinfo +++ b/graphics/ilmbase/distinfo @@ -1,9 +1,11 @@ -$NetBSD: distinfo,v 1.10 2013/12/09 11:39:20 adam Exp $ +$NetBSD: distinfo,v 1.11 2013/12/26 15:59:27 tron 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 (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-Iex_IexBaseExc.cpp b/graphics/ilmbase/patches/patch-Iex_IexBaseExc.cpp new file mode 100644 index 00000000000..4a4f3706c35 --- /dev/null +++ b/graphics/ilmbase/patches/patch-Iex_IexBaseExc.cpp @@ -0,0 +1,17 @@ +$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 diff --git a/graphics/ilmbase/patches/patch-Imath_ImathMatrixAlgo.cpp b/graphics/ilmbase/patches/patch-Imath_ImathMatrixAlgo.cpp new file mode 100644 index 00000000000..b6088a8f247 --- /dev/null +++ b/graphics/ilmbase/patches/patch-Imath_ImathMatrixAlgo.cpp @@ -0,0 +1,14 @@ +$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) |