diff options
26 files changed, 159 insertions, 846 deletions
diff --git a/graphics/blender/Makefile b/graphics/blender/Makefile index 7025c699f4b..76e9e7d5bd7 100644 --- a/graphics/blender/Makefile +++ b/graphics/blender/Makefile @@ -1,7 +1,6 @@ -# $NetBSD: Makefile,v 1.103 2014/02/12 23:17:59 tron Exp $ +# $NetBSD: Makefile,v 1.104 2014/04/07 12:21:25 ryoon Exp $ -DISTNAME= blender-2.69 -PKGREVISION= 1 +DISTNAME= blender-2.70 CATEGORIES= graphics MASTER_SITES= http://download.blender.org/source/ @@ -10,7 +9,7 @@ HOMEPAGE= http://www.blender.org/ COMMENT= Fully integrated 3D graphics creation suite LICENSE= gnu-gpl-v2 -USE_TOOLS+= gmake +USE_TOOLS+= gmake sed USE_LANGUAGES= c c++ PYTHON_VERSIONS_ACCEPTED= 33 @@ -25,17 +24,17 @@ FIND_PREFIX:= SCONSDIR=scons INSTALLATION_DIRS= bin share/blender .if ${OPSYS} == "NetBSD" && exists(/usr/include/execinfo.h) -LDFLAGS+= -lexecinfo +PYLDFLAGS+= '-lexecinfo', .endif +PYLDFLAGS+= '${COMPILER_RPATH_FLAG}${PREFIX}/lib', \ + '${COMPILER_RPATH_FLAG}${X11BASE}/lib' # To pass LDFLAGS to compiler/linker -MYLDFLAGS= `printf "'%s'," ${LDFLAGS} | sed -e 's:,$$::'` -pre-configure: - ${CP} -f ${WRKSRC}/user-config.py ${WRKSRC}/user-config.py.1 - ${SED} \ - -e "s|@MYLDFLAGS@|${MYLDFLAGS}|g" \ - < ${WRKSRC}/user-config.py.1 > ${WRKSRC}/user-config.py - ${RM} -f ${WRKSRC}/user-config.py.1 +SUBST_CLASSES+= ldflags +SUBST_STAGE.ldflags= pre-configure +SUBST_MESSAGE.ldflags= Setting LDFLAGS +SUBST_FILES.ldflags+= build_files/scons/config/*-config.py +SUBST_VARS.ldflags+= PYLDFLAGS SCONS_ARGS+= WITH_BF_JACK=False SCONS_ARGS+= WITH_BF_OPENAL=False @@ -83,6 +82,7 @@ post-install: .include "../../devel/SDL/buildlink3.mk" .include "../../devel/boost-libs/buildlink3.mk" .include "../../devel/gettext-tools/buildlink3.mk" +.include "../../devel/libexecinfo/buildlink3.mk" .include "../../devel/pcre/buildlink3.mk" .include "../../graphics/Mesa/buildlink3.mk" .include "../../graphics/freetype2/buildlink3.mk" diff --git a/graphics/blender/PLIST b/graphics/blender/PLIST index db2d92cf657..78dc1df1bcb 100644 --- a/graphics/blender/PLIST +++ b/graphics/blender/PLIST @@ -1,8 +1,9 @@ -@comment $NetBSD: PLIST,v 1.17 2014/02/01 03:57:52 markd Exp $ +@comment $NetBSD: PLIST,v 1.18 2014/04/07 12:21:25 ryoon Exp $ bin/blender share/blender/${PKGVERSION}/datafiles/fonts/bmonofont-i18n.ttf.gz share/blender/${PKGVERSION}/datafiles/fonts/droidsans.ttf.gz share/blender/${PKGVERSION}/datafiles/locale/ar/LC_MESSAGES/blender.mo +share/blender/${PKGVERSION}/datafiles/locale/ar_raw/LC_MESSAGES/blender.mo share/blender/${PKGVERSION}/datafiles/locale/ca/LC_MESSAGES/blender.mo share/blender/${PKGVERSION}/datafiles/locale/cs/LC_MESSAGES/blender.mo share/blender/${PKGVERSION}/datafiles/locale/de/LC_MESSAGES/blender.mo @@ -10,8 +11,10 @@ share/blender/${PKGVERSION}/datafiles/locale/eo/LC_MESSAGES/blender.mo share/blender/${PKGVERSION}/datafiles/locale/es/LC_MESSAGES/blender.mo share/blender/${PKGVERSION}/datafiles/locale/es_ES/LC_MESSAGES/blender.mo share/blender/${PKGVERSION}/datafiles/locale/fa/LC_MESSAGES/blender.mo +share/blender/${PKGVERSION}/datafiles/locale/fa_raw/LC_MESSAGES/blender.mo share/blender/${PKGVERSION}/datafiles/locale/fr/LC_MESSAGES/blender.mo share/blender/${PKGVERSION}/datafiles/locale/he/LC_MESSAGES/blender.mo +share/blender/${PKGVERSION}/datafiles/locale/he_raw/LC_MESSAGES/blender.mo share/blender/${PKGVERSION}/datafiles/locale/hi/LC_MESSAGES/blender.mo share/blender/${PKGVERSION}/datafiles/locale/hr/LC_MESSAGES/blender.mo share/blender/${PKGVERSION}/datafiles/locale/hu/LC_MESSAGES/blender.mo @@ -389,6 +392,8 @@ share/blender/${PKGVERSION}/python/lib/python3.3/pickle.py share/blender/${PKGVERSION}/python/lib/python3.3/pickletools.py share/blender/${PKGVERSION}/python/lib/python3.3/pipes.py share/blender/${PKGVERSION}/python/lib/python3.3/pkgutil.py +share/blender/${PKGVERSION}/python/lib/python3.3/plat-netbsd6/IN.py +share/blender/${PKGVERSION}/python/lib/python3.3/plat-netbsd6/regen share/blender/${PKGVERSION}/python/lib/python3.3/platform.py share/blender/${PKGVERSION}/python/lib/python3.3/plistlib.py share/blender/${PKGVERSION}/python/lib/python3.3/poplib.py @@ -509,6 +514,8 @@ share/blender/${PKGVERSION}/python/lib/python3.3/xmlrpc/__init__.py share/blender/${PKGVERSION}/python/lib/python3.3/xmlrpc/client.py share/blender/${PKGVERSION}/python/lib/python3.3/xmlrpc/server.py share/blender/${PKGVERSION}/python/lib/python3.3/zipfile.py +share/blender/${PKGVERSION}/scripts/addons/.arcconfig +share/blender/${PKGVERSION}/scripts/addons/.gitignore share/blender/${PKGVERSION}/scripts/addons/add_curve_extra_objects/__init__.py share/blender/${PKGVERSION}/scripts/addons/add_curve_extra_objects/add_curve_aceous_galore.py share/blender/${PKGVERSION}/scripts/addons/add_curve_extra_objects/add_curve_spirals.py @@ -548,8 +555,6 @@ share/blender/${PKGVERSION}/scripts/addons/add_mesh_pipe_joint.py share/blender/${PKGVERSION}/scripts/addons/add_mesh_solid.py share/blender/${PKGVERSION}/scripts/addons/animation_add_corrective_shape_key.py share/blender/${PKGVERSION}/scripts/addons/animation_animall.py -share/blender/${PKGVERSION}/scripts/addons/compositing_film_response/__init__.py -share/blender/${PKGVERSION}/scripts/addons/compositing_film_response/film_response_curves.py share/blender/${PKGVERSION}/scripts/addons/curve_simplify.py share/blender/${PKGVERSION}/scripts/addons/cycles/__init__.py share/blender/${PKGVERSION}/scripts/addons/cycles/engine.py @@ -576,6 +581,7 @@ share/blender/${PKGVERSION}/scripts/addons/cycles/kernel/kernel.cl share/blender/${PKGVERSION}/scripts/addons/cycles/kernel/kernel.cu share/blender/${PKGVERSION}/scripts/addons/cycles/kernel/kernel.h share/blender/${PKGVERSION}/scripts/addons/cycles/kernel/kernel_accumulate.h +share/blender/${PKGVERSION}/scripts/addons/cycles/kernel/kernel_avx.cpp share/blender/${PKGVERSION}/scripts/addons/cycles/kernel/kernel_bvh.h share/blender/${PKGVERSION}/scripts/addons/cycles/kernel/kernel_bvh_subsurface.h share/blender/${PKGVERSION}/scripts/addons/cycles/kernel/kernel_bvh_traversal.h @@ -601,12 +607,15 @@ share/blender/${PKGVERSION}/scripts/addons/cycles/kernel/kernel_primitive.h share/blender/${PKGVERSION}/scripts/addons/cycles/kernel/kernel_projection.h share/blender/${PKGVERSION}/scripts/addons/cycles/kernel/kernel_random.h share/blender/${PKGVERSION}/scripts/addons/cycles/kernel/kernel_shader.h +share/blender/${PKGVERSION}/scripts/addons/cycles/kernel/kernel_shadow.h share/blender/${PKGVERSION}/scripts/addons/cycles/kernel/kernel_sse2.cpp share/blender/${PKGVERSION}/scripts/addons/cycles/kernel/kernel_sse3.cpp +share/blender/${PKGVERSION}/scripts/addons/cycles/kernel/kernel_sse41.cpp share/blender/${PKGVERSION}/scripts/addons/cycles/kernel/kernel_subsurface.h share/blender/${PKGVERSION}/scripts/addons/cycles/kernel/kernel_textures.h share/blender/${PKGVERSION}/scripts/addons/cycles/kernel/kernel_triangle.h share/blender/${PKGVERSION}/scripts/addons/cycles/kernel/kernel_types.h +share/blender/${PKGVERSION}/scripts/addons/cycles/kernel/kernel_volume.h share/blender/${PKGVERSION}/scripts/addons/cycles/kernel/svm/svm.h share/blender/${PKGVERSION}/scripts/addons/cycles/kernel/svm/svm_attribute.h share/blender/${PKGVERSION}/scripts/addons/cycles/kernel/svm/svm_blackbody.h @@ -647,6 +656,7 @@ share/blender/${PKGVERSION}/scripts/addons/cycles/kernel/svm/svm_wave.h share/blender/${PKGVERSION}/scripts/addons/cycles/kernel/svm/svm_wavelength.h share/blender/${PKGVERSION}/scripts/addons/cycles/kernel/svm/svm_wireframe.h share/blender/${PKGVERSION}/scripts/addons/cycles/kernel/util_color.h +share/blender/${PKGVERSION}/scripts/addons/cycles/kernel/util_half.h share/blender/${PKGVERSION}/scripts/addons/cycles/kernel/util_math.h share/blender/${PKGVERSION}/scripts/addons/cycles/kernel/util_transform.h share/blender/${PKGVERSION}/scripts/addons/cycles/kernel/util_types.h @@ -726,6 +736,8 @@ share/blender/${PKGVERSION}/scripts/addons/io_mesh_uv_layout/__init__.py share/blender/${PKGVERSION}/scripts/addons/io_mesh_uv_layout/export_uv_eps.py share/blender/${PKGVERSION}/scripts/addons/io_mesh_uv_layout/export_uv_png.py share/blender/${PKGVERSION}/scripts/addons/io_mesh_uv_layout/export_uv_svg.py +share/blender/${PKGVERSION}/scripts/addons/io_online_sketchfab/__init__.py +share/blender/${PKGVERSION}/scripts/addons/io_online_sketchfab/pack_for_export.py share/blender/${PKGVERSION}/scripts/addons/io_scene_3ds/__init__.py share/blender/${PKGVERSION}/scripts/addons/io_scene_3ds/export_3ds.py share/blender/${PKGVERSION}/scripts/addons/io_scene_3ds/import_3ds.py @@ -898,6 +910,7 @@ share/blender/${PKGVERSION}/scripts/addons/rigify/rigs/palm.py share/blender/${PKGVERSION}/scripts/addons/rigify/rigs/spine.py share/blender/${PKGVERSION}/scripts/addons/rigify/ui.py share/blender/${PKGVERSION}/scripts/addons/rigify/utils.py +share/blender/${PKGVERSION}/scripts/addons/sequencer_extra_actions/operators_extra_actions.py share/blender/${PKGVERSION}/scripts/addons/space_view3d_3d_navigation.py share/blender/${PKGVERSION}/scripts/addons/space_view3d_copy_attributes.py share/blender/${PKGVERSION}/scripts/addons/space_view3d_materials_utils.py @@ -921,77 +934,53 @@ share/blender/${PKGVERSION}/scripts/addons/ui_translate/update_svn.py share/blender/${PKGVERSION}/scripts/addons/ui_translate/update_ui.py share/blender/${PKGVERSION}/scripts/addons/uv_bake_texture_to_vcols.py share/blender/${PKGVERSION}/scripts/addons/uv_texture_atlas.py -share/blender/${PKGVERSION}/scripts/freestyle/data/env_map/brown00.png -share/blender/${PKGVERSION}/scripts/freestyle/data/env_map/gray00.png -share/blender/${PKGVERSION}/scripts/freestyle/data/env_map/gray01.png -share/blender/${PKGVERSION}/scripts/freestyle/data/env_map/gray02.png -share/blender/${PKGVERSION}/scripts/freestyle/data/env_map/gray03.png -share/blender/${PKGVERSION}/scripts/freestyle/data/textures/brushes/charcoalAlpha.bmp -share/blender/${PKGVERSION}/scripts/freestyle/data/textures/brushes/oil.bmp -share/blender/${PKGVERSION}/scripts/freestyle/data/textures/brushes/oilnoblend.bmp -share/blender/${PKGVERSION}/scripts/freestyle/data/textures/brushes/opaqueBrushAlpha.bmp -share/blender/${PKGVERSION}/scripts/freestyle/data/textures/brushes/opaqueDryBrushAlpha.bmp -share/blender/${PKGVERSION}/scripts/freestyle/data/textures/brushes/smoothAlpha.bmp -share/blender/${PKGVERSION}/scripts/freestyle/data/textures/brushes/washbrushAlpha.bmp -share/blender/${PKGVERSION}/scripts/freestyle/data/textures/papers/whitepaper.jpg -share/blender/${PKGVERSION}/scripts/freestyle/data/textures/variation_patterns/dashed.bmp -share/blender/${PKGVERSION}/scripts/freestyle/data/textures/variation_patterns/dashedfine.bmp -share/blender/${PKGVERSION}/scripts/freestyle/data/textures/variation_patterns/pattern00.bmp -share/blender/${PKGVERSION}/scripts/freestyle/data/textures/variation_patterns/pattern01.bmp -share/blender/${PKGVERSION}/scripts/freestyle/data/textures/variation_patterns/pattern02.bmp -share/blender/${PKGVERSION}/scripts/freestyle/data/textures/variation_patterns/pattern03.bmp -share/blender/${PKGVERSION}/scripts/freestyle/data/textures/variation_patterns/pattern04.bmp -share/blender/${PKGVERSION}/scripts/freestyle/data/textures/variation_patterns/pattern05.bmp -share/blender/${PKGVERSION}/scripts/freestyle/data/textures/variation_patterns/pattern06.bmp -share/blender/${PKGVERSION}/scripts/freestyle/data/textures/variation_patterns/pattern07.bmp -share/blender/${PKGVERSION}/scripts/freestyle/style_modules/ChainingIterators.py -share/blender/${PKGVERSION}/scripts/freestyle/style_modules/Functions0D.py -share/blender/${PKGVERSION}/scripts/freestyle/style_modules/Functions1D.py -share/blender/${PKGVERSION}/scripts/freestyle/style_modules/PredicatesB1D.py -share/blender/${PKGVERSION}/scripts/freestyle/style_modules/PredicatesU0D.py -share/blender/${PKGVERSION}/scripts/freestyle/style_modules/PredicatesU1D.py -share/blender/${PKGVERSION}/scripts/freestyle/style_modules/anisotropic_diffusion.py -share/blender/${PKGVERSION}/scripts/freestyle/style_modules/apriori_and_causal_density.py -share/blender/${PKGVERSION}/scripts/freestyle/style_modules/apriori_density.py -share/blender/${PKGVERSION}/scripts/freestyle/style_modules/backbone_stretcher.py -share/blender/${PKGVERSION}/scripts/freestyle/style_modules/blueprint_circles.py -share/blender/${PKGVERSION}/scripts/freestyle/style_modules/blueprint_ellipses.py -share/blender/${PKGVERSION}/scripts/freestyle/style_modules/blueprint_squares.py -share/blender/${PKGVERSION}/scripts/freestyle/style_modules/cartoon.py -share/blender/${PKGVERSION}/scripts/freestyle/style_modules/contour.py -share/blender/${PKGVERSION}/scripts/freestyle/style_modules/curvature2d.py -share/blender/${PKGVERSION}/scripts/freestyle/style_modules/external_contour.py -share/blender/${PKGVERSION}/scripts/freestyle/style_modules/external_contour_sketchy.py -share/blender/${PKGVERSION}/scripts/freestyle/style_modules/external_contour_smooth.py -share/blender/${PKGVERSION}/scripts/freestyle/style_modules/haloing.py -share/blender/${PKGVERSION}/scripts/freestyle/style_modules/ignore_small_occlusions.py -share/blender/${PKGVERSION}/scripts/freestyle/style_modules/invisible_lines.py -share/blender/${PKGVERSION}/scripts/freestyle/style_modules/japanese_bigbrush.py -share/blender/${PKGVERSION}/scripts/freestyle/style_modules/logical_operators.py -share/blender/${PKGVERSION}/scripts/freestyle/style_modules/long_anisotropically_dense.py -share/blender/${PKGVERSION}/scripts/freestyle/style_modules/multiple_parameterization.py -share/blender/${PKGVERSION}/scripts/freestyle/style_modules/nature.py -share/blender/${PKGVERSION}/scripts/freestyle/style_modules/near_lines.py -share/blender/${PKGVERSION}/scripts/freestyle/style_modules/occluded_by_specific_object.py -share/blender/${PKGVERSION}/scripts/freestyle/style_modules/parameter_editor.py -share/blender/${PKGVERSION}/scripts/freestyle/style_modules/polygonalize.py -share/blender/${PKGVERSION}/scripts/freestyle/style_modules/qi0.py -share/blender/${PKGVERSION}/scripts/freestyle/style_modules/qi0_not_external_contour.py -share/blender/${PKGVERSION}/scripts/freestyle/style_modules/qi1.py -share/blender/${PKGVERSION}/scripts/freestyle/style_modules/qi2.py -share/blender/${PKGVERSION}/scripts/freestyle/style_modules/sequentialsplit_sketchy.py -share/blender/${PKGVERSION}/scripts/freestyle/style_modules/shaders.py -share/blender/${PKGVERSION}/scripts/freestyle/style_modules/sketchy_multiple_parameterization.py -share/blender/${PKGVERSION}/scripts/freestyle/style_modules/sketchy_topology_broken.py -share/blender/${PKGVERSION}/scripts/freestyle/style_modules/sketchy_topology_preserved.py -share/blender/${PKGVERSION}/scripts/freestyle/style_modules/split_at_highest_2d_curvatures.py -share/blender/${PKGVERSION}/scripts/freestyle/style_modules/split_at_tvertices.py -share/blender/${PKGVERSION}/scripts/freestyle/style_modules/stroke_texture.py -share/blender/${PKGVERSION}/scripts/freestyle/style_modules/suggestive.py -share/blender/${PKGVERSION}/scripts/freestyle/style_modules/thickness_fof_depth_discontinuity.py -share/blender/${PKGVERSION}/scripts/freestyle/style_modules/tipremover.py -share/blender/${PKGVERSION}/scripts/freestyle/style_modules/tvertex_remover.py -share/blender/${PKGVERSION}/scripts/freestyle/style_modules/uniformpruning_zsort.py +share/blender/${PKGVERSION}/scripts/freestyle/modules/freestyle/__init__.py +share/blender/${PKGVERSION}/scripts/freestyle/modules/freestyle/chainingiterators.py +share/blender/${PKGVERSION}/scripts/freestyle/modules/freestyle/functions.py +share/blender/${PKGVERSION}/scripts/freestyle/modules/freestyle/predicates.py +share/blender/${PKGVERSION}/scripts/freestyle/modules/freestyle/shaders.py +share/blender/${PKGVERSION}/scripts/freestyle/modules/freestyle/types.py +share/blender/${PKGVERSION}/scripts/freestyle/modules/freestyle/utils.py +share/blender/${PKGVERSION}/scripts/freestyle/modules/parameter_editor.py +share/blender/${PKGVERSION}/scripts/freestyle/styles/anisotropic_diffusion.py +share/blender/${PKGVERSION}/scripts/freestyle/styles/apriori_and_causal_density.py +share/blender/${PKGVERSION}/scripts/freestyle/styles/apriori_density.py +share/blender/${PKGVERSION}/scripts/freestyle/styles/backbone_stretcher.py +share/blender/${PKGVERSION}/scripts/freestyle/styles/blueprint_circles.py +share/blender/${PKGVERSION}/scripts/freestyle/styles/blueprint_ellipses.py +share/blender/${PKGVERSION}/scripts/freestyle/styles/blueprint_squares.py +share/blender/${PKGVERSION}/scripts/freestyle/styles/cartoon.py +share/blender/${PKGVERSION}/scripts/freestyle/styles/contour.py +share/blender/${PKGVERSION}/scripts/freestyle/styles/curvature2d.py +share/blender/${PKGVERSION}/scripts/freestyle/styles/external_contour.py +share/blender/${PKGVERSION}/scripts/freestyle/styles/external_contour_sketchy.py +share/blender/${PKGVERSION}/scripts/freestyle/styles/external_contour_smooth.py +share/blender/${PKGVERSION}/scripts/freestyle/styles/haloing.py +share/blender/${PKGVERSION}/scripts/freestyle/styles/ignore_small_occlusions.py +share/blender/${PKGVERSION}/scripts/freestyle/styles/invisible_lines.py +share/blender/${PKGVERSION}/scripts/freestyle/styles/japanese_bigbrush.py +share/blender/${PKGVERSION}/scripts/freestyle/styles/long_anisotropically_dense.py +share/blender/${PKGVERSION}/scripts/freestyle/styles/multiple_parameterization.py +share/blender/${PKGVERSION}/scripts/freestyle/styles/nature.py +share/blender/${PKGVERSION}/scripts/freestyle/styles/near_lines.py +share/blender/${PKGVERSION}/scripts/freestyle/styles/occluded_by_specific_object.py +share/blender/${PKGVERSION}/scripts/freestyle/styles/polygonalize.py +share/blender/${PKGVERSION}/scripts/freestyle/styles/qi0.py +share/blender/${PKGVERSION}/scripts/freestyle/styles/qi0_not_external_contour.py +share/blender/${PKGVERSION}/scripts/freestyle/styles/qi1.py +share/blender/${PKGVERSION}/scripts/freestyle/styles/qi2.py +share/blender/${PKGVERSION}/scripts/freestyle/styles/sequentialsplit_sketchy.py +share/blender/${PKGVERSION}/scripts/freestyle/styles/sketchy_multiple_parameterization.py +share/blender/${PKGVERSION}/scripts/freestyle/styles/sketchy_topology_broken.py +share/blender/${PKGVERSION}/scripts/freestyle/styles/sketchy_topology_preserved.py +share/blender/${PKGVERSION}/scripts/freestyle/styles/split_at_highest_2d_curvatures.py +share/blender/${PKGVERSION}/scripts/freestyle/styles/split_at_tvertices.py +share/blender/${PKGVERSION}/scripts/freestyle/styles/stroke_texture.py +share/blender/${PKGVERSION}/scripts/freestyle/styles/suggestive.py +share/blender/${PKGVERSION}/scripts/freestyle/styles/thickness_fof_depth_discontinuity.py +share/blender/${PKGVERSION}/scripts/freestyle/styles/tipremover.py +share/blender/${PKGVERSION}/scripts/freestyle/styles/tvertex_remover.py +share/blender/${PKGVERSION}/scripts/freestyle/styles/uniformpruning_zsort.py share/blender/${PKGVERSION}/scripts/modules/addon_utils.py share/blender/${PKGVERSION}/scripts/modules/animsys_refactor.py share/blender/${PKGVERSION}/scripts/modules/bl_i18n_utils/__init__.py @@ -1035,33 +1024,40 @@ share/blender/${PKGVERSION}/scripts/modules/rna_keymap_ui.py share/blender/${PKGVERSION}/scripts/modules/rna_prop_ui.py share/blender/${PKGVERSION}/scripts/modules/rna_xml.py share/blender/${PKGVERSION}/scripts/modules/sys_info.py -share/blender/${PKGVERSION}/scripts/presets/camera/APS-C_DSLR.py +share/blender/${PKGVERSION}/scripts/presets/camera/1__colon__2.3_inch.py +share/blender/${PKGVERSION}/scripts/presets/camera/1__colon__2.5_inch.py +share/blender/${PKGVERSION}/scripts/presets/camera/2__colon__3_inch.py +share/blender/${PKGVERSION}/scripts/presets/camera/4__colon__3_inch.py +share/blender/${PKGVERSION}/scripts/presets/camera/Arri_Alexa.py +share/blender/${PKGVERSION}/scripts/presets/camera/Blackmagic_Cinema_Camera.py share/blender/${PKGVERSION}/scripts/presets/camera/Blender.py share/blender/${PKGVERSION}/scripts/presets/camera/Canon_1100D.py -share/blender/${PKGVERSION}/scripts/presets/camera/Canon_1D.py -share/blender/${PKGVERSION}/scripts/presets/camera/Canon_1DS.py -share/blender/${PKGVERSION}/scripts/presets/camera/Canon_500D.py -share/blender/${PKGVERSION}/scripts/presets/camera/Canon_550D.py -share/blender/${PKGVERSION}/scripts/presets/camera/Canon_5D.py -share/blender/${PKGVERSION}/scripts/presets/camera/Canon_600D.py -share/blender/${PKGVERSION}/scripts/presets/camera/Canon_60D.py -share/blender/${PKGVERSION}/scripts/presets/camera/Canon_7D.py -share/blender/${PKGVERSION}/scripts/presets/camera/Nikon_D300S.py +share/blender/${PKGVERSION}/scripts/presets/camera/Canon_APS-C.py +share/blender/${PKGVERSION}/scripts/presets/camera/Canon_APS-H.py +share/blender/${PKGVERSION}/scripts/presets/camera/Canon_C300.py +share/blender/${PKGVERSION}/scripts/presets/camera/Full_Frame_35mm_Camera.py +share/blender/${PKGVERSION}/scripts/presets/camera/GoPro_Hero3_Black.py +share/blender/${PKGVERSION}/scripts/presets/camera/GoPro_Hero3_Silver.py +share/blender/${PKGVERSION}/scripts/presets/camera/GoPro_Hero3_White.py +share/blender/${PKGVERSION}/scripts/presets/camera/Nexus_5.py share/blender/${PKGVERSION}/scripts/presets/camera/Nikon_D3100.py -share/blender/${PKGVERSION}/scripts/presets/camera/Nikon_D3S.py -share/blender/${PKGVERSION}/scripts/presets/camera/Nikon_D5000.py -share/blender/${PKGVERSION}/scripts/presets/camera/Nikon_D5100.py -share/blender/${PKGVERSION}/scripts/presets/camera/Nikon_D7000.py -share/blender/${PKGVERSION}/scripts/presets/camera/Nikon_D90.py +share/blender/${PKGVERSION}/scripts/presets/camera/Nikon_DX.py +share/blender/${PKGVERSION}/scripts/presets/camera/Panasonic_AG-HVX200.py +share/blender/${PKGVERSION}/scripts/presets/camera/Panasonic_LX2.py share/blender/${PKGVERSION}/scripts/presets/camera/Red_Epic.py share/blender/${PKGVERSION}/scripts/presets/camera/Red_One_2K.py share/blender/${PKGVERSION}/scripts/presets/camera/Red_One_3K.py share/blender/${PKGVERSION}/scripts/presets/camera/Red_One_4K.py +share/blender/${PKGVERSION}/scripts/presets/camera/Samsung_Galaxy_S3.py +share/blender/${PKGVERSION}/scripts/presets/camera/Samsung_Galaxy_S4.py share/blender/${PKGVERSION}/scripts/presets/camera/Sony_A55.py -share/blender/${PKGVERSION}/scripts/presets/camera/full_frame_35mm_film.py -share/blender/${PKGVERSION}/scripts/presets/camera/micro_four_thirds.py -share/blender/${PKGVERSION}/scripts/presets/camera/super_16_film.py -share/blender/${PKGVERSION}/scripts/presets/camera/super_35_film.py +share/blender/${PKGVERSION}/scripts/presets/camera/Sony_EX1.py +share/blender/${PKGVERSION}/scripts/presets/camera/Sony_F65.py +share/blender/${PKGVERSION}/scripts/presets/camera/Super_16_Film.py +share/blender/${PKGVERSION}/scripts/presets/camera/Super_35_Film.py +share/blender/${PKGVERSION}/scripts/presets/camera/iPhone_4.py +share/blender/${PKGVERSION}/scripts/presets/camera/iPhone_4S.py +share/blender/${PKGVERSION}/scripts/presets/camera/iPhone_5.py share/blender/${PKGVERSION}/scripts/presets/cloth/cotton.py share/blender/${PKGVERSION}/scripts/presets/cloth/denim.py share/blender/${PKGVERSION}/scripts/presets/cloth/leather.py @@ -1127,28 +1123,40 @@ share/blender/${PKGVERSION}/scripts/presets/sss/whole_milk.py share/blender/${PKGVERSION}/scripts/presets/sunsky/classic.py share/blender/${PKGVERSION}/scripts/presets/sunsky/desert.py share/blender/${PKGVERSION}/scripts/presets/sunsky/mountain.py +share/blender/${PKGVERSION}/scripts/presets/tracking_camera/1__colon__2.3_inch.py +share/blender/${PKGVERSION}/scripts/presets/tracking_camera/1__colon__2.5_inch.py +share/blender/${PKGVERSION}/scripts/presets/tracking_camera/2__colon__3_inch.py +share/blender/${PKGVERSION}/scripts/presets/tracking_camera/4__colon__3_inch.py +share/blender/${PKGVERSION}/scripts/presets/tracking_camera/Arri_Alexa.py +share/blender/${PKGVERSION}/scripts/presets/tracking_camera/Blackmagic_Cinema_Camera.py share/blender/${PKGVERSION}/scripts/presets/tracking_camera/Blender.py share/blender/${PKGVERSION}/scripts/presets/tracking_camera/Canon_1100D.py -share/blender/${PKGVERSION}/scripts/presets/tracking_camera/Canon_1D.py -share/blender/${PKGVERSION}/scripts/presets/tracking_camera/Canon_1DS.py -share/blender/${PKGVERSION}/scripts/presets/tracking_camera/Canon_500D.py -share/blender/${PKGVERSION}/scripts/presets/tracking_camera/Canon_550D.py -share/blender/${PKGVERSION}/scripts/presets/tracking_camera/Canon_5D.py -share/blender/${PKGVERSION}/scripts/presets/tracking_camera/Canon_600D.py -share/blender/${PKGVERSION}/scripts/presets/tracking_camera/Canon_60D.py -share/blender/${PKGVERSION}/scripts/presets/tracking_camera/Canon_7D.py -share/blender/${PKGVERSION}/scripts/presets/tracking_camera/Nikon_D300S.py +share/blender/${PKGVERSION}/scripts/presets/tracking_camera/Canon_APS-C.py +share/blender/${PKGVERSION}/scripts/presets/tracking_camera/Canon_APS-H.py +share/blender/${PKGVERSION}/scripts/presets/tracking_camera/Canon_C300.py +share/blender/${PKGVERSION}/scripts/presets/tracking_camera/Full_Frame_35mm_Camera.py +share/blender/${PKGVERSION}/scripts/presets/tracking_camera/GoPro_Hero3_Black.py +share/blender/${PKGVERSION}/scripts/presets/tracking_camera/GoPro_Hero3_Silver.py +share/blender/${PKGVERSION}/scripts/presets/tracking_camera/GoPro_Hero3_White.py +share/blender/${PKGVERSION}/scripts/presets/tracking_camera/Nexus_5.py share/blender/${PKGVERSION}/scripts/presets/tracking_camera/Nikon_D3100.py -share/blender/${PKGVERSION}/scripts/presets/tracking_camera/Nikon_D35.py -share/blender/${PKGVERSION}/scripts/presets/tracking_camera/Nikon_D5000.py -share/blender/${PKGVERSION}/scripts/presets/tracking_camera/Nikon_D5100.py -share/blender/${PKGVERSION}/scripts/presets/tracking_camera/Nikon_D7000.py -share/blender/${PKGVERSION}/scripts/presets/tracking_camera/Nikon_D90.py +share/blender/${PKGVERSION}/scripts/presets/tracking_camera/Nikon_DX.py +share/blender/${PKGVERSION}/scripts/presets/tracking_camera/Panasonic_AG-HVX200.py +share/blender/${PKGVERSION}/scripts/presets/tracking_camera/Panasonic_LX2.py share/blender/${PKGVERSION}/scripts/presets/tracking_camera/Red_Epic.py share/blender/${PKGVERSION}/scripts/presets/tracking_camera/Red_One_2K.py share/blender/${PKGVERSION}/scripts/presets/tracking_camera/Red_One_3K.py share/blender/${PKGVERSION}/scripts/presets/tracking_camera/Red_One_4K.py +share/blender/${PKGVERSION}/scripts/presets/tracking_camera/Samsung_Galaxy_S3.py +share/blender/${PKGVERSION}/scripts/presets/tracking_camera/Samsung_Galaxy_S4.py share/blender/${PKGVERSION}/scripts/presets/tracking_camera/Sony_A55.py +share/blender/${PKGVERSION}/scripts/presets/tracking_camera/Sony_EX1.py +share/blender/${PKGVERSION}/scripts/presets/tracking_camera/Sony_F65.py +share/blender/${PKGVERSION}/scripts/presets/tracking_camera/Super_16.py +share/blender/${PKGVERSION}/scripts/presets/tracking_camera/Super_35.py +share/blender/${PKGVERSION}/scripts/presets/tracking_camera/iPhone_4.py +share/blender/${PKGVERSION}/scripts/presets/tracking_camera/iPhone_4S.py +share/blender/${PKGVERSION}/scripts/presets/tracking_camera/iPhone_5.py share/blender/${PKGVERSION}/scripts/presets/tracking_settings/blurry_footage.py share/blender/${PKGVERSION}/scripts/presets/tracking_settings/default.py share/blender/${PKGVERSION}/scripts/presets/tracking_settings/fast_motion.py @@ -1197,6 +1205,7 @@ share/blender/${PKGVERSION}/scripts/startup/bl_ui/properties_data_modifier.py share/blender/${PKGVERSION}/scripts/startup/bl_ui/properties_data_speaker.py share/blender/${PKGVERSION}/scripts/startup/bl_ui/properties_freestyle.py share/blender/${PKGVERSION}/scripts/startup/bl_ui/properties_game.py +share/blender/${PKGVERSION}/scripts/startup/bl_ui/properties_grease_pencil_common.py share/blender/${PKGVERSION}/scripts/startup/bl_ui/properties_mask_common.py share/blender/${PKGVERSION}/scripts/startup/bl_ui/properties_material.py share/blender/${PKGVERSION}/scripts/startup/bl_ui/properties_object.py @@ -1237,12 +1246,11 @@ share/blender/${PKGVERSION}/scripts/startup/bl_ui/space_view3d_toolbar.py share/blender/${PKGVERSION}/scripts/startup/keyingsets_builtins.py share/blender/${PKGVERSION}/scripts/startup/nodeitems_builtins.py share/blender/${PKGVERSION}/scripts/templates_osl/empty_shader.osl +share/blender/${PKGVERSION}/scripts/templates_osl/gabor_noise.osl +share/blender/${PKGVERSION}/scripts/templates_osl/lyapunov_texture.osl share/blender/${PKGVERSION}/scripts/templates_osl/noise.osl share/blender/${PKGVERSION}/scripts/templates_osl/ramp_closure.osl -share/blender/${PKGVERSION}/scripts/templates_osl/temperature_to_rgb.osl -share/blender/${PKGVERSION}/scripts/templates_osl/wavelength_to_rgb.osl share/blender/${PKGVERSION}/scripts/templates_osl/westin_closure.osl -share/blender/${PKGVERSION}/scripts/templates_osl/wireframe.osl share/blender/${PKGVERSION}/scripts/templates_py/addon_add_object.py share/blender/${PKGVERSION}/scripts/templates_py/background_job.py share/blender/${PKGVERSION}/scripts/templates_py/batch_export.py @@ -1257,6 +1265,7 @@ share/blender/${PKGVERSION}/scripts/templates_py/gamelogic_simple.py share/blender/${PKGVERSION}/scripts/templates_py/operator_file_export.py share/blender/${PKGVERSION}/scripts/templates_py/operator_file_import.py share/blender/${PKGVERSION}/scripts/templates_py/operator_mesh_add.py +share/blender/${PKGVERSION}/scripts/templates_py/operator_mesh_uv.py share/blender/${PKGVERSION}/scripts/templates_py/operator_modal.py share/blender/${PKGVERSION}/scripts/templates_py/operator_modal_draw.py share/blender/${PKGVERSION}/scripts/templates_py/operator_modal_timer.py @@ -1264,7 +1273,6 @@ share/blender/${PKGVERSION}/scripts/templates_py/operator_modal_view3d.py share/blender/${PKGVERSION}/scripts/templates_py/operator_modal_view3d_raycast.py share/blender/${PKGVERSION}/scripts/templates_py/operator_node.py share/blender/${PKGVERSION}/scripts/templates_py/operator_simple.py -share/blender/${PKGVERSION}/scripts/templates_py/operator_uv.py share/blender/${PKGVERSION}/scripts/templates_py/script_stub.py share/blender/${PKGVERSION}/scripts/templates_py/ui_list.py share/blender/${PKGVERSION}/scripts/templates_py/ui_list_simple.py @@ -1279,7 +1287,6 @@ share/blender/LICENSE-bmonofont-i18n.ttf.txt share/blender/LICENSE-droidsans.ttf.txt share/blender/Python-license.txt share/blender/blender -share/blender/blenderplayer share/blender/copyright.txt share/blender/jemalloc-license.txt share/blender/readme.html diff --git a/graphics/blender/distinfo b/graphics/blender/distinfo index 6f3ca5505a6..79f965ba6ff 100644 --- a/graphics/blender/distinfo +++ b/graphics/blender/distinfo @@ -1,34 +1,15 @@ -$NetBSD: distinfo,v 1.40 2014/02/01 03:57:52 markd Exp $ +$NetBSD: distinfo,v 1.41 2014/04/07 12:21:25 ryoon Exp $ -SHA1 (blender-2.69.tar.gz) = 9500410d2457d99e685ca506bec12851454dc5d4 -RMD160 (blender-2.69.tar.gz) = 27997d071a767630baeaddc0017e19dccb99b1a9 -Size (blender-2.69.tar.gz) = 41274518 bytes -SHA1 (patch-ab) = f752ba279aed273bb5c93ede64c2d7292f33fd83 +SHA1 (blender-2.70.tar.gz) = 294d89855e4bd2226bfbd4311f835709379ec309 +RMD160 (blender-2.70.tar.gz) = 83a44e77d1143cc01932ec18b55a7b7f12bc21b0 +Size (blender-2.70.tar.gz) = 55298021 bytes SHA1 (patch-build__files_scons_config_linux-config.py) = 863ff0b2839fa96a4b579cb52d7c4475aa4c571c -SHA1 (patch-build__files_scons_config_netbsd6-config.py) = a2ef239cc40430a5eaafd006b423e7f70ac9ee80 +SHA1 (patch-build__files_scons_config_netbsd6-config.py) = f7224f0cd7baacdf26e47348c3ee45caf9e31a32 SHA1 (patch-build__files_scons_tools_btools.py) = 09fe67666091daafcf586aa70dc19fa6964b2098 -SHA1 (patch-doc_python__api_sphinx__doc__gen.sh) = 52c9ee0e0c73b9b9628a3d82292a9588ff0060da -SHA1 (patch-extern_carve_lib_triangulator.cpp) = ad539e2f04a3b181504c4a9135f106189fccbda0 -SHA1 (patch-extern_libmv_libmv_numeric_numeric.h) = 37649c996eda56c2a6e0776b9933df28fac645e3 -SHA1 (patch-extern_libmv_libmv_tracking_brute__region__tracker.cc) = be5fe12d44221bde94326cccb30316bcf29f9aba -SHA1 (patch-extern_libmv_third__party_ceres_internal_ceres_collections__port.h) = 5a276e652ad222aca3ff626da4b4850e5043672c SHA1 (patch-extern_libmv_third__party_glog_src_config.h) = d889d56d47167222ab54fad1c8f87c7ddb02852a SHA1 (patch-extern_libmv_third__party_glog_src_config__netbsd.h) = 423dda12bb5871f810938666c0267ac73b3f856e SHA1 (patch-extern_libmv_third__party_glog_src_utilities.h) = 32fea10d935621ef0529fe56b3e857685fbc5d1f SHA1 (patch-extern_rangetree_range__tree.hh) = 976881b9caad67a2cfb24039652e887867fa6cc0 -SHA1 (patch-intern_cycles_util_util__types.h) = 85624299d7b3ed354ba06406c9022393a448ad54 +SHA1 (patch-intern_cycles_util_util__types.h) = 37944c6b0a970468e6791ec4a5beef1ec0ddf190 SHA1 (patch-intern_ghost_SConscript) = 84dad76663e6dfc3bd6636fe8924921fe04caa2f -SHA1 (patch-intern_itasc_Armature.cpp) = ee841eff87e7cb85657868246285644994263fa2 -SHA1 (patch-intern_itasc_kdl_frameacc.hpp) = 06c5b13e889968b87513ff8ad7952b34173147de -SHA1 (patch-intern_itasc_kdl_frames.hpp) = afcf3d74e50e12d4b8b2efd9b6d2fdfbee8fc629 -SHA1 (patch-intern_itasc_kdl_framevel.hpp) = fbf4accd352be468d3bdc039e315a86ce42010bd -SHA1 (patch-intern_itasc_kdl_jacobian.hpp) = 490f67d9938e321b41c4bd93ccca06fe0c2d920a -SHA1 (patch-intern_itasc_kdl_jntarray.hpp) = ff1b5befef08c8a7eb7f542a01305854b303156d -SHA1 (patch-intern_itasc_kdl_jntarrayacc.hpp) = 05088dc8422c7fef2c7d80fd32547e8c46fb1158 -SHA1 (patch-intern_itasc_kdl_jntarrayvel.hpp) = 5673396e00d984448543959064a0d44e23baa09b -SHA1 (patch-intern_itasc_kdl_tree.cpp) = 15d3b38b8a936c40726407ec17ee4c2dc7e0ac53 -SHA1 (patch-intern_itasc_kdl_tree.hpp) = 776b17eb67e4a619539d41c680b221d3c6f57dc8 -SHA1 (patch-intern_itasc_kdl_treefksolverpos__recursive.cpp) = bed5ba3ac0578161f35b561a6d4d1595ca085b88 -SHA1 (patch-intern_itasc_kdl_treefksolverpos__recursive.hpp) = da02d9c1bfe1f5825b1afded32ac1b1400613c08 -SHA1 (patch-intern_itasc_kdl_treejnttojacsolver.cpp) = bde39ea3c0b56cfbc7836cf5a30b94b7adbdfaff -SHA1 (patch-user-config.py) = a3cf1a22185496f13b068a31d4b9638c8821f941 +SHA1 (patch-intern_guardedalloc_intern_mallocn__intern.h) = 6d92a0c0a19c04cbb5e34de360c9e3303e2d8ceb diff --git a/graphics/blender/patches/patch-ab b/graphics/blender/patches/patch-ab deleted file mode 100644 index 161cd237400..00000000000 --- a/graphics/blender/patches/patch-ab +++ /dev/null @@ -1,38 +0,0 @@ -$NetBSD: patch-ab,v 1.12 2014/01/10 20:06:46 joerg Exp $ - ---- source/blender/blenlib/intern/storage.c.orig 2013-08-20 08:33:04.000000000 +0000 -+++ source/blender/blenlib/intern/storage.c -@@ -42,13 +42,13 @@ - #include <time.h> - #include <sys/stat.h> - --#if defined(__sun__) || defined(__sun) || defined(__NetBSD__) -+#if defined(__sun__) || defined(__sun) || defined(__NetBSD__) || defined(__DragonFly__) - # include <sys/statvfs.h> /* Other modern unix os's should probably use this also */ - #elif !defined(__FreeBSD__) && !defined(__linux__) && (defined(__sparc) || defined(__sparc__)) - # include <sys/statfs.h> - #endif - --#if defined(__FreeBSD__) || defined(__OpenBSD__) || defined(__NetBSD__) -+#if defined(__FreeBSD__) || defined(__OpenBSD__) || defined(__NetBSD__) || defined(__DragonFly__) - # include <sys/param.h> - # include <sys/mount.h> - #endif -@@ -172,7 +172,7 @@ double BLI_dir_free_space(const char *di - return (double) (freec * bytesps * sectorspc); - #else - --#if defined(__sun__) || defined(__sun) || defined(__NetBSD__) -+#if defined(__sun__) || defined(__sun) || defined(__NetBSD__) || defined(__DragonFly__) - struct statvfs disk; - #else - struct statfs disk; -@@ -197,7 +197,7 @@ double BLI_dir_free_space(const char *di - if (statfs(name, &disk)) return(-1); - #endif - --#if defined(__sun__) || defined(__sun) || defined(__NetBSD__) -+#if defined(__sun__) || defined(__sun) || defined(__NetBSD__) || defined(__DragonFly__) - if (statvfs(name, &disk)) return(-1); - #elif !defined(__FreeBSD__) && !defined(__linux__) && (defined(__sparc) || defined(__sparc__)) - /* WARNING - This may not be supported by geeneric unix os's - Campbell */ diff --git a/graphics/blender/patches/patch-build__files_scons_config_netbsd6-config.py b/graphics/blender/patches/patch-build__files_scons_config_netbsd6-config.py index 089cc636650..6dee722e0d0 100644 --- a/graphics/blender/patches/patch-build__files_scons_config_netbsd6-config.py +++ b/graphics/blender/patches/patch-build__files_scons_config_netbsd6-config.py @@ -1,4 +1,4 @@ -$NetBSD: patch-build__files_scons_config_netbsd6-config.py,v 1.3 2014/01/10 20:06:46 joerg Exp $ +$NetBSD: patch-build__files_scons_config_netbsd6-config.py,v 1.4 2014/04/07 12:21:25 ryoon Exp $ * config file for NetBSD 6 @@ -230,5 +230,5 @@ $NetBSD: patch-build__files_scons_config_netbsd6-config.py,v 1.3 2014/01/10 20:0 +BF_BUILDDIR = '../build/netbsd6' +BF_INSTALLDIR='../install/netbsd6' + -+#Link against pthread -+PLATFORM_LINKFLAGS = ['-pthread'] ++#Link against pthread and libexecinfo ++PLATFORM_LINKFLAGS = ['-pthread', @PYLDFLAGS@] diff --git a/graphics/blender/patches/patch-doc_python__api_sphinx__doc__gen.sh b/graphics/blender/patches/patch-doc_python__api_sphinx__doc__gen.sh deleted file mode 100644 index 22cec3cba05..00000000000 --- a/graphics/blender/patches/patch-doc_python__api_sphinx__doc__gen.sh +++ /dev/null @@ -1,24 +0,0 @@ -$NetBSD: patch-doc_python__api_sphinx__doc__gen.sh,v 1.3 2013/10/12 22:11:00 ryoon Exp $ - -* Improve portability - ---- doc/python_api/sphinx_doc_gen.sh.orig 2013-04-19 13:00:21.000000000 +0000 -+++ doc/python_api/sphinx_doc_gen.sh -@@ -32,7 +32,7 @@ blender_version_char=$(grep BLENDER_VERS - blender_version_cycle=$(grep BLENDER_VERSION_CYCLE $blender_srcdir/source/blender/blenkernel/BKE_blender.h | awk '{print $3}') - blender_subversion=$(grep BLENDER_SUBVERSION $blender_srcdir/source/blender/blenkernel/BKE_blender.h | awk '{print $3}') - --if [ "$blender_version_cycle" == "release" ] ; then -+if [ "$blender_version_cycle" = "release" ] ; then - BLENDER_VERSION=$(expr $blender_version / 100)_$(expr $blender_version % 100)$blender_version_char"_release" - else - BLENDER_VERSION=$(expr $blender_version / 100)_$(expr $blender_version % 100)_$blender_subversion -@@ -109,7 +109,7 @@ if $DO_UPLOAD ; then - ssh $SSH_USER@emo.blender.org 'echo "<html><head><title>Redirecting...</title><meta http-equiv=\"REFRESH\" content=\"0;url=../blender_python_api_'$BLENDER_VERSION'/\"></head><body>Redirecting...</body></html>" > '$SSH_UPLOAD'/250PythonDoc/index.html' - - # redirect for release only so wiki can point here -- if [ "$blender_version_cycle" == "release" ] ; then -+ if [ "$blender_version_cycle" = "release" ] ; then - ssh $SSH_USER@emo.blender.org 'echo "<html><head><title>Redirecting...</title><meta http-equiv=\"REFRESH\" content=\"0;url=../blender_python_api_'$BLENDER_VERSION'/\"></head><body>Redirecting...</body></html>" > '$SSH_UPLOAD'/blender_python_api/index.html' - fi - diff --git a/graphics/blender/patches/patch-extern_carve_lib_triangulator.cpp b/graphics/blender/patches/patch-extern_carve_lib_triangulator.cpp deleted file mode 100644 index 88135fb6dbd..00000000000 --- a/graphics/blender/patches/patch-extern_carve_lib_triangulator.cpp +++ /dev/null @@ -1,13 +0,0 @@ -$NetBSD: patch-extern_carve_lib_triangulator.cpp,v 1.1 2014/01/10 20:06:46 joerg Exp $ - ---- extern/carve/lib/triangulator.cpp.orig 2013-11-20 21:53:04.000000000 +0000 -+++ extern/carve/lib/triangulator.cpp -@@ -122,7 +122,7 @@ namespace { - std::vector<vertex_info *> queue; - - void checkheap() { --#ifdef __GNUC__ -+#if defined(__GNUC__) && !defined(_LIBCPP_VERSION) - CARVE_ASSERT(std::__is_heap(queue.begin(), queue.end(), vertex_info_ordering())); - #endif - } diff --git a/graphics/blender/patches/patch-extern_libmv_libmv_numeric_numeric.h b/graphics/blender/patches/patch-extern_libmv_libmv_numeric_numeric.h deleted file mode 100644 index b5f649e70b4..00000000000 --- a/graphics/blender/patches/patch-extern_libmv_libmv_numeric_numeric.h +++ /dev/null @@ -1,13 +0,0 @@ -$NetBSD: patch-extern_libmv_libmv_numeric_numeric.h,v 1.2 2013/10/12 22:11:00 ryoon Exp $ - ---- extern/libmv/libmv/numeric/numeric.h.orig 2013-04-05 09:23:20.000000000 +0000 -+++ extern/libmv/libmv/numeric/numeric.h -@@ -33,7 +33,7 @@ - #include <Eigen/QR> - #include <Eigen/SVD> - --#if (defined(_WIN32) || defined(__APPLE__) || defined(__FreeBSD__)) && !defined(__MINGW64__) -+#if (defined(_WIN32) || defined(__APPLE__) || defined(__FreeBSD__) || defined(__NetBSD__)) && !defined(__MINGW64__) - static void sincos(double x, double *sinx, double *cosx) { - *sinx = sin(x); - *cosx = cos(x); diff --git a/graphics/blender/patches/patch-extern_libmv_libmv_tracking_brute__region__tracker.cc b/graphics/blender/patches/patch-extern_libmv_libmv_tracking_brute__region__tracker.cc deleted file mode 100644 index 099e2caf90b..00000000000 --- a/graphics/blender/patches/patch-extern_libmv_libmv_tracking_brute__region__tracker.cc +++ /dev/null @@ -1,22 +0,0 @@ -$NetBSD: patch-extern_libmv_libmv_tracking_brute__region__tracker.cc,v 1.2 2013/10/12 22:11:00 ryoon Exp $ - ---- extern/libmv/libmv/tracking/brute_region_tracker.cc.orig 2013-04-05 09:23:20.000000000 +0000 -+++ extern/libmv/libmv/tracking/brute_region_tracker.cc -@@ -24,7 +24,7 @@ - #include <emmintrin.h> - #endif - --#if !defined(__APPLE__) && !defined(__FreeBSD__) -+#if !defined(__APPLE__) && !defined(__FreeBSD__) && !defined(__NetBSD__) - // Needed for memalign on Linux and _aligned_alloc on Windows. - #ifdef FREE_WINDOWS - /* make sure _aligned_malloc is included */ -@@ -60,7 +60,7 @@ void *aligned_malloc(int size, int align - // they work natively with SSE types with no further work. - CHECK_EQ(alignment, 16); - return malloc(size); --#elif __FreeBSD__ -+#elif defined(__FreeBSD__) || defined(__NetBSD__) - void *result; - - if (posix_memalign(&result, alignment, size)) { diff --git a/graphics/blender/patches/patch-extern_libmv_third__party_ceres_internal_ceres_collections__port.h b/graphics/blender/patches/patch-extern_libmv_third__party_ceres_internal_ceres_collections__port.h deleted file mode 100644 index a9f14d55842..00000000000 --- a/graphics/blender/patches/patch-extern_libmv_third__party_ceres_internal_ceres_collections__port.h +++ /dev/null @@ -1,44 +0,0 @@ -$NetBSD: patch-extern_libmv_third__party_ceres_internal_ceres_collections__port.h,v 1.1 2014/01/10 20:06:46 joerg Exp $ - ---- extern/libmv/third_party/ceres/internal/ceres/collections_port.h.orig 2013-11-20 21:36:24.000000000 +0000 -+++ extern/libmv/third_party/ceres/internal/ceres/collections_port.h -@@ -33,11 +33,13 @@ - #ifndef CERES_INTERNAL_COLLECTIONS_PORT_H_ - #define CERES_INTERNAL_COLLECTIONS_PORT_H_ - -+#include <cstddef> -+ - #if defined(CERES_NO_TR1) - # include <map> - # include <set> - #else --# if defined(_MSC_VER) -+# if defined(_MSC_VER) || defined(_LIBCPP_VERSION) || __cplusplus >= 201103L - # include <unordered_map> - # include <unordered_set> - # else -@@ -71,11 +73,24 @@ struct HashSet : set<K> {}; - namespace ceres { - namespace internal { - -+#if defined(_LIBCPP_VERSION) || __cplusplus >= 201103L -+#undef CERES_HASH_NAMESPACE_START -+#define CERES_HASH_NAMESPACE_START namespace std { -+#undef CERES_HASH_NAMESPACE_END -+#define CERES_HASH_NAMESPACE_END } -+ -+template<typename K, typename V> -+struct HashMap : std::unordered_map<K, V> {}; -+ -+template<typename K> -+struct HashSet : std::unordered_set<K> {}; -+#else - template<typename K, typename V> - struct HashMap : std::tr1::unordered_map<K, V> {}; - - template<typename K> - struct HashSet : std::tr1::unordered_set<K> {}; -+#endif - - #if defined(_WIN32) && !defined(__MINGW64__) && !defined(__MINGW32__) - #define GG_LONGLONG(x) x##I64 diff --git a/graphics/blender/patches/patch-intern_cycles_util_util__types.h b/graphics/blender/patches/patch-intern_cycles_util_util__types.h index f646e549f1b..25617c4a8b6 100644 --- a/graphics/blender/patches/patch-intern_cycles_util_util__types.h +++ b/graphics/blender/patches/patch-intern_cycles_util_util__types.h @@ -1,8 +1,8 @@ -$NetBSD: patch-intern_cycles_util_util__types.h,v 1.1 2014/01/10 20:06:46 joerg Exp $ +$NetBSD: patch-intern_cycles_util_util__types.h,v 1.2 2014/04/07 12:21:25 ryoon Exp $ ---- intern/cycles/util/util_types.h.orig 2013-11-20 21:10:53.000000000 +0000 +--- intern/cycles/util/util_types.h.orig 2014-03-19 22:27:02.000000000 +0000 +++ intern/cycles/util/util_types.h -@@ -26,6 +26,9 @@ +@@ -32,6 +32,9 @@ /* Qualifiers for kernel code shared by CPU and GPU */ #ifndef __KERNEL_GPU__ @@ -10,5 +10,5 @@ $NetBSD: patch-intern_cycles_util_util__types.h,v 1.1 2014/01/10 20:06:46 joerg +#include <locale> +#endif - #define __device static inline - #define __device_noinline static + #define ccl_device static inline + #define ccl_device_noinline static diff --git a/graphics/blender/patches/patch-intern_guardedalloc_intern_mallocn__intern.h b/graphics/blender/patches/patch-intern_guardedalloc_intern_mallocn__intern.h new file mode 100644 index 00000000000..24775e1d54a --- /dev/null +++ b/graphics/blender/patches/patch-intern_guardedalloc_intern_mallocn__intern.h @@ -0,0 +1,13 @@ +$NetBSD: patch-intern_guardedalloc_intern_mallocn__intern.h,v 1.1 2014/04/07 12:21:25 ryoon Exp $ + +--- intern/guardedalloc/intern/mallocn_intern.h.orig 2014-03-19 22:05:25.000000000 +0000 ++++ intern/guardedalloc/intern/mallocn_intern.h +@@ -62,6 +62,8 @@ + #elif defined(WIN32) + # include <malloc.h> + # define malloc_usable_size _msize ++#elif defined(__NetBSD__) ++# define malloc_usable_size(x) 0 + #else + # error "We don't know how to use malloc_usable_size on your platform" + #endif diff --git a/graphics/blender/patches/patch-intern_itasc_Armature.cpp b/graphics/blender/patches/patch-intern_itasc_Armature.cpp deleted file mode 100644 index 970cbbe8ba1..00000000000 --- a/graphics/blender/patches/patch-intern_itasc_Armature.cpp +++ /dev/null @@ -1,13 +0,0 @@ -$NetBSD: patch-intern_itasc_Armature.cpp,v 1.1 2014/01/10 20:06:46 joerg Exp $ - ---- intern/itasc/Armature.cpp.orig 2013-03-18 11:44:56.000000000 +0000 -+++ intern/itasc/Armature.cpp -@@ -402,7 +402,7 @@ bool Armature::finalize() - m_armlength = 0.0; - for (i=0; i<m_neffector; i++) { - length = 0.0; -- KDL::SegmentMap::const_iterator sit = m_tree.getSegment(m_effectors[i].name); -+ KDL::SegmentMap::value_type const *sit = m_tree.getSegmentPtr(m_effectors[i].name); - while (sit->first != "root") { - Frame tip = sit->second.segment.pose(m_qKdl(sit->second.q_nr)); - length += tip.p.Norm(); diff --git a/graphics/blender/patches/patch-intern_itasc_kdl_frameacc.hpp b/graphics/blender/patches/patch-intern_itasc_kdl_frameacc.hpp deleted file mode 100644 index 94f82aef25a..00000000000 --- a/graphics/blender/patches/patch-intern_itasc_kdl_frameacc.hpp +++ /dev/null @@ -1,94 +0,0 @@ -$NetBSD: patch-intern_itasc_kdl_frameacc.hpp,v 1.1 2014/01/10 20:06:46 joerg Exp $ - ---- intern/itasc/kdl/frameacc.hpp.orig 2013-11-20 15:03:18.000000000 +0000 -+++ intern/itasc/kdl/frameacc.hpp -@@ -78,15 +78,18 @@ public: - IMETHOD friend VectorAcc operator / (const VectorAcc& r2,const doubleAcc& r1); - - -- IMETHOD friend bool Equal(const VectorAcc& r1,const VectorAcc& r2,double eps=epsilon); -- IMETHOD friend bool Equal(const Vector& r1,const VectorAcc& r2,double eps=epsilon); -- IMETHOD friend bool Equal(const VectorAcc& r1,const Vector& r2,double eps=epsilon); -+ IMETHOD friend bool Equal(const VectorAcc& r1,const VectorAcc& r2,double eps); -+ IMETHOD friend bool Equal(const Vector& r1,const VectorAcc& r2,double eps); -+ IMETHOD friend bool Equal(const VectorAcc& r1,const Vector& r2,double eps); - IMETHOD friend VectorAcc operator - (const VectorAcc& r); - IMETHOD friend doubleAcc dot(const VectorAcc& lhs,const VectorAcc& rhs); - IMETHOD friend doubleAcc dot(const VectorAcc& lhs,const Vector& rhs); - IMETHOD friend doubleAcc dot(const Vector& lhs,const VectorAcc& rhs); - }; - -+bool Equal(const VectorAcc& r1,const VectorAcc& r2,double eps=epsilon); -+bool Equal(const Vector& r1,const VectorAcc& r2,double eps=epsilon); -+bool Equal(const VectorAcc& r1,const Vector& r2,double eps=epsilon); - - - class RotationAcc -@@ -132,15 +135,18 @@ public: - IMETHOD friend RotationAcc operator* (const RotationAcc& r1,const RotationAcc& r2); - IMETHOD friend RotationAcc operator* (const Rotation& r1,const RotationAcc& r2); - IMETHOD friend RotationAcc operator* (const RotationAcc& r1,const Rotation& r2); -- IMETHOD friend bool Equal(const RotationAcc& r1,const RotationAcc& r2,double eps=epsilon); -- IMETHOD friend bool Equal(const Rotation& r1,const RotationAcc& r2,double eps=epsilon); -- IMETHOD friend bool Equal(const RotationAcc& r1,const Rotation& r2,double eps=epsilon); -+ IMETHOD friend bool Equal(const RotationAcc& r1,const RotationAcc& r2,double eps); -+ IMETHOD friend bool Equal(const Rotation& r1,const RotationAcc& r2,double eps); -+ IMETHOD friend bool Equal(const RotationAcc& r1,const Rotation& r2,double eps); - IMETHOD TwistAcc Inverse(const TwistAcc& arg) const; - IMETHOD TwistAcc Inverse(const Twist& arg) const; - IMETHOD TwistAcc operator * (const TwistAcc& arg) const; - IMETHOD TwistAcc operator * (const Twist& arg) const; - }; - -+bool Equal(const RotationAcc& r1,const RotationAcc& r2,double eps=epsilon); -+bool Equal(const Rotation& r1,const RotationAcc& r2,double eps=epsilon); -+bool Equal(const RotationAcc& r1,const Rotation& r2,double eps=epsilon); - - - -@@ -170,9 +176,9 @@ public: - IMETHOD friend FrameAcc operator * (const FrameAcc& f1,const FrameAcc& f2); - IMETHOD friend FrameAcc operator * (const Frame& f1,const FrameAcc& f2); - IMETHOD friend FrameAcc operator * (const FrameAcc& f1,const Frame& f2); -- IMETHOD friend bool Equal(const FrameAcc& r1,const FrameAcc& r2,double eps=epsilon); -- IMETHOD friend bool Equal(const Frame& r1,const FrameAcc& r2,double eps=epsilon); -- IMETHOD friend bool Equal(const FrameAcc& r1,const Frame& r2,double eps=epsilon); -+ IMETHOD friend bool Equal(const FrameAcc& r1,const FrameAcc& r2,double eps); -+ IMETHOD friend bool Equal(const Frame& r1,const FrameAcc& r2,double eps); -+ IMETHOD friend bool Equal(const FrameAcc& r1,const Frame& r2,double eps); - - IMETHOD TwistAcc Inverse(const TwistAcc& arg) const; - IMETHOD TwistAcc Inverse(const Twist& arg) const; -@@ -180,6 +186,9 @@ public: - IMETHOD TwistAcc operator * (const Twist& arg) const; - }; - -+bool Equal(const FrameAcc& r1,const FrameAcc& r2,double eps=epsilon); -+bool Equal(const Frame& r1,const FrameAcc& r2,double eps=epsilon); -+bool Equal(const FrameAcc& r1,const Frame& r2,double eps=epsilon); - - - -@@ -226,9 +235,9 @@ public: - // the new point. - // Complexity : 6M+6A - -- IMETHOD friend bool Equal(const TwistAcc& a,const TwistAcc& b,double eps=epsilon); -- IMETHOD friend bool Equal(const Twist& a,const TwistAcc& b,double eps=epsilon); -- IMETHOD friend bool Equal(const TwistAcc& a,const Twist& b,double eps=epsilon); -+ IMETHOD friend bool Equal(const TwistAcc& a,const TwistAcc& b,double eps); -+ IMETHOD friend bool Equal(const Twist& a,const TwistAcc& b,double eps); -+ IMETHOD friend bool Equal(const TwistAcc& a,const Twist& b,double eps); - - - IMETHOD Twist GetTwist() const; -@@ -239,6 +248,9 @@ public: - - }; - -+bool Equal(const TwistAcc& a,const TwistAcc& b,double eps=epsilon); -+bool Equal(const Twist& a,const TwistAcc& b,double eps=epsilon); -+bool Equal(const TwistAcc& a,const Twist& b,double eps=epsilon); - - - diff --git a/graphics/blender/patches/patch-intern_itasc_kdl_frames.hpp b/graphics/blender/patches/patch-intern_itasc_kdl_frames.hpp deleted file mode 100644 index 78f400de3ad..00000000000 --- a/graphics/blender/patches/patch-intern_itasc_kdl_frames.hpp +++ /dev/null @@ -1,93 +0,0 @@ -$NetBSD: patch-intern_itasc_kdl_frames.hpp,v 1.1 2014/01/10 20:06:46 joerg Exp $ - ---- intern/itasc/kdl/frames.hpp.orig 2013-11-20 14:46:29.000000000 +0000 -+++ intern/itasc/kdl/frames.hpp -@@ -248,10 +248,10 @@ public: - - //! do not use operator == because the definition of Equal(.,.) is slightly - //! different. It compares whether the 2 arguments are equal in an eps-interval -- inline friend bool Equal(const Vector& a,const Vector& b,double eps=epsilon); -+ inline friend bool Equal(const Vector& a,const Vector& b,double eps); - - //! return a normalized vector -- inline friend Vector Normalize(const Vector& a, double eps=epsilon); -+ inline friend Vector Normalize(const Vector& a, double eps); - - //! The literal equality operator==(), also identical. - inline friend bool operator==(const Vector& a,const Vector& b); -@@ -502,7 +502,7 @@ public: - - //! do not use operator == because the definition of Equal(.,.) is slightly - //! different. It compares whether the 2 arguments are equal in an eps-interval -- friend bool Equal(const Rotation& a,const Rotation& b,double eps=epsilon); -+ friend bool Equal(const Rotation& a,const Rotation& b,double eps); - - //! The literal equality operator==(), also identical. - friend bool operator==(const Rotation& a,const Rotation& b); -@@ -663,7 +663,7 @@ public: - - //! do not use operator == because the definition of Equal(.,.) is slightly - //! different. It compares whether the 2 arguments are equal in an eps-interval -- inline friend bool Equal(const Frame& a,const Frame& b,double eps=epsilon); -+ inline friend bool Equal(const Frame& a,const Frame& b,double eps); - - //! The literal equality operator==(), also identical. - inline friend bool operator==(const Frame& a,const Frame& b); -@@ -735,7 +735,7 @@ public: - - //! do not use operator == because the definition of Equal(.,.) is slightly - //! different. It compares whether the 2 arguments are equal in an eps-interval -- inline friend bool Equal(const Twist& a,const Twist& b,double eps=epsilon); -+ inline friend bool Equal(const Twist& a,const Twist& b,double eps); - - //! The literal equality operator==(), also identical. - inline friend bool operator==(const Twist& a,const Twist& b); -@@ -898,7 +898,7 @@ public: - - //! do not use operator == because the definition of Equal(.,.) is slightly - //! different. It compares whether the 2 arguments are equal in an eps-interval -- inline friend bool Equal(const Wrench& a,const Wrench& b,double eps=epsilon); -+ inline friend bool Equal(const Wrench& a,const Wrench& b,double eps); - - //! The literal equality operator==(), also identical. - inline friend bool operator==(const Wrench& a,const Wrench& b); -@@ -979,7 +979,7 @@ public: - - //! do not use operator == because the definition of Equal(.,.) is slightly - //! different. It compares whether the 2 arguments are equal in an eps-interval -- inline friend bool Equal(const Vector2& a,const Vector2& b,double eps=epsilon); -+ inline friend bool Equal(const Vector2& a,const Vector2& b,double eps); - - friend class Rotation2; - }; -@@ -1026,7 +1026,7 @@ public: - - //! do not use operator == because the definition of Equal(.,.) is slightly - //! different. It compares whether the 2 arguments are equal in an eps-interval -- inline friend bool Equal(const Rotation2& a,const Rotation2& b,double eps=epsilon); -+ inline friend bool Equal(const Rotation2& a,const Rotation2& b,double eps); - }; - - //! A 2D frame class, for further documentation see the Frames class -@@ -1067,9 +1067,20 @@ public: - tmp.SetIdentity(); - return tmp; - } -- inline friend bool Equal(const Frame2& a,const Frame2& b,double eps=epsilon); -+ inline friend bool Equal(const Frame2& a,const Frame2& b,double eps); - }; - -+ -+Vector Normalize(const Vector& a, double eps=epsilon); -+bool Equal(const Vector& a,const Vector& b,double eps=epsilon); -+bool Equal(const Rotation& a,const Rotation& b,double eps=epsilon); -+bool Equal(const Frame& a,const Frame& b,double eps=epsilon); -+bool Equal(const Twist& a,const Twist& b,double eps=epsilon); -+bool Equal(const Wrench& a,const Wrench& b,double eps=epsilon); -+bool Equal(const Vector2& a,const Vector2& b,double eps=epsilon); -+bool Equal(const Rotation2& a,const Rotation2& b,double eps=epsilon); -+bool Equal(const Frame2& a,const Frame2& b,double eps=epsilon); -+ - IMETHOD Vector diff(const Vector& a,const Vector& b,double dt=1); - IMETHOD Vector diff(const Rotation& R_a_b1,const Rotation& R_a_b2,double dt=1); - IMETHOD Twist diff(const Frame& F_a_b1,const Frame& F_a_b2,double dt=1); diff --git a/graphics/blender/patches/patch-intern_itasc_kdl_framevel.hpp b/graphics/blender/patches/patch-intern_itasc_kdl_framevel.hpp deleted file mode 100644 index 4d28d80aa12..00000000000 --- a/graphics/blender/patches/patch-intern_itasc_kdl_framevel.hpp +++ /dev/null @@ -1,96 +0,0 @@ -$NetBSD: patch-intern_itasc_kdl_framevel.hpp,v 1.1 2014/01/10 20:06:46 joerg Exp $ - ---- intern/itasc/kdl/framevel.hpp.orig 2013-11-20 14:52:47.000000000 +0000 -+++ intern/itasc/kdl/framevel.hpp -@@ -110,15 +110,18 @@ public: - IMETHOD friend void SetToZero(VectorVel& v); - - -- IMETHOD friend bool Equal(const VectorVel& r1,const VectorVel& r2,double eps=epsilon); -- IMETHOD friend bool Equal(const Vector& r1,const VectorVel& r2,double eps=epsilon); -- IMETHOD friend bool Equal(const VectorVel& r1,const Vector& r2,double eps=epsilon); -+ IMETHOD friend bool Equal(const VectorVel& r1,const VectorVel& r2,double eps); -+ IMETHOD friend bool Equal(const Vector& r1,const VectorVel& r2,double eps); -+ IMETHOD friend bool Equal(const VectorVel& r1,const Vector& r2,double eps); - IMETHOD friend VectorVel operator - (const VectorVel& r); - IMETHOD friend doubleVel dot(const VectorVel& lhs,const VectorVel& rhs); - IMETHOD friend doubleVel dot(const VectorVel& lhs,const Vector& rhs); - IMETHOD friend doubleVel dot(const Vector& lhs,const VectorVel& rhs); - }; - -+bool Equal(const VectorVel& r1,const VectorVel& r2,double eps=epsilon); -+bool Equal(const Vector& r1,const VectorVel& r2,double eps=epsilon); -+bool Equal(const VectorVel& r1,const Vector& r2,double eps=epsilon); - - - class RotationVel -@@ -166,9 +169,9 @@ public: - IMETHOD friend RotationVel operator* (const RotationVel& r1,const RotationVel& r2); - IMETHOD friend RotationVel operator* (const Rotation& r1,const RotationVel& r2); - IMETHOD friend RotationVel operator* (const RotationVel& r1,const Rotation& r2); -- IMETHOD friend bool Equal(const RotationVel& r1,const RotationVel& r2,double eps=epsilon); -- IMETHOD friend bool Equal(const Rotation& r1,const RotationVel& r2,double eps=epsilon); -- IMETHOD friend bool Equal(const RotationVel& r1,const Rotation& r2,double eps=epsilon); -+ IMETHOD friend bool Equal(const RotationVel& r1,const RotationVel& r2,double eps); -+ IMETHOD friend bool Equal(const Rotation& r1,const RotationVel& r2,double eps); -+ IMETHOD friend bool Equal(const RotationVel& r1,const Rotation& r2,double eps); - - IMETHOD TwistVel Inverse(const TwistVel& arg) const; - IMETHOD TwistVel Inverse(const Twist& arg) const; -@@ -176,6 +179,9 @@ public: - IMETHOD TwistVel operator * (const Twist& arg) const; - }; - -+bool Equal(const RotationVel& r1,const RotationVel& r2,double eps=epsilon); -+bool Equal(const Rotation& r1,const RotationVel& r2,double eps=epsilon); -+bool Equal(const RotationVel& r1,const Rotation& r2,double eps=epsilon); - - - -@@ -220,9 +226,9 @@ public: - IMETHOD friend FrameVel operator * (const FrameVel& f1,const FrameVel& f2); - IMETHOD friend FrameVel operator * (const Frame& f1,const FrameVel& f2); - IMETHOD friend FrameVel operator * (const FrameVel& f1,const Frame& f2); -- IMETHOD friend bool Equal(const FrameVel& r1,const FrameVel& r2,double eps=epsilon); -- IMETHOD friend bool Equal(const Frame& r1,const FrameVel& r2,double eps=epsilon); -- IMETHOD friend bool Equal(const FrameVel& r1,const Frame& r2,double eps=epsilon); -+ IMETHOD friend bool Equal(const FrameVel& r1,const FrameVel& r2,double eps); -+ IMETHOD friend bool Equal(const Frame& r1,const FrameVel& r2,double eps); -+ IMETHOD friend bool Equal(const FrameVel& r1,const Frame& r2,double eps); - - IMETHOD TwistVel Inverse(const TwistVel& arg) const; - IMETHOD TwistVel Inverse(const Twist& arg) const; -@@ -230,6 +236,9 @@ public: - IMETHOD TwistVel operator * (const Twist& arg) const; - }; - -+bool Equal(const FrameVel& r1,const FrameVel& r2,double eps=epsilon); -+bool Equal(const Frame& r1,const FrameVel& r2,double eps=epsilon); -+bool Equal(const FrameVel& r1,const Frame& r2,double eps=epsilon); - - - -@@ -292,9 +301,9 @@ public: - // = Equality operators - // do not use operator == because the definition of Equal(.,.) is slightly - // different. It compares whether the 2 arguments are equal in an eps-interval -- IMETHOD friend bool Equal(const TwistVel& a,const TwistVel& b,double eps=epsilon); -- IMETHOD friend bool Equal(const Twist& a,const TwistVel& b,double eps=epsilon); -- IMETHOD friend bool Equal(const TwistVel& a,const Twist& b,double eps=epsilon); -+ IMETHOD friend bool Equal(const TwistVel& a,const TwistVel& b,double eps); -+ IMETHOD friend bool Equal(const Twist& a,const TwistVel& b,double eps); -+ IMETHOD friend bool Equal(const TwistVel& a,const Twist& b,double eps); - - // = Conversion to other entities - IMETHOD Twist GetTwist() const; -@@ -305,6 +314,10 @@ public: - - }; - -+bool Equal(const TwistVel& a,const TwistVel& b,double eps=epsilon); -+bool Equal(const Twist& a,const TwistVel& b,double eps=epsilon); -+bool Equal(const TwistVel& a,const Twist& b,double eps=epsilon); -+ - IMETHOD VectorVel diff(const VectorVel& a,const VectorVel& b,double dt=1.0) { - return VectorVel(diff(a.p,b.p,dt),diff(a.v,b.v,dt)); - } diff --git a/graphics/blender/patches/patch-intern_itasc_kdl_jacobian.hpp b/graphics/blender/patches/patch-intern_itasc_kdl_jacobian.hpp deleted file mode 100644 index 6d1f33be537..00000000000 --- a/graphics/blender/patches/patch-intern_itasc_kdl_jacobian.hpp +++ /dev/null @@ -1,23 +0,0 @@ -$NetBSD: patch-intern_itasc_kdl_jacobian.hpp,v 1.1 2014/01/10 20:06:46 joerg Exp $ - ---- intern/itasc/kdl/jacobian.hpp.orig 2013-11-20 14:57:39.000000000 +0000 -+++ intern/itasc/kdl/jacobian.hpp -@@ -45,7 +45,7 @@ namespace KDL - bool operator ==(const Jacobian& arg); - bool operator !=(const Jacobian& arg); - -- friend bool Equal(const Jacobian& a,const Jacobian& b,double eps=epsilon); -+ friend bool Equal(const Jacobian& a,const Jacobian& b,double eps); - - - ~Jacobian(); -@@ -63,6 +63,9 @@ namespace KDL - - - }; -+ -+ bool Equal(const Jacobian& a,const Jacobian& b,double eps=epsilon); - } - -+ - #endif diff --git a/graphics/blender/patches/patch-intern_itasc_kdl_jntarray.hpp b/graphics/blender/patches/patch-intern_itasc_kdl_jntarray.hpp deleted file mode 100644 index ea5704c7f94..00000000000 --- a/graphics/blender/patches/patch-intern_itasc_kdl_jntarray.hpp +++ /dev/null @@ -1,19 +0,0 @@ -$NetBSD: patch-intern_itasc_kdl_jntarray.hpp,v 1.1 2014/01/10 20:06:46 joerg Exp $ - ---- intern/itasc/kdl/jntarray.hpp.orig 2013-11-20 14:54:27.000000000 +0000 -+++ intern/itasc/kdl/jntarray.hpp -@@ -209,12 +209,13 @@ class MyTask : public RTT::TaskContext - * @return true if each element of src1 is within eps of the same - * element in src2, or if both src1 and src2 have no data (ie 0==rows()) - */ -- friend bool Equal(const JntArray& src1,const JntArray& src2,double eps=epsilon); -+ friend bool Equal(const JntArray& src1,const JntArray& src2,double eps); - - friend bool operator==(const JntArray& src1,const JntArray& src2); - //friend bool operator!=(const JntArray& src1,const JntArray& src2); - }; - -+ bool Equal(const JntArray& src1,const JntArray& src2,double eps=epsilon); - bool operator==(const JntArray& src1,const JntArray& src2); - //bool operator!=(const JntArray& src1,const JntArray& src2); - diff --git a/graphics/blender/patches/patch-intern_itasc_kdl_jntarrayacc.hpp b/graphics/blender/patches/patch-intern_itasc_kdl_jntarrayacc.hpp deleted file mode 100644 index bcf0932d416..00000000000 --- a/graphics/blender/patches/patch-intern_itasc_kdl_jntarrayacc.hpp +++ /dev/null @@ -1,17 +0,0 @@ -$NetBSD: patch-intern_itasc_kdl_jntarrayacc.hpp,v 1.1 2014/01/10 20:06:46 joerg Exp $ - ---- intern/itasc/kdl/jntarrayacc.hpp.orig 2013-11-20 15:09:06.000000000 +0000 -+++ intern/itasc/kdl/jntarrayacc.hpp -@@ -58,9 +58,11 @@ namespace KDL - friend void Divide(const JntArrayAcc& src,const doubleVel& factor,JntArrayAcc& dest); - friend void Divide(const JntArrayAcc& src,const doubleAcc& factor,JntArrayAcc& dest); - friend void SetToZero(JntArrayAcc& array); -- friend bool Equal(const JntArrayAcc& src1,const JntArrayAcc& src2,double eps=epsilon); -+ friend bool Equal(const JntArrayAcc& src1,const JntArrayAcc& src2,double eps); - - }; -+ -+ bool Equal(const JntArrayAcc& src1,const JntArrayAcc& src2,double eps=epsilon); - } - - #endif diff --git a/graphics/blender/patches/patch-intern_itasc_kdl_jntarrayvel.hpp b/graphics/blender/patches/patch-intern_itasc_kdl_jntarrayvel.hpp deleted file mode 100644 index b6b90f3ea98..00000000000 --- a/graphics/blender/patches/patch-intern_itasc_kdl_jntarrayvel.hpp +++ /dev/null @@ -1,17 +0,0 @@ -$NetBSD: patch-intern_itasc_kdl_jntarrayvel.hpp,v 1.1 2014/01/10 20:06:46 joerg Exp $ - ---- intern/itasc/kdl/jntarrayvel.hpp.orig 2013-11-20 15:08:46.000000000 +0000 -+++ intern/itasc/kdl/jntarrayvel.hpp -@@ -51,9 +51,11 @@ namespace KDL - friend void Divide(const JntArrayVel& src,const double& factor,JntArrayVel& dest); - friend void Divide(const JntArrayVel& src,const doubleVel& factor,JntArrayVel& dest); - friend void SetToZero(JntArrayVel& array); -- friend bool Equal(const JntArrayVel& src1,const JntArrayVel& src2,double eps=epsilon); -+ friend bool Equal(const JntArrayVel& src1,const JntArrayVel& src2,double eps); - - }; -+ -+ bool Equal(const JntArrayVel& src1,const JntArrayVel& src2,double eps=epsilon); - } - - #endif diff --git a/graphics/blender/patches/patch-intern_itasc_kdl_tree.cpp b/graphics/blender/patches/patch-intern_itasc_kdl_tree.cpp deleted file mode 100644 index 21a4eb8885c..00000000000 --- a/graphics/blender/patches/patch-intern_itasc_kdl_tree.cpp +++ /dev/null @@ -1,13 +0,0 @@ -$NetBSD: patch-intern_itasc_kdl_tree.cpp,v 1.1 2014/01/10 20:06:46 joerg Exp $ - ---- intern/itasc/kdl/tree.cpp.orig 2012-06-03 12:00:41.000000000 +0000 -+++ intern/itasc/kdl/tree.cpp -@@ -64,7 +64,7 @@ bool Tree::addSegment(const Segment& seg - return false; - pair<SegmentMap::iterator, bool> retval; - //insert new element -- TreeElement elem(segment, parent, nrOfJoints); -+ TreeElement elem(segment, *parent, nrOfJoints); - std::pair<std::string, TreeElement> val(segment_name, elem); - - retval = segments.insert(val); diff --git a/graphics/blender/patches/patch-intern_itasc_kdl_tree.hpp b/graphics/blender/patches/patch-intern_itasc_kdl_tree.hpp deleted file mode 100644 index 8bf76b9b2c4..00000000000 --- a/graphics/blender/patches/patch-intern_itasc_kdl_tree.hpp +++ /dev/null @@ -1,59 +0,0 @@ -$NetBSD: patch-intern_itasc_kdl_tree.hpp,v 1.1 2014/01/10 20:06:46 joerg Exp $ - ---- intern/itasc/kdl/tree.hpp.orig 2012-12-15 11:15:05.000000000 +0000 -+++ intern/itasc/kdl/tree.hpp -@@ -41,32 +41,28 @@ namespace KDL - { - //Forward declaration - class TreeElement; --#if defined(__APPLE__) --# if MAC_OS_X_VERSION_MIN_REQUIRED <= 1050 -+#if defined(__APPLE__) && MAC_OS_X_VERSION_MIN_REQUIRED <= 1050 - typedef std::map<std::string,TreeElement> SegmentMap; --# else -- // Eigen allocator is needed for alignment of Eigen data types -- typedef std::map<std::string,TreeElement, std::less<std::string>, Eigen::aligned_allocator<std::pair<std::string, TreeElement> > > SegmentMap; --# endif /* MAC_OS_X_VERSION_MIN_REQUIRED */ - #else - // Eigen allocator is needed for alignment of Eigen data types - typedef std::map<std::string,TreeElement, std::less<std::string>, Eigen::aligned_allocator<std::pair<std::string, TreeElement> > > SegmentMap; - #endif -+ - class TreeElement - { - public: -- TreeElement():q_nr(0) -+ TreeElement():q_nr(0),parent(0) - {}; - public: - Segment segment; - unsigned int q_nr; -- SegmentMap::const_iterator parent; -+ SegmentMap::value_type const *parent; - std::vector<SegmentMap::const_iterator > children; -- TreeElement(const Segment& segment_in,const SegmentMap::const_iterator& parent_in,unsigned int q_nr_in) -+ TreeElement(const Segment& segment_in,const SegmentMap::value_type& parent_in,unsigned int q_nr_in) - { - q_nr=q_nr_in; - segment=segment_in; -- parent=parent_in; -+ parent=&parent_in; - }; - static TreeElement Root() - { -@@ -167,7 +163,15 @@ namespace KDL - return segments.find(segment_name); - }; - -+ SegmentMap::value_type const* getSegmentPtr(const std::string& segment_name)const -+ { -+ SegmentMap::const_iterator it = segments.find(segment_name); -+ -+ if (it == segments.end()) -+ return 0; - -+ return &*it; -+ }; - - const SegmentMap& getSegments()const - { diff --git a/graphics/blender/patches/patch-intern_itasc_kdl_treefksolverpos__recursive.cpp b/graphics/blender/patches/patch-intern_itasc_kdl_treefksolverpos__recursive.cpp deleted file mode 100644 index 191196fbbef..00000000000 --- a/graphics/blender/patches/patch-intern_itasc_kdl_treefksolverpos__recursive.cpp +++ /dev/null @@ -1,44 +0,0 @@ -$NetBSD: patch-intern_itasc_kdl_treefksolverpos__recursive.cpp,v 1.1 2014/01/10 20:06:46 joerg Exp $ - ---- intern/itasc/kdl/treefksolverpos_recursive.cpp.orig 2011-10-23 18:38:16.000000000 +0000 -+++ intern/itasc/kdl/treefksolverpos_recursive.cpp -@@ -35,22 +35,22 @@ namespace KDL { - - int TreeFkSolverPos_recursive::JntToCart(const JntArray& q_in, Frame& p_out, const std::string& segmentName, const std::string& baseName) - { -- SegmentMap::const_iterator it = tree.getSegment(segmentName); -- SegmentMap::const_iterator baseit = tree.getSegment(baseName); -+ SegmentMap::value_type const* it = tree.getSegmentPtr(segmentName); -+ SegmentMap::value_type const* baseit = tree.getSegmentPtr(baseName); - - if(q_in.rows() != tree.getNrOfJoints()) - return -1; -- else if(it == tree.getSegments().end()) //if the segment name is not found -+ else if(!it) //if the segment name is not found - return -2; -- else if(baseit == tree.getSegments().end()) //if the base segment name is not found -+ else if(!baseit) //if the base segment name is not found - return -3; - else{ -- p_out = recursiveFk(q_in, it, baseit); -- return 0; -+ p_out = recursiveFk(q_in, it, baseit); -+ return 0; - } - } - -- Frame TreeFkSolverPos_recursive::recursiveFk(const JntArray& q_in, const SegmentMap::const_iterator& it, const SegmentMap::const_iterator& baseit) -+ Frame TreeFkSolverPos_recursive::recursiveFk(const JntArray& q_in, SegmentMap::value_type const* it, SegmentMap::value_type const* baseit) - { - //gets the frame for the current element (segment) - const TreeElement& currentElement = it->second; -@@ -60,8 +60,7 @@ namespace KDL { - } - else{ - Frame currentFrame = currentElement.segment.pose(((JntArray&)q_in)(currentElement.q_nr)); -- SegmentMap::const_iterator parentIt = currentElement.parent; -- return recursiveFk(q_in, parentIt, baseit) * currentFrame; -+ return recursiveFk(q_in, currentElement.parent, baseit) * currentFrame; - } - } - diff --git a/graphics/blender/patches/patch-intern_itasc_kdl_treefksolverpos__recursive.hpp b/graphics/blender/patches/patch-intern_itasc_kdl_treefksolverpos__recursive.hpp deleted file mode 100644 index 215de82270b..00000000000 --- a/graphics/blender/patches/patch-intern_itasc_kdl_treefksolverpos__recursive.hpp +++ /dev/null @@ -1,13 +0,0 @@ -$NetBSD: patch-intern_itasc_kdl_treefksolverpos__recursive.hpp,v 1.1 2014/01/10 20:06:46 joerg Exp $ - ---- intern/itasc/kdl/treefksolverpos_recursive.hpp.orig 2009-07-14 15:36:21.000000000 +0000 -+++ intern/itasc/kdl/treefksolverpos_recursive.hpp -@@ -45,7 +45,7 @@ namespace KDL { - private: - const Tree tree; - -- Frame recursiveFk(const JntArray& q_in, const SegmentMap::const_iterator& it, const SegmentMap::const_iterator& baseit); -+ Frame recursiveFk(const JntArray& q_in, SegmentMap::value_type const* it, SegmentMap::value_type const* baseit); - }; - - } diff --git a/graphics/blender/patches/patch-intern_itasc_kdl_treejnttojacsolver.cpp b/graphics/blender/patches/patch-intern_itasc_kdl_treejnttojacsolver.cpp deleted file mode 100644 index 76f527e8ed6..00000000000 --- a/graphics/blender/patches/patch-intern_itasc_kdl_treejnttojacsolver.cpp +++ /dev/null @@ -1,24 +0,0 @@ -$NetBSD: patch-intern_itasc_kdl_treejnttojacsolver.cpp,v 1.1 2014/01/10 20:06:46 joerg Exp $ - ---- intern/itasc/kdl/treejnttojacsolver.cpp.orig 2011-10-23 18:38:16.000000000 +0000 -+++ intern/itasc/kdl/treejnttojacsolver.cpp -@@ -28,16 +28,16 @@ int TreeJntToJacSolver::JntToJac(const J - return -1; - - //Lets search the tree-element -- SegmentMap::const_iterator it = tree.getSegments().find(segmentname); -+ SegmentMap::value_type const* it = tree.getSegmentPtr(segmentname); - - //If segmentname is not inside the tree, back out: -- if (it == tree.getSegments().end()) -+ if (!it) - return -2; - - //Let's make the jacobian zero: - SetToZero(jac); - -- SegmentMap::const_iterator root = tree.getSegments().find("root"); -+ SegmentMap::value_type const* root = tree.getSegmentPtr("root"); - - Frame T_total = Frame::Identity(); - Frame T_local, T_joint; diff --git a/graphics/blender/patches/patch-user-config.py b/graphics/blender/patches/patch-user-config.py deleted file mode 100644 index 7d93f4fb0e5..00000000000 --- a/graphics/blender/patches/patch-user-config.py +++ /dev/null @@ -1,9 +0,0 @@ -$NetBSD: patch-user-config.py,v 1.1 2012/12/03 13:15:52 ryoon Exp $ - -From Gentoo's ebuild - ---- user-config.py.orig 2012-12-03 06:03:04.000000000 +0000 -+++ user-config.py -@@ -0,0 +1,2 @@ -+LINKFLAGS=[@MYLDFLAGS@] -+PLATFORM_LINKFLAGS=[@MYLDFLAGS@] |