diff -ur graphics/blender.orig/Makefile graphics/blender/Makefile --- graphics/blender.orig/Makefile +++ graphics/blender/Makefile @@ -2,8 +2,8 @@ # $FreeBSD: head/graphics/blender/Makefile 534996 2020-05-12 15:47:52Z mandree $ PORTNAME= blender -DISTVERSION= 2.82 -PORTREVISION= 5 +DISTVERSION= 2.83.0 +PORTREVISION= 0 CATEGORIES= graphics multimedia MASTER_SITES= http://download.blender.org/source/ \ http://mirror.cs.umn.edu/blender.org/source/ \ @@ -48,7 +48,7 @@ .endif # version without trailing update letters -VERDIR= ${DISTVERSION:C/[abcdef]//g} +VERDIR= ${DISTVERSION:C/[abcdef]//g:R} PLIST_SUB+= VER=${VERDIR} LLVM_VER= 90 OPTIONS_SUB= yes @@ -159,6 +159,12 @@ .if defined(WITH_DEBUG) CMAKE_ARGS+= -DWITH_GHOST_DEBUG:BOOL=ON +.endif + +.include + +.if ${PORT_OPTIONS:MCYCLESOSL} +BROKEN= does not compile: /usr/ports/graphics/blender/work/blender-2.83.0/intern/cycles/kernel/shaders/stdcycles.h:31:10: fatal error: 'stdosl.h' file not found .endif post-patch-OPENCOLORIO-on: diff -ur graphics/blender.orig/distinfo graphics/blender/distinfo --- graphics/blender.orig/distinfo +++ graphics/blender/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1581917248 -SHA256 (blender-2.82.tar.xz) = 002adf2c51fc58a8941c87fc8e180bb1aacb73a0c223714f36d3d84da345fc65 -SIZE (blender-2.82.tar.xz) = 39895660 +TIMESTAMP = 1591500157 +SHA256 (blender-2.83.0.tar.xz) = 14e2bc85e076b12ae94438ff3c1dd417eba642840ed32d7c979724a93aa93f1f +SIZE (blender-2.83.0.tar.xz) = 38515064 diff -ur graphics/blender.orig/pkg-plist graphics/blender/pkg-plist --- graphics/blender.orig/pkg-plist +++ graphics/blender/pkg-plist @@ -169,8 +169,8 @@ %%DATADIR%%/%%VER%%/datafiles/icons/ops.transform.vert_slide.dat %%DATADIR%%/%%VER%%/datafiles/icons/ops.transform.vertex_random.dat %%DATADIR%%/%%VER%%/datafiles/icons/ops.view3d.ruler.dat -%%NLS%%%%DATADIR%%/%%VER%%/datafiles/fonts/bmonofont-i18n.ttf.gz -%%NLS%%%%DATADIR%%/%%VER%%/datafiles/fonts/droidsans.ttf.gz +%%NLS%%%%DATADIR%%/%%VER%%/datafiles/fonts/bmonofont-i18n.ttf +%%NLS%%%%DATADIR%%/%%VER%%/datafiles/fonts/droidsans.ttf %%NLS%%%%DATADIR%%/%%VER%%/datafiles/locale/ab/LC_MESSAGES/blender.mo %%NLS%%%%DATADIR%%/%%VER%%/datafiles/locale/ar/LC_MESSAGES/blender.mo %%NLS%%%%DATADIR%%/%%VER%%/datafiles/locale/ca/LC_MESSAGES/blender.mo @@ -297,7 +297,6 @@ %%DATADIR%%/%%VER%%/scripts/addons/add_mesh_extra_objects/add_mesh_rocks/rockgen.py %%DATADIR%%/%%VER%%/scripts/addons/add_mesh_extra_objects/add_mesh_rocks/settings.py %%DATADIR%%/%%VER%%/scripts/addons/add_mesh_extra_objects/add_mesh_rocks/utils.py -%%DATADIR%%/%%VER%%/scripts/addons/add_mesh_extra_objects/utils.py %%DATADIR%%/%%VER%%/scripts/addons/add_mesh_extra_objects/add_mesh_round_brilliant.py %%DATADIR%%/%%VER%%/scripts/addons/add_mesh_extra_objects/add_mesh_round_cube.py %%DATADIR%%/%%VER%%/scripts/addons/add_mesh_extra_objects/add_mesh_solid.py @@ -1048,10 +1047,8 @@ %%DATADIR%%/%%VER%%/scripts/addons/io_scene_gltf2/blender/com/gltf2_blender_conversion.py %%DATADIR%%/%%VER%%/scripts/addons/io_scene_gltf2/blender/com/gltf2_blender_data_path.py %%DATADIR%%/%%VER%%/scripts/addons/io_scene_gltf2/blender/com/gltf2_blender_extras.py -%%DATADIR%%/%%VER%%/scripts/addons/io_scene_gltf2/blender/exp/gltf2_blender_gather_drivers.py %%DATADIR%%/%%VER%%/scripts/addons/io_scene_gltf2/blender/com/gltf2_blender_json.py %%DATADIR%%/%%VER%%/scripts/addons/io_scene_gltf2/blender/com/gltf2_blender_material_helpers.py -%%DATADIR%%/%%VER%%/scripts/addons/io_scene_gltf2/blender/imp/gltf2_blender_material_utils.py %%DATADIR%%/%%VER%%/scripts/addons/io_scene_gltf2/blender/com/gltf2_blender_math.py %%DATADIR%%/%%VER%%/scripts/addons/io_scene_gltf2/blender/exp/gltf2_blender_export_keys.py %%DATADIR%%/%%VER%%/scripts/addons/io_scene_gltf2/blender/exp/gltf2_blender_export.py @@ -1064,6 +1061,7 @@ %%DATADIR%%/%%VER%%/scripts/addons/io_scene_gltf2/blender/exp/gltf2_blender_gather_animations.py %%DATADIR%%/%%VER%%/scripts/addons/io_scene_gltf2/blender/exp/gltf2_blender_gather_cache.py %%DATADIR%%/%%VER%%/scripts/addons/io_scene_gltf2/blender/exp/gltf2_blender_gather_cameras.py +%%DATADIR%%/%%VER%%/scripts/addons/io_scene_gltf2/blender/exp/gltf2_blender_gather_drivers.py %%DATADIR%%/%%VER%%/scripts/addons/io_scene_gltf2/blender/exp/gltf2_blender_gather_image.py %%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 @@ -1086,34 +1084,30 @@ %%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_animation_bone.py %%DATADIR%%/%%VER%%/scripts/addons/io_scene_gltf2/blender/imp/gltf2_blender_animation_node.py %%DATADIR%%/%%VER%%/scripts/addons/io_scene_gltf2/blender/imp/gltf2_blender_animation_utils.py -%%DATADIR%%/%%VER%%/scripts/addons/io_scene_gltf2/blender/imp/gltf2_blender_animation.py %%DATADIR%%/%%VER%%/scripts/addons/io_scene_gltf2/blender/imp/gltf2_blender_animation_weight.py +%%DATADIR%%/%%VER%%/scripts/addons/io_scene_gltf2/blender/imp/gltf2_blender_animation.py %%DATADIR%%/%%VER%%/scripts/addons/io_scene_gltf2/blender/imp/gltf2_blender_camera.py %%DATADIR%%/%%VER%%/scripts/addons/io_scene_gltf2/blender/imp/gltf2_blender_gltf.py %%DATADIR%%/%%VER%%/scripts/addons/io_scene_gltf2/blender/imp/gltf2_blender_image.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_light.py -%%DATADIR%%/%%VER%%/scripts/addons/io_scene_gltf2/blender/imp/gltf2_blender_map_emissive.py -%%DATADIR%%/%%VER%%/scripts/addons/io_scene_gltf2/blender/imp/gltf2_blender_map_normal.py -%%DATADIR%%/%%VER%%/scripts/addons/io_scene_gltf2/blender/imp/gltf2_blender_map_occlusion.py %%DATADIR%%/%%VER%%/scripts/addons/io_scene_gltf2/blender/imp/gltf2_blender_material.py %%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_skin.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 %%DATADIR%%/%%VER%%/scripts/addons/io_scene_gltf2/io/__init__.py %%DATADIR%%/%%VER%%/scripts/addons/io_scene_gltf2/io/com/gltf2_io_color_management.py %%DATADIR%%/%%VER%%/scripts/addons/io_scene_gltf2/io/com/gltf2_io_constants.py %%DATADIR%%/%%VER%%/scripts/addons/io_scene_gltf2/io/com/gltf2_io_debug.py %%DATADIR%%/%%VER%%/scripts/addons/io_scene_gltf2/io/com/gltf2_io_extensions.py %%DATADIR%%/%%VER%%/scripts/addons/io_scene_gltf2/io/com/gltf2_io_lights_punctual.py -%%DATADIR%%/%%VER%%/scripts/addons/io_scene_gltf2/io/com/gltf2_io_trs.py %%DATADIR%%/%%VER%%/scripts/addons/io_scene_gltf2/io/com/gltf2_io.py %%DATADIR%%/%%VER%%/scripts/addons/io_scene_gltf2/io/exp/gltf2_io_binary_data.py %%DATADIR%%/%%VER%%/scripts/addons/io_scene_gltf2/io/exp/gltf2_io_buffer.py @@ -1314,17 +1308,6 @@ %%DATADIR%%/%%VER%%/scripts/addons/power_sequencer/addon_properties.py %%DATADIR%%/%%VER%%/scripts/addons/power_sequencer/handlers.py %%DATADIR%%/%%VER%%/scripts/addons/power_sequencer/operators/__init__.py -%%DATADIR%%/%%VER%%/scripts/addons/power_sequencer/operators/align_audios.py -%%DATADIR%%/%%VER%%/scripts/addons/power_sequencer/operators/audiosync/__init__.py -%%DATADIR%%/%%VER%%/scripts/addons/power_sequencer/operators/audiosync/convert_and_trim.py -%%DATADIR%%/%%VER%%/scripts/addons/power_sequencer/operators/audiosync/cross_correlation.py -%%DATADIR%%/%%VER%%/scripts/addons/power_sequencer/operators/audiosync/ensure_non_zero.py -%%DATADIR%%/%%VER%%/scripts/addons/power_sequencer/operators/audiosync/find_offset.py -%%DATADIR%%/%%VER%%/scripts/addons/power_sequencer/operators/audiosync/mfcc/__init__.py -%%DATADIR%%/%%VER%%/scripts/addons/power_sequencer/operators/audiosync/mfcc/mfcc.py -%%DATADIR%%/%%VER%%/scripts/addons/power_sequencer/operators/audiosync/mfcc/segment_axis.py -%%DATADIR%%/%%VER%%/scripts/addons/power_sequencer/operators/audiosync/mfcc/trfbank.py -%%DATADIR%%/%%VER%%/scripts/addons/power_sequencer/operators/audiosync/std_mfcc.py %%DATADIR%%/%%VER%%/scripts/addons/power_sequencer/operators/channel_offset.py %%DATADIR%%/%%VER%%/scripts/addons/power_sequencer/operators/concatenate_strips.py %%DATADIR%%/%%VER%%/scripts/addons/power_sequencer/operators/copy_selected_sequences.py @@ -1339,16 +1322,15 @@ %%DATADIR%%/%%VER%%/scripts/addons/power_sequencer/operators/fade_add.py %%DATADIR%%/%%VER%%/scripts/addons/power_sequencer/operators/fade_clear.py %%DATADIR%%/%%VER%%/scripts/addons/power_sequencer/operators/gap_remove.py -%%DATADIR%%/%%VER%%/scripts/addons/power_sequencer/operators/grab.py %%DATADIR%%/%%VER%%/scripts/addons/power_sequencer/operators/grab_closest_handle_or_cut.py %%DATADIR%%/%%VER%%/scripts/addons/power_sequencer/operators/grab_sequence_handles.py +%%DATADIR%%/%%VER%%/scripts/addons/power_sequencer/operators/grab.py %%DATADIR%%/%%VER%%/scripts/addons/power_sequencer/operators/import_local_footage.py %%DATADIR%%/%%VER%%/scripts/addons/power_sequencer/operators/jump_time_offset.py %%DATADIR%%/%%VER%%/scripts/addons/power_sequencer/operators/jump_to_cut.py -%%DATADIR%%/%%VER%%/scripts/addons/power_sequencer/operators/make_still_image.py +%%DATADIR%%/%%VER%%/scripts/addons/power_sequencer/operators/make_hold_frame.py %%DATADIR%%/%%VER%%/scripts/addons/power_sequencer/operators/marker_delete_closest.py %%DATADIR%%/%%VER%%/scripts/addons/power_sequencer/operators/marker_delete_direct.py -%%DATADIR%%/%%VER%%/scripts/addons/power_sequencer/operators/marker_go_to_next.py %%DATADIR%%/%%VER%%/scripts/addons/power_sequencer/operators/marker_snap_to_cursor.py %%DATADIR%%/%%VER%%/scripts/addons/power_sequencer/operators/markers_as_timecodes.py %%DATADIR%%/%%VER%%/scripts/addons/power_sequencer/operators/markers_create_from_selected.py @@ -1382,14 +1364,12 @@ %%DATADIR%%/%%VER%%/scripts/addons/power_sequencer/operators/select_linked_strips.py %%DATADIR%%/%%VER%%/scripts/addons/power_sequencer/operators/select_related_strips.py %%DATADIR%%/%%VER%%/scripts/addons/power_sequencer/operators/select_strips_under_cursor.py -%%DATADIR%%/%%VER%%/scripts/addons/power_sequencer/operators/set_timeline_range.py -%%DATADIR%%/%%VER%%/scripts/addons/power_sequencer/operators/snap.py %%DATADIR%%/%%VER%%/scripts/addons/power_sequencer/operators/snap_selection.py +%%DATADIR%%/%%VER%%/scripts/addons/power_sequencer/operators/snap.py %%DATADIR%%/%%VER%%/scripts/addons/power_sequencer/operators/space_sequences.py %%DATADIR%%/%%VER%%/scripts/addons/power_sequencer/operators/speed_remove_effect.py %%DATADIR%%/%%VER%%/scripts/addons/power_sequencer/operators/speed_up_movie_strip.py %%DATADIR%%/%%VER%%/scripts/addons/power_sequencer/operators/swap_strips.py -%%DATADIR%%/%%VER%%/scripts/addons/power_sequencer/operators/synchronize_titles.py %%DATADIR%%/%%VER%%/scripts/addons/power_sequencer/operators/toggle_selected_mute.py %%DATADIR%%/%%VER%%/scripts/addons/power_sequencer/operators/toggle_waveforms.py %%DATADIR%%/%%VER%%/scripts/addons/power_sequencer/operators/transitions_remove.py