diff -Nru graphics/blender.orig/Makefile graphics/blender/Makefile --- graphics/blender.orig/Makefile 2020-09-06 16:17:09.001385000 +0930 +++ graphics/blender/Makefile 2020-09-05 12:47:32.836443000 +0930 @@ -2,8 +2,7 @@ # $FreeBSD$ PORTNAME= blender -DISTVERSION= 2.83.2 -PORTREVISION= 1 +DISTVERSION= 2.90.0 CATEGORIES= graphics multimedia MASTER_SITES= http://download.blender.org/source/ \ http://mirror.cs.umn.edu/blender.org/source/ \ @@ -15,6 +14,9 @@ LICENSE= GPLv3+ LICENSE_FILE= ${WRKSRC}/doc/license/GPL3-license.txt +NOT_FOR_ARCHS= i386 +NOT_FOR_ARCHS_REASON= uses 64bit atomic functions + BUILD_DEPENDS= ${PYNUMPY} LIB_DEPENDS= libpng.so:graphics/png \ libfreetype.so:print/freetype2 \ @@ -24,7 +26,7 @@ # libraries are used, if either of the most common options in blender # are set. We will pull boost in just to be on the safe side. -USES= cmake compiler:c++14-lang gl jpeg python:3.7 shebangfix \ +USES= cmake compiler:c++14-lang gl jpeg python:3.8 shebangfix \ tar:xz xorg USE_XORG= x11 xext xfixes xmu xrender USE_GL= gl glu glew diff -Nru graphics/blender.orig/Makefile.options graphics/blender/Makefile.options --- graphics/blender.orig/Makefile.options 2020-09-06 16:17:09.022295000 +0930 +++ graphics/blender/Makefile.options 2020-09-05 12:47:32.848868000 +0930 @@ -57,6 +57,7 @@ COMPOSITOR \ CYCLES \ DDS \ + DRACO \ FFMPEG \ FFTW3 \ FRAMESERVER \ diff -Nru graphics/blender.orig/Makefile.versions graphics/blender/Makefile.versions --- graphics/blender.orig/Makefile.versions 2020-09-06 16:17:08.563524000 +0930 +++ graphics/blender/Makefile.versions 2020-09-05 12:47:32.893477000 +0930 @@ -2,5 +2,5 @@ # Versions of Blender and its python dependency for use by depending ports, like add-ons -BLENDER_BL_VERSION= 2.83.0 -BLENDER_PY_VERSION= 3.7 +BLENDER_BL_VERSION= 2.90.0 +BLENDER_PY_VERSION= 3.8 diff -Nru graphics/blender.orig/distinfo graphics/blender/distinfo --- graphics/blender.orig/distinfo 2020-09-06 16:17:08.985672000 +0930 +++ graphics/blender/distinfo 2020-09-05 12:47:32.920660000 +0930 @@ -1,3 +1,3 @@ -TIMESTAMP = 1594629379 -SHA256 (blender-2.83.2.tar.xz) = c18b70349df96bdd1fcec75f61ab6f17cbebd406ddcc8e6ba442773b734c4e22 -SIZE (blender-2.83.2.tar.xz) = 38525380 +TIMESTAMP = 1599036952 +SHA256 (blender-2.90.0.tar.xz) = 04f19e7984ad8d9f0432f873db89664eb710e75ac4d4c2b1a404e2ecdadb1323 +SIZE (blender-2.90.0.tar.xz) = 38831704 diff -Nru graphics/blender.orig/files/patch-extern_audaspace_bindings_python_PySound.cpp graphics/blender/files/patch-extern_audaspace_bindings_python_PySound.cpp --- graphics/blender.orig/files/patch-extern_audaspace_bindings_python_PySound.cpp 1970-01-01 09:30:00.000000000 +0930 +++ graphics/blender/files/patch-extern_audaspace_bindings_python_PySound.cpp 2020-09-05 12:47:32.945993000 +0930 @@ -0,0 +1,11 @@ +--- extern/audaspace/bindings/python/PySound.cpp.orig 2020-09-02 11:06:51 UTC ++++ extern/audaspace/bindings/python/PySound.cpp +@@ -2015,7 +2015,7 @@ AUD_API Sound* checkSound(PyObject* sound) + + bool initializeSound() + { +- import_array(); ++ import_array1(false); + + return PyType_Ready(&SoundType) >= 0; + } diff -Nru graphics/blender.orig/files/patch-intern_opensubdiv_CMakeLists.txt graphics/blender/files/patch-intern_opensubdiv_CMakeLists.txt --- graphics/blender.orig/files/patch-intern_opensubdiv_CMakeLists.txt 2020-09-06 16:17:08.907573000 +0930 +++ graphics/blender/files/patch-intern_opensubdiv_CMakeLists.txt 2020-09-05 12:47:32.963462000 +0930 @@ -1,11 +1,11 @@ ---- intern/opensubdiv/CMakeLists.txt.orig 2019-07-24 17:11:39 UTC +--- intern/opensubdiv/CMakeLists.txt.orig 2020-08-31 21:29:44 UTC +++ intern/opensubdiv/CMakeLists.txt -@@ -83,7 +83,7 @@ if(WITH_OPENSUBDIV) - internal/opensubdiv_util.h - ) +@@ -97,7 +97,7 @@ if(WITH_OPENSUBDIV) + ) + endif() - OPENSUBDIV_DEFINE_COMPONENT(OPENSUBDIV_HAS_OPENMP) +# OPENSUBDIV_DEFINE_COMPONENT(OPENSUBDIV_HAS_OPENMP) - # TODO(sergey): OpenCL is not tested and totally unstable atm. - # OPENSUBDIV_DEFINE_COMPONENT(OPENSUBDIV_HAS_OPENCL) - # TODO(sergey): CUDA stays disabled for util it's ported to drievr API. + OPENSUBDIV_DEFINE_COMPONENT(OPENSUBDIV_HAS_OPENCL) + OPENSUBDIV_DEFINE_COMPONENT(OPENSUBDIV_HAS_CUDA) + OPENSUBDIV_DEFINE_COMPONENT(OPENSUBDIV_HAS_GLSL_TRANSFORM_FEEDBACK) diff -Nru graphics/blender.orig/pkg-plist graphics/blender/pkg-plist --- graphics/blender.orig/pkg-plist 2020-09-06 16:17:08.966935000 +0930 +++ graphics/blender/pkg-plist 2020-09-05 12:47:33.032658000 +0930 @@ -131,6 +131,7 @@ %%DATADIR%%/%%VER%%/datafiles/icons/ops.mesh.bisect.dat %%DATADIR%%/%%VER%%/datafiles/icons/ops.mesh.dupli_extrude_cursor.dat %%DATADIR%%/%%VER%%/datafiles/icons/ops.mesh.extrude_faces_move.dat +%%DATADIR%%/%%VER%%/datafiles/icons/ops.mesh.extrude_manifold.dat %%DATADIR%%/%%VER%%/datafiles/icons/ops.mesh.extrude_region_move.dat %%DATADIR%%/%%VER%%/datafiles/icons/ops.mesh.extrude_region_shrink_fatten.dat %%DATADIR%%/%%VER%%/datafiles/icons/ops.mesh.inset.dat @@ -161,6 +162,7 @@ %%DATADIR%%/%%VER%%/datafiles/icons/ops.pose.relax.dat %%DATADIR%%/%%VER%%/datafiles/icons/ops.sculpt.border_hide.dat %%DATADIR%%/%%VER%%/datafiles/icons/ops.sculpt.border_mask.dat +%%DATADIR%%/%%VER%%/datafiles/icons/ops.sculpt.cloth_filter.dat %%DATADIR%%/%%VER%%/datafiles/icons/ops.sculpt.lasso_mask.dat %%DATADIR%%/%%VER%%/datafiles/icons/ops.sculpt.mesh_filter.dat %%DATADIR%%/%%VER%%/datafiles/icons/ops.sequencer.blade.dat @@ -695,18 +697,6 @@ %%CYCLES%%%%DATADIR%%/%%VER%%/scripts/addons/cycles/source/kernel/bvh/bvh_types.h %%CYCLES%%%%DATADIR%%/%%VER%%/scripts/addons/cycles/source/kernel/bvh/bvh_volume.h %%CYCLES%%%%DATADIR%%/%%VER%%/scripts/addons/cycles/source/kernel/bvh/bvh_volume_all.h -%%CYCLES%%%%DATADIR%%/%%VER%%/scripts/addons/cycles/source/kernel/bvh/obvh_local.h -%%CYCLES%%%%DATADIR%%/%%VER%%/scripts/addons/cycles/source/kernel/bvh/obvh_nodes.h -%%CYCLES%%%%DATADIR%%/%%VER%%/scripts/addons/cycles/source/kernel/bvh/obvh_shadow_all.h -%%CYCLES%%%%DATADIR%%/%%VER%%/scripts/addons/cycles/source/kernel/bvh/obvh_traversal.h -%%CYCLES%%%%DATADIR%%/%%VER%%/scripts/addons/cycles/source/kernel/bvh/obvh_volume.h -%%CYCLES%%%%DATADIR%%/%%VER%%/scripts/addons/cycles/source/kernel/bvh/obvh_volume_all.h -%%CYCLES%%%%DATADIR%%/%%VER%%/scripts/addons/cycles/source/kernel/bvh/qbvh_local.h -%%CYCLES%%%%DATADIR%%/%%VER%%/scripts/addons/cycles/source/kernel/bvh/qbvh_nodes.h -%%CYCLES%%%%DATADIR%%/%%VER%%/scripts/addons/cycles/source/kernel/bvh/qbvh_shadow_all.h -%%CYCLES%%%%DATADIR%%/%%VER%%/scripts/addons/cycles/source/kernel/bvh/qbvh_traversal.h -%%CYCLES%%%%DATADIR%%/%%VER%%/scripts/addons/cycles/source/kernel/bvh/qbvh_volume.h -%%CYCLES%%%%DATADIR%%/%%VER%%/scripts/addons/cycles/source/kernel/bvh/qbvh_volume_all.h %%CYCLES%%%%DATADIR%%/%%VER%%/scripts/addons/cycles/source/kernel/closure/alloc.h %%CYCLES%%%%DATADIR%%/%%VER%%/scripts/addons/cycles/source/kernel/closure/bsdf.h %%CYCLES%%%%DATADIR%%/%%VER%%/scripts/addons/cycles/source/kernel/closure/bsdf_ashikhmin_shirley.h @@ -773,6 +763,8 @@ %%CYCLES%%%%DATADIR%%/%%VER%%/scripts/addons/cycles/source/kernel/kernel_id_passes.h %%CYCLES%%%%DATADIR%%/%%VER%%/scripts/addons/cycles/source/kernel/kernel_jitter.h %%CYCLES%%%%DATADIR%%/%%VER%%/scripts/addons/cycles/source/kernel/kernel_light.h +%%CYCLES%%%%DATADIR%%/%%VER%%/scripts/addons/cycles/source/kernel/kernel_light_background.h +%%CYCLES%%%%DATADIR%%/%%VER%%/scripts/addons/cycles/source/kernel/kernel_light_common.h %%CYCLES%%%%DATADIR%%/%%VER%%/scripts/addons/cycles/source/kernel/kernel_math.h %%CYCLES%%%%DATADIR%%/%%VER%%/scripts/addons/cycles/source/kernel/kernel_montecarlo.h %%CYCLES%%%%DATADIR%%/%%VER%%/scripts/addons/cycles/source/kernel/kernel_passes.h @@ -980,6 +972,7 @@ %%DATADIR%%/%%VER%%/scripts/addons/io_coat3D/__init__.py %%DATADIR%%/%%VER%%/scripts/addons/io_coat3D/data.json %%DATADIR%%/%%VER%%/scripts/addons/io_coat3D/tex.py +%%DATADIR%%/%%VER%%/scripts/addons/io_coat3D/texVR.py %%DATADIR%%/%%VER%%/scripts/addons/io_curve_svg/__init__.py %%DATADIR%%/%%VER%%/scripts/addons/io_curve_svg/import_svg.py %%DATADIR%%/%%VER%%/scripts/addons/io_curve_svg/svg_colors.py @@ -1006,6 +999,7 @@ %%DATADIR%%/%%VER%%/scripts/addons/io_export_dxf/test2.txt %%DATADIR%%/%%VER%%/scripts/addons/io_export_paper_model.py %%DATADIR%%/%%VER%%/scripts/addons/io_export_pc2.py +%%DATADIR%%/%%VER%%/scripts/addons/io_import_BrushSet.py %%DATADIR%%/%%VER%%/scripts/addons/io_import_dxf/__init__.py %%DATADIR%%/%%VER%%/scripts/addons/io_import_dxf/dxfgrabber/__init__.py %%DATADIR%%/%%VER%%/scripts/addons/io_import_dxf/dxfgrabber/acdsdata.py @@ -1108,7 +1102,7 @@ %%DATADIR%%/%%VER%%/scripts/addons/io_scene_gltf2/blender/exp/gltf2_blender_gltf2_exporter.py %%DATADIR%%/%%VER%%/scripts/addons/io_scene_gltf2/blender/exp/gltf2_blender_image.py %%DATADIR%%/%%VER%%/scripts/addons/io_scene_gltf2/blender/exp/gltf2_blender_search_node_tree.py -%%DATADIR%%/%%VER%%/scripts/addons/io_scene_gltf2/blender/exp/gltf2_blender_utils.py +%%DATADIR%%/%%VER%%/scripts/addons/io_scene_gltf2/blender/imp/gltf2_blender_KHR_materials_clearcoat.py %%DATADIR%%/%%VER%%/scripts/addons/io_scene_gltf2/blender/imp/gltf2_blender_KHR_materials_pbrSpecularGlossiness.py %%DATADIR%%/%%VER%%/scripts/addons/io_scene_gltf2/blender/imp/gltf2_blender_KHR_materials_unlit.py %%DATADIR%%/%%VER%%/scripts/addons/io_scene_gltf2/blender/imp/gltf2_blender_animation.py @@ -1123,7 +1117,6 @@ %%DATADIR%%/%%VER%%/scripts/addons/io_scene_gltf2/blender/imp/gltf2_blender_mesh.py %%DATADIR%%/%%VER%%/scripts/addons/io_scene_gltf2/blender/imp/gltf2_blender_node.py %%DATADIR%%/%%VER%%/scripts/addons/io_scene_gltf2/blender/imp/gltf2_blender_pbrMetallicRoughness.py -%%DATADIR%%/%%VER%%/scripts/addons/io_scene_gltf2/blender/imp/gltf2_blender_primitive.py %%DATADIR%%/%%VER%%/scripts/addons/io_scene_gltf2/blender/imp/gltf2_blender_scene.py %%DATADIR%%/%%VER%%/scripts/addons/io_scene_gltf2/blender/imp/gltf2_blender_texture.py %%DATADIR%%/%%VER%%/scripts/addons/io_scene_gltf2/blender/imp/gltf2_blender_vnode.py @@ -1552,7 +1545,7 @@ %%DATADIR%%/%%VER%%/scripts/addons/presets/operator/mesh.primitive_xyz_function_surface/sterosphere.py %%DATADIR%%/%%VER%%/scripts/addons/presets/operator/mesh.primitive_xyz_function_surface/torus.py %%DATADIR%%/%%VER%%/scripts/addons/presets/operator/mesh.primitive_xyz_function_surface/twisted_torus.py -%%DATADIR%%/%%VER%%/scripts/addons/presets/pov/light/01_(5400K)_Direct_Sun.py +%%DATADIR%%/%%VER%%/scripts/addons/presets/pov/light/01_(4800K)_Direct_Sun.py %%DATADIR%%/%%VER%%/scripts/addons/presets/pov/light/02_(5400K)_High_Noon_Sun.py %%DATADIR%%/%%VER%%/scripts/addons/presets/pov/light/03_(6000K)_Daylight_Window.py %%DATADIR%%/%%VER%%/scripts/addons/presets/pov/light/04_(6000K)_2500W_HMI_(Halogen_Metal_Iodide).py @@ -2089,6 +2082,7 @@ %%DATADIR%%/%%VER%%/scripts/startup/bl_operators/constraint.py %%DATADIR%%/%%VER%%/scripts/startup/bl_operators/file.py %%DATADIR%%/%%VER%%/scripts/startup/bl_operators/freestyle.py +%%DATADIR%%/%%VER%%/scripts/startup/bl_operators/gpencil_mesh_bake.py %%DATADIR%%/%%VER%%/scripts/startup/bl_operators/image.py %%DATADIR%%/%%VER%%/scripts/startup/bl_operators/mesh.py %%DATADIR%%/%%VER%%/scripts/startup/bl_operators/node.py @@ -2100,6 +2094,7 @@ %%DATADIR%%/%%VER%%/scripts/startup/bl_operators/rigidbody.py %%DATADIR%%/%%VER%%/scripts/startup/bl_operators/screen_play_rendered_anim.py %%DATADIR%%/%%VER%%/scripts/startup/bl_operators/sequencer.py +%%DATADIR%%/%%VER%%/scripts/startup/bl_operators/simulation.py %%DATADIR%%/%%VER%%/scripts/startup/bl_operators/userpref.py %%DATADIR%%/%%VER%%/scripts/startup/bl_operators/uvcalc_follow_active.py %%DATADIR%%/%%VER%%/scripts/startup/bl_operators/uvcalc_lightmap.py