svn commit: r350228 - in head/graphics/blender: . files

[Marcus von Appen]

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 <bsd.port.pre.mk>
+
+.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 <bsd.port.mk>
+.include <bsd.port.post.mk>

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<VertexInfo *> 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 <stddef.h>
++
+ /* allow readfile to use deprecated functionality */
+ #define DNA_DEPRECATED_ALLOW
+