diff --git a/graphics/blender/Makefile b/graphics/blender/Makefile index 08b891c179b7..6f293b3327e1 100644 --- a/graphics/blender/Makefile +++ b/graphics/blender/Makefile @@ -2,8 +2,7 @@ # $FreeBSD$ PORTNAME= blender -DISTVERSION= 2.90.0 -PORTREVISION= 2 +DISTVERSION= 2.91.0 CATEGORIES= graphics multimedia MASTER_SITES= http://download.blender.org/source/ \ http://mirror.cs.umn.edu/blender.org/source/ \ @@ -93,6 +92,8 @@ CYCLESOSL_RUN_DEPENDS= llvm-config${LLVM_VER}:devel/llvm${LLVM_VER} DDS_CMAKE_BOOL= WITH_IMAGE_DDS DRACO_CMAKE_BOOL= WITH_DRACO DRACO_USE= LDCONFIG=${PYTHON_SITELIBDIR} +EBOOL_CMAKE_BOOL= WITH_GMP +EBOOL_LIB_DEPENDS= libgmp.so:math/gmp FFMPEG_CMAKE_BOOL= WITH_CODEC_FFMPEG FFMPEG_LIB_DEPENDS= libavutil.so:multimedia/ffmpeg FFTW3_CMAKE_BOOL= WITH_FFTW3 @@ -156,6 +157,8 @@ TBB_CMAKE_BOOL= WITH_TBB TBB_LIB_DEPENDS= libtbb.so:devel/tbb TIFF_CMAKE_BOOL= WITH_IMAGE_TIFF TIFF_LIB_DEPENDS= libtiff.so:graphics/tiff +TRACE_CMAKE_BOOL= WITH_POTRACE +TRACE_LIB_DEPENDS= libpotrace.so:graphics/libpotrace XINPUT_CMAKE_BOOL= WITH_X11_XINPUT XINPUT_USE= XORG=xi XF86VMODE_CMAKE_BOOL= WITH_X11_XF86VMODE diff --git a/graphics/blender/Makefile.options b/graphics/blender/Makefile.options index 000a7b632718..cb5c09060b40 100644 --- a/graphics/blender/Makefile.options +++ b/graphics/blender/Makefile.options @@ -14,6 +14,7 @@ OPTIONS_DEFINE= \ CYCLESOSL \ DDS \ DRACO \ + EBOOL \ FFMPEG \ FFTW3 \ FRAMESERVER \ @@ -44,6 +45,7 @@ OPTIONS_DEFINE= \ SNDFILE \ TBB \ TIFF \ + TRACE \ XINPUT \ XF86VMODE @@ -58,6 +60,7 @@ OPTIONS_DEFAULT= \ CYCLES \ DDS \ DRACO \ + EBOOL \ FFMPEG \ FFTW3 \ FRAMESERVER \ @@ -82,6 +85,7 @@ OPTIONS_DEFAULT= \ SDL \ TBB \ TIFF \ + TRACE \ XINPUT \ XF86VMODE @@ -101,6 +105,7 @@ CYCLESOSL_DESC= Shading support for the cycles render engine DDS_DESC= DDS graphics format support # this is required to support gltf import/export DRACO_DESC= Install draco python module +EBOOL_DESC= Enable exact boolean support FFTW3_DESC= Use fftw for smoke and audio effects FRAMESERVER_DESC= Image FrameServer support for rendering FREESTYLE_DESC= Enable advanced edges rendering @@ -123,5 +128,6 @@ OPENVDB_DESC= Use openVDB library for volumetric data RAYOPTIMIZATION_DESC= Enable SSE optimizatons for raytracing SDL_DESC= Audio and Joystick support using SDL TBB_DESC= Enable use of Intel's tbb +TRACE_DESC= Enable tracing image to GP stroke XINPUT_DESC= X11 Xinput (tablet) support XF86VMODE_DESC= X11 video mode switching support diff --git a/graphics/blender/Makefile.versions b/graphics/blender/Makefile.versions index cd4170b130b6..a8b1d1bf7eb9 100644 --- a/graphics/blender/Makefile.versions +++ b/graphics/blender/Makefile.versions @@ -2,5 +2,5 @@ # Versions of Blender and its python dependency for use by depending ports, like add-ons -BLENDER_BL_VERSION= 2.90.0 +BLENDER_BL_VERSION= 2.91.0 BLENDER_PY_VERSION= 3.8 diff --git a/graphics/blender/distinfo b/graphics/blender/distinfo index 4fcdd9407c59..a5929af893e4 100644 --- a/graphics/blender/distinfo +++ b/graphics/blender/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1599036952 -SHA256 (blender-2.90.0.tar.xz) = 04f19e7984ad8d9f0432f873db89664eb710e75ac4d4c2b1a404e2ecdadb1323 -SIZE (blender-2.90.0.tar.xz) = 38831704 +TIMESTAMP = 1607230073 +SHA256 (blender-2.91.0.tar.xz) = 557a4afd09fe086ebcb0256b904896f577fe913683655f4248b881591f356974 +SIZE (blender-2.91.0.tar.xz) = 41528920 diff --git a/graphics/blender/files/patch-build__files_cmake_Modules_FindEmbree.cmake b/graphics/blender/files/patch-build__files_cmake_Modules_FindEmbree.cmake deleted file mode 100644 index a76937d6bdc3..000000000000 --- a/graphics/blender/files/patch-build__files_cmake_Modules_FindEmbree.cmake +++ /dev/null @@ -1,25 +0,0 @@ ---- build_files/cmake/Modules/FindEmbree.cmake.orig 2019-08-12 17:21:01 UTC -+++ build_files/cmake/Modules/FindEmbree.cmake -@@ -48,14 +48,14 @@ FIND_PATH(EMBREE_INCLUDE_DIR - - SET(_embree_FIND_COMPONENTS - embree3 -- embree_avx -- embree_avx2 -- embree_sse42 -- lexers -- math -- simd -- sys -- tasking -+# embree_avx -+# embree_avx2 -+# embree_sse42 -+# lexers -+# math -+# simd -+# sys -+# tasking - ) - - SET(_embree_LIBRARIES) diff --git a/graphics/blender/files/patch-extern_audaspace_bindings_python_PySound.cpp b/graphics/blender/files/patch-extern_audaspace_bindings_python_PySound.cpp deleted file mode 100644 index cd35e1098a1b..000000000000 --- a/graphics/blender/files/patch-extern_audaspace_bindings_python_PySound.cpp +++ /dev/null @@ -1,11 +0,0 @@ ---- 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 --git a/graphics/blender/pkg-plist b/graphics/blender/pkg-plist index acdca802ff19..2bdd5078b034 100644 --- a/graphics/blender/pkg-plist +++ b/graphics/blender/pkg-plist @@ -56,11 +56,13 @@ share/applications/blender.desktop %%DATADIR%%/%%VER%%/datafiles/icons/brush.particle.smooth.dat %%DATADIR%%/%%VER%%/datafiles/icons/brush.particle.weight.dat %%DATADIR%%/%%VER%%/datafiles/icons/brush.sculpt.blob.dat +%%DATADIR%%/%%VER%%/datafiles/icons/brush.sculpt.boundary.dat %%DATADIR%%/%%VER%%/datafiles/icons/brush.sculpt.clay.dat %%DATADIR%%/%%VER%%/datafiles/icons/brush.sculpt.clay_strips.dat %%DATADIR%%/%%VER%%/datafiles/icons/brush.sculpt.clay_thumb.dat %%DATADIR%%/%%VER%%/datafiles/icons/brush.sculpt.cloth.dat %%DATADIR%%/%%VER%%/datafiles/icons/brush.sculpt.crease.dat +%%DATADIR%%/%%VER%%/datafiles/icons/brush.sculpt.displacement_eraser.dat %%DATADIR%%/%%VER%%/datafiles/icons/brush.sculpt.draw.dat %%DATADIR%%/%%VER%%/datafiles/icons/brush.sculpt.draw_face_sets.dat %%DATADIR%%/%%VER%%/datafiles/icons/brush.sculpt.draw_sharp.dat @@ -160,10 +162,17 @@ share/applications/blender.desktop %%DATADIR%%/%%VER%%/datafiles/icons/ops.pose.breakdowner.dat %%DATADIR%%/%%VER%%/datafiles/icons/ops.pose.push.dat %%DATADIR%%/%%VER%%/datafiles/icons/ops.pose.relax.dat +%%DATADIR%%/%%VER%%/datafiles/icons/ops.sculpt.border_face_set.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.box_trim.dat %%DATADIR%%/%%VER%%/datafiles/icons/ops.sculpt.cloth_filter.dat +%%DATADIR%%/%%VER%%/datafiles/icons/ops.sculpt.face_set_edit.dat +%%DATADIR%%/%%VER%%/datafiles/icons/ops.sculpt.lasso_face_set.dat %%DATADIR%%/%%VER%%/datafiles/icons/ops.sculpt.lasso_mask.dat +%%DATADIR%%/%%VER%%/datafiles/icons/ops.sculpt.lasso_trim.dat +%%DATADIR%%/%%VER%%/datafiles/icons/ops.sculpt.line_mask.dat +%%DATADIR%%/%%VER%%/datafiles/icons/ops.sculpt.line_project.dat %%DATADIR%%/%%VER%%/datafiles/icons/ops.sculpt.mesh_filter.dat %%DATADIR%%/%%VER%%/datafiles/icons/ops.sequencer.blade.dat %%DATADIR%%/%%VER%%/datafiles/icons/ops.transform.bone_envelope.dat @@ -529,6 +538,7 @@ share/applications/blender.desktop %%DATADIR%%/%%VER%%/scripts/addons/blenderkit/thumbnails/rating_ui.png %%DATADIR%%/%%VER%%/scripts/addons/blenderkit/thumbnails/rating_ui_empty.png %%DATADIR%%/%%VER%%/scripts/addons/blenderkit/thumbnails/star_white.png +%%DATADIR%%/%%VER%%/scripts/addons/blenderkit/thumbnails/thumbnail_not_available.jpg %%DATADIR%%/%%VER%%/scripts/addons/blenderkit/thumbnails/thumbnail_notready.jpg %%DATADIR%%/%%VER%%/scripts/addons/blenderkit/thumbnails/vs_deleted.png %%DATADIR%%/%%VER%%/scripts/addons/blenderkit/thumbnails/vs_on_hold.png @@ -962,6 +972,13 @@ share/applications/blender.desktop %%DATADIR%%/%%VER%%/scripts/addons/development_edit_operator.py %%DATADIR%%/%%VER%%/scripts/addons/development_icon_get.py %%DATADIR%%/%%VER%%/scripts/addons/development_iskeyfree.py +%%DATADIR%%/%%VER%%/scripts/addons/greasepencil_tools/__init__.py +%%DATADIR%%/%%VER%%/scripts/addons/greasepencil_tools/box_deform.py +%%DATADIR%%/%%VER%%/scripts/addons/greasepencil_tools/import_brush_pack.py +%%DATADIR%%/%%VER%%/scripts/addons/greasepencil_tools/line_reshape.py +%%DATADIR%%/%%VER%%/scripts/addons/greasepencil_tools/prefs.py +%%DATADIR%%/%%VER%%/scripts/addons/greasepencil_tools/rotate_canvas.py +%%DATADIR%%/%%VER%%/scripts/addons/greasepencil_tools/ui_panels.py %%DATADIR%%/%%VER%%/scripts/addons/io_anim_bvh/__init__.py %%DATADIR%%/%%VER%%/scripts/addons/io_anim_bvh/export_bvh.py %%DATADIR%%/%%VER%%/scripts/addons/io_anim_bvh/import_bvh.py @@ -971,8 +988,10 @@ share/applications/blender.desktop %%DATADIR%%/%%VER%%/scripts/addons/io_anim_nuke_chan/import_nuke_chan.py %%DATADIR%%/%%VER%%/scripts/addons/io_coat3D/__init__.py %%DATADIR%%/%%VER%%/scripts/addons/io_coat3D/data.json +%%DATADIR%%/%%VER%%/scripts/addons/io_coat3D/folders.py %%DATADIR%%/%%VER%%/scripts/addons/io_coat3D/tex.py %%DATADIR%%/%%VER%%/scripts/addons/io_coat3D/texVR.py +%%DATADIR%%/%%VER%%/scripts/addons/io_coat3D/updateimage.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 @@ -1086,10 +1105,9 @@ share/applications/blender.desktop %%DATADIR%%/%%VER%%/scripts/addons/io_scene_gltf2/blender/exp/gltf2_blender_gather_joints.py %%DATADIR%%/%%VER%%/scripts/addons/io_scene_gltf2/blender/exp/gltf2_blender_gather_light_spots.py %%DATADIR%%/%%VER%%/scripts/addons/io_scene_gltf2/blender/exp/gltf2_blender_gather_lights.py -%%DATADIR%%/%%VER%%/scripts/addons/io_scene_gltf2/blender/exp/gltf2_blender_gather_material_normal_texture_info_class.py -%%DATADIR%%/%%VER%%/scripts/addons/io_scene_gltf2/blender/exp/gltf2_blender_gather_material_occlusion_texture_info_class.py %%DATADIR%%/%%VER%%/scripts/addons/io_scene_gltf2/blender/exp/gltf2_blender_gather_materials.py %%DATADIR%%/%%VER%%/scripts/addons/io_scene_gltf2/blender/exp/gltf2_blender_gather_materials_pbr_metallic_roughness.py +%%DATADIR%%/%%VER%%/scripts/addons/io_scene_gltf2/blender/exp/gltf2_blender_gather_materials_unlit.py %%DATADIR%%/%%VER%%/scripts/addons/io_scene_gltf2/blender/exp/gltf2_blender_gather_mesh.py %%DATADIR%%/%%VER%%/scripts/addons/io_scene_gltf2/blender/exp/gltf2_blender_gather_nodes.py %%DATADIR%%/%%VER%%/scripts/addons/io_scene_gltf2/blender/exp/gltf2_blender_gather_primitive_attributes.py @@ -1155,6 +1173,7 @@ share/applications/blender.desktop %%DATADIR%%/%%VER%%/scripts/addons/magic_uv/op/__init__.py %%DATADIR%%/%%VER%%/scripts/addons/magic_uv/op/align_uv.py %%DATADIR%%/%%VER%%/scripts/addons/magic_uv/op/align_uv_cursor.py +%%DATADIR%%/%%VER%%/scripts/addons/magic_uv/op/clip_uv.py %%DATADIR%%/%%VER%%/scripts/addons/magic_uv/op/copy_paste_uv.py %%DATADIR%%/%%VER%%/scripts/addons/magic_uv/op/copy_paste_uv_object.py %%DATADIR%%/%%VER%%/scripts/addons/magic_uv/op/copy_paste_uv_uvedit.py @@ -1310,25 +1329,6 @@ share/applications/blender.desktop %%DATADIR%%/%%VER%%/scripts/addons/object_scatter/operator.py %%DATADIR%%/%%VER%%/scripts/addons/object_scatter/ui.py %%DATADIR%%/%%VER%%/scripts/addons/object_skinify.py -%%DATADIR%%/%%VER%%/scripts/addons/oscurart_tools/__init__.py -%%DATADIR%%/%%VER%%/scripts/addons/oscurart_tools/files/collect_images.py -%%DATADIR%%/%%VER%%/scripts/addons/oscurart_tools/files/reload_images.py -%%DATADIR%%/%%VER%%/scripts/addons/oscurart_tools/files/save_incremental.py -%%DATADIR%%/%%VER%%/scripts/addons/oscurart_tools/mesh/apply_linked_meshes.py -%%DATADIR%%/%%VER%%/scripts/addons/oscurart_tools/mesh/flipped_uvs.py -%%DATADIR%%/%%VER%%/scripts/addons/oscurart_tools/mesh/overlap_island.py -%%DATADIR%%/%%VER%%/scripts/addons/oscurart_tools/mesh/overlap_uvs.py -%%DATADIR%%/%%VER%%/scripts/addons/oscurart_tools/mesh/print_uv_stats.py -%%DATADIR%%/%%VER%%/scripts/addons/oscurart_tools/mesh/remove_modifiers.py -%%DATADIR%%/%%VER%%/scripts/addons/oscurart_tools/mesh/select_doubles.py -%%DATADIR%%/%%VER%%/scripts/addons/oscurart_tools/mesh/shapes_to_objects.py -%%DATADIR%%/%%VER%%/scripts/addons/oscurart_tools/mesh/vertex_color_id.py -%%DATADIR%%/%%VER%%/scripts/addons/oscurart_tools/object/distribute.py -%%DATADIR%%/%%VER%%/scripts/addons/oscurart_tools/object/search_and_select.py -%%DATADIR%%/%%VER%%/scripts/addons/oscurart_tools/object/selection.py -%%DATADIR%%/%%VER%%/scripts/addons/oscurart_tools/render/batch_maker.py -%%DATADIR%%/%%VER%%/scripts/addons/oscurart_tools/render/material_overrides.py -%%DATADIR%%/%%VER%%/scripts/addons/oscurart_tools/render/render_tokens.py %%DATADIR%%/%%VER%%/scripts/addons/paint_palette.py %%DATADIR%%/%%VER%%/scripts/addons/power_sequencer/__init__.py %%DATADIR%%/%%VER%%/scripts/addons/power_sequencer/addon_preferences.py @@ -1702,7 +1702,6 @@ share/applications/blender.desktop %%DATADIR%%/%%VER%%/scripts/addons/rigify/rigs/chain_rigs.py %%DATADIR%%/%%VER%%/scripts/addons/rigify/rigs/experimental/__init__.py %%DATADIR%%/%%VER%%/scripts/addons/rigify/rigs/experimental/super_chain.py -%%DATADIR%%/%%VER%%/scripts/addons/rigify/rigs/experimental/super_eye.py %%DATADIR%%/%%VER%%/scripts/addons/rigify/rigs/faces/__init__.py %%DATADIR%%/%%VER%%/scripts/addons/rigify/rigs/faces/super_face.py %%DATADIR%%/%%VER%%/scripts/addons/rigify/rigs/limbs/__init__.py @@ -2098,7 +2097,6 @@ share/applications/blender.desktop %%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 -%%DATADIR%%/%%VER%%/scripts/startup/bl_operators/uvcalc_smart_project.py %%DATADIR%%/%%VER%%/scripts/startup/bl_operators/vertexpaint_dirt.py %%DATADIR%%/%%VER%%/scripts/startup/bl_operators/view3d.py %%DATADIR%%/%%VER%%/scripts/startup/bl_operators/wm.py @@ -2208,14 +2206,22 @@ share/applications/blender.desktop %%DATADIR%%/%%VER%%/scripts/templates_py/ui_previews_custom_icon.py %%DATADIR%%/%%VER%%/scripts/templates_py/ui_previews_dynamic_enum.py %%DATADIR%%/%%VER%%/scripts/templates_py/ui_tool_simple.py -%%DOCSDIR%%/GPL-license.txt -%%DOCSDIR%%/GPL3-license.txt -%%DOCSDIR%%/LICENSE-bfont.ttf.txt -%%NLS%%%%DOCSDIR%%/LICENSE-bmonofont-i18n.ttf.txt -%%NLS%%%%DOCSDIR%%/LICENSE-droidsans.ttf.txt -%%DOCSDIR%%/Python-license.txt %%DOCSDIR%%/copyright.txt -%%OPENCOLORIO%%%%DOCSDIR%%/ocio-license.txt +%%DOCSDIR%%/license/Apache-2.0.txt +%%DOCSDIR%%/license/bfont.ttf.txt +%%DOCSDIR%%/license/bmonofont-i18n.ttf.txt +%%DOCSDIR%%/license/BSD-3-Clause.txt +%%DOCSDIR%%/license/BSL-1.0.txt +%%DOCSDIR%%/license/droidsans.ttf.txt +%%DOCSDIR%%/license/FTL.txt +%%DOCSDIR%%/license/GPL-3.0.txt +%%DOCSDIR%%/license/GPL-license.txt +%%DOCSDIR%%/license/ISC.txt +%%DOCSDIR%%/license/jemalloc.txt +%%DOCSDIR%%/license/MIT.txt +%%DOCSDIR%%/license/OpenColorIO.txt +%%DOCSDIR%%/license/OpenSSL.txt +%%DOCSDIR%%/license/Python.txt %%DOCSDIR%%/readme.html share/icons/hicolor/scalable/apps/blender.svg share/icons/hicolor/symbolic/apps/blender-symbolic.svg