- Update to version 2.72b

  Changelog: http://www.blender.org/features/2-72/

- Mark FFMPEG usage as broken on amd64, if the CPU supports SSE. Blender
  will crash with a SIGBUS error on rendering.
- Add an explicit DEBUG option to make tracking errors easier.

3 files changed, 61 insertions, 72 deletions

diff --git a/graphics/blender/Makefile b/graphics/blender/Makefile
index 7471e0f710c5..df3be2c4aecc 100644
--- a/graphics/blender/Makefile
+++ b/graphics/blender/Makefile
@@ -2,8 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	blender
-PORTVERSION=	2.71
-PORTREVISION=	3
+PORTVERSION=	2.72b
 CATEGORIES=	graphics games
 MASTER_SITES=	http://download.blender.org/source/ \
 		http://mirror.cs.umn.edu/blender.org/source/ \
@@ -33,12 +32,10 @@ SHEBANG_FILES=	release/bin/blender-thumbnailer.py \
 SUB_FILES=	blender blenderplayer
 
 WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
-OUTDIR=		${INSTALL_WRKSRC}/bin/2.71
+OUTDIR=		${INSTALL_WRKSRC}/bin/2.72
 
 .include "${.CURDIR}/Makefile.options"
 
-# TODO: WITH_CYCLES_STANDALONE WITH_CYCLES_STANDALONE_GUI
-
 MOD_BOOLEAN_CMAKE_ON=		-DWITH_MOD_BOOLEAN:BOOL=ON
 MOD_BOOLEAN_CMAKE_OFF=		-DWITH_MOD_BOOLEAN:BOOL=OFF
 MOD_BOOLEAN_LIB_DEPENDS=	libboost_thread.so:${PORTSDIR}/devel/boost-libs
@@ -54,6 +51,8 @@ BULLET_CMAKE_ON=		-DWITH_BULLET:BOOL=ON
 BULLET_CMAKE_OFF=		-DWITH_BULLET:BOOL=OFF
 CINEON_CMAKE_ON=		-DWITH_IMAGE_CINEON:BOOL=ON
 CINEON_CMAKE_OFF=		-DWITH_IMAGE_CINEON:BOOL=OFF
+CYCLES_CMAKE_ON=		-DWITH_CYCLES:BOOL=ON
+CYCLES_CMAKE_OFF=		-DWITH_CYCLES:BOOL=OFF
 CAMERATRACK_CMAKE_ON=		-DWITH_LIBMV:BOOL=ON
 CAMERATRACK_CMAKE_OFF=		-DWITH_LIBMV:BOOL=OFF
 CAMERATRACK_LIB_DEPENDS=	libunwind.so:${PORTSDIR}/devel/libunwind
@@ -76,6 +75,8 @@ FREESTYLE_CMAKE_ON=		-DWITH_FREESTYLE:BOOL=ON
 FREESTYLE_CMAKE_OFF=		-DWITH_FREESTYLE:BOOL=OFF
 GAMEENGINE_CMAKE_ON=		-DWITH_GAMEENGINE:BOOL=ON
 GAMEENGINE_CMAKE_OFF=		-DWITH_GAMEENGINE:BOOL=OFF
+HEADLESS_CMAKE_ON=		-DWITH_HEADLESS:BOOL=ON
+HEADLESS_CMAKE_OFF=		-DWITH_HEADLESS:BOOL=OFF
 HDR_CMAKE_ON=			-DWITH_IMAGE_HDR:BOOL=ON
 HDR_CMAKE_OFF=			-DWITH_IMAGE_HDR:BOOL=OFF
 INPUT_NDOF_CMAKE_ON=		-DWITH_INPUT_NDOF:BOOL=ON
@@ -90,29 +91,44 @@ LZMA_CMAKE_OFF=			-DWITH_LZMA:BOOL=OFF
 LIBMV_CMAKE_ON=			-DWITH_LIBMV:BOOL=ON
 LIBMV_CMAKE_OFF=		-DWITH_LIBMV:BOOL=OFF
 MENU_USES=			desktop-file-utils
+MOD_OCEANSIM_CMAKE_ON=		-DWITH_MOD_OCEANSIM:BOOL=ON
+MOD_OCEANSIM_CMAKE_OFF=		-DWITH_MOD_OCEANSIM:BOOL=OFF
 NLS_CMAKE_ON=			-DWITH_INTERNATIONAL:BOOL=ON
 NLS_CMAKE_OFF=			-DWITH_INTERNATIONAL:BOOL=OFF
 # Use iconv:wchar_t to force the usage of iconv from ports.
 # libboost_locale.so uses libiconv_open, while we only provide
 # iconv_open in 10.x+
 NLS_USES=			gettext iconv:lib,wchar_t
+OPENAL_CMAKE_ON=		-DWITH_OPENAL:BOOL=ON
+OPENAL_CMAKE_OFF=		-DWITH_OPENAL:BOOL=OFF
+OPENAL_USES=			openal:al,alut
 OPENCOLORIO_CMAKE_ON=		-DWITH_OPENCOLORIO:BOOL=ON
 OPENCOLORIO_CMAKE_OFF=		-DWITH_OPENCOLORIO:BOOL=OFF
 OPENCOLORIO_LIB_DEPENDS=	libOpenColorIO.so:${PORTSDIR}/graphics/opencolorio
 OPENEXR_CMAKE_ON=		-DWITH_IMAGE_OPENEXR:BOOL=ON
 OPENEXR_CMAKE_OFF=		-DWITH_IMAGE_OPENEXR:BOOL=OFF
 OPENEXR_LIB_DEPENDS=		libIlmImf.so:${PORTSDIR}/graphics/OpenEXR
+OPENIMAGEIO_CMAKE_ON=		-DWITH_OPENIMAGEIO:BOOL=ON
+OPENIMAGEIO_CMAKE_OFF=		-DWITH_OPENIMAGEIO:BOOL=OFF
+OPENIMAGEIO_LIB_DEPENDS=	libOpenImageIO.so:${PORTSDIR}/graphics/openimageio
 OPENJPEG_CMAKE_ON=		-DWITH_SYSTEM_OPENJPEG:BOOL=ON \
 				-DWITH_IMAGE_OPENJPEG:BOOL=ON
 OPENJPEG_CMAKE_OFF=		-DWITH_IMAGE_OPENJPEG:BOOL=OFF
 OPENJPEG_LIB_DEPENDS=		libopenjpeg.so:${PORTSDIR}/graphics/openjpeg15
-OPENMP_CMAKE_ON=		-DWITH_OPENMP:BOOL=ON
-OPENMP_CMAKE_OFF=		-DWITH_OPENMP:BOOL=OFF
+# Only works, if everything else is compiled with the same compiler
+# OPENMP_CMAKE_ON=		-DWITH_OPENMP:BOOL=ON
+# OPENMP_CMAKE_OFF=		-DWITH_OPENMP:BOOL=OFF
+# OPENMP_USES=			compiler:openmp
+# OPENMP_USES_OFF=		compiler:features
+PLAYER_CMAKE_ON=		-DWITH_PLAYER:BOOL=ON
+PLAYER_CMAKE_OFF=		-DWITH_PLAYER:BOOL=OFF
 RAYOPTIMIZATION_CMAKE_ON=	-DWITH_RAYOPTIMIZATION:BOOL=ON
 RAYOPTIMIZATION_CMAKE_OFF=	-DWITH_RAYOPTIMIZATION:BOOL=OFF
-SAMPLERATE_CMAKE_ON=		-DWITH_SAMPLERATE:BOOL=ON
-SAMPLERATE_CMAKE_OFF=		-DWITH_SAMPLERATE:BOOL=OFF
-SAMPLERATE_LIB_DEPENDS=		libsamplerate.so:${PORTSDIR}/audio/libsamplerate
+REDCODE_CMAKE_ON=		-DWITH_IMAGE_REDCODE:BOOL=ON
+REDCODE_CMAKE_OFF=		-DWITH_IMAGE_REDCODE:BOOL=OFF
+SDL_CMAKE_ON=			-DWITH_SDL:BOOL=ON
+SDL_CMAKE_OFF=			-DWITH_SDL:BOOL=OFF
+SDL_USE=			SDL=sdl
 SNDFILE_CMAKE_ON=		-DWITH_CODEC_SNDFILE:BOOL=ON
 SNDFILE_CMAKE_OFF=		-DWITH_CODEC_SNDFILE:BOOL=OFF
 SNDFILE_LIB_DEPENDS=		libsndfile.so:${PORTSDIR}/audio/libsndfile
@@ -128,24 +144,17 @@ XF86VMODE_USE=			XORG=xi,xxf86vm
 
 .include <bsd.port.options.mk>
 
-.if ${PORT_OPTIONS:MMOD_OCEANSIM}
-.if ${PORT_OPTIONS:MFFTW3}
-CMAKE_ARGS+=	-DWITH_MOD_OCEANSIM:BOOL=ON
-.else
-BROKEN=		MOD_OCEANSIM requires FFTW3
-.endif
-.else
-CMAKE_ARGS+=	-DWITH_MOD_OCEANSIM:BOOL=OFF
+.if ${PORT_OPTIONS:MDEBUG}
+CMAKE_BUILD_TYPE=	Debug
+CMAKE_ARGS+=		-DWITH_GHOST_DEBUG:BOOL=ON
 .endif
 
-.if ${PORT_OPTIONS:MCYCLES}
-CMAKE_ARGS+=	-DWITH_CYCLES:BOOL=ON
-.if !${PORT_OPTIONS:MOPENEXR} || !${PORT_OPTIONS:MTIFF}
-BROKEN=		CYCLES requires OPENEXR and TIFF
+.if ${PORT_OPTIONS:MMOD_OCEANSIM} && !${PORT_OPTIONS:MFFTW3}
+BROKEN=	MOD_OCEANSIM requires FFTW3
 .endif
-LIB_DEPENDS+=	libOpenImageIO.so:${PORTSDIR}/graphics/openimageio
-.else
-CMAKE_ARGS+=	-DWITH_CYCLES:BOOL=OFF
+
+.if ${PORT_OPTIONS:MCYCLES} && !${PORT_OPTIONS:MOPENIMAGEIO}
+BROKEN=	CYCLES requires OPENIMAGEIO
 .endif
 
 .if ${PORT_OPTIONS:MCYCLESOSL}
@@ -155,64 +164,36 @@ IGNORE=	support for the OpenShadingLanguage in cycles obviously requires CYCLES
 CMAKE_ARGS+=	-DWITH_CYCLES_OSL:BOOL=ON \
 		-DLLVM_STATIC:BOOL=OFF \
 		-DWITH_LLVM:BOOL=ON \
-		-DLLVM_VERSION:STRING="3.3" \
-		-DLLVM_CONFIG:STRING="${LOCALBASE}/bin/llvm-config33"
+		-DLLVM_VERSION:STRING="3.4" \
+		-DLLVM_CONFIG:STRING="${LOCALBASE}/bin/llvm-config34"
 LIB_DEPENDS+=	liboslexec.so:${PORTSDIR}/graphics/openshadinglanguage
-BUILD_DEPENDS+=	llvm-config33:${PORTSDIR}/devel/llvm33
+BUILD_DEPENDS+=	llvm-config34:${PORTSDIR}/devel/llvm34
 .else
 CMAKE_ARGS+=	-DWITH_CYCLES_OSL:BOOL=OFF
 .endif
 
-.if ${PORT_OPTIONS:MHEADLESS}
+.if ${PORT_OPTIONS:MHEADLESS} 
 .if ${PORT_OPTIONS:MXINPUT} || ${PORT_OPTIONS:MXF86VMODE}
 BROKEN=	HEADLESS does not require any X11 dependency
 .endif
-CMAKE_ARGS+=	-DWITH_HEADLESS:BOOL=ON
-.else
-CMAKE_ARGS+=	-DWITH_HEADLESS:BOOL=OFF
 .endif
 
-.if ${PORT_OPTIONS:MOPENAL}
-.if ${PORT_OPTIONS:MSAMPLERATE}
-USES+=		openal:al,alut
-CMAKE_ARGS+=	-DWITH_OPENAL:BOOL=ON
-.else
-BROKEN=		OPENAL requires SAMPLERATE
+.if ${PORT_OPTIONS:MOPENIMAGEIO} 
+.if !${PORT_OPTIONS:MOPENEXR} || !${PORT_OPTIONS:MTIFF}
+BROKEN=	OPENIMAGEIO requires OPENEXR and TIFF
 .endif
-.else
-CMAKE_ARGS+=	-DWITH_OPENAL:BOOL=OFF
 .endif
 
-.if ${PORT_OPTIONS:MPLAYER}
-.if ${PORT_OPTIONS:MGAMEENGINE}
-CMAKE_ARGS+=	-DWITH_PLAYER:BOOL=ON
-.else
-BROKEN=		PLAYER requires GAMEENGINE
-.endif
-.else
-CMAKE_ARGS+=	-DWITH_PLAYER:BOOL=OFF
+.if ${PORT_OPTIONS:MPLAYER} && !${PORT_OPTIONS:MGAMEENGINE}
+BROKEN=	PLAYER requires GAMEENGINE
 .endif
 
 .if ${PORT_OPTIONS:MREDCODE}
-.if ${PORT_OPTIONS:MOPENJPEG} && ${PORT_OPTIONS:MFFMPEG}
-CMAKE_ARGS+=	-DWITH_IMAGE_REDCODE:BOOL=ON
-.else
-BROKEN=		REDCODE requires OPENJPEG and FFMPEG
+.if !${PORT_OPTIONS:MOPENJPEG} || !${PORT_OPTIONS:MFFMPEG}
+BROKEN=	REDCODE requires OPENJPEG and FFMPEG
 .endif
-.else
-CMAKE_ARGS+=	-DWITH_IMAGE_REDCODE:BOOL=OFF
 .endif
 
-.if ${PORT_OPTIONS:MSDL}
-.if ${PORT_OPTIONS:MSAMPLERATE}
-USE_SDL=	sdl
-CMAKE_ARGS+=	-DWITH_SDL:BOOL=ON
-.else
-BROKEN=		SDL requires SAMPLERATE
-.endif
-.else
-CMAKE_ARGS+=	-DWITH_SDL:BOOL=OFF
-.endif
 
 .include <bsd.port.pre.mk>
 
@@ -221,9 +202,17 @@ CMAKE_ARGS+=	-DWITH_SDL:BOOL=OFF
 USE_GCC=	yes
 .endif
 
+.if defined(MACHINE_CPU) && (${MACHINE_CPU:Msse} == "sse" || ${MACHINE_CPU:Mamd64} == "amd64")
+.if ${PORT_OPTIONS:MFFMPEG}
+BROKEN=	Blender crashes on rendering, if ffmpeg is built with SSE support
+.endif
+.endif
+
 post-patch:
-	@${REINPLACE_CMD} -e 's|md;mud;ud;d|dm;dmu;du;d|' \
-		${WRKSRC}/build_files/cmake/Modules/FindPythonLibsUnix.cmake
+.if ${PORT_OPTIONS:MOPENCOLORIO}
+	@${REINPLACE_CMD} -e 's|yaml-cpp|&03|' \
+		${PATCH_WRKSRC}/build_files/cmake/Modules/FindOpenColorIO.cmake
+.endif
 
 post-build:
 	@(cd ${WRKSRC}/doc/manpage && \
diff --git a/graphics/blender/Makefile.options b/graphics/blender/Makefile.options
index 1f5ef75f38c6..51eee2c978ac 100644
--- a/graphics/blender/Makefile.options
+++ b/graphics/blender/Makefile.options
@@ -9,6 +9,7 @@ OPTIONS_DEFINE=		\
 	COMPOSITOR 	\
 	CYCLES 		\
 	CYCLESOSL 	\
+	DEBUG		\
 	DDS 		\
 	FFMPEG 		\
 	FFTW3 		\
@@ -31,13 +32,12 @@ OPTIONS_DEFINE=		\
 	NLS 		\
 	OPENAL 		\
 	OPENCOLORIO 	\
+	OPENIMAGEIO	\
 	OPENEXR 	\
 	OPENJPEG 	\
-	OPENMP 		\
 	PLAYER 		\
 	RAYOPTIMIZATION	\
 	REDCODE		\
-	SAMPLERATE	\
 	SDL		\
 	SNDFILE		\
 	TIFF		\
@@ -65,11 +65,10 @@ OPTIONS_DEFAULT=	\
 	MOD_SMOKE	\
 	OPENAL		\
 	OPENCOLORIO	\
+	OPENIMAGEIO	\
 	OPENEXR		\
 	OPENJPEG	\
-	OPENMP		\
 	PLAYER		\
-	SAMPLERATE	\
 	SDL		\
 	TIFF		\
 	XINPUT		\
@@ -101,6 +100,7 @@ MOD_OCEANSIM_DESC=	Ocean simulation support
 MOD_REMESH_DESC=	Remesh modifier support
 MOD_SMOKE_DESC=		Smoke simulation support
 OPENCOLORIO_DESC=	OpenColorIO-based color management support
+OPENIMAGEIO_DESC=	OpenImageIO image processing support
 PLAYER_DESC=		Enable blender player
 RAYOPTIMIZATION_DESC=	Enable SSE optimizatons for raytracing
 REDCODE_DESC=		RedCode graphics format support
diff --git a/graphics/blender/distinfo b/graphics/blender/distinfo
index d7330471736c..3162ebbbc0d0 100644
--- a/graphics/blender/distinfo
+++ b/graphics/blender/distinfo
@@ -1,2 +1,2 @@
-SHA256 (blender-2.71.tar.gz) = 7daa7f8ce1df495ad20843aa86bc5268179085ec2963655c358b65a2b365ffa2
-SIZE (blender-2.71.tar.gz) = 57120144
+SHA256 (blender-2.72b.tar.gz) = 4436c704afa28e2e5e7b28b2c06981806ddedab70565d40972e422c00644bf47
+SIZE (blender-2.72b.tar.gz) = 52018242