CVS commit: pkgsrc/graphics/blender

["Joerg Sonnenberger" <joerg%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   joerg
Date:           Thu Feb  9 00:23:29 UTC 2017

Modified Files:
        pkgsrc/graphics/blender: Makefile distinfo
Added Files:
        pkgsrc/graphics/blender/patches:
            patch-source_blender_blenlib_BLI__alloca.h

Log Message:
Force alloca to be the builtin for GCC-like compilers. Be explicit about
the Python version.


To generate a diff of this commit:
cvs rdiff -u -r1.127 -r1.128 pkgsrc/graphics/blender/Makefile
cvs rdiff -u -r1.48 -r1.49 pkgsrc/graphics/blender/distinfo
cvs rdiff -u -r0 -r1.1 \
    pkgsrc/graphics/blender/patches/patch-source_blender_blenlib_BLI__alloca.h

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/Makefile
diff -u pkgsrc/graphics/blender/Makefile:1.127 pkgsrc/graphics/blender/Makefile:1.128
--- pkgsrc/graphics/blender/Makefile:1.127      Mon Feb  6 01:29:10 2017
+++ pkgsrc/graphics/blender/Makefile    Thu Feb  9 00:23:29 2017
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.127 2017/02/06 01:29:10 markd Exp $
+# $NetBSD: Makefile,v 1.128 2017/02/09 00:23:29 joerg Exp $
 
 DISTNAME=      blender-2.77a
 PKGREVISION=   4
@@ -36,6 +36,7 @@ CXXFLAGS+=    -std=c++11
 CMAKE_OPTS+=           -DCMAKE_CXX_FLAGS:STRING=${CXXFLAGS:Q}
 
 PYTHON_VERSIONS_INCOMPATIBLE=  27
+CMAKE_OPTS+=           -DPYTHON_VERSION=${PYVERSSUFFIX:Q}
 GCC_REQD+=     4.7
 
 DEPENDS+=      ${PYPKGPREFIX}-expat>=0:../../textproc/py-expat

Index: pkgsrc/graphics/blender/distinfo
diff -u pkgsrc/graphics/blender/distinfo:1.48 pkgsrc/graphics/blender/distinfo:1.49
--- pkgsrc/graphics/blender/distinfo:1.48       Mon Aug 15 19:26:18 2016
+++ pkgsrc/graphics/blender/distinfo    Thu Feb  9 00:23:29 2017
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.48 2016/08/15 19:26:18 ryoon Exp $
+$NetBSD: distinfo,v 1.49 2017/02/09 00:23:29 joerg Exp $
 
 SHA1 (blender-2.77a.tar.gz) = 935793b3e9fd4d02c71f275aac3aca27cd58bdfb
 RMD160 (blender-2.77a.tar.gz) = 7d99f064b5a6055aaf549ddb30c49e73f081f002
@@ -12,4 +12,5 @@ SHA1 (patch-extern_glog_src_utilities.h)
 SHA1 (patch-extern_rangetree_range__tree.hh) = 976881b9caad67a2cfb24039652e887867fa6cc0
 SHA1 (patch-intern_cycles_util_util__types.h) = 37944c6b0a970468e6791ec4a5beef1ec0ddf190
 SHA1 (patch-intern_guardedalloc_intern_mallocn__intern.h) = c7bc89af1c03b50ae0bd8af5aacc25cd82dfcbfc
+SHA1 (patch-source_blender_blenlib_BLI__alloca.h) = 95ef3250aaf8b3701c56254d9a8ca2752c1bb715
 SHA1 (patch-source_blender_imbuf_intern_dds_DirectDrawSurface.cpp) = b38f61900aa30b02479c7397062d71d295932847

Added files:

Index: pkgsrc/graphics/blender/patches/patch-source_blender_blenlib_BLI__alloca.h
diff -u /dev/null pkgsrc/graphics/blender/patches/patch-source_blender_blenlib_BLI__alloca.h:1.1
--- /dev/null   Thu Feb  9 00:23:29 2017
+++ pkgsrc/graphics/blender/patches/patch-source_blender_blenlib_BLI__alloca.h  Thu Feb  9 00:23:29 2017
@@ -0,0 +1,16 @@
+$NetBSD: patch-source_blender_blenlib_BLI__alloca.h,v 1.1 2017/02/09 00:23:29 joerg Exp $
+
+Ensure that alloca is always using the builtin. On NetBSD, it is not
+provided in standard-only mode.
+
+--- source/blender/blenlib/BLI_alloca.h.orig   2017-01-08 18:11:56.918657083 +0000
++++ source/blender/blenlib/BLI_alloca.h
+@@ -34,6 +34,8 @@
+ #endif
+ 
+ #if defined(__GNUC__) || defined(__clang__)
++#undef alloca
++#define alloca(n) __builtin_alloca(n)
+ #if defined(__cplusplus) && (__cplusplus > 199711L)
+ #define BLI_array_alloca(arr, realsize) \
+       (decltype(arr))alloca(sizeof(*arr) * (realsize))