ports/167061: [patch] graphics/blender update

Shane Ambler FreeBSD at Shaneware.biz
Wed Apr 18 15:20:03 UTC 2012 

>Number:         167061
>Category:       ports
>Synopsis:       [patch] graphics/blender update
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          change-request
>Submitter-Id:   current-users
>Arrival-Date:   Wed Apr 18 15:20:03 UTC 2012
>Closed-Date:
>Last-Modified:
>Originator:     Shane Ambler
>Release:        9.0-RELEASE
>Organization:
>Environment:
FreeBSD leader.local 9.0-RELEASE FreeBSD 9.0-RELEASE #1: Wed Feb 15 16:03:18 CST 2012     root@:/usr/obj/usr/src/sys/GENERIC  amd64
>Description:
Having just had graphics/openimageio added to the ports tree I would like to submit a patch to allow using it to enable blender's new cycles render engine. 

Within the patch I have also added a few options to turn on/off several other recent features such as carve boolean library, camera tracking and ocean simulation.
>How-To-Repeat:

>Fix:


Patch attached with submission follows:

diff -u blender.orig/Makefile blender/Makefile
--- blender.orig/Makefile	2012-03-18 22:44:59.000000000 +1030
+++ blender/Makefile	2012-04-19 00:22:45.000000000 +0930
@@ -6,6 +6,7 @@
 
 PORTNAME=	blender
 PORTVERSION=	2.62
+PORTREVISION=	1
 CATEGORIES=	graphics games
 MASTER_SITES=	http://download.blender.org/source/ \
 		http://mirror.cs.umn.edu/blender.org/source/ \
@@ -27,9 +28,7 @@
 MAKE_JOBS_SAFE=	yes
 
 CMAKE_OUTSOURCE=	yes
-CMAKE_ARGS+=	-DWITH_BUILTIN_GLEW:BOOL=OFF -DWITH_PYTHON_INSTALL:BOOL=OFF \
-		-DWITH_LIBMV:BOOL=OFF -DWITH_CYCLES:BOOL=OFF \
-		-DWITH_CARVE:BOOL=OFF
+CMAKE_ARGS+=	-DWITH_BUILTIN_GLEW:BOOL=OFF -DWITH_PYTHON_INSTALL:BOOL=OFF
 
 SUB_FILES=	blender blenderplayer
 MAN1=		blender.1
@@ -40,16 +39,20 @@
 		ru sr sr at latin sv zh_CN zh_TW
 
 OPTIONS=	BULLET		"Enable bullet physics engine" on \
+		CARVE		"Carve boolean library" on \
 		CINEON		"CINEON and DPX graphics format support" on \
+		CAMERATRACK	"Camera tracking" on \
+		CYCLES		"Cycles render engine" on \
 		DDS		"DDS graphics format support" on \
 		FFMPEG		"Audio and video support using ffmpeg" on \
-		FFTW3		"Floating point support using fftw" off \
+		FFTW3		"Floating point support using fftw" on \
 		GAMEENGINE	"Enable game engine" on \
 		HDR		"Generic high dynamic-range (HDR) support" on \
 		HEADLESS	"Disable user interface" off \
 		JACK		"Audio support using JackAudio" off \
 		NLS		"Native language support" on \
 		MENU		"Install desktop menu" on \
+		OCEANSIM	"Ocean sim support" on \
 		OPENAL		"3D sound support using OpenAL" on \
 		OPENEXR		"High dynamic-range (HDR) support using OpenEXR" on \
 		OPENJPEG	"Enhanced JPEG graphics support using OpenJPEG" on \
@@ -70,12 +73,40 @@
 CMAKE_ARGS+=	-DWITH_BULLET:BOOL=ON
 .endif
 
+.if defined(WITHOUT_CARVE)
+CMAKE_ARGS+=	-DWITH_CARVE:BOOL=OFF
+.else
+CMAKE_ARGS+=	-DWITH_CARVE:BOOL=ON
+LIB_DEPENDS+=	boost_thread.4:${PORTSDIR}/devel/boost-libs
+.endif
+
 .if defined(WITHOUT_CINEON)
 CMAKE_ARGS+=	-DWITH_IMAGE_CINEON:BOOL=OFF
 .else
 CMAKE_ARGS+=	-DWITH_IMAGE_CINEON:BOOL=ON
 .endif
 
+.if defined(WITHOUT_CAMERATRACK)
+CMAKE_ARGS+=	-DWITH_LIBMV:BOOL=OFF
+.else
+CMAKE_ARGS+=	-DWITH_LIBMV:BOOL=ON
+LIB_DEPENDS+=	unwind:${PORTSDIR}/devel/libunwind
+.endif
+
+# openimageio to enable cycles requires 8.0 or higher
+.if defined(WITH_CYCLES) && ${OSVERSION} >= 800000
+CMAKE_ARGS+=	-DWITH_CYCLES:BOOL=ON
+.if ${ARCH} == "i386" || ${OSVERSION} < 803000
+# this is needed for linking with openimageio
+LDFLAGS+=	-L${LOCALBASE}/lib/gcc46 -rpath ${LOCALBASE}/lib/gcc46
+.endif
+LIB_DEPENDS+=	OpenImageIO:${PORTSDIR}/graphics/openimageio
+PLIST_SUB+=	CYCLES=""
+.else
+CMAKE_ARGS+=	-DWITH_CYCLES:BOOL=OFF
+PLIST_SUB+=	CYCLES="@comment "
+.endif
+
 .if defined(WITHOUT_DDS)
 CMAKE_ARGS+=	-DWITH_IMAGE_DDS:BOOL=OFF
 .else
@@ -141,6 +172,15 @@
 CMAKE_ARGS+=	-DWITH_INTERNATIONAL:BOOL=ON
 .endif
 
+.if defined(WITHOUT_OCEANSIM)
+CMAKE_ARGS+=	-DWITH_MOD_OCEANSIM:BOOL=OFF
+.else
+.if defined(WITHOUT_FFTW3)
+BROKEN=		WITH_OCEANSIM requires WITH_FFTW3
+.endif
+CMAKE_ARGS+=	-DWITH_MOD_OCEANSIM:BOOL=ON
+.endif
+
 .if defined(WITHOUT_OPENAL)
 CMAKE_ARGS+=	-DWITH_OPENAL:BOOL=OFF
 .else
@@ -229,6 +269,11 @@
 CMAKE_ARGS+=	-DWITH_X11_XINPUT:BOOL=ON
 .endif
 
+post-configure:
+.if defined(WITH_CYCLES) && ${OSVERSION} < 800000
+	@${ECHO_MSG} "Cycles render engine is only available in 8.0 or higher."
+.endif
+
 post-install:
 	@${INSTALL_SCRIPT} ${WRKDIR}/blender ${PREFIX}/bin/blender
 	@${INSTALL_PROGRAM} ${INSTALL_WRKSRC}/bin/blender \
Only in blender: Makefile~
Common subdirectories: blender.orig/files and blender/files
diff -u blender.orig/pkg-plist blender/pkg-plist
--- blender.orig/pkg-plist	2012-03-18 22:44:59.000000000 +1030
+++ blender/pkg-plist	2012-04-18 17:22:01.000000000 +0930
@@ -41,6 +41,96 @@
 %%DATADIR%%/scripts/addons/animation_animall.py
 %%DATADIR%%/scripts/addons/animation_rotobezier.py
 %%DATADIR%%/scripts/addons/curve_simplify.py
+%%CYCLES%%%%DATADIR%%/scripts/addons/cycles/license/readme.txt
+%%CYCLES%%%%DATADIR%%/scripts/addons/cycles/license/Blender.txt
+%%CYCLES%%%%DATADIR%%/scripts/addons/cycles/license/GPL.txt
+%%CYCLES%%%%DATADIR%%/scripts/addons/cycles/license/ILM.txt
+%%CYCLES%%%%DATADIR%%/scripts/addons/cycles/license/NVidia.txt
+%%CYCLES%%%%DATADIR%%/scripts/addons/cycles/license/OSL.txt
+%%CYCLES%%%%DATADIR%%/scripts/addons/cycles/license/Sobol.txt
+%%CYCLES%%%%DATADIR%%/scripts/addons/cycles/license/Apache_2.0.txt
+%%CYCLES%%%%DATADIR%%/scripts/addons/cycles/kernel/svm/volume.h
+%%CYCLES%%%%DATADIR%%/scripts/addons/cycles/kernel/svm/bsdf_ashikhmin_velvet.h
+%%CYCLES%%%%DATADIR%%/scripts/addons/cycles/kernel/svm/bsdf_diffuse.h
+%%CYCLES%%%%DATADIR%%/scripts/addons/cycles/kernel/svm/bsdf_oren_nayar.h
+%%CYCLES%%%%DATADIR%%/scripts/addons/cycles/kernel/svm/bsdf_microfacet.h
+%%CYCLES%%%%DATADIR%%/scripts/addons/cycles/kernel/svm/bsdf_reflection.h
+%%CYCLES%%%%DATADIR%%/scripts/addons/cycles/kernel/svm/bsdf_refraction.h
+%%CYCLES%%%%DATADIR%%/scripts/addons/cycles/kernel/svm/bsdf_transparent.h
+%%CYCLES%%%%DATADIR%%/scripts/addons/cycles/kernel/svm/bsdf_ward.h
+%%CYCLES%%%%DATADIR%%/scripts/addons/cycles/kernel/svm/bsdf_westin.h
+%%CYCLES%%%%DATADIR%%/scripts/addons/cycles/kernel/svm/emissive.h
+%%CYCLES%%%%DATADIR%%/scripts/addons/cycles/kernel/svm/svm.h
+%%CYCLES%%%%DATADIR%%/scripts/addons/cycles/kernel/svm/svm_attribute.h
+%%CYCLES%%%%DATADIR%%/scripts/addons/cycles/kernel/svm/svm_bsdf.h
+%%CYCLES%%%%DATADIR%%/scripts/addons/cycles/kernel/svm/svm_camera.h
+%%CYCLES%%%%DATADIR%%/scripts/addons/cycles/kernel/svm/svm_closure.h
+%%CYCLES%%%%DATADIR%%/scripts/addons/cycles/kernel/svm/svm_convert.h
+%%CYCLES%%%%DATADIR%%/scripts/addons/cycles/kernel/svm/svm_checker.h
+%%CYCLES%%%%DATADIR%%/scripts/addons/cycles/kernel/svm/svm_displace.h
+%%CYCLES%%%%DATADIR%%/scripts/addons/cycles/kernel/svm/svm_fresnel.h
+%%CYCLES%%%%DATADIR%%/scripts/addons/cycles/kernel/svm/svm_gamma.h
+%%CYCLES%%%%DATADIR%%/scripts/addons/cycles/kernel/svm/svm_brightness.h
+%%CYCLES%%%%DATADIR%%/scripts/addons/cycles/kernel/svm/svm_geometry.h
+%%CYCLES%%%%DATADIR%%/scripts/addons/cycles/kernel/svm/svm_gradient.h
+%%CYCLES%%%%DATADIR%%/scripts/addons/cycles/kernel/svm/svm_hsv.h
+%%CYCLES%%%%DATADIR%%/scripts/addons/cycles/kernel/svm/svm_image.h
+%%CYCLES%%%%DATADIR%%/scripts/addons/cycles/kernel/svm/svm_invert.h
+%%CYCLES%%%%DATADIR%%/scripts/addons/cycles/kernel/svm/svm_light_path.h
+%%CYCLES%%%%DATADIR%%/scripts/addons/cycles/kernel/svm/svm_magic.h
+%%CYCLES%%%%DATADIR%%/scripts/addons/cycles/kernel/svm/svm_mapping.h
+%%CYCLES%%%%DATADIR%%/scripts/addons/cycles/kernel/svm/svm_math.h
+%%CYCLES%%%%DATADIR%%/scripts/addons/cycles/kernel/svm/svm_mix.h
+%%CYCLES%%%%DATADIR%%/scripts/addons/cycles/kernel/svm/svm_musgrave.h
+%%CYCLES%%%%DATADIR%%/scripts/addons/cycles/kernel/svm/svm_noise.h
+%%CYCLES%%%%DATADIR%%/scripts/addons/cycles/kernel/svm/svm_noisetex.h
+%%CYCLES%%%%DATADIR%%/scripts/addons/cycles/kernel/svm/svm_normal.h
+%%CYCLES%%%%DATADIR%%/scripts/addons/cycles/kernel/svm/svm_sepcomb_rgb.h
+%%CYCLES%%%%DATADIR%%/scripts/addons/cycles/kernel/svm/svm_sky.h
+%%CYCLES%%%%DATADIR%%/scripts/addons/cycles/kernel/svm/svm_tex_coord.h
+%%CYCLES%%%%DATADIR%%/scripts/addons/cycles/kernel/svm/svm_texture.h
+%%CYCLES%%%%DATADIR%%/scripts/addons/cycles/kernel/svm/svm_types.h
+%%CYCLES%%%%DATADIR%%/scripts/addons/cycles/kernel/svm/svm_value.h
+%%CYCLES%%%%DATADIR%%/scripts/addons/cycles/kernel/svm/svm_voronoi.h
+%%CYCLES%%%%DATADIR%%/scripts/addons/cycles/kernel/svm/svm_wave.h
+%%CYCLES%%%%DATADIR%%/scripts/addons/cycles/kernel/svm/bsdf.h
+%%CYCLES%%%%DATADIR%%/scripts/addons/cycles/kernel/kernel.cu
+%%CYCLES%%%%DATADIR%%/scripts/addons/cycles/kernel/kernel.h
+%%CYCLES%%%%DATADIR%%/scripts/addons/cycles/kernel/kernel_accumulate.h
+%%CYCLES%%%%DATADIR%%/scripts/addons/cycles/kernel/kernel_bvh.h
+%%CYCLES%%%%DATADIR%%/scripts/addons/cycles/kernel/kernel_camera.h
+%%CYCLES%%%%DATADIR%%/scripts/addons/cycles/kernel/kernel_compat_cpu.h
+%%CYCLES%%%%DATADIR%%/scripts/addons/cycles/kernel/kernel_compat_cuda.h
+%%CYCLES%%%%DATADIR%%/scripts/addons/cycles/kernel/kernel_compat_opencl.h
+%%CYCLES%%%%DATADIR%%/scripts/addons/cycles/kernel/kernel_differential.h
+%%CYCLES%%%%DATADIR%%/scripts/addons/cycles/kernel/kernel_displace.h
+%%CYCLES%%%%DATADIR%%/scripts/addons/cycles/kernel/kernel_emission.h
+%%CYCLES%%%%DATADIR%%/scripts/addons/cycles/kernel/kernel_film.h
+%%CYCLES%%%%DATADIR%%/scripts/addons/cycles/kernel/kernel_globals.h
+%%CYCLES%%%%DATADIR%%/scripts/addons/cycles/kernel/kernel_light.h
+%%CYCLES%%%%DATADIR%%/scripts/addons/cycles/kernel/kernel_math.h
+%%CYCLES%%%%DATADIR%%/scripts/addons/cycles/kernel/kernel_mbvh.h
+%%CYCLES%%%%DATADIR%%/scripts/addons/cycles/kernel/kernel_montecarlo.h
+%%CYCLES%%%%DATADIR%%/scripts/addons/cycles/kernel/kernel_object.h
+%%CYCLES%%%%DATADIR%%/scripts/addons/cycles/kernel/kernel_passes.h
+%%CYCLES%%%%DATADIR%%/scripts/addons/cycles/kernel/kernel_path.h
+%%CYCLES%%%%DATADIR%%/scripts/addons/cycles/kernel/kernel_qbvh.h
+%%CYCLES%%%%DATADIR%%/scripts/addons/cycles/kernel/kernel_random.h
+%%CYCLES%%%%DATADIR%%/scripts/addons/cycles/kernel/kernel_shader.h
+%%CYCLES%%%%DATADIR%%/scripts/addons/cycles/kernel/kernel_textures.h
+%%CYCLES%%%%DATADIR%%/scripts/addons/cycles/kernel/kernel_triangle.h
+%%CYCLES%%%%DATADIR%%/scripts/addons/cycles/kernel/kernel_types.h
+%%CYCLES%%%%DATADIR%%/scripts/addons/cycles/kernel/util_color.h
+%%CYCLES%%%%DATADIR%%/scripts/addons/cycles/kernel/util_math.h
+%%CYCLES%%%%DATADIR%%/scripts/addons/cycles/kernel/util_transform.h
+%%CYCLES%%%%DATADIR%%/scripts/addons/cycles/kernel/kernel.cl
+%%CYCLES%%%%DATADIR%%/scripts/addons/cycles/kernel/util_types.h
+%%CYCLES%%%%DATADIR%%/scripts/addons/cycles/enums.py
+%%CYCLES%%%%DATADIR%%/scripts/addons/cycles/presets.py
+%%CYCLES%%%%DATADIR%%/scripts/addons/cycles/__init__.py
+%%CYCLES%%%%DATADIR%%/scripts/addons/cycles/ui.py
+%%CYCLES%%%%DATADIR%%/scripts/addons/cycles/properties.py
+%%CYCLES%%%%DATADIR%%/scripts/addons/cycles/engine.py
 %%DATADIR%%/scripts/addons/development_api_navigator.py
 %%DATADIR%%/scripts/addons/development_icon_get.py
 %%DATADIR%%/scripts/addons/game_engine_save_as_runtime.py
@@ -557,6 +647,10 @@
 @dirrm %%DATADIR%%/scripts/addons/io_anim_c3d
 @dirrm %%DATADIR%%/scripts/addons/io_anim_bvh
 @dirrm %%DATADIR%%/scripts/addons/io_anim_acclaim
+%%CYCLES%%@dirrm %%DATADIR%%/scripts/addons/cycles/kernel/svm
+%%CYCLES%%@dirrm %%DATADIR%%/scripts/addons/cycles/kernel
+%%CYCLES%%@dirrm %%DATADIR%%/scripts/addons/cycles/license
+%%CYCLES%%@dirrm %%DATADIR%%/scripts/addons/cycles
 @dirrm %%DATADIR%%/scripts/addons/add_mesh_extra_objects
 @dirrm %%DATADIR%%/scripts/addons/add_mesh_BoltFactory/presets
 @dirrm %%DATADIR%%/scripts/addons/add_mesh_BoltFactory


>Release-Note:
>Audit-Trail:
>Unformatted:

More information about the freebsd-ports-bugs mailing list