Date: Mon, 7 Sep 2020 21:09:52 +0000 (UTC) From: Kurt Jaeger <pi@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r547941 - in head/graphics/blender: . files Message-ID: <202009072109.087L9q1h084241@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: pi Date: Mon Sep 7 21:09:52 2020 New Revision: 547941 URL: https://svnweb.freebsd.org/changeset/ports/547941 Log: graphics/blender: update 2.83.2 -> 2.90.0 - This version uses 64 bit atomic functions so does not build on i386 probably also fails on other 32 bit platforms PR: 249140 Submitted by: FreeBSD@ShaneWare.Biz (maintainer) Relnotes: https://wiki.blender.org/wiki/Reference/Release_Notes/2.90 Added: head/graphics/blender/files/patch-extern_audaspace_bindings_python_PySound.cpp (contents, props changed) Modified: head/graphics/blender/Makefile head/graphics/blender/Makefile.options head/graphics/blender/Makefile.versions head/graphics/blender/distinfo head/graphics/blender/files/patch-intern_opensubdiv_CMakeLists.txt head/graphics/blender/pkg-plist Modified: head/graphics/blender/Makefile ============================================================================== --- head/graphics/blender/Makefile Mon Sep 7 21:05:22 2020 (r547940) +++ head/graphics/blender/Makefile Mon Sep 7 21:09:52 2020 (r547941) @@ -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 @@ COMMENT= 3D modeling/rendering/animation package 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 @@ RUN_DEPENDS= ${PYNUMPY} # 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 Modified: head/graphics/blender/Makefile.options ============================================================================== --- head/graphics/blender/Makefile.options Mon Sep 7 21:05:22 2020 (r547940) +++ head/graphics/blender/Makefile.options Mon Sep 7 21:09:52 2020 (r547941) @@ -57,6 +57,7 @@ OPTIONS_DEFAULT= \ COMPOSITOR \ CYCLES \ DDS \ + DRACO \ FFMPEG \ FFTW3 \ FRAMESERVER \ Modified: head/graphics/blender/Makefile.versions ============================================================================== --- head/graphics/blender/Makefile.versions Mon Sep 7 21:05:22 2020 (r547940) +++ head/graphics/blender/Makefile.versions Mon Sep 7 21:09:52 2020 (r547941) @@ -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 Modified: head/graphics/blender/distinfo ============================================================================== --- head/graphics/blender/distinfo Mon Sep 7 21:05:22 2020 (r547940) +++ head/graphics/blender/distinfo Mon Sep 7 21:09:52 2020 (r547941) @@ -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 Added: head/graphics/blender/files/patch-extern_audaspace_bindings_python_PySound.cpp ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/graphics/blender/files/patch-extern_audaspace_bindings_python_PySound.cpp Mon Sep 7 21:09:52 2020 (r547941) @@ -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; + } Modified: head/graphics/blender/files/patch-intern_opensubdiv_CMakeLists.txt ============================================================================== --- head/graphics/blender/files/patch-intern_opensubdiv_CMakeLists.txt Mon Sep 7 21:05:22 2020 (r547940) +++ head/graphics/blender/files/patch-intern_opensubdiv_CMakeLists.txt Mon Sep 7 21:09:52 2020 (r547941) @@ -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) Modified: head/graphics/blender/pkg-plist ============================================================================== --- head/graphics/blender/pkg-plist Mon Sep 7 21:05:22 2020 (r547940) +++ head/graphics/blender/pkg-plist Mon Sep 7 21:09:52 2020 (r547941) @@ -131,6 +131,7 @@ share/applications/blender.desktop %%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 @@ share/applications/blender.desktop %%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 @@ share/applications/blender.desktop %%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 @@ share/applications/blender.desktop %%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 @@ share/applications/blender.desktop %%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 @@ share/applications/blender.desktop %%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 @@ share/applications/blender.desktop %%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 @@ share/applications/blender.desktop %%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 @@ share/applications/blender.desktop %%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 @@ share/applications/blender.desktop %%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 @@ share/applications/blender.desktop %%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
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202009072109.087L9q1h084241>