diff --git a/graphics/blender/Makefile b/graphics/blender/Makefile index 1fc01cb83f2..bd9e6db3ac8 100644 --- a/graphics/blender/Makefile +++ b/graphics/blender/Makefile @@ -1,10 +1,10 @@ -# $OpenBSD: Makefile,v 1.65 2015/01/10 00:30:48 pascal Exp $ +# $OpenBSD: Makefile,v 1.66 2015/04/01 21:26:40 pascal Exp $ ONLY_FOR_ARCHS = amd64 i386 COMMENT = 3D creation software -DISTNAME = blender-2.73 +DISTNAME = blender-2.74 CATEGORIES = graphics @@ -31,7 +31,8 @@ CONFIGURE_ARGS = -DPYTHON_INCLUDE_DIR="${MODPY_INCDIR}" \ -DWITH_INTERNATIONAL=OFF \ -DWITH_RAYOPTIMIZATION=OFF \ -DWITH_OPENCOLORIO=ON \ - -DWITH_SYSTEM_OPENJPEG=ON + -DWITH_SYSTEM_OPENJPEG=ON \ + -DWITH_CPU_SSE=OFF BUILD_DEPENDS = devel/gflags LIB_DEPENDS = graphics/png \ diff --git a/graphics/blender/distinfo b/graphics/blender/distinfo index 42974817bae..9f591893733 100644 --- a/graphics/blender/distinfo +++ b/graphics/blender/distinfo @@ -1,2 +1,2 @@ -SHA256 (blender-2.73.tar.gz) = JWEWOFe7xP6mpMM0Cp8fO7KhaRAAgQ0GqfGNs2RnDpA= -SIZE (blender-2.73.tar.gz) = 53095386 +SHA256 (blender-2.74.tar.gz) = DKPOtsZWrnxVb4GrCZTmqnpsZDJIJMvJSofK828KEZ0= +SIZE (blender-2.74.tar.gz) = 54011017 diff --git a/graphics/blender/patches/patch-intern_cycles_CMakeLists_txt b/graphics/blender/patches/patch-intern_cycles_CMakeLists_txt deleted file mode 100644 index b96e6f751bc..00000000000 --- a/graphics/blender/patches/patch-intern_cycles_CMakeLists_txt +++ /dev/null @@ -1,13 +0,0 @@ -$OpenBSD: patch-intern_cycles_CMakeLists_txt,v 1.5 2015/01/10 00:30:48 pascal Exp $ ---- intern/cycles/CMakeLists.txt.orig Wed Jan 7 16:32:07 2015 -+++ intern/cycles/CMakeLists.txt Fri Jan 9 19:50:19 2015 -@@ -73,9 +73,6 @@ if(CXX_HAS_SSE) - add_definitions( - -DWITH_KERNEL_SSE2 - -DWITH_KERNEL_SSE3 -- -DWITH_KERNEL_SSE41 -- -DWITH_KERNEL_AVX -- -DWITH_KERNEL_AVX2 - ) - endif() - diff --git a/graphics/blender/patches/patch-intern_cycles_util_CMakeLists_txt b/graphics/blender/patches/patch-intern_cycles_util_CMakeLists_txt deleted file mode 100644 index f8846e37732..00000000000 --- a/graphics/blender/patches/patch-intern_cycles_util_CMakeLists_txt +++ /dev/null @@ -1,12 +0,0 @@ -$OpenBSD: patch-intern_cycles_util_CMakeLists_txt,v 1.6 2015/01/10 00:30:48 pascal Exp $ ---- intern/cycles/util/CMakeLists.txt.orig Wed Jan 7 16:32:07 2015 -+++ intern/cycles/util/CMakeLists.txt Fri Jan 9 19:50:19 2015 -@@ -67,6 +67,8 @@ set(SRC_HEADERS - util_xml.h - ) - -+remove_definitions(-DWITH_KERNEL_SSE2 -DWITH_KERNEL_SSE3) -+ - include_directories(${INC}) - include_directories(SYSTEM ${INC_SYS}) - diff --git a/graphics/blender/patches/patch-intern_cycles_util_util_aligned_malloc_cpp b/graphics/blender/patches/patch-intern_cycles_util_util_aligned_malloc_cpp new file mode 100644 index 00000000000..4e5c18d4e0b --- /dev/null +++ b/graphics/blender/patches/patch-intern_cycles_util_util_aligned_malloc_cpp @@ -0,0 +1,22 @@ +$OpenBSD: patch-intern_cycles_util_util_aligned_malloc_cpp,v 1.1 2015/04/01 21:26:40 pascal Exp $ +--- intern/cycles/util/util_aligned_malloc.cpp.orig Wed Apr 1 13:21:04 2015 ++++ intern/cycles/util/util_aligned_malloc.cpp Wed Apr 1 13:19:49 2015 +@@ -21,7 +21,8 @@ + + /* Adopted from Libmv. */ + +-#if !defined(__APPLE__) && !defined(__FreeBSD__) && !defined(__NetBSD__) ++#if !defined(__APPLE__) && !defined(__FreeBSD__) && !defined(__NetBSD__) \ ++ && !defined(__OpenBSD__) + /* Needed for memalign on Linux and _aligned_alloc on Windows. */ + # ifdef FREE_WINDOWS + /* Make sure _aligned_malloc is included. */ +@@ -53,7 +54,7 @@ void *util_aligned_malloc(size_t size, int alignment) + */ + assert(alignment == 16); + return malloc(size); +-#elif defined(__FreeBSD__) || defined(__NetBSD__) ++#elif defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__) + void *result; + if (posix_memalign(&result, alignment, size)) { + /* Non-zero means allocation error diff --git a/graphics/blender/patches/patch-intern_guardedalloc_intern_mallocn_c b/graphics/blender/patches/patch-intern_guardedalloc_intern_mallocn_c index 89b1d590417..c9eb0548b13 100644 --- a/graphics/blender/patches/patch-intern_guardedalloc_intern_mallocn_c +++ b/graphics/blender/patches/patch-intern_guardedalloc_intern_mallocn_c @@ -1,10 +1,10 @@ -$OpenBSD: patch-intern_guardedalloc_intern_mallocn_c,v 1.3 2015/01/10 00:30:48 pascal Exp $ +$OpenBSD: patch-intern_guardedalloc_intern_mallocn_c,v 1.4 2015/04/01 21:26:40 pascal Exp $ Use posix_memalign() on OpenBSD. ---- intern/guardedalloc/intern/mallocn.c.orig Sun Jan 4 15:13:38 2015 -+++ intern/guardedalloc/intern/mallocn.c Fri Jan 9 23:57:09 2015 -@@ -74,7 +74,7 @@ void *aligned_malloc(size_t size, size_t alignment) +--- intern/guardedalloc/intern/mallocn.c.orig Wed Mar 25 12:01:16 2015 ++++ intern/guardedalloc/intern/mallocn.c Wed Apr 1 11:56:33 2015 +@@ -75,7 +75,7 @@ void *aligned_malloc(size_t size, size_t alignment) assert(alignment == 16); (void)alignment; return malloc(size); diff --git a/graphics/blender/patches/patch-intern_guardedalloc_intern_mallocn_guarded_impl_c b/graphics/blender/patches/patch-intern_guardedalloc_intern_mallocn_guarded_impl_c index 6b639a6750e..5ccca891e09 100644 --- a/graphics/blender/patches/patch-intern_guardedalloc_intern_mallocn_guarded_impl_c +++ b/graphics/blender/patches/patch-intern_guardedalloc_intern_mallocn_guarded_impl_c @@ -1,7 +1,7 @@ -$OpenBSD: patch-intern_guardedalloc_intern_mallocn_guarded_impl_c,v 1.3 2014/11/21 18:55:16 pascal Exp $ ---- intern/guardedalloc/intern/mallocn_guarded_impl.c.orig Wed Sep 24 17:29:54 2014 -+++ intern/guardedalloc/intern/mallocn_guarded_impl.c Fri Oct 3 21:53:58 2014 -@@ -686,6 +686,9 @@ static int compare_len(const void *p1, const void *p2) +$OpenBSD: patch-intern_guardedalloc_intern_mallocn_guarded_impl_c,v 1.4 2015/04/01 21:26:40 pascal Exp $ +--- intern/guardedalloc/intern/mallocn_guarded_impl.c.orig Wed Mar 25 12:01:16 2015 ++++ intern/guardedalloc/intern/mallocn_guarded_impl.c Wed Apr 1 11:56:33 2015 +@@ -687,6 +687,9 @@ static int compare_len(const void *p1, const void *p2) void MEM_guarded_printmemlist_stats(void) { @@ -11,7 +11,7 @@ $OpenBSD: patch-intern_guardedalloc_intern_mallocn_guarded_impl_c,v 1.3 2014/11/ MemHead *membl; MemPrintBlock *pb, *printblock; unsigned int totpb, a, b; -@@ -758,6 +761,7 @@ void MEM_guarded_printmemlist_stats(void) +@@ -759,6 +762,7 @@ void MEM_guarded_printmemlist_stats(void) #ifdef HAVE_MALLOC_STATS printf("System Statistics:\n"); malloc_stats(); diff --git a/graphics/blender/pkg/PLIST b/graphics/blender/pkg/PLIST index cb9e62dc19e..d8da2279cfa 100644 --- a/graphics/blender/pkg/PLIST +++ b/graphics/blender/pkg/PLIST @@ -1,4 +1,4 @@ -@comment $OpenBSD: PLIST,v 1.21 2015/01/10 00:30:49 pascal Exp $ +@comment $OpenBSD: PLIST,v 1.22 2015/04/01 21:26:40 pascal Exp $ @pkgpath graphics/blender,ffmpeg bin/blender @bin bin/blender-bin @@ -96,6 +96,7 @@ share/blender/datafiles/blender_icons16/icon16_file_blank.dat share/blender/datafiles/blender_icons16/icon16_file_blend.dat share/blender/datafiles/blender_icons16/icon16_file_folder.dat share/blender/datafiles/blender_icons16/icon16_file_font.dat +share/blender/datafiles/blender_icons16/icon16_file_hidden.dat share/blender/datafiles/blender_icons16/icon16_file_image.dat share/blender/datafiles/blender_icons16/icon16_file_movie.dat share/blender/datafiles/blender_icons16/icon16_file_parent.dat @@ -246,6 +247,7 @@ share/blender/datafiles/blender_icons16/icon16_mod_build.dat share/blender/datafiles/blender_icons16/icon16_mod_cast.dat share/blender/datafiles/blender_icons16/icon16_mod_cloth.dat share/blender/datafiles/blender_icons16/icon16_mod_curve.dat +share/blender/datafiles/blender_icons16/icon16_mod_data_transfer.dat share/blender/datafiles/blender_icons16/icon16_mod_decim.dat share/blender/datafiles/blender_icons16/icon16_mod_displace.dat share/blender/datafiles/blender_icons16/icon16_mod_dynamicpaint.dat @@ -257,6 +259,7 @@ share/blender/datafiles/blender_icons16/icon16_mod_mask.dat share/blender/datafiles/blender_icons16/icon16_mod_meshdeform.dat share/blender/datafiles/blender_icons16/icon16_mod_mirror.dat share/blender/datafiles/blender_icons16/icon16_mod_multires.dat +share/blender/datafiles/blender_icons16/icon16_mod_normaledit.dat share/blender/datafiles/blender_icons16/icon16_mod_ocean.dat share/blender/datafiles/blender_icons16/icon16_mod_particles.dat share/blender/datafiles/blender_icons16/icon16_mod_physics.dat @@ -570,6 +573,7 @@ share/blender/datafiles/blender_icons32/icon32_file_blank.dat share/blender/datafiles/blender_icons32/icon32_file_blend.dat share/blender/datafiles/blender_icons32/icon32_file_folder.dat share/blender/datafiles/blender_icons32/icon32_file_font.dat +share/blender/datafiles/blender_icons32/icon32_file_hidden.dat share/blender/datafiles/blender_icons32/icon32_file_image.dat share/blender/datafiles/blender_icons32/icon32_file_movie.dat share/blender/datafiles/blender_icons32/icon32_file_parent.dat @@ -720,6 +724,7 @@ share/blender/datafiles/blender_icons32/icon32_mod_build.dat share/blender/datafiles/blender_icons32/icon32_mod_cast.dat share/blender/datafiles/blender_icons32/icon32_mod_cloth.dat share/blender/datafiles/blender_icons32/icon32_mod_curve.dat +share/blender/datafiles/blender_icons32/icon32_mod_data_transfer.dat share/blender/datafiles/blender_icons32/icon32_mod_decim.dat share/blender/datafiles/blender_icons32/icon32_mod_displace.dat share/blender/datafiles/blender_icons32/icon32_mod_dynamicpaint.dat @@ -731,6 +736,7 @@ share/blender/datafiles/blender_icons32/icon32_mod_mask.dat share/blender/datafiles/blender_icons32/icon32_mod_meshdeform.dat share/blender/datafiles/blender_icons32/icon32_mod_mirror.dat share/blender/datafiles/blender_icons32/icon32_mod_multires.dat +share/blender/datafiles/blender_icons32/icon32_mod_normaledit.dat share/blender/datafiles/blender_icons32/icon32_mod_ocean.dat share/blender/datafiles/blender_icons32/icon32_mod_particles.dat share/blender/datafiles/blender_icons32/icon32_mod_physics.dat @@ -1119,6 +1125,7 @@ share/blender/datafiles/locale/po/ja.po share/blender/datafiles/locale/po/ko.po share/blender/datafiles/locale/po/ky.po share/blender/datafiles/locale/po/nl.po +share/blender/datafiles/locale/po/pl.po share/blender/datafiles/locale/po/pt.po share/blender/datafiles/locale/po/pt_BR.po share/blender/datafiles/locale/po/ru.po @@ -1407,18 +1414,13 @@ share/blender/scripts/addons/mocap/mocap_constraints.py share/blender/scripts/addons/mocap/mocap_tools.py share/blender/scripts/addons/mocap/retarget.py share/blender/scripts/addons/modules/ -share/blender/scripts/addons/modules/constants_utils.py -share/blender/scripts/addons/modules/cursor_utils.py share/blender/scripts/addons/modules/extensions_framework/ share/blender/scripts/addons/modules/extensions_framework/__init__.py share/blender/scripts/addons/modules/extensions_framework/ui.py share/blender/scripts/addons/modules/extensions_framework/util.py share/blender/scripts/addons/modules/extensions_framework/validate.py -share/blender/scripts/addons/modules/geometry_utils.py -share/blender/scripts/addons/modules/misc_utils.py share/blender/scripts/addons/modules/rna_wiki_reference.py share/blender/scripts/addons/modules/selection_utils.py -share/blender/scripts/addons/modules/ui_utils.py share/blender/scripts/addons/netrender/ share/blender/scripts/addons/netrender/__init__.py share/blender/scripts/addons/netrender/baking.py @@ -1465,7 +1467,7 @@ share/blender/scripts/addons/netrender/thumbnail.py share/blender/scripts/addons/netrender/ui.py share/blender/scripts/addons/netrender/utils.py share/blender/scripts/addons/netrender/versioning.py -share/blender/scripts/addons/node_efficiency_tools.py +share/blender/scripts/addons/node_wrangler.py share/blender/scripts/addons/object_add_chain.py share/blender/scripts/addons/object_animrenderbake.py share/blender/scripts/addons/object_cloud_gen.py @@ -1490,6 +1492,7 @@ share/blender/scripts/addons/object_print3d_utils/report.py share/blender/scripts/addons/object_print3d_utils/todo.rst share/blender/scripts/addons/object_print3d_utils/ui.py share/blender/scripts/addons/paint_palette.py +share/blender/scripts/addons/render_auto_tile_size.py share/blender/scripts/addons/render_copy_settings/ share/blender/scripts/addons/render_copy_settings/__init__.py share/blender/scripts/addons/render_copy_settings/operator.py @@ -1499,6 +1502,7 @@ share/blender/scripts/addons/render_copy_settings/translations.py share/blender/scripts/addons/render_freestyle_svg.py share/blender/scripts/addons/render_povray/ share/blender/scripts/addons/render_povray/__init__.py +share/blender/scripts/addons/render_povray/df3.py share/blender/scripts/addons/render_povray/render.py share/blender/scripts/addons/render_povray/ui.py share/blender/scripts/addons/render_povray/update_files.py @@ -1569,8 +1573,6 @@ share/blender/scripts/addons/rigify/rigs/pitchipoy/tentacle.py share/blender/scripts/addons/rigify/rigs/spine.py share/blender/scripts/addons/rigify/ui.py share/blender/scripts/addons/rigify/utils.py -share/blender/scripts/addons/sequencer_extra_actions/ -share/blender/scripts/addons/sequencer_extra_actions/operators_extra_actions.py share/blender/scripts/addons/space_view3d_3d_navigation.py share/blender/scripts/addons/space_view3d_copy_attributes.py share/blender/scripts/addons/space_view3d_materials_utils.py @@ -1586,7 +1588,6 @@ share/blender/scripts/addons/system_demo_mode/__init__.py share/blender/scripts/addons/system_demo_mode/config.py share/blender/scripts/addons/system_demo_mode/demo_mode.py share/blender/scripts/addons/system_property_chart.py -share/blender/scripts/addons/texture_paint_layer_manager.py share/blender/scripts/addons/ui_layer_manager.py share/blender/scripts/addons/ui_pie_menus_official.py share/blender/scripts/addons/ui_translate/ @@ -1643,7 +1644,6 @@ share/blender/scripts/freestyle/styles/sketchy_topology_broken.py share/blender/scripts/freestyle/styles/sketchy_topology_preserved.py share/blender/scripts/freestyle/styles/split_at_highest_2d_curvatures.py share/blender/scripts/freestyle/styles/split_at_tvertices.py -share/blender/scripts/freestyle/styles/stroke_texture.py share/blender/scripts/freestyle/styles/suggestive.py share/blender/scripts/freestyle/styles/thickness_fof_depth_discontinuity.py share/blender/scripts/freestyle/styles/tipremover.py @@ -1771,6 +1771,8 @@ share/blender/scripts/presets/framerate/50.py share/blender/scripts/presets/framerate/59.94.py share/blender/scripts/presets/framerate/60.py share/blender/scripts/presets/framerate/Custom.py +share/blender/scripts/presets/hair_dynamics/ +share/blender/scripts/presets/hair_dynamics/default.py share/blender/scripts/presets/interaction/ share/blender/scripts/presets/interaction/3dsmax.py share/blender/scripts/presets/interaction/blender.py @@ -1779,8 +1781,10 @@ share/blender/scripts/presets/interface_theme/ share/blender/scripts/presets/interface_theme/back_to_black.xml share/blender/scripts/presets/interface_theme/blender_24x.xml share/blender/scripts/presets/interface_theme/elsyiun.xml +share/blender/scripts/presets/interface_theme/flatty_light.xml share/blender/scripts/presets/interface_theme/graph.xml share/blender/scripts/presets/interface_theme/hexagon.xml +share/blender/scripts/presets/interface_theme/rtheme.xml share/blender/scripts/presets/interface_theme/science_lab.xml share/blender/scripts/presets/interface_theme/softimage.xml share/blender/scripts/presets/interface_theme/ubuntu_ambiance.xml @@ -1803,6 +1807,10 @@ share/blender/scripts/presets/render/TV_NTSC_16_colon_9.py share/blender/scripts/presets/render/TV_NTSC_4_colon_3.py share/blender/scripts/presets/render/TV_PAL_16_colon_9.py share/blender/scripts/presets/render/TV_PAL_4_colon_3.py +share/blender/scripts/presets/safe_areas/ +share/blender/scripts/presets/safe_areas/14_colon_9_in_16_colon_9.py +share/blender/scripts/presets/safe_areas/16_colon_9.py +share/blender/scripts/presets/safe_areas/4_colon_3_in_16_colon_9.py share/blender/scripts/presets/sss/ share/blender/scripts/presets/sss/apple.py share/blender/scripts/presets/sss/chicken.py