From owner-svn-ports-head@FreeBSD.ORG Sat Apr 5 14:13:00 2014 Return-Path: Delivered-To: svn-ports-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id F14D553B; Sat, 5 Apr 2014 14:13:00 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id D22432AC; Sat, 5 Apr 2014 14:13:00 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s35D9ljT089399; Sat, 5 Apr 2014 13:09:47 GMT (envelope-from mva@svn.freebsd.org) Received: (from mva@localhost) by svn.freebsd.org (8.14.8/8.14.8/Submit) id s35D9kLa089393; Sat, 5 Apr 2014 13:09:46 GMT (envelope-from mva@svn.freebsd.org) Message-Id: <201404051309.s35D9kLa089393@svn.freebsd.org> From: Marcus von Appen Date: Sat, 5 Apr 2014 13:09:46 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r350228 - in head/graphics/blender: . files X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 05 Apr 2014 14:13:01 -0000 Author: mva Date: Sat Apr 5 13:09:46 2014 New Revision: 350228 URL: http://svnweb.freebsd.org/changeset/ports/350228 QAT: https://qat.redports.org/buildarchive/r350228/ Log: - Update to version 2.70 Changelog: http://wiki.blender.org/index.php/Dev:Ref/Release_Notes/2.70 Added: head/graphics/blender/files/patch-extern_carve_include_mesh_ops.hpp (contents, props changed) head/graphics/blender/files/patch-source_blender_blenloader_intern_versioning_270.c (contents, props changed) Deleted: head/graphics/blender/files/patch-CMakelists.txt head/graphics/blender/files/patch-extern_carve_lib_triangulator.cpp head/graphics/blender/files/patch-extern_libmv_third_party_ceres_internal_ceres_collections_port.h head/graphics/blender/files/patch-extern_rangetree_range_tree.hh head/graphics/blender/files/patch-intern_ffmpeg_compat.h head/graphics/blender/files/patch-intern_itasc_kdl_tree.hpp head/graphics/blender/files/patch-source_blender_imbuf_intern_cineon_cineonlib.c head/graphics/blender/files/patch-source_blender_imbuf_intern_cineon_dpxlib.c Modified: head/graphics/blender/Makefile head/graphics/blender/distinfo Modified: head/graphics/blender/Makefile ============================================================================== --- head/graphics/blender/Makefile Sat Apr 5 12:40:04 2014 (r350227) +++ head/graphics/blender/Makefile Sat Apr 5 13:09:46 2014 (r350228) @@ -2,8 +2,7 @@ # $FreeBSD$ PORTNAME= blender -PORTVERSION= 2.69 -PORTREVISION= 4 +PORTVERSION= 2.70 CATEGORIES= graphics games MASTER_SITES= http://download.blender.org/source/ \ http://mirror.cs.umn.edu/blender.org/source/ \ @@ -20,9 +19,8 @@ LIB_DEPENDS= libjpeg.so:${PORTSDIR}/grap USE_XORG= x11 xext xmu USE_GL= glew -USES= cmake:outsource shebangfix +USES= cmake:outsource compiler:features shebangfix USE_PYTHON= 3.3 - CMAKE_ARGS+= -DWITH_PYTHON_INSTALL:BOOL=OFF \ -DWITH_PYTHON_INSTALL_NUMPY:BOOL=OFF @@ -34,7 +32,7 @@ SHEBANG_FILES= release/bin/blender-thumb SUB_FILES= blender blenderplayer -OUTDIR= ${INSTALL_WRKSRC}/bin/2.69 +OUTDIR= ${INSTALL_WRKSRC}/bin/2.70 .include "${.CURDIR}/Makefile.options" @@ -212,14 +210,12 @@ BROKEN= SDL requires SAMPLERATE CMAKE_ARGS+= -DWITH_SDL:BOOL=OFF .endif -post-patch: - @cd ${WRKSRC}/intern/cycles && ${REINPLACE_CMD} \ - -e 's/__align/cycles_align/' \ - -e 's/__global/cycles_global/g' \ - util/util_types.h kernel/kernel_compat_cuda.h \ - kernel/kernel_displace.h kernel/kernel_film.h \ - kernel/kernel_passes.h kernel/kernel_path.h \ - kernel/kernel_random.h +.include + +.if ${COMPILER_TYPE} == gcc +# gcc 4.2 does not support -msse4.1, which is needed for blender 2.70+ +USE_GCC= yes +.endif # We ignore MAKE_ARGS, since those would set DESTDIR for make stage, # which in turn would cause make install to install everything in a @@ -287,4 +283,4 @@ post-install: @${ECHO} man/man1/${PORTNAME}.1.gz >> ${TMPPLIST} .endif -.include +.include Modified: head/graphics/blender/distinfo ============================================================================== --- head/graphics/blender/distinfo Sat Apr 5 12:40:04 2014 (r350227) +++ head/graphics/blender/distinfo Sat Apr 5 13:09:46 2014 (r350228) @@ -1,2 +1,2 @@ -SHA256 (blender-2.69.tar.gz) = c94a7f5dec0d42683b96b2591c240ebcc2743d10b84fc53ca13374b5e654ce09 -SIZE (blender-2.69.tar.gz) = 41274518 +SHA256 (blender-2.70.tar.gz) = 2695c3cab21721d1108c90e6e9cb4b279817f551904d5276793fb3adaef3e348 +SIZE (blender-2.70.tar.gz) = 55298021 Added: head/graphics/blender/files/patch-extern_carve_include_mesh_ops.hpp ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/graphics/blender/files/patch-extern_carve_include_mesh_ops.hpp Sat Apr 5 13:09:46 2014 (r350228) @@ -0,0 +1,14 @@ +--- extern/carve/include/carve/mesh_ops.hpp.orig 2014-03-22 13:19:46.000000000 +0100 ++++ extern/carve/include/carve/mesh_ops.hpp 2014-03-22 13:20:36.000000000 +0100 +@@ -580,8 +580,10 @@ + std::vector queue; + + void checkheap() { +-#ifdef __GNUC__ ++#if defined(__GNUC__) && !defined(__clang__) + CARVE_ASSERT(std::__is_heap(queue.begin(), queue.end(), order_by_score())); ++#elif defined(__clang__) && defined(_LIBCPP_VERSION) ++ CARVE_ASSERT(std::is_heap(queue.begin(), queue.end(), order_by_score())); + #endif + } + Added: head/graphics/blender/files/patch-source_blender_blenloader_intern_versioning_270.c ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/graphics/blender/files/patch-source_blender_blenloader_intern_versioning_270.c Sat Apr 5 13:09:46 2014 (r350228) @@ -0,0 +1,11 @@ +--- source/blender/blenloader/intern/versioning_270.c.orig 2014-03-22 12:10:23.000000000 +0100 ++++ source/blender/blenloader/intern/versioning_270.c 2014-03-22 12:10:40.000000000 +0100 +@@ -28,6 +28,8 @@ + #include "BLI_utildefines.h" + #include "BLI_compiler_attrs.h" + ++#include ++ + /* allow readfile to use deprecated functionality */ + #define DNA_DEPRECATED_ALLOW +