diff options
| author | ryoon <ryoon@pkgsrc.org> | 2016-08-15 19:26:18 +0000 |
|---|---|---|
| committer | ryoon <ryoon@pkgsrc.org> | 2016-08-15 19:26:18 +0000 |
| commit | 15bba827254ea7acc37adaf4c924fa9fdfeda0bd (patch) | |
| tree | c704aa749986701a2deec81b01710cf69ba7957f | |
| parent | fa2dc1743e98cd05c7d869e6d539f8f589ee8980 (diff) | |
| download | pkgsrc-15bba827254ea7acc37adaf4c924fa9fdfeda0bd.tar.gz | |
Update to 2.77a
* Convert to cmake build from scons
Changelog:
In this release:
Cycles: Better Subsurface Scattering, GPU support for Smoke/Fire and Point Density.
Grease pencil stroke sculpting and improved workflow.
OpenVDB caching for smoke/volumetric simulations.
Reworked library handling to manage missing and deleted datablocks.
Redesigned progress bar.
Edit mode boolean tool, better decimate modifier.
Improved extruding and weight painting tools for sculpting/painting.
Support for Windows XP and the SCons build system was removed.
And: 100s of bug fixes and other improvements!
13 files changed, 104 insertions, 438 deletions
diff --git a/graphics/blender/Makefile b/graphics/blender/Makefile index d4b6cf16256..25d831954e4 100644 --- a/graphics/blender/Makefile +++ b/graphics/blender/Makefile @@ -1,7 +1,6 @@ -# $NetBSD: Makefile,v 1.121 2016/07/09 13:03:50 wiz Exp $ +# $NetBSD: Makefile,v 1.122 2016/08/15 19:26:18 ryoon Exp $ -DISTNAME= blender-2.76b -PKGREVISION= 2 +DISTNAME= blender-2.77a CATEGORIES= graphics MASTER_SITES= http://download.blender.org/source/ @@ -11,57 +10,25 @@ COMMENT= Fully integrated 3D graphics creation suite LICENSE= gnu-gpl-v2 USE_TOOLS+= gmake sed +USE_CMAKE= yes USE_LANGUAGES= c c++ - -PYTHON_VERSIONS_ACCEPTED= 34 35 +CMAKE_OPTS+= -DWITH_OPENAL:BOOL=OFF +CMAKE_OPTS+= -DPYVERSSUFFIX:STRING=${PYVERSSUFFIX} +CMAKE_OPTS+= -DCMAKE_INSTALL_PREFIX:PATH=${PREFIX}/share/blender +CMAKE_OPTS+= -DCMAKE_MODULE_PATH:PATH=${_CMAKE_DIR} +CMAKE_OPTS+= -DCMAKE_SKIP_RPATH:BOOL=TRUE +CMAKE_OPTS+= -DCMAKE_INSTALL_LIBDIR:PATH=lib +CMAKE_OPTS+= -DCMAKE_INSTALL_MANDIR:PATH=man + +PYTHON_VERSIONS_INCOMPATIBLE= 27 GCC_REQD+= 4.7 -BUILD_DEPENDS+= scons-[0-9]*:../../devel/scons +REPLACE_PYTHON= release/bin/blender-thumbnailer.py .include "options.mk" INSTALLATION_DIRS= bin share/blender -.if ${OPSYS} == "NetBSD" && exists(/usr/include/execinfo.h) -PYLDFLAGS+= '-lexecinfo', -.endif -PYLDFLAGS+= '${COMPILER_RPATH_FLAG}${PREFIX}/lib', \ - '${COMPILER_RPATH_FLAG}${X11BASE}/lib' - -# To pass LDFLAGS to compiler/linker -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 -SCONS_ARGS+= WITH_BF_SNDFILE=False -SCONS_ARGS+= WITH_BF_FFMPEG=False -SCONS_ARGS+= WITH_BF_3DMOUSE=False - -SCONS_ARGS+= BF_PYTHON=${PREFIX} -#SCONS_ARGS+= BF_PYTHON_INC=${PREFIX}/include/python${PYVERSSUFFIX} -SCONS_ARGS+= BF_PYTHON_ABI_FLAGS='' -SCONS_ARGS+= BF_PYTHON_VERSION=${PYVERSSUFFIX} -SCONS_ARGS+= BF_SDL=${BUILDLINK_PREFIX.SDL} -SCONS_ARGS+= BF_OPENEXR=${BUILDLINK_PREFIX.openexr} -SCONS_ARGS+= BF_JPEG=${BUILDLINK_PREFIX.jpeg} -SCONS_ARGS+= BF_PNG=${BUILDLINK_PREFIX.png} -SCONS_ARGS+= BF_TIFF=${BUILDLINK_PREFIX.tiff} -SCONS_ARGS+= BF_GETTEXT=${BUILDLINK_PREFIX.gettext-tools} -SCONS_ARGS+= BF_FREETYPE=${BUILDLINK_PREFIX.freetype2} -SCONS_ARGS+= BF_OPENJPEG=${BUILDLINK_PREFIX.openjpeg15} -SCONS_ARGS+= BF_OPENJPEG_INC=${BUILDLINK_PREFIX.openjpeg15}/include/openjpeg-1.5 -SCONS_ARGS+= BF_OPENGL=${BUILDLINK_PREFIX.Mesa} -SCONS_ARGS+= BF_PCRE=${BUILDLINK_PREFIX.pcre} -#SCONS_ARGS+= BF_FFMPEG=${BUILDLINK_PREFIX.ffmpeg010} -#SCONS_ARGS+= BF_FFMPEG_INC=${BUILDLINK_PREFIX.ffmpeg010}/include/ffmpeg010 -#SCONS_ARGS+= BF_FFMPEG_LIBPATH='${BUILDLINK_PREFIX.ffmpeg010}/lib/ffmpeg010' -SCONS_ARGS+= BF_FFTW3=${BUILDLINK_PREFIX.fftw} -SCONS_ARGS+= BF_INSTALLDIR=${DESTDIR}${PREFIX}/share/blender - PLIST_SUBST+= PYVERSSUFFIX=${PYVERSSUFFIX} PLIST_SUBST+= BLENDERVER=${PKGVERSION_NOREV:C/[a-z]//} @@ -73,22 +40,18 @@ PLIST_SUBST+= NETBSDVER=netbsd6 PLIST_VARS+= py34 py35 -post-patch: - cd ${WRKSRC}/build_files/scons/config/; ln netbsd6-config.py netbsd7-config.py - -# I cannot separate build and install... -do-build: - -# build is done in install phase. -do-install: - cd ${WRKSRC:Q} && ${PKGSRC_SETENV} ${MAKE_ENV} \ - ${LOCALBASE}/bin/scons ${SCONS_ARGS} ${_MAKE_JOBS} +OBJDIR= ../build +CONFIGURE_DIRS= ${OBJDIR} +CMAKE_ARG_PATH= ../${DISTNAME} -CHECK_INTERPRETER_SKIP= share/blender/${DISTNAME:S/blender-//:C/[a-z]//}/scripts/*.py share/blender/${DISTNAME:S/blender-//:C/[a-z]//}datafiles/*.py \ - share/blender/${DISTNAME:S/blender-//:C/[a-z]//}/python/lib/python3.3/venv/scripts/posix/pydoc +pre-configure: + ${MKDIR} ${WRKSRC}/${OBJDIR} -REPLACE_PYTHON+= release/bin/blender-thumbnailer.py -REPLACE_PYTHON+= intern/cycles/kernel/SConscript +# Install to custom CMAKE_INSTALL_PREFIX. +do-configure: + cd ${WRKSRC}/${OBJDIR} && \ + env ${CONFIGURE_ENV} \ + ${PREFIX}/bin/cmake ${CMAKE_OPTS} ${CMAKE_ARG_PATH} post-install: ${LN} -sf ${PREFIX}/share/blender/blender \ diff --git a/graphics/blender/PLIST b/graphics/blender/PLIST index e0d44d9e936..921106372a4 100644 --- a/graphics/blender/PLIST +++ b/graphics/blender/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.22 2015/12/19 20:52:12 markd Exp $ +@comment $NetBSD: PLIST,v 1.23 2016/08/15 19:26:18 ryoon Exp $ bin/blender share/blender/${BLENDERVER}/datafiles/fonts/bmonofont-i18n.ttf.gz share/blender/${BLENDERVER}/datafiles/fonts/droidsans.ttf.gz @@ -9,6 +9,7 @@ share/blender/${BLENDERVER}/datafiles/locale/de/LC_MESSAGES/blender.mo share/blender/${BLENDERVER}/datafiles/locale/eo/LC_MESSAGES/blender.mo share/blender/${BLENDERVER}/datafiles/locale/es/LC_MESSAGES/blender.mo share/blender/${BLENDERVER}/datafiles/locale/es_ES/LC_MESSAGES/blender.mo +share/blender/${BLENDERVER}/datafiles/locale/eu/LC_MESSAGES/blender.mo share/blender/${BLENDERVER}/datafiles/locale/fa/LC_MESSAGES/blender.mo share/blender/${BLENDERVER}/datafiles/locale/fr/LC_MESSAGES/blender.mo share/blender/${BLENDERVER}/datafiles/locale/he/LC_MESSAGES/blender.mo @@ -41,11 +42,11 @@ share/blender/${BLENDERVER}/python/lib/python${PYVERSSUFFIX}/__phello__.foo.py share/blender/${BLENDERVER}/python/lib/python${PYVERSSUFFIX}/_bootlocale.py share/blender/${BLENDERVER}/python/lib/python${PYVERSSUFFIX}/_collections_abc.py share/blender/${BLENDERVER}/python/lib/python${PYVERSSUFFIX}/_compat_pickle.py -${PLIST.py35}share/blender/${BLENDERVER}/python/lib/python${PYVERSSUFFIX}/_compression.py +share/blender/${BLENDERVER}/python/lib/python${PYVERSSUFFIX}/_compression.py share/blender/${BLENDERVER}/python/lib/python${PYVERSSUFFIX}/_dummy_thread.py share/blender/${BLENDERVER}/python/lib/python${PYVERSSUFFIX}/_markupbase.py share/blender/${BLENDERVER}/python/lib/python${PYVERSSUFFIX}/_osx_support.py -${PLIST.py35}share/blender/${BLENDERVER}/python/lib/python${PYVERSSUFFIX}/_pydecimal.py +share/blender/${BLENDERVER}/python/lib/python${PYVERSSUFFIX}/_pydecimal.py share/blender/${BLENDERVER}/python/lib/python${PYVERSSUFFIX}/_pyio.py share/blender/${BLENDERVER}/python/lib/python${PYVERSSUFFIX}/_sitebuiltins.py share/blender/${BLENDERVER}/python/lib/python${PYVERSSUFFIX}/_strptime.py @@ -61,7 +62,7 @@ share/blender/${BLENDERVER}/python/lib/python${PYVERSSUFFIX}/asynchat.py share/blender/${BLENDERVER}/python/lib/python${PYVERSSUFFIX}/asyncio/__init__.py share/blender/${BLENDERVER}/python/lib/python${PYVERSSUFFIX}/asyncio/base_events.py share/blender/${BLENDERVER}/python/lib/python${PYVERSSUFFIX}/asyncio/base_subprocess.py -${PLIST.py35}share/blender/${BLENDERVER}/python/lib/python${PYVERSSUFFIX}/asyncio/compat.py +share/blender/${BLENDERVER}/python/lib/python${PYVERSSUFFIX}/asyncio/compat.py share/blender/${BLENDERVER}/python/lib/python${PYVERSSUFFIX}/asyncio/constants.py share/blender/${BLENDERVER}/python/lib/python${PYVERSSUFFIX}/asyncio/coroutines.py share/blender/${BLENDERVER}/python/lib/python${PYVERSSUFFIX}/asyncio/events.py @@ -252,9 +253,9 @@ share/blender/${BLENDERVER}/python/lib/python${PYVERSSUFFIX}/encodings/iso8859_8 share/blender/${BLENDERVER}/python/lib/python${PYVERSSUFFIX}/encodings/iso8859_9.py share/blender/${BLENDERVER}/python/lib/python${PYVERSSUFFIX}/encodings/johab.py share/blender/${BLENDERVER}/python/lib/python${PYVERSSUFFIX}/encodings/koi8_r.py -${PLIST.py35}share/blender/${BLENDERVER}/python/lib/python${PYVERSSUFFIX}/encodings/koi8_t.py +share/blender/${BLENDERVER}/python/lib/python${PYVERSSUFFIX}/encodings/koi8_t.py share/blender/${BLENDERVER}/python/lib/python${PYVERSSUFFIX}/encodings/koi8_u.py -${PLIST.py35}share/blender/${BLENDERVER}/python/lib/python${PYVERSSUFFIX}/encodings/kz1048.py +share/blender/${BLENDERVER}/python/lib/python${PYVERSSUFFIX}/encodings/kz1048.py share/blender/${BLENDERVER}/python/lib/python${PYVERSSUFFIX}/encodings/latin_1.py share/blender/${BLENDERVER}/python/lib/python${PYVERSSUFFIX}/encodings/mac_arabic.py share/blender/${BLENDERVER}/python/lib/python${PYVERSSUFFIX}/encodings/mac_centeuro.py @@ -294,10 +295,8 @@ share/blender/${BLENDERVER}/python/lib/python${PYVERSSUFFIX}/encodings/uu_codec. share/blender/${BLENDERVER}/python/lib/python${PYVERSSUFFIX}/encodings/zlib_codec.py share/blender/${BLENDERVER}/python/lib/python${PYVERSSUFFIX}/ensurepip/__init__.py share/blender/${BLENDERVER}/python/lib/python${PYVERSSUFFIX}/ensurepip/__main__.py -${PLIST.py34}share/blender/${BLENDERVER}/python/lib/python${PYVERSSUFFIX}/ensurepip/_bundled/pip-6.0.8-py2.py3-none-any.whl -${PLIST.py34}share/blender/${BLENDERVER}/python/lib/python${PYVERSSUFFIX}/ensurepip/_bundled/setuptools-12.0.5-py2.py3-none-any.whl -${PLIST.py35}share/blender/${BLENDERVER}/python/lib/python${PYVERSSUFFIX}/ensurepip/_bundled/pip-7.1.2-py2.py3-none-any.whl -${PLIST.py35}share/blender/${BLENDERVER}/python/lib/python${PYVERSSUFFIX}/ensurepip/_bundled/setuptools-18.2-py2.py3-none-any.whl +share/blender/${BLENDERVER}/python/lib/python${PYVERSSUFFIX}/ensurepip/_bundled/pip-8.1.1-py2.py3-none-any.whl +share/blender/${BLENDERVER}/python/lib/python${PYVERSSUFFIX}/ensurepip/_bundled/setuptools-20.10.1-py2.py3-none-any.whl share/blender/${BLENDERVER}/python/lib/python${PYVERSSUFFIX}/ensurepip/_uninstall.py share/blender/${BLENDERVER}/python/lib/python${PYVERSSUFFIX}/enum.py share/blender/${BLENDERVER}/python/lib/python${PYVERSSUFFIX}/filecmp.py @@ -329,7 +328,7 @@ share/blender/${BLENDERVER}/python/lib/python${PYVERSSUFFIX}/imghdr.py share/blender/${BLENDERVER}/python/lib/python${PYVERSSUFFIX}/imp.py share/blender/${BLENDERVER}/python/lib/python${PYVERSSUFFIX}/importlib/__init__.py share/blender/${BLENDERVER}/python/lib/python${PYVERSSUFFIX}/importlib/_bootstrap.py -${PLIST.py35}share/blender/${BLENDERVER}/python/lib/python${PYVERSSUFFIX}/importlib/_bootstrap_external.py +share/blender/${BLENDERVER}/python/lib/python${PYVERSSUFFIX}/importlib/_bootstrap_external.py share/blender/${BLENDERVER}/python/lib/python${PYVERSSUFFIX}/importlib/abc.py share/blender/${BLENDERVER}/python/lib/python${PYVERSSUFFIX}/importlib/machinery.py share/blender/${BLENDERVER}/python/lib/python${PYVERSSUFFIX}/importlib/util.py @@ -378,7 +377,7 @@ share/blender/${BLENDERVER}/python/lib/python${PYVERSSUFFIX}/lib-dynload/_struct share/blender/${BLENDERVER}/python/lib/python${PYVERSSUFFIX}/lib-dynload/_testbuffer.so share/blender/${BLENDERVER}/python/lib/python${PYVERSSUFFIX}/lib-dynload/_testcapi.so share/blender/${BLENDERVER}/python/lib/python${PYVERSSUFFIX}/lib-dynload/_testimportmultiple.so -${PLIST.py35}share/blender/${BLENDERVER}/python/lib/python${PYVERSSUFFIX}/lib-dynload/_testmultiphase.so +share/blender/${BLENDERVER}/python/lib/python${PYVERSSUFFIX}/lib-dynload/_testmultiphase.so share/blender/${BLENDERVER}/python/lib/python${PYVERSSUFFIX}/lib-dynload/array.so share/blender/${BLENDERVER}/python/lib/python${PYVERSSUFFIX}/lib-dynload/audioop.so share/blender/${BLENDERVER}/python/lib/python${PYVERSSUFFIX}/lib-dynload/binascii.so @@ -389,11 +388,11 @@ share/blender/${BLENDERVER}/python/lib/python${PYVERSSUFFIX}/lib-dynload/math.so share/blender/${BLENDERVER}/python/lib/python${PYVERSSUFFIX}/lib-dynload/mmap.so share/blender/${BLENDERVER}/python/lib/python${PYVERSSUFFIX}/lib-dynload/nis.so share/blender/${BLENDERVER}/python/lib/python${PYVERSSUFFIX}/lib-dynload/parser.so +share/blender/${BLENDERVER}/python/lib/python${PYVERSSUFFIX}/lib-dynload/pyexpat.so share/blender/${BLENDERVER}/python/lib/python${PYVERSSUFFIX}/lib-dynload/resource.so share/blender/${BLENDERVER}/python/lib/python${PYVERSSUFFIX}/lib-dynload/select.so share/blender/${BLENDERVER}/python/lib/python${PYVERSSUFFIX}/lib-dynload/syslog.so share/blender/${BLENDERVER}/python/lib/python${PYVERSSUFFIX}/lib-dynload/termios.so -${PLIST.py34}share/blender/${BLENDERVER}/python/lib/python${PYVERSSUFFIX}/lib-dynload/time.so share/blender/${BLENDERVER}/python/lib/python${PYVERSSUFFIX}/lib-dynload/unicodedata.so share/blender/${BLENDERVER}/python/lib/python${PYVERSSUFFIX}/lib-dynload/zlib.so share/blender/${BLENDERVER}/python/lib/python${PYVERSSUFFIX}/linecache.py @@ -471,7 +470,7 @@ share/blender/${BLENDERVER}/python/lib/python${PYVERSSUFFIX}/selectors.py share/blender/${BLENDERVER}/python/lib/python${PYVERSSUFFIX}/shelve.py share/blender/${BLENDERVER}/python/lib/python${PYVERSSUFFIX}/shlex.py share/blender/${BLENDERVER}/python/lib/python${PYVERSSUFFIX}/shutil.py -${PLIST.py35}share/blender/${BLENDERVER}/python/lib/python${PYVERSSUFFIX}/signal.py +share/blender/${BLENDERVER}/python/lib/python${PYVERSSUFFIX}/signal.py share/blender/${BLENDERVER}/python/lib/python${PYVERSSUFFIX}/site.py share/blender/${BLENDERVER}/python/lib/python${PYVERSSUFFIX}/smtpd.py share/blender/${BLENDERVER}/python/lib/python${PYVERSSUFFIX}/smtplib.py @@ -510,7 +509,7 @@ share/blender/${BLENDERVER}/python/lib/python${PYVERSSUFFIX}/traceback.py share/blender/${BLENDERVER}/python/lib/python${PYVERSSUFFIX}/tracemalloc.py share/blender/${BLENDERVER}/python/lib/python${PYVERSSUFFIX}/tty.py share/blender/${BLENDERVER}/python/lib/python${PYVERSSUFFIX}/types.py -${PLIST.py35}share/blender/${BLENDERVER}/python/lib/python${PYVERSSUFFIX}/typing.py +share/blender/${BLENDERVER}/python/lib/python${PYVERSSUFFIX}/typing.py share/blender/${BLENDERVER}/python/lib/python${PYVERSSUFFIX}/unittest/__init__.py share/blender/${BLENDERVER}/python/lib/python${PYVERSSUFFIX}/unittest/__main__.py share/blender/${BLENDERVER}/python/lib/python${PYVERSSUFFIX}/unittest/case.py @@ -571,7 +570,7 @@ share/blender/${BLENDERVER}/python/lib/python${PYVERSSUFFIX}/xml/sax/xmlreader.p share/blender/${BLENDERVER}/python/lib/python${PYVERSSUFFIX}/xmlrpc/__init__.py share/blender/${BLENDERVER}/python/lib/python${PYVERSSUFFIX}/xmlrpc/client.py share/blender/${BLENDERVER}/python/lib/python${PYVERSSUFFIX}/xmlrpc/server.py -${PLIST.py35}share/blender/${BLENDERVER}/python/lib/python${PYVERSSUFFIX}/zipapp.py +share/blender/${BLENDERVER}/python/lib/python${PYVERSSUFFIX}/zipapp.py share/blender/${BLENDERVER}/python/lib/python${PYVERSSUFFIX}/zipfile.py share/blender/${BLENDERVER}/scripts/addons/add_curve_extra_objects/__init__.py share/blender/${BLENDERVER}/scripts/addons/add_curve_extra_objects/add_curve_aceous_galore.py @@ -651,7 +650,6 @@ share/blender/${BLENDERVER}/scripts/addons/cycles/kernel/geom/geom_qbvh_volume_a share/blender/${BLENDERVER}/scripts/addons/cycles/kernel/geom/geom_triangle.h share/blender/${BLENDERVER}/scripts/addons/cycles/kernel/geom/geom_triangle_intersect.h share/blender/${BLENDERVER}/scripts/addons/cycles/kernel/geom/geom_volume.h -share/blender/${BLENDERVER}/scripts/addons/cycles/kernel/kernel.h share/blender/${BLENDERVER}/scripts/addons/cycles/kernel/kernel_accumulate.h share/blender/${BLENDERVER}/scripts/addons/cycles/kernel/kernel_bake.h share/blender/${BLENDERVER}/scripts/addons/cycles/kernel/kernel_camera.h @@ -678,19 +676,12 @@ share/blender/${BLENDERVER}/scripts/addons/cycles/kernel/kernel_projection.h share/blender/${BLENDERVER}/scripts/addons/cycles/kernel/kernel_queues.h share/blender/${BLENDERVER}/scripts/addons/cycles/kernel/kernel_random.h share/blender/${BLENDERVER}/scripts/addons/cycles/kernel/kernel_shader.h -share/blender/${BLENDERVER}/scripts/addons/cycles/kernel/kernel_shaderdata_vars.h share/blender/${BLENDERVER}/scripts/addons/cycles/kernel/kernel_shadow.h share/blender/${BLENDERVER}/scripts/addons/cycles/kernel/kernel_subsurface.h share/blender/${BLENDERVER}/scripts/addons/cycles/kernel/kernel_textures.h share/blender/${BLENDERVER}/scripts/addons/cycles/kernel/kernel_types.h share/blender/${BLENDERVER}/scripts/addons/cycles/kernel/kernel_volume.h share/blender/${BLENDERVER}/scripts/addons/cycles/kernel/kernel_work_stealing.h -share/blender/${BLENDERVER}/scripts/addons/cycles/kernel/kernels/cpu/kernel.cpp -share/blender/${BLENDERVER}/scripts/addons/cycles/kernel/kernels/cpu/kernel_avx.cpp -share/blender/${BLENDERVER}/scripts/addons/cycles/kernel/kernels/cpu/kernel_avx2.cpp -share/blender/${BLENDERVER}/scripts/addons/cycles/kernel/kernels/cpu/kernel_sse2.cpp -share/blender/${BLENDERVER}/scripts/addons/cycles/kernel/kernels/cpu/kernel_sse3.cpp -share/blender/${BLENDERVER}/scripts/addons/cycles/kernel/kernels/cpu/kernel_sse41.cpp share/blender/${BLENDERVER}/scripts/addons/cycles/kernel/kernels/cuda/kernel.cu share/blender/${BLENDERVER}/scripts/addons/cycles/kernel/kernels/opencl/kernel.cl share/blender/${BLENDERVER}/scripts/addons/cycles/kernel/kernels/opencl/kernel_background_buffer_update.cl @@ -764,7 +755,6 @@ share/blender/${BLENDERVER}/scripts/addons/cycles/kernel/util_math_fast.h share/blender/${BLENDERVER}/scripts/addons/cycles/kernel/util_transform.h share/blender/${BLENDERVER}/scripts/addons/cycles/kernel/util_types.h share/blender/${BLENDERVER}/scripts/addons/cycles/license/Apache_2.0.txt -share/blender/${BLENDERVER}/scripts/addons/cycles/license/Boost.txt share/blender/${BLENDERVER}/scripts/addons/cycles/license/ILM.txt share/blender/${BLENDERVER}/scripts/addons/cycles/license/NVidia.txt share/blender/${BLENDERVER}/scripts/addons/cycles/license/OSL.txt @@ -789,6 +779,13 @@ share/blender/${BLENDERVER}/scripts/addons/io_anim_camera.py share/blender/${BLENDERVER}/scripts/addons/io_anim_nuke_chan/__init__.py share/blender/${BLENDERVER}/scripts/addons/io_anim_nuke_chan/export_nuke_chan.py share/blender/${BLENDERVER}/scripts/addons/io_anim_nuke_chan/import_nuke_chan.py +share/blender/${BLENDERVER}/scripts/addons/io_blend_utils/__init__.py +share/blender/${BLENDERVER}/scripts/addons/io_blend_utils/bl_utils/pipe_non_blocking.py +share/blender/${BLENDERVER}/scripts/addons/io_blend_utils/bl_utils/subprocess_helper.py +share/blender/${BLENDERVER}/scripts/addons/io_blend_utils/blend/blendfile.py +share/blender/${BLENDERVER}/scripts/addons/io_blend_utils/blend/blendfile_path_walker.py +share/blender/${BLENDERVER}/scripts/addons/io_blend_utils/blendfile_pack.py +share/blender/${BLENDERVER}/scripts/addons/io_blend_utils/utils/system.py share/blender/${BLENDERVER}/scripts/addons/io_coat3D/__init__.py share/blender/${BLENDERVER}/scripts/addons/io_coat3D/coat.py share/blender/${BLENDERVER}/scripts/addons/io_coat3D/tex.py @@ -1000,6 +997,16 @@ share/blender/${BLENDERVER}/scripts/addons/object_print3d_utils/report.py share/blender/${BLENDERVER}/scripts/addons/object_print3d_utils/todo.rst share/blender/${BLENDERVER}/scripts/addons/object_print3d_utils/ui.py share/blender/${BLENDERVER}/scripts/addons/paint_palette.py +share/blender/${BLENDERVER}/scripts/addons/presets/operator/curve.torus_knot_plus/13x8_wicker_globe.py +share/blender/${BLENDERVER}/scripts/addons/presets/operator/curve.torus_knot_plus/7x6.py +share/blender/${BLENDERVER}/scripts/addons/presets/operator/curve.torus_knot_plus/9x9_color.py +share/blender/${BLENDERVER}/scripts/addons/presets/operator/curve.torus_knot_plus/braided_coil.py +share/blender/${BLENDERVER}/scripts/addons/presets/operator/curve.torus_knot_plus/flower_mesh_(2d).py +share/blender/${BLENDERVER}/scripts/addons/presets/operator/curve.torus_knot_plus/slinky_knot.py +share/blender/${BLENDERVER}/scripts/addons/presets/operator/curve.torus_knot_plus/snowflake_(2d).py +share/blender/${BLENDERVER}/scripts/addons/presets/operator/curve.torus_knot_plus/sun_cross_(2d).py +share/blender/${BLENDERVER}/scripts/addons/presets/operator/curve.torus_knot_plus/tripple_dna.py +share/blender/${BLENDERVER}/scripts/addons/presets/operator/curve.torus_knot_plus/wicker_basket.py share/blender/${BLENDERVER}/scripts/addons/presets/operator/mesh.bolt_add/default.py share/blender/${BLENDERVER}/scripts/addons/presets/operator/mesh.bolt_add/m10.py share/blender/${BLENDERVER}/scripts/addons/presets/operator/mesh.bolt_add/m12.py @@ -1048,7 +1055,9 @@ share/blender/${BLENDERVER}/scripts/addons/render_copy_settings/translations.py share/blender/${BLENDERVER}/scripts/addons/render_freestyle_svg.py share/blender/${BLENDERVER}/scripts/addons/render_povray/__init__.py share/blender/${BLENDERVER}/scripts/addons/render_povray/df3.py +share/blender/${BLENDERVER}/scripts/addons/render_povray/primitives.py share/blender/${BLENDERVER}/scripts/addons/render_povray/render.py +share/blender/${BLENDERVER}/scripts/addons/render_povray/shading.py share/blender/${BLENDERVER}/scripts/addons/render_povray/ui.py share/blender/${BLENDERVER}/scripts/addons/render_povray/update_files.py share/blender/${BLENDERVER}/scripts/addons/rigify/CREDITS @@ -1369,6 +1378,7 @@ share/blender/${BLENDERVER}/scripts/presets/tracking_track_color/object.py share/blender/${BLENDERVER}/scripts/startup/bl_operators/__init__.py share/blender/${BLENDERVER}/scripts/startup/bl_operators/add_mesh_torus.py share/blender/${BLENDERVER}/scripts/startup/bl_operators/anim.py +share/blender/${BLENDERVER}/scripts/startup/bl_operators/bmesh/find_adjacent.py share/blender/${BLENDERVER}/scripts/startup/bl_operators/clip.py share/blender/${BLENDERVER}/scripts/startup/bl_operators/console.py share/blender/${BLENDERVER}/scripts/startup/bl_operators/file.py @@ -1492,7 +1502,9 @@ share/blender/LICENSE-bmonofont-i18n.ttf.txt share/blender/LICENSE-droidsans.ttf.txt share/blender/Python-license.txt share/blender/blender +share/blender/blender-thumbnailer.py +share/blender/blender.desktop +share/blender/blender.svg share/blender/copyright.txt share/blender/jemalloc-license.txt share/blender/readme.html -@pkgdir share/blender/${BLENDERVER}/python/lib/python${PYVERSSUFFIX}/site-packages diff --git a/graphics/blender/distinfo b/graphics/blender/distinfo index 00e30bd12e5..9c12bd76de8 100644 --- a/graphics/blender/distinfo +++ b/graphics/blender/distinfo @@ -1,18 +1,15 @@ -$NetBSD: distinfo,v 1.47 2016/07/16 03:45:19 markd Exp $ +$NetBSD: distinfo,v 1.48 2016/08/15 19:26:18 ryoon Exp $ -SHA1 (blender-2.76b.tar.gz) = 7be96d90296cc95e15380ad0ae56cb86f1374a65 -RMD160 (blender-2.76b.tar.gz) = 393c03e9ff15631f89ddd0cdfc8548bb87a0bde5 -SHA512 (blender-2.76b.tar.gz) = 6226f9709d680344fe5cd8106fafc94c33c131658971681d56df6865ae86c834fc248830c9d2c2ac0c5342bf903ada4d5b61afcdfb1ab79a06976287eeed28b9 -Size (blender-2.76b.tar.gz) = 41728871 bytes -SHA1 (patch-build__files_scons_config_linux-config.py) = 595dbb0c8d8ceaa06e5b862ceb318b5aa4011d16 -SHA1 (patch-build__files_scons_config_netbsd6-config.py) = 105360e9959ac98620e178cf4139d68a277bead2 -SHA1 (patch-build__files_scons_tools_btools.py) = 53e9b0766e040f24cfe4a3e8a8ced8d799e2dbe4 +SHA1 (blender-2.77a.tar.gz) = 935793b3e9fd4d02c71f275aac3aca27cd58bdfb +RMD160 (blender-2.77a.tar.gz) = 7d99f064b5a6055aaf549ddb30c49e73f081f002 +SHA512 (blender-2.77a.tar.gz) = 4f8223a3786b80fa613ace27bea9349309b5857bcc1fafdb7d769f6192d5cb455ce4faf60920d7a1c2cb82ef8c40a10b25a760748b305c16c550657cf1e4df93 +Size (blender-2.77a.tar.gz) = 41927082 bytes SHA1 (patch-doc_python_api_sphinx_doc_gen.sh) = 734a372369ca7bb89ef62f0e0aae22d7046f49f8 -SHA1 (patch-extern_libmv_third__party_glog_src_config.h) = d889d56d47167222ab54fad1c8f87c7ddb02852a -SHA1 (patch-extern_libmv_third__party_glog_src_config__netbsd.h) = 72dad7d3ec74560d46217b7e943eeeef097c23fe -SHA1 (patch-extern_libmv_third__party_glog_src_utilities.h) = 32fea10d935621ef0529fe56b3e857685fbc5d1f +SHA1 (patch-extern_glog_src_base_mutex.h) = 34a20264581a093a1686f1d13a6fccbd5cd9e674 +SHA1 (patch-extern_glog_src_config.h) = 9666c5d925cfeebeef2f178418c9fc2403831da1 +SHA1 (patch-extern_glog_src_config__netbsd.h) = be4727135b8fe1ddbcb5ad52f8230aec51a1a909 +SHA1 (patch-extern_glog_src_utilities.h) = c78ef191ab6ec7e65837b88468a7e1b8eaf325d3 SHA1 (patch-extern_rangetree_range__tree.hh) = 976881b9caad67a2cfb24039652e887867fa6cc0 SHA1 (patch-intern_cycles_util_util__types.h) = 37944c6b0a970468e6791ec4a5beef1ec0ddf190 -SHA1 (patch-intern_ghost_SConscript) = d576ea87b5b0f386e2c78efa78351927a105f243 SHA1 (patch-intern_guardedalloc_intern_mallocn__intern.h) = c7bc89af1c03b50ae0bd8af5aacc25cd82dfcbfc SHA1 (patch-source_blender_imbuf_intern_dds_DirectDrawSurface.cpp) = b38f61900aa30b02479c7397062d71d295932847 diff --git a/graphics/blender/options.mk b/graphics/blender/options.mk index a05a4dd8e35..d7d42577aca 100644 --- a/graphics/blender/options.mk +++ b/graphics/blender/options.mk @@ -1,4 +1,4 @@ -# $NetBSD: options.mk,v 1.4 2010/05/05 18:21:52 drochner Exp $ +# $NetBSD: options.mk,v 1.5 2016/08/15 19:26:18 ryoon Exp $ PKG_OPTIONS_VAR= PKG_OPTIONS.blender PKG_SUPPORTED_OPTIONS= @@ -26,7 +26,7 @@ CONFIGURE_ARGS+= --without-ogg --disable-oggtest CONFIGURE_ARGS+= --enable-openal .include "../../audio/openal/buildlink3.mk" .else -CMAKE_ARGS+= -D WITH_OPENAL:BOOL=OFF +CMAKE_OPTS+= -DWITH_OPENAL:BOOL=OFF .endif .if !empty(PKG_OPTIONS:Mvorbis) diff --git a/graphics/blender/patches/patch-build__files_scons_config_linux-config.py b/graphics/blender/patches/patch-build__files_scons_config_linux-config.py deleted file mode 100644 index a73d2a9b910..00000000000 --- a/graphics/blender/patches/patch-build__files_scons_config_linux-config.py +++ /dev/null @@ -1,30 +0,0 @@ -$NetBSD: patch-build__files_scons_config_linux-config.py,v 1.2 2015/12/15 09:46:27 markd Exp $ - ---- build_files/scons/config/linux-config.py.orig 2015-03-30 23:32:22.000000000 +0000 -+++ build_files/scons/config/linux-config.py -@@ -175,7 +175,7 @@ BF_JEMALLOC_LIBPATH = '${BF_JEMALLOC}/li - BF_JEMALLOC_LIB = 'jemalloc' - BF_JEMALLOC_LIB_STATIC = '${BF_JEMALLOC_LIBPATH}/libjemalloc.a' - --WITH_BF_OIIO = False -+WITH_BF_OIIO = True - WITH_BF_STATICOIIO = False - BF_OIIO = '/usr' - BF_OIIO_INC = '${BF_OIIO}/include' -@@ -215,7 +215,7 @@ WITH_BF_RAYOPTIMIZATION = True - BF_RAYOPTIMIZATION_SSE_FLAGS = ['-msse','-pthread'] - - #SpaceNavigator and friends --WITH_BF_3DMOUSE = True -+WITH_BF_3DMOUSE = False - WITH_BF_STATIC3DMOUSE = False - BF_3DMOUSE = '/usr' - BF_3DMOUSE_INC = '${BF_3DMOUSE}/include' -@@ -261,6 +261,7 @@ BF_INSTALLDIR='../install/linux' - - #Link against pthread - PLATFORM_LINKFLAGS = ['-pthread'] -+PLATFORM_LINKFLAGS += ['-Wl,-R${BF_OPENEXR}/lib'] - - #Fix for LLVM conflict with Mesa llvmpipe, SDL dynload also requires symbols to be hidden. - # TODO(sergey): Move this to SConstruct, so we can have this line depended on user config. 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 deleted file mode 100644 index 3f16dbbbd71..00000000000 --- a/graphics/blender/patches/patch-build__files_scons_config_netbsd6-config.py +++ /dev/null @@ -1,234 +0,0 @@ -$NetBSD: patch-build__files_scons_config_netbsd6-config.py,v 1.5 2014/07/09 20:01:08 ryoon Exp $ - -* config file for NetBSD 6 - ---- build_files/scons/config/netbsd6-config.py.orig 2014-07-09 12:42:15.000000000 +0000 -+++ build_files/scons/config/netbsd6-config.py -@@ -0,0 +1,227 @@ -+CC = 'gcc' -+CXX = 'g++' -+ -+LCGDIR = '../lib/netbsd6' -+LIBDIR = "${LCGDIR}" -+ -+BF_PYTHON_ABI_FLAGS = '' -+BF_PYTHON = '/usr/local' -+BF_PYTHON_LIBPATH = '${BF_PYTHON}/lib' -+BF_PYTHON_VERSION = '3.3' -+WITH_BF_STATICPYTHON = False -+BF_PYTHON_INC = '${BF_PYTHON}/include/python${BF_PYTHON_VERSION}${BF_PYTHON_ABI_FLAGS}' -+BF_PYTHON_BINARY = '${BF_PYTHON}/bin/python${BF_PYTHON_VERSION}' -+BF_PYTHON_LIB = 'python${BF_PYTHON_VERSION}${BF_PYTHON_ABI_FLAGS}' -+BF_PYTHON_LIB_STATIC = '${BF_PYTHON}/lib/libpython${BF_PYTHON_VERSION}${BF_PYTHON_ABI_FLAGS}.a' -+ -+WITH_BF_OPENAL = True -+WITH_BF_STATICOPENAL = False -+BF_OPENAL = '/usr/local' -+BF_OPENAL_INC = '${BF_OPENAL}/include' -+BF_OPENAL_LIB = 'openal' -+BF_OPENAL_LIB_STATIC = '${BF_OPENAL}/lib/libopenal.a' -+ -+BF_CXX = '/usr/local' -+WITH_BF_STATICCXX = False -+BF_CXX_LIB_STATIC = '${BF_CXX}/lib/libstdc++.a' -+ -+WITH_BF_JACK = True -+BF_JACK = '/usr/local' -+BF_JACK_INC = '${BF_JACK}/include/jack' -+BF_JACK_LIB = 'jack' -+BF_JACK_LIBPATH = '${BF_JACK}/lib' -+ -+WITH_BF_SNDFILE = True -+BF_SNDFILE = '/usr/local' -+BF_SNDFILE_INC = '${BF_SNDFILE}/include/sndfile' -+BF_SNDFILE_LIB = 'sndfile' -+BF_SNDFILE_LIBPATH = '${BF_SNDFILE}/lib' -+ -+WITH_BF_SDL = True -+BF_SDL = '/usr/local' #$(shell sdl-config --prefix) -+BF_SDL_INC = '${BF_SDL}/include/SDL' #$(shell $(BF_SDL)/bin/sdl-config --cflags) -+BF_SDL_LIB = 'SDL' #BF_SDL #$(shell $(BF_SDL)/bin/sdl-config --libs) -lSDL_mixer -+ -+WITH_BF_OPENEXR = True -+WITH_BF_STATICOPENEXR = False -+BF_OPENEXR = '/usr/local' -+# when compiling with your own openexr lib you might need to set... -+# BF_OPENEXR_INC = '${BF_OPENEXR}/include/OpenEXR ${BF_OPENEXR}/include' -+ -+BF_OPENEXR_INC = '${BF_OPENEXR}/include/OpenEXR' -+BF_OPENEXR_LIB = 'Half IlmImf Iex Imath ' -+BF_OPENEXR_LIB_STATIC = '${BF_OPENEXR}/lib/libHalf.a ${BF_OPENEXR}/lib/libIlmImf.a ${BF_OPENEXR}/lib/libIex.a ${BF_OPENEXR}/lib/libImath.a ${BF_OPENEXR}/lib/libIlmThread.a' -+# BF_OPENEXR_LIBPATH = '${BF_OPENEXR}/lib' -+ -+WITH_BF_DDS = True -+ -+WITH_BF_JPEG = True -+BF_JPEG = '/usr/local' -+BF_JPEG_INC = '${BF_JPEG}/include' -+BF_JPEG_LIB = 'jpeg' -+ -+WITH_BF_PNG = True -+BF_PNG = '/usr/local' -+BF_PNG_INC = '${BF_PNG}/include' -+BF_PNG_LIB = 'png' -+ -+WITH_BF_TIFF = True -+BF_TIFF = '/usr/local' -+BF_TIFF_INC = '${BF_TIFF}/include' -+BF_TIFF_LIB = 'tiff' -+ -+WITH_BF_ZLIB = True -+BF_ZLIB = '/usr' -+BF_ZLIB_INC = '${BF_ZLIB}/include' -+BF_ZLIB_LIB = 'z' -+ -+WITH_BF_INTERNATIONAL = True -+ -+BF_GETTEXT = '/usr/local' -+BF_GETTEXT_INC = '${BF_GETTEXT}/include' -+BF_GETTEXT_LIB = 'gettextlib' -+BF_GETTEXT_LIBPATH = '${BF_GETTEXT}/lib' -+ -+WITH_BF_GAMEENGINE = False -+WITH_BF_PLAYER = True -+WITH_BF_OCEANSIM = True -+ -+WITH_BF_BULLET = True -+BF_BULLET = '#extern/bullet2/src' -+BF_BULLET_INC = '${BF_BULLET}' -+BF_BULLET_LIB = 'extern_bullet' -+ -+BF_FREETYPE = '/usr/local' -+BF_FREETYPE_INC = '${BF_FREETYPE}/include ${BF_FREETYPE}/include/freetype2' -+BF_FREETYPE_LIB = 'freetype' -+ -+### XXX Find what this actually wants; it doesn't want libquicktime. -+WITH_BF_QUICKTIME = False -+BF_QUICKTIME = '/usr/local' -+BF_QUICKTIME_INC = '${BF_QUICKTIME}/include' -+ -+WITH_BF_ICONV = True -+BF_ICONV = LIBDIR + "/iconv" -+BF_ICONV_INC = '${BF_ICONV}/include' -+BF_ICONV_LIB = 'iconv' -+BF_ICONV_LIBPATH = '${BF_ICONV}/lib' -+ -+WITH_BF_BINRELOC = True -+ -+# enable ffmpeg support -+WITH_BF_FFMPEG = True -+BF_FFMPEG = '/usr/local' -+BF_FFMPEG_LIB = 'avformat avcodec swscale avutil avdevice' -+BF_FFMPEG_INC = '${BF_FFMPEG}/include' -+BF_FFMPEG_LIBPATH='${BF_FFMPEG}/lib' -+ -+# enable ogg, vorbis and theora in ffmpeg -+WITH_BF_OGG = True -+BF_OGG = '/usr/local' -+BF_OGG_INC = '${BF_OGG}/include' -+BF_OGG_LIB = 'ogg vorbis vorbisenc theoraenc theoradec' -+ -+WITH_BF_OPENJPEG = True -+BF_OPENJPEG = '#extern/libopenjpeg' -+BF_OPENJPEG_LIB = '' -+BF_OPENJPEG_INC = '${BF_OPENJPEG}' -+BF_OPENJPEG_LIBPATH='${BF_OPENJPEG}/lib' -+ -+WITH_BF_FFTW3 = True -+BF_FFTW3 = LIBDIR + '/usr/local' -+BF_FFTW3_INC = '${BF_FFTW3}/include' -+BF_FFTW3_LIB = 'fftw3' -+BF_FFTW3_LIBPATH = '${BF_FFTW3}/lib' -+ -+WITH_BF_REDCODE = False -+BF_REDCODE = '#extern/libredcode' -+BF_REDCODE_LIB = '' -+# BF_REDCODE_INC = '${BF_REDCODE}/include' -+BF_REDCODE_INC = '${BF_REDCODE}/../' #C files request "libredcode/format.h" which is in "#extern/libredcode/format.h", stupid but compiles for now. -+BF_REDCODE_LIBPATH='${BF_REDCODE}/lib' -+ -+# Mesa Libs should go here if your using them as well.... -+WITH_BF_STATICOPENGL = False -+BF_OPENGL = '/usr/local' -+BF_OPENGL_INC = '${BF_OPENGL}/include' -+BF_OPENGL_LIB = 'GL GLU X11 Xi' -+BF_OPENGL_LIBPATH = '/usr/X11R6/lib' -+BF_OPENGL_LIB_STATIC = '${BF_OPENGL_LIBPATH}/libGL.a ${BF_OPENGL_LIBPATH}/libGLU.a ${BF_OPENGL_LIBPATH}/libXxf86vm.a ${BF_OPENGL_LIBPATH}/libX11.a ${BF_OPENGL_LIBPATH}/libXi.a ${BF_OPENGL_LIBPATH}/libXext.a ${BF_OPENGL_LIBPATH}/libXxf86vm.a' -+ -+WITH_BF_COLLADA = False -+BF_COLLADA = '#source/blender/collada' -+BF_COLLADA_INC = '${BF_COLLADA}' -+BF_COLLADA_LIB = 'bf_collada' -+BF_OPENCOLLADA = '/usr' -+BF_OPENCOLLADA_INC = '${BF_OPENCOLLADA}' -+BF_OPENCOLLADA_LIB = 'OpenCOLLADAStreamWriter OpenCOLLADASaxFrameworkLoader OpenCOLLADAFramework OpenCOLLADABaseUtils GeneratedSaxParser UTF MathMLSolver pcre buffer ftoa' -+BF_OPENCOLLADA_LIBPATH = '${BF_OPENCOLLADA}/lib' -+BF_PCRE = '/usr/local' -+BF_PCRE_LIB = 'pcre' -+BF_PCRE_LIBPATH = '${BF_PCRE}/lib' -+BF_EXPAT = '/usr/local' -+BF_EXPAT_LIB = 'expat' -+BF_EXPAT_LIBPATH = '${BF_EXPAT}/lib' -+ -+WITH_BF_OIIO = True -+WITH_BF_STATICOIIO = False -+BF_OIIO = LIBDIR + '/oiio' -+BF_OIIO_INC = BF_OIIO + '/include' -+BF_OIIO_LIB = 'OpenImageIO' -+BF_OIIO_LIBPATH = BF_OIIO + '/lib' -+ -+WITH_BF_BOOST = True -+WITH_BF_STATICBOOST = False -+BF_BOOST = LIBDIR + '/boost' -+BF_BOOST_INC = BF_BOOST + '/include' -+BF_BOOST_LIB = 'boost_date_time boost_filesystem boost_regex boost_system boost_thread' -+BF_BOOST_LIB_INTERNATIONAL = 'boost_locale' -+BF_BOOST_LIBPATH = BF_BOOST + '/lib' -+ -+WITH_BF_OPENMP = False -+ -+WITH_GHOST_XDND = False -+ -+#Ray trace optimization -+WITH_BF_RAYOPTIMIZATION = True -+BF_RAYOPTIMIZATION_SSE_FLAGS = ['-msse','-pthread'] -+ -+CCFLAGS = ['-pipe','-fPIC','-funsigned-char','-fno-strict-aliasing','-D_LARGEFILE_SOURCE','-D_FILE_OFFSET_BITS=64','-D_LARGEFILE64_SOURCE'] -+CXXFLAGS = [] -+ -+CPPFLAGS = [] -+if WITH_BF_FFMPEG: -+ # libavutil needs UINT64_C() -+ CXXFLAGS += ['-D__STDC_CONSTANT_MACROS', ] -+REL_CFLAGS = [] -+REL_CXXFLAGS = [] -+REL_CCFLAGS = ['-DNDEBUG', '-O2'] -+##BF_DEPEND = True -+## -+##AR = ar -+##ARFLAGS = ruv -+##ARFLAGSQUIET = ru -+## -+C_WARN = ['-Wno-char-subscripts', '-Wdeclaration-after-statement', '-Wstrict-prototypes'] -+CC_WARN = ['-Wall'] -+CXX_WARN = ['-Wno-invalid-offsetof', '-Wno-sign-compare'] -+ -+ -+##FIX_STUBS_WARNINGS = -Wno-unused -+ -+LLIBS = ['util', 'c', 'm', 'pthread', 'stdc++'] -+##LOPTS = --dynamic -+##DYNLDFLAGS = -shared $(LDFLAGS) -+ -+BF_PROFILE = False -+BF_PROFILE_CCFLAGS = ['-pg','-g'] -+BF_PROFILE_LINKFLAGS = ['-pg'] -+ -+BF_DEBUG = False -+BF_DEBUG_CCFLAGS = ['-g', '-D_DEBUG'] -+ -+BF_BUILDDIR = '../build/netbsd6' -+BF_INSTALLDIR='../install/netbsd6' -+ -+#Link against pthread and libexecinfo -+PLATFORM_LINKFLAGS = ['-pthread', '-lexecinfo', '-Wl,-R/usr/pkg/lib', '-Wl,-R/usr/X11R7/lib'] diff --git a/graphics/blender/patches/patch-build__files_scons_tools_btools.py b/graphics/blender/patches/patch-build__files_scons_tools_btools.py deleted file mode 100644 index c86d55db0fc..00000000000 --- a/graphics/blender/patches/patch-build__files_scons_tools_btools.py +++ /dev/null @@ -1,34 +0,0 @@ -$NetBSD: patch-build__files_scons_tools_btools.py,v 1.3 2015/12/15 09:46:27 markd Exp $ - -From Gentoo's 2.64a/0300-scons-failure.patch - ---- build_files/scons/tools/btools.py.orig 2015-04-01 02:44:23.000000000 +0000 -+++ build_files/scons/tools/btools.py -@@ -71,16 +71,7 @@ def get_version(): - raise Exception("%s: missing version string" % fname) - - def get_hash(): -- try: -- build_hash = get_command_output(['git', 'rev-parse', '--short', 'HEAD']).strip() -- except OSError: -- build_hash = None -- print("WARNING: could not use git to retrieve current Blender repository hash...") -- except subprocess.CalledProcessError as e: -- build_hash = None -- print("WARNING: git errored while retrieving current Blender repository hash (%d)..." % e.returncode) -- if build_hash == '' or build_hash == None: -- build_hash = 'UNKNOWN' -+ build_hash = 'UNKNOWN' - - return build_hash - -@@ -517,7 +508,9 @@ def read_opts(env, cfg, args): - ('BF_3DMOUSE_LIB', '3d mouse library', ''), - ('BF_3DMOUSE_LIBPATH', '3d mouse library path', ''), - ('BF_3DMOUSE_LIB_STATIC', '3d mouse static library', ''), -+ ) # end of opts.AddOptions() - -+ localopts.AddVariables( - ('CFLAGS', 'C only flags', []), - ('CCFLAGS', 'Generic C and C++ flags', []), - ('CXXFLAGS', 'C++ only flags', []), diff --git a/graphics/blender/patches/patch-extern_glog_src_base_mutex.h b/graphics/blender/patches/patch-extern_glog_src_base_mutex.h new file mode 100644 index 00000000000..203880558e1 --- /dev/null +++ b/graphics/blender/patches/patch-extern_glog_src_base_mutex.h @@ -0,0 +1,13 @@ +$NetBSD: patch-extern_glog_src_base_mutex.h,v 1.1 2016/08/15 19:26:18 ryoon Exp $ + +--- extern/glog/src/base/mutex.h.orig 2016-03-23 08:49:49.000000000 +0000 ++++ extern/glog/src/base/mutex.h +@@ -133,7 +133,7 @@ + // out, but then you'd have to unset HAVE_RWLOCK (at least on linux -- it + // *does* cause problems for FreeBSD, or MacOSX, but isn't needed + // for locking there.) +-# ifdef __linux__ ++# if defined(__linux__) || defined(__NetBSD__) + # ifndef _XOPEN_SOURCE // Some other header might have already set it for us. + # define _XOPEN_SOURCE 500 // may be needed to get the rwlock calls + # endif diff --git a/graphics/blender/patches/patch-extern_glog_src_config.h b/graphics/blender/patches/patch-extern_glog_src_config.h new file mode 100644 index 00000000000..b4a97027c46 --- /dev/null +++ b/graphics/blender/patches/patch-extern_glog_src_config.h @@ -0,0 +1,13 @@ +$NetBSD: patch-extern_glog_src_config.h,v 1.1 2016/08/15 19:26:18 ryoon Exp $ + +--- extern/glog/src/config.h.orig 2016-03-23 08:49:49.000000000 +0000 ++++ extern/glog/src/config.h +@@ -10,6 +10,8 @@ + #include "windows/config.h" + #elif defined(__linux__) + #include "config_linux.h" ++#elif defined(__NetBSD__) ++ #include "config_netbsd.h" + #elif defined(_MSC_VER) + #include "windows/config.h" + #elif defined(__GNU__) diff --git a/graphics/blender/patches/patch-extern_libmv_third__party_glog_src_config__netbsd.h b/graphics/blender/patches/patch-extern_glog_src_config__netbsd.h index a6a8aab2e8b..a7b7161b8a3 100644 --- a/graphics/blender/patches/patch-extern_libmv_third__party_glog_src_config__netbsd.h +++ b/graphics/blender/patches/patch-extern_glog_src_config__netbsd.h @@ -1,9 +1,7 @@ -$NetBSD: patch-extern_libmv_third__party_glog_src_config__netbsd.h,v 1.3 2014/07/09 20:01:08 ryoon Exp $ +$NetBSD: patch-extern_glog_src_config__netbsd.h,v 1.1 2016/08/15 19:26:18 ryoon Exp $ -* config file for NetBSD - ---- extern/libmv/third_party/glog/src/config_netbsd.h.orig 2014-07-09 12:42:15.000000000 +0000 -+++ extern/libmv/third_party/glog/src/config_netbsd.h +--- extern/glog/src/config_netbsd.h.orig 2016-07-28 08:46:50.262373648 +0000 ++++ extern/glog/src/config_netbsd.h @@ -0,0 +1,177 @@ +/* src/config.h. Generated from config.h.in by configure. */ +/* src/config.h.in. Generated from configure.ac by autoheader. */ diff --git a/graphics/blender/patches/patch-extern_libmv_third__party_glog_src_utilities.h b/graphics/blender/patches/patch-extern_glog_src_utilities.h index 52d18a4f5e4..fcb585e2bf4 100644 --- a/graphics/blender/patches/patch-extern_libmv_third__party_glog_src_utilities.h +++ b/graphics/blender/patches/patch-extern_glog_src_utilities.h @@ -1,9 +1,7 @@ -$NetBSD: patch-extern_libmv_third__party_glog_src_utilities.h,v 1.1 2012/12/03 13:15:51 ryoon Exp $ +$NetBSD: patch-extern_glog_src_utilities.h,v 1.1 2016/08/15 19:26:18 ryoon Exp $ -* NetBSD has no unwind - ---- extern/libmv/third_party/glog/src/utilities.h.orig 2012-10-09 18:43:15.000000000 +0000 -+++ extern/libmv/third_party/glog/src/utilities.h +--- extern/glog/src/utilities.h.orig 2016-03-23 08:49:49.000000000 +0000 ++++ extern/glog/src/utilities.h @@ -101,7 +101,7 @@ // correctly when GetStackTrace() is called with max_depth == 0. // Some code may do that. diff --git a/graphics/blender/patches/patch-extern_libmv_third__party_glog_src_config.h b/graphics/blender/patches/patch-extern_libmv_third__party_glog_src_config.h deleted file mode 100644 index 34ffd540a6e..00000000000 --- a/graphics/blender/patches/patch-extern_libmv_third__party_glog_src_config.h +++ /dev/null @@ -1,15 +0,0 @@ -$NetBSD: patch-extern_libmv_third__party_glog_src_config.h,v 1.1 2012/12/03 13:15:51 ryoon Exp $ - -* Load NetBSD config file - ---- extern/libmv/third_party/glog/src/config.h.orig 2012-10-09 18:43:15.000000000 +0000 -+++ extern/libmv/third_party/glog/src/config.h -@@ -6,6 +6,8 @@ - #include "config_mac.h" - #elif defined(__FreeBSD__) || defined(__FreeBSD_kernel__) - #include "config_freebsd.h" -+#elif defined(__NetBSD__) -+ #include "config_netbsd.h" - #elif defined(__MINGW32__) - #include "windows/config.h" - #elif defined(__linux__) diff --git a/graphics/blender/patches/patch-intern_ghost_SConscript b/graphics/blender/patches/patch-intern_ghost_SConscript deleted file mode 100644 index 56ffc42ed86..00000000000 --- a/graphics/blender/patches/patch-intern_ghost_SConscript +++ /dev/null @@ -1,15 +0,0 @@ -$NetBSD: patch-intern_ghost_SConscript,v 1.2 2015/12/15 09:46:27 markd Exp $ - -* Add window system support on NetBSD - ---- intern/ghost/SConscript.orig 2012-10-09 18:33:16.000000000 +0000 -+++ intern/ghost/SConscript -@@ -26,7 +26,7 @@ if env['WITH_GHOST_SDL']: - pass - incs += ' ' + env['BF_SDL_INC'] - defs += ['WITH_GHOST_SDL'] --elif window_system in ('linux', 'openbsd3', 'sunos5', 'freebsd7', 'freebsd8', 'freebsd9', 'aix4', 'aix5'): -+elif window_system in ('linux', 'openbsd3', 'sunos5', 'freebsd7', 'freebsd8', 'freebsd9', 'aix4', 'aix5', 'netbsd6', 'netbsd7'): - for f in pf: - try: - sources.remove('intern' + os.sep + f + 'Win32.cpp') |