Received: from mail.netbsd.org (mail.netbsd.org [199.233.217.200]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mail.netbsd.org", Issuer "Postmaster NetBSD.org" (verified OK)) by mollari.NetBSD.org (Postfix) with ESMTPS id 2F26F7A213 for ; Thu, 9 Feb 2017 00:23:32 +0000 (UTC) Received: by mail.netbsd.org (Postfix, from userid 605) id 019BE85649; Thu, 9 Feb 2017 00:23:31 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by mail.netbsd.org (Postfix) with ESMTP id 7FE1985645 for ; Thu, 9 Feb 2017 00:23:30 +0000 (UTC) X-Virus-Scanned: amavisd-new at netbsd.org Received: from mail.netbsd.org ([IPv6:::1]) by localhost (mail.netbsd.org [IPv6:::1]) (amavisd-new, port 10025) with ESMTP id G40S3FrgUVmi for ; Thu, 9 Feb 2017 00:23:30 +0000 (UTC) Received: from cvs.NetBSD.org (unknown [IPv6:2001:470:a085:999:28c:faff:fe03:5984]) by mail.netbsd.org (Postfix) with ESMTP id 04CC085654 for ; Thu, 9 Feb 2017 00:23:30 +0000 (UTC) Received: by cvs.NetBSD.org (Postfix, from userid 500) id 02CB5FBA3; Thu, 9 Feb 2017 00:23:30 +0000 (UTC) Content-Transfer-Encoding: 7bit Content-Type: multipart/mixed; boundary="_----------=_1486599809146230" MIME-Version: 1.0 Date: Thu, 9 Feb 2017 00:23:29 +0000 From: "Joerg Sonnenberger" Subject: CVS commit: pkgsrc/graphics/blender To: pkgsrc-changes@NetBSD.org Reply-To: joerg@netbsd.org X-Mailer: log_accum Message-Id: <20170209002330.02CB5FBA3@cvs.NetBSD.org> Sender: pkgsrc-changes-owner@NetBSD.org List-Id: pkgsrc-changes.NetBSD.org Precedence: bulk This is a multi-part message in MIME format. --_----------=_1486599809146230 Content-Disposition: inline Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII" 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. --_----------=_1486599809146230 Content-Disposition: inline Content-Length: 2749 Content-Transfer-Encoding: binary Content-Type: text/x-diff; charset=us-ascii 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)) --_----------=_1486599809146230--