pkgsrc-Changes archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
CVS commit: pkgsrc/graphics/blender
Module Name: pkgsrc
Committed By: ryoon
Date: Mon Aug 15 19:26:18 UTC 2016
Modified Files:
pkgsrc/graphics/blender: Makefile PLIST distinfo options.mk
Added Files:
pkgsrc/graphics/blender/patches: patch-extern_glog_src_base_mutex.h
patch-extern_glog_src_config.h
patch-extern_glog_src_config__netbsd.h
patch-extern_glog_src_utilities.h
Removed Files:
pkgsrc/graphics/blender/patches:
patch-build__files_scons_config_linux-config.py
patch-build__files_scons_config_netbsd6-config.py
patch-build__files_scons_tools_btools.py
patch-extern_libmv_third__party_glog_src_config.h
patch-extern_libmv_third__party_glog_src_config__netbsd.h
patch-extern_libmv_third__party_glog_src_utilities.h
patch-intern_ghost_SConscript
Log Message:
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!
To generate a diff of this commit:
cvs rdiff -u -r1.121 -r1.122 pkgsrc/graphics/blender/Makefile
cvs rdiff -u -r1.22 -r1.23 pkgsrc/graphics/blender/PLIST
cvs rdiff -u -r1.47 -r1.48 pkgsrc/graphics/blender/distinfo
cvs rdiff -u -r1.4 -r1.5 pkgsrc/graphics/blender/options.mk
cvs rdiff -u -r1.2 -r0 \
pkgsrc/graphics/blender/patches/patch-build__files_scons_config_linux-config.py \
pkgsrc/graphics/blender/patches/patch-intern_ghost_SConscript
cvs rdiff -u -r1.5 -r0 \
pkgsrc/graphics/blender/patches/patch-build__files_scons_config_netbsd6-config.py
cvs rdiff -u -r1.3 -r0 \
pkgsrc/graphics/blender/patches/patch-build__files_scons_tools_btools.py \
pkgsrc/graphics/blender/patches/patch-extern_libmv_third__party_glog_src_config__netbsd.h
cvs rdiff -u -r0 -r1.1 \
pkgsrc/graphics/blender/patches/patch-extern_glog_src_base_mutex.h \
pkgsrc/graphics/blender/patches/patch-extern_glog_src_config.h \
pkgsrc/graphics/blender/patches/patch-extern_glog_src_config__netbsd.h \
pkgsrc/graphics/blender/patches/patch-extern_glog_src_utilities.h
cvs rdiff -u -r1.1 -r0 \
pkgsrc/graphics/blender/patches/patch-extern_libmv_third__party_glog_src_config.h \
pkgsrc/graphics/blender/patches/patch-extern_libmv_third__party_glog_src_utilities.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: pkgsrc/graphics/blender/Makefile
diff -u pkgsrc/graphics/blender/Makefile:1.121 pkgsrc/graphics/blender/Makefile:1.122
--- pkgsrc/graphics/blender/Makefile:1.121 Sat Jul 9 13:03:50 2016
+++ pkgsrc/graphics/blender/Makefile Mon Aug 15 19:26:18 2016
@@ -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 cr
LICENSE= gnu-gpl-v2
USE_TOOLS+= gmake sed
+USE_CMAKE= yes
USE_LANGUAGES= c c++
+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_ACCEPTED= 34 35
+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}
-
-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
-
-REPLACE_PYTHON+= release/bin/blender-thumbnailer.py
-REPLACE_PYTHON+= intern/cycles/kernel/SConscript
+OBJDIR= ../build
+CONFIGURE_DIRS= ${OBJDIR}
+CMAKE_ARG_PATH= ../${DISTNAME}
+
+pre-configure:
+ ${MKDIR} ${WRKSRC}/${OBJDIR}
+
+# 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 \
Index: pkgsrc/graphics/blender/PLIST
diff -u pkgsrc/graphics/blender/PLIST:1.22 pkgsrc/graphics/blender/PLIST:1.23
--- pkgsrc/graphics/blender/PLIST:1.22 Sat Dec 19 20:52:12 2015
+++ pkgsrc/graphics/blender/PLIST Mon Aug 15 19:26:18 2016
@@ -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/lo
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/p
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/p
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/p
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/p
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/p
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/p
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/p
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/p
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/p
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/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/addo
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/addo
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/addo
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/addo
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/addo
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/addo
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/pres
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
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
Index: pkgsrc/graphics/blender/distinfo
diff -u pkgsrc/graphics/blender/distinfo:1.47 pkgsrc/graphics/blender/distinfo:1.48
--- pkgsrc/graphics/blender/distinfo:1.47 Sat Jul 16 03:45:19 2016
+++ pkgsrc/graphics/blender/distinfo Mon Aug 15 19:26:18 2016
@@ -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
Index: pkgsrc/graphics/blender/options.mk
diff -u pkgsrc/graphics/blender/options.mk:1.4 pkgsrc/graphics/blender/options.mk:1.5
--- pkgsrc/graphics/blender/options.mk:1.4 Wed May 5 18:21:52 2010
+++ pkgsrc/graphics/blender/options.mk Mon Aug 15 19:26:18 2016
@@ -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
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)
Added files:
Index: pkgsrc/graphics/blender/patches/patch-extern_glog_src_base_mutex.h
diff -u /dev/null pkgsrc/graphics/blender/patches/patch-extern_glog_src_base_mutex.h:1.1
--- /dev/null Mon Aug 15 19:26:18 2016
+++ pkgsrc/graphics/blender/patches/patch-extern_glog_src_base_mutex.h Mon Aug 15 19:26:18 2016
@@ -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
Index: pkgsrc/graphics/blender/patches/patch-extern_glog_src_config.h
diff -u /dev/null pkgsrc/graphics/blender/patches/patch-extern_glog_src_config.h:1.1
--- /dev/null Mon Aug 15 19:26:18 2016
+++ pkgsrc/graphics/blender/patches/patch-extern_glog_src_config.h Mon Aug 15 19:26:18 2016
@@ -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__)
Index: pkgsrc/graphics/blender/patches/patch-extern_glog_src_config__netbsd.h
diff -u /dev/null pkgsrc/graphics/blender/patches/patch-extern_glog_src_config__netbsd.h:1.1
--- /dev/null Mon Aug 15 19:26:18 2016
+++ pkgsrc/graphics/blender/patches/patch-extern_glog_src_config__netbsd.h Mon Aug 15 19:26:18 2016
@@ -0,0 +1,182 @@
+$NetBSD: patch-extern_glog_src_config__netbsd.h,v 1.1 2016/08/15 19:26:18 ryoon Exp $
+
+--- 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. */
++
++/* Namespace for Google classes */
++#define GOOGLE_NAMESPACE google
++
++/* Define if you have the `dladdr' function */
++/* #undef HAVE_DLADDR */
++
++/* Define to 1 if you have the <dlfcn.h> header file. */
++#define HAVE_DLFCN_H 1
++
++#include <sys/param.h>
++/* Define to 1 if you have the <execinfo.h> header file. */
++#if __NetBSD_Version__ > 699001500
++#define HAVE_EXECINFO_H 1
++#else
++#undef HAVE_EXECINFO_H
++#endif
++
++/* Define if you have the `fcntl' function */
++#define HAVE_FCNTL 1
++
++/* Define to 1 if you have the <glob.h> header file. */
++#define HAVE_GLOB_H 1
++
++/* Define to 1 if you have the <inttypes.h> header file. */
++#define HAVE_INTTYPES_H 1
++
++/* Define to 1 if you have the `pthread' library (-lpthread). */
++#define HAVE_LIBPTHREAD 1
++
++/* Define to 1 if you have the <libunwind.h> header file. */
++/* #undef HAVE_LIBUNWIND_H */
++
++/* define if you have google gflags library */
++#define HAVE_LIB_GFLAGS 1
++
++/* define if you have google gmock library */
++/* #undef HAVE_LIB_GMOCK */
++
++/* define if you have google gtest library */
++/* #undef HAVE_LIB_GTEST */
++
++/* define if you have libunwind */
++/* #undef HAVE_LIB_UNWIND */
++
++/* Define to 1 if you have the <memory.h> header file. */
++#define HAVE_MEMORY_H 1
++
++/* define if the compiler implements namespaces */
++#define HAVE_NAMESPACES 1
++
++/* Define if you have the 'pread' function */
++#define HAVE_PREAD 1
++
++/* Define if you have POSIX threads libraries and header files. */
++#define HAVE_PTHREAD 1
++
++/* Define to 1 if you have the <pwd.h> header file. */
++#define HAVE_PWD_H 1
++
++/* Define if you have the 'pwrite' function */
++#define HAVE_PWRITE 1
++
++/* define if the compiler implements pthread_rwlock_* */
++#define HAVE_RWLOCK 1
++
++/* Define if you have the `sigaltstack' function */
++#define HAVE_SIGALTSTACK 1
++
++/* Define to 1 if you have the <stdint.h> header file. */
++#define HAVE_STDINT_H 1
++
++/* Define to 1 if you have the <stdlib.h> header file. */
++#define HAVE_STDLIB_H 1
++
++/* Define to 1 if you have the <strings.h> header file. */
++#define HAVE_STRINGS_H 1
++
++/* Define to 1 if you have the <string.h> header file. */
++#define HAVE_STRING_H 1
++
++/* Define to 1 if you have the <syscall.h> header file. */
++/* #undef HAVE_SYSCALL_H */
++
++/* Define to 1 if you have the <syslog.h> header file. */
++#define HAVE_SYSLOG_H 1
++
++/* Define to 1 if you have the <sys/stat.h> header file. */
++#define HAVE_SYS_STAT_H 1
++
++/* Define to 1 if you have the <sys/syscall.h> header file. */
++#define HAVE_SYS_SYSCALL_H 1
++
++/* Define to 1 if you have the <sys/time.h> header file. */
++#define HAVE_SYS_TIME_H 1
++
++/* Define to 1 if you have the <sys/types.h> header file. */
++#define HAVE_SYS_TYPES_H 1
++
++/* Define to 1 if you have the <sys/ucontext.h> header file. */
++#define HAVE_SYS_UCONTEXT_H 1
++
++/* Define to 1 if you have the <sys/utsname.h> header file. */
++#define HAVE_SYS_UTSNAME_H 1
++
++/* Define to 1 if you have the <ucontext.h> header file. */
++#define HAVE_UCONTEXT_H 1
++
++/* Define to 1 if you have the <unistd.h> header file. */
++#define HAVE_UNISTD_H 1
++
++/* define if the compiler supports using expression for operator */
++#define HAVE_USING_OPERATOR 1
++
++/* define if your compiler has __attribute__ */
++#define HAVE___ATTRIBUTE__ 1
++
++/* define if your compiler has __builtin_expect */
++#define HAVE___BUILTIN_EXPECT 1
++
++/* define if your compiler has __sync_val_compare_and_swap */
++/* #undef HAVE___SYNC_VAL_COMPARE_AND_SWAP */
++
++/* Name of package */
++#define PACKAGE "glog"
++
++/* Define to the address where bug reports for this package should be sent. */
++#define PACKAGE_BUGREPORT "opensource%google.com@localhost"
++
++/* Define to the full name of this package. */
++#define PACKAGE_NAME "glog"
++
++/* Define to the full name and version of this package. */
++#define PACKAGE_STRING "glog 0.3.2"
++
++/* Define to the one symbol short name of this package. */
++#define PACKAGE_TARNAME "glog"
++
++/* Define to the version of this package. */
++#define PACKAGE_VERSION "0.3.2"
++
++/* How to access the PC from a struct ucontext */
++/* #define PC_FROM_UCONTEXT uc_mcontext.gregs[REG_RIP] */
++
++/* Define to necessary symbol if this constant uses a non-standard name on
++ your system. */
++/* #undef PTHREAD_CREATE_JOINABLE */
++
++/* The size of `void *', as computed by sizeof. */
++#define SIZEOF_VOID_P 8
++
++/* Define to 1 if you have the ANSI C header files. */
++/* #undef STDC_HEADERS */
++
++#define STDC_HEADERS 1
++/* the namespace where STL code like vector<> is defined */
++#define STL_NAMESPACE std
++
++/* location of source code */
++#define TEST_SRC_DIR "."
++
++/* Version number of package */
++#define VERSION "0.3.2"
++
++/* Stops putting the code inside the Google namespace */
++#define _END_GOOGLE_NAMESPACE_ }
++
++/* Puts following code inside the Google namespace */
++#define _START_GOOGLE_NAMESPACE_ namespace google {
++
++/* isn't getting defined by configure script when clang compilers are used
++ and cuases compilation errors in stactrace/unwind modules */
++#ifdef __clang__
++# define NO_FRAME_POINTER
++#endif
Index: pkgsrc/graphics/blender/patches/patch-extern_glog_src_utilities.h
diff -u /dev/null pkgsrc/graphics/blender/patches/patch-extern_glog_src_utilities.h:1.1
--- /dev/null Mon Aug 15 19:26:18 2016
+++ pkgsrc/graphics/blender/patches/patch-extern_glog_src_utilities.h Mon Aug 15 19:26:18 2016
@@ -0,0 +1,13 @@
+$NetBSD: patch-extern_glog_src_utilities.h,v 1.1 2016/08/15 19:26:18 ryoon Exp $
+
+--- 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.
+
+-#if defined(__MINGW32__) || defined(__FreeBSD__)
++#if defined(__MINGW32__) || defined(__FreeBSD__) || defined(__NetBSD__)
+ # undef STACKTRACE_H
+ #elif defined(HAVE_LIB_UNWIND)
+ # define STACKTRACE_H "stacktrace_libunwind-inl.h"
Home |
Main Index |
Thread Index |
Old Index