summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--graphics/ilmbase/distinfo4
-rw-r--r--graphics/ilmbase/patches/patch-Iex_IexBaseExc.cpp17
-rw-r--r--graphics/ilmbase/patches/patch-Imath_ImathMatrixAlgo.cpp14
-rw-r--r--graphics/png/distinfo3
-rw-r--r--graphics/png/patches/patch-contrib_tools_pngfix.c14
5 files changed, 50 insertions, 2 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)
diff --git a/graphics/png/distinfo b/graphics/png/distinfo
index 07077234a31..db2bb7509cf 100644
--- a/graphics/png/distinfo
+++ b/graphics/png/distinfo
@@ -1,6 +1,7 @@
-$NetBSD: distinfo,v 1.109 2013/11/14 23:09:45 wiz Exp $
+$NetBSD: distinfo,v 1.110 2013/12/26 15:59:20 tron Exp $
SHA1 (libpng-1.6.7.tar.xz) = d2917fe56d416354a0dffdc852401b364624a7de
RMD160 (libpng-1.6.7.tar.xz) = fec3676e60e019e3b2fb84c1470baec4fd9105de
Size (libpng-1.6.7.tar.xz) = 873472 bytes
SHA1 (patch-aa) = 080c890ee48923db959fcdeeb12e4a5a27845138
+SHA1 (patch-contrib_tools_pngfix.c) = 76d84ef9db87cb3e04e33c94a442110b2ab115da
diff --git a/graphics/png/patches/patch-contrib_tools_pngfix.c b/graphics/png/patches/patch-contrib_tools_pngfix.c
new file mode 100644
index 00000000000..3d508340cb1
--- /dev/null
+++ b/graphics/png/patches/patch-contrib_tools_pngfix.c
@@ -0,0 +1,14 @@
+$NetBSD: patch-contrib_tools_pngfix.c,v 1.1 2013/12/26 15:59:20 tron Exp $
+
+Fix build with C compilers other than GCC.
+
+--- contrib/tools/pngfix.c.orig 2013-11-14 19:03:02.000000000 +0000
++++ contrib/tools/pngfix.c 2013-12-26 15:44:27.000000000 +0000
+@@ -32,7 +32,6 @@
+ # define FIX_GCC volatile
+ #else
+ # define FIX_GCC
+-# error not tested
+ #endif
+
+ #define PROGRAM_NAME "pngfix"