CVS commit: pkgsrc/graphics/blender

["Mark Davies" <markd%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   markd
Date:           Sat Jul 16 03:45:19 UTC 2016

Modified Files:
        pkgsrc/graphics/blender: distinfo
Added Files:
        pkgsrc/graphics/blender/patches:
            patch-source_blender_imbuf_intern_dds_DirectDrawSurface.cpp

Log Message:
Fix build with gcc6


To generate a diff of this commit:
cvs rdiff -u -r1.46 -r1.47 pkgsrc/graphics/blender/distinfo
cvs rdiff -u -r0 -r1.1 \
    pkgsrc/graphics/blender/patches/patch-source_blender_imbuf_intern_dds_DirectDrawSurface.cpp

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/graphics/blender/distinfo
diff -u pkgsrc/graphics/blender/distinfo:1.46 pkgsrc/graphics/blender/distinfo:1.47
--- pkgsrc/graphics/blender/distinfo:1.46       Sat Dec 19 20:52:12 2015
+++ pkgsrc/graphics/blender/distinfo    Sat Jul 16 03:45:19 2016
@@ -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
 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

Added files:

Index: pkgsrc/graphics/blender/patches/patch-source_blender_imbuf_intern_dds_DirectDrawSurface.cpp
diff -u /dev/null pkgsrc/graphics/blender/patches/patch-source_blender_imbuf_intern_dds_DirectDrawSurface.cpp:1.1
--- /dev/null   Sat Jul 16 03:45:19 2016
+++ pkgsrc/graphics/blender/patches/patch-source_blender_imbuf_intern_dds_DirectDrawSurface.cpp Sat Jul 16 03:45:19 2016
@@ -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>
+