diff options
| author | markd <markd@pkgsrc.org> | 2016-07-16 03:36:51 +0000 |
|---|---|---|
| committer | markd <markd@pkgsrc.org> | 2016-07-16 03:36:51 +0000 |
| commit | 67a96a1d83141e2b48bdcd3c57180c205e24f176 (patch) | |
| tree | 9e51074b16e073c7067d76104be04cb085aae4ef /graphics/blender | |
| parent | 7aef229c8d2a77744015b67f89ae327394536bc0 (diff) | |
| download | pkgsrc-67a96a1d83141e2b48bdcd3c57180c205e24f176.tar.gz | |
Fix build with gcc6
Diffstat (limited to 'graphics/blender')
| -rw-r--r-- | graphics/blender/distinfo | 3 | ||||
| -rw-r--r-- | graphics/blender/patches/patch-source_blender_imbuf_intern_dds_DirectDrawSurface.cpp | 19 |
2 files changed, 21 insertions, 1 deletions
diff --git a/graphics/blender/distinfo b/graphics/blender/distinfo index 825143c6a71..00e30bd12e5 100644 --- a/graphics/blender/distinfo +++ b/graphics/blender/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.46 2015/12/19 20:52:12 markd Exp $ +$NetBSD: distinfo,v 1.47 2016/07/16 03:45:19 markd Exp $ SHA1 (blender-2.76b.tar.gz) = 7be96d90296cc95e15380ad0ae56cb86f1374a65 RMD160 (blender-2.76b.tar.gz) = 393c03e9ff15631f89ddd0cdfc8548bb87a0bde5 @@ -15,3 +15,4 @@ SHA1 (patch-extern_rangetree_range__tree.hh) = 976881b9caad67a2cfb24039652e88786 SHA1 (patch-intern_cycles_util_util__types.h) = 37944c6b0a970468e6791ec4a5beef1ec0ddf190 SHA1 (patch-intern_ghost_SConscript) = d576ea87b5b0f386e2c78efa78351927a105f243 SHA1 (patch-intern_guardedalloc_intern_mallocn__intern.h) = c7bc89af1c03b50ae0bd8af5aacc25cd82dfcbfc +SHA1 (patch-source_blender_imbuf_intern_dds_DirectDrawSurface.cpp) = b38f61900aa30b02479c7397062d71d295932847 diff --git a/graphics/blender/patches/patch-source_blender_imbuf_intern_dds_DirectDrawSurface.cpp b/graphics/blender/patches/patch-source_blender_imbuf_intern_dds_DirectDrawSurface.cpp new file mode 100644 index 00000000000..8c99db5baee --- /dev/null +++ b/graphics/blender/patches/patch-source_blender_imbuf_intern_dds_DirectDrawSurface.cpp @@ -0,0 +1,19 @@ +$NetBSD: patch-source_blender_imbuf_intern_dds_DirectDrawSurface.cpp,v 1.1 2016/07/16 03:45:19 markd Exp $ + +--- source/blender/imbuf/intern/dds/DirectDrawSurface.cpp.orig 2015-11-04 10:02:15.000000000 +0000 ++++ source/blender/imbuf/intern/dds/DirectDrawSurface.cpp +@@ -55,12 +55,13 @@ + // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR + // OTHER DEALINGS IN THE SOFTWARE. + ++// Include stdlib first to restore undefined min/max behavior w/ GCC 6 ++#include <stdlib.h> // malloc + #include <DirectDrawSurface.h> + #include <BlockDXT.h> + #include <PixelFormat.h> + + #include <stdio.h> // printf +-#include <stdlib.h> // malloc + #include <math.h> // sqrt + #include <sys/types.h> + |