Update to blender 2.75.

This commit is contained in:
pascal 2015-09-22 18:48:40 +00:00
parent 9bbafd048f
commit f483798f56
7 changed files with 81 additions and 39 deletions

View File

@ -1,11 +1,10 @@
# $OpenBSD: Makefile,v 1.68 2015/05/28 10:17:23 pascal Exp $
# $OpenBSD: Makefile,v 1.69 2015/09/22 18:48:40 pascal Exp $
ONLY_FOR_ARCHS = amd64 i386
COMMENT = 3D creation software
DISTNAME = blender-2.74
REVISION = 0
DISTNAME = blender-2.75
CATEGORIES = graphics

View File

@ -1,2 +1,2 @@
SHA256 (blender-2.74.tar.gz) = DKPOtsZWrnxVb4GrCZTmqnpsZDJIJMvJSofK828KEZ0=
SIZE (blender-2.74.tar.gz) = 54011017
SHA256 (blender-2.75.tar.gz) = X1M4bydJv4lKMCK4gxU9C0Cz/OxfH0wEydGAd4r0eOQ=
SIZE (blender-2.75.tar.gz) = 55390532

View File

@ -1,6 +1,6 @@
$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
$OpenBSD: patch-intern_cycles_util_util_aligned_malloc_cpp,v 1.2 2015/09/22 18:48:40 pascal Exp $
--- intern/cycles/util/util_aligned_malloc.cpp.orig Tue Jun 30 14:38:37 2015
+++ intern/cycles/util/util_aligned_malloc.cpp Thu Sep 10 19:35:17 2015
@@ -21,7 +21,8 @@
/* Adopted from Libmv. */
@ -18,5 +18,5 @@ $OpenBSD: patch-intern_cycles_util_util_aligned_malloc_cpp,v 1.1 2015/04/01 21:2
-#elif defined(__FreeBSD__) || defined(__NetBSD__)
+#elif defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__)
void *result;
if (posix_memalign(&result, alignment, size)) {
if(posix_memalign(&result, alignment, size)) {
/* Non-zero means allocation error

View File

@ -1,6 +1,6 @@
$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
$OpenBSD: patch-intern_guardedalloc_intern_mallocn_guarded_impl_c,v 1.5 2015/09/22 18:48:40 pascal Exp $
--- intern/guardedalloc/intern/mallocn_guarded_impl.c.orig Tue Jun 30 15:07:35 2015
+++ intern/guardedalloc/intern/mallocn_guarded_impl.c Thu Sep 10 19:35:19 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.4 2015/04/
MemHead *membl;
MemPrintBlock *pb, *printblock;
unsigned int totpb, a, b;
@@ -759,6 +762,7 @@ void MEM_guarded_printmemlist_stats(void)
@@ -761,6 +764,7 @@ void MEM_guarded_printmemlist_stats(void)
#ifdef HAVE_MALLOC_STATS
printf("System Statistics:\n");
malloc_stats();

View File

@ -1,10 +1,10 @@
$OpenBSD: patch-intern_guardedalloc_intern_mallocn_intern_h,v 1.3 2014/11/04 06:02:40 brad Exp $
$OpenBSD: patch-intern_guardedalloc_intern_mallocn_intern_h,v 1.4 2015/09/22 18:48:40 pascal Exp $
Don't use malloc.h header on OpenBSD.
--- intern/guardedalloc/intern/mallocn_intern.h.orig Wed Jun 25 16:43:52 2014
+++ intern/guardedalloc/intern/mallocn_intern.h Sun Oct 19 01:17:43 2014
@@ -56,6 +56,8 @@
--- intern/guardedalloc/intern/mallocn_intern.h.orig Tue Jun 30 15:07:35 2015
+++ intern/guardedalloc/intern/mallocn_intern.h Thu Sep 10 19:35:19 2015
@@ -57,6 +57,8 @@
# define HAVE_MALLOC_STATS
#elif defined(__FreeBSD__)
# include <malloc_np.h>
@ -13,7 +13,7 @@ Don't use malloc.h header on OpenBSD.
#elif defined(__APPLE__)
# include <malloc/malloc.h>
# define malloc_usable_size malloc_size
@@ -85,7 +87,8 @@
@@ -87,7 +89,8 @@
# define UNLIKELY(x) (x)
#endif

View File

@ -1,11 +1,11 @@
$OpenBSD: patch-source_blender_blenlib_intern_storage_c,v 1.10 2014/11/04 06:02:40 brad Exp $
$OpenBSD: patch-source_blender_blenlib_intern_storage_c,v 1.11 2015/09/22 18:48:40 pascal Exp $
Use statvfs() on OpenBSD.
--- source/blender/blenlib/intern/storage.c.orig Wed Mar 19 23:05:25 2014
+++ source/blender/blenlib/intern/storage.c Thu Mar 20 22:35:00 2014
@@ -42,7 +42,7 @@
#include <time.h>
--- source/blender/blenlib/intern/storage.c.orig Thu Jul 2 11:28:14 2015
+++ source/blender/blenlib/intern/storage.c Thu Sep 10 19:35:19 2015
@@ -37,7 +37,7 @@
#include <sys/stat.h>
-#if defined(__NetBSD__) || defined(__DragonFly__) || defined(__sun__) || defined(__sun)

View File

@ -1,4 +1,4 @@
@comment $OpenBSD: PLIST,v 1.22 2015/04/01 21:26:40 pascal Exp $
@comment $OpenBSD: PLIST,v 1.23 2015/09/22 18:48:40 pascal Exp $
@pkgpath graphics/blender,ffmpeg
bin/blender
@bin bin/blender-bin
@ -1134,6 +1134,7 @@ share/blender/datafiles/locale/po/sr@latin.po
share/blender/datafiles/locale/po/sv.po
share/blender/datafiles/locale/po/tr.po
share/blender/datafiles/locale/po/uk.po
share/blender/datafiles/locale/po/vi.po
share/blender/datafiles/locale/po/zh_CN.po
share/blender/datafiles/locale/po/zh_TW.po
share/blender/datafiles/matcaps/
@ -1185,37 +1186,32 @@ share/blender/scripts/addons/add_curve_sapling/presets/
share/blender/scripts/addons/add_curve_sapling/presets/black_tupelo.py
share/blender/scripts/addons/add_curve_sapling/presets/ca_black_oak.py
share/blender/scripts/addons/add_curve_sapling/presets/quaking_aspen.py
share/blender/scripts/addons/add_curve_sapling/presets/weeping_willow.py
share/blender/scripts/addons/add_curve_sapling/presets/willow.py
share/blender/scripts/addons/add_curve_sapling/utils.py
share/blender/scripts/addons/add_mesh_BoltFactory/
share/blender/scripts/addons/add_mesh_BoltFactory/Boltfactory.py
share/blender/scripts/addons/add_mesh_BoltFactory/__init__.py
share/blender/scripts/addons/add_mesh_BoltFactory/createMesh.py
share/blender/scripts/addons/add_mesh_BoltFactory/preset_utils.py
share/blender/scripts/addons/add_mesh_BoltFactory/presets/
share/blender/scripts/addons/add_mesh_BoltFactory/presets/M10.py
share/blender/scripts/addons/add_mesh_BoltFactory/presets/M12.py
share/blender/scripts/addons/add_mesh_BoltFactory/presets/M3.py
share/blender/scripts/addons/add_mesh_BoltFactory/presets/M4.py
share/blender/scripts/addons/add_mesh_BoltFactory/presets/M5.py
share/blender/scripts/addons/add_mesh_BoltFactory/presets/M6.py
share/blender/scripts/addons/add_mesh_BoltFactory/presets/M8.py
share/blender/scripts/addons/add_mesh_ant_landscape.py
share/blender/scripts/addons/add_mesh_extra_objects/
share/blender/scripts/addons/add_mesh_extra_objects/__init__.py
share/blender/scripts/addons/add_mesh_extra_objects/add_empty_as_parent.py
share/blender/scripts/addons/add_mesh_extra_objects/add_mesh_3d_function_surface.py
share/blender/scripts/addons/add_mesh_extra_objects/add_mesh_extra_objects.py
share/blender/scripts/addons/add_mesh_extra_objects/add_mesh_gears.py
share/blender/scripts/addons/add_mesh_extra_objects/add_mesh_gemstones.py
share/blender/scripts/addons/add_mesh_extra_objects/add_mesh_honeycomb.py
share/blender/scripts/addons/add_mesh_extra_objects/add_mesh_menger_sponge.py
share/blender/scripts/addons/add_mesh_extra_objects/add_mesh_pipe_joint.py
share/blender/scripts/addons/add_mesh_extra_objects/add_mesh_polysphere.py
share/blender/scripts/addons/add_mesh_extra_objects/add_mesh_pyramid.py
share/blender/scripts/addons/add_mesh_extra_objects/add_mesh_round_brilliant.py
share/blender/scripts/addons/add_mesh_extra_objects/add_mesh_round_cube.py
share/blender/scripts/addons/add_mesh_extra_objects/add_mesh_solid.py
share/blender/scripts/addons/add_mesh_extra_objects/add_mesh_star.py
share/blender/scripts/addons/add_mesh_extra_objects/add_mesh_supertoroid.py
share/blender/scripts/addons/add_mesh_extra_objects/add_mesh_teapot.py
share/blender/scripts/addons/add_mesh_extra_objects/add_mesh_torusknot.py
share/blender/scripts/addons/add_mesh_extra_objects/add_mesh_twisted_torus.py
share/blender/scripts/addons/add_mesh_extra_objects/add_mesh_vertex.py
share/blender/scripts/addons/animation_add_corrective_shape_key.py
share/blender/scripts/addons/animation_animall.py
share/blender/scripts/addons/curve_simplify.py
@ -1419,7 +1415,7 @@ 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/rna_wiki_reference.py
share/blender/scripts/addons/modules/rna_manual_reference.py
share/blender/scripts/addons/modules/selection_utils.py
share/blender/scripts/addons/netrender/
share/blender/scripts/addons/netrender/__init__.py
@ -1492,6 +1488,50 @@ 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/presets/
share/blender/scripts/addons/presets/operator/
share/blender/scripts/addons/presets/operator/mesh.bolt_add/
share/blender/scripts/addons/presets/operator/mesh.bolt_add/default.py
share/blender/scripts/addons/presets/operator/mesh.bolt_add/m10.py
share/blender/scripts/addons/presets/operator/mesh.bolt_add/m12.py
share/blender/scripts/addons/presets/operator/mesh.bolt_add/m3.py
share/blender/scripts/addons/presets/operator/mesh.bolt_add/m4.py
share/blender/scripts/addons/presets/operator/mesh.bolt_add/m5.py
share/blender/scripts/addons/presets/operator/mesh.bolt_add/m6.py
share/blender/scripts/addons/presets/operator/mesh.bolt_add/m8.py
share/blender/scripts/addons/presets/operator/mesh.primitive_round_cube_add/
share/blender/scripts/addons/presets/operator/mesh.primitive_round_cube_add/Capsule.py
share/blender/scripts/addons/presets/operator/mesh.primitive_round_cube_add/Clay_Bar.py
share/blender/scripts/addons/presets/operator/mesh.primitive_round_cube_add/Cube.py
share/blender/scripts/addons/presets/operator/mesh.primitive_round_cube_add/Grid_3D.py
share/blender/scripts/addons/presets/operator/mesh.primitive_round_cube_add/Octahedron.py
share/blender/scripts/addons/presets/operator/mesh.primitive_round_cube_add/Quadsphere.py
share/blender/scripts/addons/presets/operator/mesh.primitive_round_cube_add/Rounded_Cube.py
share/blender/scripts/addons/presets/operator/mesh.primitive_xyz_function_surface/
share/blender/scripts/addons/presets/operator/mesh.primitive_xyz_function_surface/bonbon.py
share/blender/scripts/addons/presets/operator/mesh.primitive_xyz_function_surface/boy.py
share/blender/scripts/addons/presets/operator/mesh.primitive_xyz_function_surface/catalan.py
share/blender/scripts/addons/presets/operator/mesh.primitive_xyz_function_surface/catenoid.py
share/blender/scripts/addons/presets/operator/mesh.primitive_xyz_function_surface/clifford_torus.py
share/blender/scripts/addons/presets/operator/mesh.primitive_xyz_function_surface/cochlea.py
share/blender/scripts/addons/presets/operator/mesh.primitive_xyz_function_surface/cosinus.py
share/blender/scripts/addons/presets/operator/mesh.primitive_xyz_function_surface/dini.py
share/blender/scripts/addons/presets/operator/mesh.primitive_xyz_function_surface/enneper.py
share/blender/scripts/addons/presets/operator/mesh.primitive_xyz_function_surface/helicoidal.py
share/blender/scripts/addons/presets/operator/mesh.primitive_xyz_function_surface/helix.py
share/blender/scripts/addons/presets/operator/mesh.primitive_xyz_function_surface/hexahedron.py
share/blender/scripts/addons/presets/operator/mesh.primitive_xyz_function_surface/hyperhelicoidal.py
share/blender/scripts/addons/presets/operator/mesh.primitive_xyz_function_surface/klein.py
share/blender/scripts/addons/presets/operator/mesh.primitive_xyz_function_surface/moebius.py
share/blender/scripts/addons/presets/operator/mesh.primitive_xyz_function_surface/pseudo_catenoid.py
share/blender/scripts/addons/presets/operator/mesh.primitive_xyz_function_surface/pseudosphere.py
share/blender/scripts/addons/presets/operator/mesh.primitive_xyz_function_surface/ridged_torus.py
share/blender/scripts/addons/presets/operator/mesh.primitive_xyz_function_surface/shell.py
share/blender/scripts/addons/presets/operator/mesh.primitive_xyz_function_surface/sine.py
share/blender/scripts/addons/presets/operator/mesh.primitive_xyz_function_surface/snake.py
share/blender/scripts/addons/presets/operator/mesh.primitive_xyz_function_surface/sterosphere.py
share/blender/scripts/addons/presets/operator/mesh.primitive_xyz_function_surface/torus.py
share/blender/scripts/addons/presets/operator/mesh.primitive_xyz_function_surface/twisted_torus.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
@ -1580,7 +1620,6 @@ share/blender/scripts/addons/space_view3d_math_vis/
share/blender/scripts/addons/space_view3d_math_vis/__init__.py
share/blender/scripts/addons/space_view3d_math_vis/draw.py
share/blender/scripts/addons/space_view3d_math_vis/utils.py
share/blender/scripts/addons/space_view3d_panel_measure.py
share/blender/scripts/addons/space_view3d_spacebar_menu.py
share/blender/scripts/addons/system_blend_info.py
share/blender/scripts/addons/system_demo_mode/
@ -1667,7 +1706,9 @@ share/blender/scripts/modules/bpy/
share/blender/scripts/modules/bpy/__init__.py
share/blender/scripts/modules/bpy/ops.py
share/blender/scripts/modules/bpy/path.py
share/blender/scripts/modules/bpy/utils.py
share/blender/scripts/modules/bpy/utils/
share/blender/scripts/modules/bpy/utils/__init__.py
share/blender/scripts/modules/bpy/utils/previews.py
share/blender/scripts/modules/bpy_extras/
share/blender/scripts/modules/bpy_extras/__init__.py
share/blender/scripts/modules/bpy_extras/anim_utils.py
@ -1994,6 +2035,8 @@ share/blender/scripts/templates_py/ui_menu_simple.py
share/blender/scripts/templates_py/ui_panel.py
share/blender/scripts/templates_py/ui_panel_simple.py
share/blender/scripts/templates_py/ui_pie_menu.py
share/blender/scripts/templates_py/ui_previews_custom_icon.py
share/blender/scripts/templates_py/ui_previews_dynamic_enum.py
share/doc/blender/
share/doc/blender/GPL-license.txt
share/doc/blender/GPL3-license.txt