Date: Fri, 29 Jul 2016 12:52:01 +0000 (UTC) From: Marcus von Appen <mva@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r419248 - in head/graphics/blender: . files Message-ID: <201607291252.u6TCq1Zn084120@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: mva Date: Fri Jul 29 12:52:01 2016 New Revision: 419248 URL: https://svnweb.freebsd.org/changeset/ports/419248 Log: - Update to version 2.77a - Switch to SDL2 as dependency, if the SDL option is set. Blender's dependency detection favours SDL2 over SDL - Fix some missing LIB_DEPENDS - Make boost a default dependency for Blender. Too many optional features depend on it - Include the libc++ 3.8.0 fix from PR 209614 Blender 2.77 comes with hundreds of bug fixes and many new features, such as * improved subsurface scattering and GPU support for cycles * improved sculpting workflows * better antialiasing for OpenGL renderers in the UI * speedups for the gaussian blur effect in the sequencer * improved weight-painting behaviour * and many more Changelog: https://wiki.blender.org/index.php/Dev:Ref/Release_Notes/2.77 Added: head/graphics/blender/files/patch-intern_itasc_kdl_tree.hpp (contents, props changed) Modified: head/graphics/blender/Makefile head/graphics/blender/distinfo head/graphics/blender/pkg-plist Modified: head/graphics/blender/Makefile ============================================================================== --- head/graphics/blender/Makefile Fri Jul 29 12:38:22 2016 (r419247) +++ head/graphics/blender/Makefile Fri Jul 29 12:52:01 2016 (r419248) @@ -2,8 +2,7 @@ # $FreeBSD$ PORTNAME= blender -PORTVERSION= 2.76b -PORTREVISION= 1 +PORTVERSION= 2.77a CATEGORIES= graphics games MASTER_SITES= http://download.blender.org/source/ \ http://mirror.cs.umn.edu/blender.org/source/ \ @@ -15,12 +14,17 @@ COMMENT= 3D modeling/rendering/animation LICENSE= GPLv2 LIB_DEPENDS= libpng.so:graphics/png \ - libfreetype.so:print/freetype2 + libfreetype.so:print/freetype2 \ + libboost_regex.so:devel/boost-libs + +# libboost_regex.so just acts as a placeholder; several boost +# libraries are used, if either of the most common options in blender +# are set. We will pull boost in just to be on the safe side. USE_XORG= x11 xext xmu -USE_GL= glew +USE_GL= gl glu glew USES= cmake:outsource compiler:features desktop-file-utils \ - jpeg python:3.4 shebangfix + jpeg python:3.5 shebangfix INSTALLS_ICONS= yes CMAKE_ARGS= -DWITH_PYTHON_INSTALL:BOOL=OFF \ -DWITH_PYTHON_INSTALL_NUMPY:BOOL=OFF \ @@ -31,7 +35,7 @@ SHEBANG_FILES= release/bin/blender-thumb release/scripts/modules/bl_i18n_utils/utils_rtl.py \ release/scripts/modules/blend_render_info.py -BL_VERSION= 2.76 +BL_VERSION= 2.77 OUTDIR= ${INSTALL_WRKSRC}/bin/${BL_VERSION} PLIST_SUB+= VER=${BL_VERSION} @@ -41,7 +45,6 @@ OPTIONS_SUB= yes MOD_BOOLEAN_CMAKE_ON= -DWITH_MOD_BOOLEAN:BOOL=ON MOD_BOOLEAN_CMAKE_OFF= -DWITH_MOD_BOOLEAN:BOOL=OFF -MOD_BOOLEAN_LIB_DEPENDS= libboost_thread.so:devel/boost-libs MOD_FLUID_CMAKE_ON= -DWITH_MOD_FLUID:BOOL=ON MOD_FLUID_CMAKE_OFF= -DWITH_MOD_FLUID:BOOL=OFF MOD_REMESH_CMAKE_ON= -DWITH_MOD_REMESH:BOOL=ON @@ -61,7 +64,9 @@ CAMERATRACK_CMAKE_OFF= -DWITH_LIBMV:BOO CAMERATRACK_LIB_DEPENDS= libunwind.so:devel/libunwind COLLADA_CMAKE_ON= -DWITH_OPENCOLLADA:BOOL=ON COLLADA_CMAKE_OFF= -DWITH_OPENCOLLADA:BOOL=OFF -COLLADA_LIB_DEPENDS= libOpenCOLLADABaseUtils.so:graphics/opencollada +COLLADA_LIB_DEPENDS= libOpenCOLLADABaseUtils.so:graphics/opencollada \ + libpcre.so:devel/pcre +COLLADA_USE= GNOME=libxml2 COMPOSITOR_CMAKE_ON= -DWITH_COMPOSITOR:BOOL=ON COMPOSITOR_CMAKE_OFF= -DWITH_COMPOSITOR:BOOL=OFF DDS_CMAKE_ON= -DWITH_IMAGE_DDS:BOOL=ON @@ -107,10 +112,13 @@ OPENAL_CMAKE_OFF= -DWITH_OPENAL:BOOL=OF OPENAL_USES= openal:al,alut OPENCOLORIO_CMAKE_ON= -DWITH_OPENCOLORIO:BOOL=ON OPENCOLORIO_CMAKE_OFF= -DWITH_OPENCOLORIO:BOOL=OFF -OPENCOLORIO_LIB_DEPENDS= libOpenColorIO.so:graphics/opencolorio +OPENCOLORIO_LIB_DEPENDS= libOpenColorIO.so:graphics/opencolorio \ + libyaml-cpp03.so:devel/yaml-cpp03 \ + libtinyxml.so:textproc/tinyxml OPENEXR_CMAKE_ON= -DWITH_IMAGE_OPENEXR:BOOL=ON OPENEXR_CMAKE_OFF= -DWITH_IMAGE_OPENEXR:BOOL=OFF -OPENEXR_LIB_DEPENDS= libIlmImf.so:graphics/OpenEXR +OPENEXR_LIB_DEPENDS= libIlmImf.so:graphics/OpenEXR \ + libHalf.so:graphics/ilmbase OPENIMAGEIO_CMAKE_ON= -DWITH_OPENIMAGEIO:BOOL=ON OPENIMAGEIO_CMAKE_OFF= -DWITH_OPENIMAGEIO:BOOL=OFF OPENIMAGEIO_LIB_DEPENDS= libOpenImageIO.so:graphics/openimageio @@ -134,7 +142,7 @@ REDCODE_CMAKE_ON= -DWITH_IMAGE_REDCODE: REDCODE_CMAKE_OFF= -DWITH_IMAGE_REDCODE:BOOL=OFF SDL_CMAKE_ON= -DWITH_SDL:BOOL=ON SDL_CMAKE_OFF= -DWITH_SDL:BOOL=OFF -SDL_USE= SDL=sdl +SDL_USE= SDL=sdl2 SNDFILE_CMAKE_ON= -DWITH_CODEC_SNDFILE:BOOL=ON SNDFILE_CMAKE_OFF= -DWITH_CODEC_SNDFILE:BOOL=OFF SNDFILE_LIB_DEPENDS= libsndfile.so:audio/libsndfile @@ -171,8 +179,8 @@ CMAKE_ARGS+= -DWITH_CYCLES_OSL:BOOL=ON \ -DWITH_LLVM:BOOL=ON \ -DLLVM_VERSION:STRING="3.4" \ -DLLVM_CONFIG:STRING="${LOCALBASE}/bin/llvm-config34" -LIB_DEPENDS+= liboslexec.so:graphics/openshadinglanguage -BUILD_DEPENDS+= llvm-config34:devel/llvm34 +LIB_DEPENDS+= liboslexec.so:graphics/openshadinglanguage \ + libLLVM-3.4.so:devel/llvm34 .else CMAKE_ARGS+= -DWITH_CYCLES_OSL:BOOL=OFF .endif Modified: head/graphics/blender/distinfo ============================================================================== --- head/graphics/blender/distinfo Fri Jul 29 12:38:22 2016 (r419247) +++ head/graphics/blender/distinfo Fri Jul 29 12:52:01 2016 (r419248) @@ -1,2 +1,3 @@ -SHA256 (blender-2.76b.tar.gz) = bd852a8592ec2eca596a63244152506c406d8fc1d845244a8e11c84d24ad605d -SIZE (blender-2.76b.tar.gz) = 41728871 +TIMESTAMP = 1467004298 +SHA256 (blender-2.77a.tar.gz) = 3770fa00f50a6654eb8b5fe625ca8942ab5672ac4685b7af24597251ace85c67 +SIZE (blender-2.77a.tar.gz) = 41927082 Added: head/graphics/blender/files/patch-intern_itasc_kdl_tree.hpp ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/graphics/blender/files/patch-intern_itasc_kdl_tree.hpp Fri Jul 29 12:52:01 2016 (r419248) @@ -0,0 +1,11 @@ +--- intern/itasc/kdl/tree.hpp.orig 2016-07-25 09:36:50 UTC ++++ intern/itasc/kdl/tree.hpp +@@ -34,7 +34,7 @@ + //Forward declaration + class TreeElement; + // 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; ++ typedef std::map<std::string,TreeElement, std::less<std::string>, Eigen::aligned_allocator<std::pair<const std::string, TreeElement> > > SegmentMap; + + class TreeElement + { Modified: head/graphics/blender/pkg-plist ============================================================================== --- head/graphics/blender/pkg-plist Fri Jul 29 12:38:22 2016 (r419247) +++ head/graphics/blender/pkg-plist Fri Jul 29 12:52:01 2016 (r419248) @@ -98,6 +98,7 @@ share/applications/blender.desktop %%NLS%%%%DATADIR%%/%%VER%%/datafiles/locale/eo/LC_MESSAGES/blender.mo %%NLS%%%%DATADIR%%/%%VER%%/datafiles/locale/es/LC_MESSAGES/blender.mo %%NLS%%%%DATADIR%%/%%VER%%/datafiles/locale/es_ES/LC_MESSAGES/blender.mo +%%NLS%%%%DATADIR%%/%%VER%%/datafiles/locale/eu/LC_MESSAGES/blender.mo %%NLS%%%%DATADIR%%/%%VER%%/datafiles/locale/fa/LC_MESSAGES/blender.mo %%NLS%%%%DATADIR%%/%%VER%%/datafiles/locale/fr/LC_MESSAGES/blender.mo %%NLS%%%%DATADIR%%/%%VER%%/datafiles/locale/he/LC_MESSAGES/blender.mo @@ -201,7 +202,6 @@ share/applications/blender.desktop %%CYCLESOSL%%%%DATADIR%%/%%VER%%/scripts/addons/cycles/kernel/geom/geom_triangle.h %%CYCLESOSL%%%%DATADIR%%/%%VER%%/scripts/addons/cycles/kernel/geom/geom_triangle_intersect.h %%CYCLESOSL%%%%DATADIR%%/%%VER%%/scripts/addons/cycles/kernel/geom/geom_volume.h -%%CYCLESOSL%%%%DATADIR%%/%%VER%%/scripts/addons/cycles/kernel/kernel.h %%CYCLESOSL%%%%DATADIR%%/%%VER%%/scripts/addons/cycles/kernel/kernel_accumulate.h %%CYCLESOSL%%%%DATADIR%%/%%VER%%/scripts/addons/cycles/kernel/kernel_bake.h %%CYCLESOSL%%%%DATADIR%%/%%VER%%/scripts/addons/cycles/kernel/kernel_camera.h @@ -228,7 +228,6 @@ share/applications/blender.desktop %%CYCLESOSL%%%%DATADIR%%/%%VER%%/scripts/addons/cycles/kernel/kernel_queues.h %%CYCLESOSL%%%%DATADIR%%/%%VER%%/scripts/addons/cycles/kernel/kernel_random.h %%CYCLESOSL%%%%DATADIR%%/%%VER%%/scripts/addons/cycles/kernel/kernel_shader.h -%%CYCLESOSL%%%%DATADIR%%/%%VER%%/scripts/addons/cycles/kernel/kernel_shaderdata_vars.h %%CYCLESOSL%%%%DATADIR%%/%%VER%%/scripts/addons/cycles/kernel/kernel_shadow.h %%CYCLESOSL%%%%DATADIR%%/%%VER%%/scripts/addons/cycles/kernel/kernel_subsurface.h %%CYCLESOSL%%%%DATADIR%%/%%VER%%/scripts/addons/cycles/kernel/kernel_textures.h @@ -416,6 +415,13 @@ share/applications/blender.desktop %%DATADIR%%/%%VER%%/scripts/addons/io_anim_nuke_chan/__init__.py %%DATADIR%%/%%VER%%/scripts/addons/io_anim_nuke_chan/export_nuke_chan.py %%DATADIR%%/%%VER%%/scripts/addons/io_anim_nuke_chan/import_nuke_chan.py +%%DATADIR%%/%%VER%%/scripts/addons/io_blend_utils/__init__.py +%%DATADIR%%/%%VER%%/scripts/addons/io_blend_utils/bl_utils/pipe_non_blocking.py +%%DATADIR%%/%%VER%%/scripts/addons/io_blend_utils/bl_utils/subprocess_helper.py +%%DATADIR%%/%%VER%%/scripts/addons/io_blend_utils/blend/blendfile.py +%%DATADIR%%/%%VER%%/scripts/addons/io_blend_utils/blend/blendfile_path_walker.py +%%DATADIR%%/%%VER%%/scripts/addons/io_blend_utils/blendfile_pack.py +%%DATADIR%%/%%VER%%/scripts/addons/io_blend_utils/utils/system.py %%DATADIR%%/%%VER%%/scripts/addons/io_coat3D/__init__.py %%DATADIR%%/%%VER%%/scripts/addons/io_coat3D/coat.py %%DATADIR%%/%%VER%%/scripts/addons/io_coat3D/tex.py @@ -627,6 +633,16 @@ share/applications/blender.desktop %%DATADIR%%/%%VER%%/scripts/addons/object_print3d_utils/todo.rst %%DATADIR%%/%%VER%%/scripts/addons/object_print3d_utils/ui.py %%DATADIR%%/%%VER%%/scripts/addons/paint_palette.py +%%DATADIR%%/%%VER%%/scripts/addons/presets/operator/curve.torus_knot_plus/13x8_wicker_globe.py +%%DATADIR%%/%%VER%%/scripts/addons/presets/operator/curve.torus_knot_plus/7x6.py +%%DATADIR%%/%%VER%%/scripts/addons/presets/operator/curve.torus_knot_plus/9x9_color.py +%%DATADIR%%/%%VER%%/scripts/addons/presets/operator/curve.torus_knot_plus/braided_coil.py +%%DATADIR%%/%%VER%%/scripts/addons/presets/operator/curve.torus_knot_plus/flower_mesh_(2d).py +%%DATADIR%%/%%VER%%/scripts/addons/presets/operator/curve.torus_knot_plus/slinky_knot.py +%%DATADIR%%/%%VER%%/scripts/addons/presets/operator/curve.torus_knot_plus/snowflake_(2d).py +%%DATADIR%%/%%VER%%/scripts/addons/presets/operator/curve.torus_knot_plus/sun_cross_(2d).py +%%DATADIR%%/%%VER%%/scripts/addons/presets/operator/curve.torus_knot_plus/tripple_dna.py +%%DATADIR%%/%%VER%%/scripts/addons/presets/operator/curve.torus_knot_plus/wicker_basket.py %%DATADIR%%/%%VER%%/scripts/addons/presets/operator/mesh.bolt_add/default.py %%DATADIR%%/%%VER%%/scripts/addons/presets/operator/mesh.bolt_add/m10.py %%DATADIR%%/%%VER%%/scripts/addons/presets/operator/mesh.bolt_add/m12.py @@ -675,7 +691,9 @@ share/applications/blender.desktop %%DATADIR%%/%%VER%%/scripts/addons/render_freestyle_svg.py %%DATADIR%%/%%VER%%/scripts/addons/render_povray/__init__.py %%DATADIR%%/%%VER%%/scripts/addons/render_povray/df3.py +%%DATADIR%%/%%VER%%/scripts/addons/render_povray/primitives.py %%DATADIR%%/%%VER%%/scripts/addons/render_povray/render.py +%%DATADIR%%/%%VER%%/scripts/addons/render_povray/shading.py %%DATADIR%%/%%VER%%/scripts/addons/render_povray/ui.py %%DATADIR%%/%%VER%%/scripts/addons/render_povray/update_files.py %%DATADIR%%/%%VER%%/scripts/addons/rigify/CREDITS @@ -996,6 +1014,7 @@ share/applications/blender.desktop %%DATADIR%%/%%VER%%/scripts/startup/bl_operators/__init__.py %%DATADIR%%/%%VER%%/scripts/startup/bl_operators/add_mesh_torus.py %%DATADIR%%/%%VER%%/scripts/startup/bl_operators/anim.py +%%DATADIR%%/%%VER%%/scripts/startup/bl_operators/bmesh/find_adjacent.py %%DATADIR%%/%%VER%%/scripts/startup/bl_operators/clip.py %%DATADIR%%/%%VER%%/scripts/startup/bl_operators/console.py %%DATADIR%%/%%VER%%/scripts/startup/bl_operators/file.py @@ -1113,9 +1132,11 @@ share/applications/blender.desktop %%DATADIR%%/%%VER%%/scripts/templates_py/ui_previews_custom_icon.py %%DATADIR%%/%%VER%%/scripts/templates_py/ui_previews_dynamic_enum.py %%PORTDOCS%%%%DOCSDIR%%/GPL-license.txt +%%PORTDOCS%%%%DOCSDIR%%/GPL3-license.txt %%NLS%%%%PORTDOCS%%%%DOCSDIR%%/LICENSE-bfont.ttf.txt %%NLS%%%%PORTDOCS%%%%DOCSDIR%%/LICENSE-bmonofont-i18n.ttf.txt %%NLS%%%%PORTDOCS%%%%DOCSDIR%%/LICENSE-droidsans.ttf.txt +%%PORTDOCS%%%%DOCSDIR%%/jemalloc-license.txt %%PORTDOCS%%%%DOCSDIR%%/Python-license.txt %%PORTDOCS%%%%DOCSDIR%%/copyright.txt %%PORTDOCS%%%%DOCSDIR%%/readme.html
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201607291252.u6TCq1Zn084120>