Index: head/graphics/blender/Makefile =================================================================== --- head/graphics/blender/Makefile (revision 486970) +++ head/graphics/blender/Makefile (revision 486971) @@ -1,163 +1,162 @@ # Created by: Jimmy Olgeni # $FreeBSD$ PORTNAME= blender PORTVERSION= 2.79b PORTREVISION= 7 CATEGORIES= graphics games MASTER_SITES= http://download.blender.org/source/ \ http://mirror.cs.umn.edu/blender.org/source/ \ http://public.planetmirror.com/pub/blender/source/ MAINTAINER= FreeBSD@Shaneware.biz COMMENT= 3D modeling/rendering/animation/gaming package LICENSE= GPLv3+ LICENSE_FILE= ${WRKSRC}/doc/license/GPL3-license.txt LIB_DEPENDS= libpng.so:graphics/png \ libfreetype.so:print/freetype2 \ libboost_regex.so:devel/boost-libs RUN_DEPENDS= ${PYNUMPY} # 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. -# 10.4 fails to build with clang3.4 so we want to use clang50 -# clang50 is already in place for opengl +# USES=compiler is needed to support gcc built archs USES= cmake:outsource compiler:c++14-lang desktop-file-utils \ jpeg python:3.5 shebangfix USE_XORG= x11 xext xfixes xmu xrender USE_GL= gl glu glew INSTALLS_ICONS= yes # always enable c++11, this needs to be enabled for several options CMAKE_ON= WITH_CXX11 CMAKE_OFF= WITH_PYTHON_INSTALL WITH_PYTHON_INSTALL_NUMPY \ WITH_INSTALL_PORTABLE WITH_CYCLES_LOGGING SHEBANG_FILES= release/bin/blender-thumbnailer.py \ release/scripts/modules/bl_i18n_utils/merge_po.py \ release/scripts/modules/bl_i18n_utils/utils_rtl.py \ release/scripts/modules/blend_render_info.py CFLAGS_i386= -march=i586 CXXFLAGS_i386= -march=i586 PLIST_SUB+= VER=2.79 OPTIONS_SUB= yes .include "${.CURDIR}/Makefile.options" ALEMBIC_CMAKE_BOOL= WITH_ALEMBIC ALEMBIC_LIB_DEPENDS= libAlembic.so:graphics/alembic # note that this needs to be set to match alembics hdf5 option ALEMBIC_HDF5_REQUIRES= ALEMBIC ALEMBIC_HDF5_CMAKE_BOOL= WITH_ALEMBIC_HDF5 ALEMBIC_HDF5_LIB_DEPENDS= libhdf5.so:science/hdf5 AVI_CMAKE_BOOL= WITH_CODEC_AVI BULLET_CMAKE_BOOL= WITH_BULLET CAMERATRACK_CMAKE_BOOL= WITH_LIBMV CAMERATRACK_LIB_DEPENDS= libunwind.so:devel/libunwind CINEON_CMAKE_BOOL= WITH_IMAGE_CINEON COLLADA_CMAKE_BOOL= WITH_OPENCOLLADA COLLADA_LIB_DEPENDS= libOpenCOLLADABaseUtils.so:graphics/opencollada \ libpcre.so:devel/pcre COLLADA_USE= GNOME=libxml2 COMPOSITOR_CMAKE_BOOL= WITH_COMPOSITOR CYCLES_IMPLIES= OPENIMAGEIO CYCLES_CMAKE_BOOL= WITH_CYCLES CYCLESOSL_IMPLIES= CYCLES CYCLESOSL_CMAKE_BOOL= WITH_CYCLES_OSL WITH_LLVM CYCLESOSL_CMAKE_ON= -DLLVM_STATIC:BOOL=OFF \ - -DLLVM_CONFIG:STRING="${LOCALBASE}/bin/llvm-config40" -CYCLESOSL_BUILD_DEPENDS= llvm-config40:devel/llvm40 + -DLLVM_CONFIG:STRING="${LOCALBASE}/bin/llvm-config60" +CYCLESOSL_BUILD_DEPENDS= llvm-config60:devel/llvm60 CYCLESOSL_LIB_DEPENDS= liboslcomp.so:graphics/openshadinglanguage -CYCLESOSL_RUN_DEPENDS= llvm-config40:devel/llvm40 +CYCLESOSL_RUN_DEPENDS= llvm-config60:devel/llvm60 DDS_CMAKE_BOOL= WITH_IMAGE_DDS FFMPEG_CMAKE_BOOL= WITH_CODEC_FFMPEG FFMPEG_LIB_DEPENDS= libavutil.so:multimedia/ffmpeg FFTW3_CMAKE_BOOL= WITH_FFTW3 FFTW3_LIB_DEPENDS= libfftw3.so:math/fftw3 FRAMESERVER_CMAKE_BOOL= WITH_IMAGE_FRAMESERVER FREESTYLE_CMAKE_BOOL= WITH_FREESTYLE GAMEENGINE_CMAKE_BOOL= WITH_GAMEENGINE HDR_CMAKE_BOOL= WITH_IMAGE_HDR HEADLESS_PREVENTS= MENU XINPUT XF86VMODE HEADLESS_PREVENTS_MSG= X11 options can't be used in headless mode HEADLESS_CMAKE_BOOL= WITH_HEADLESS INPUT_NDOF_CMAKE_BOOL= WITH_INPUT_NDOF JACK_CMAKE_BOOL= WITH_JACK JACK_LIB_DEPENDS= libjack.so:audio/jack LZO_CMAKE_BOOL= WITH_LZO LZMA_CMAKE_BOOL= WITH_LZMA MENU_USES= desktop-file-utils MOD_BOOLEAN_CMAKE_BOOL= WITH_MOD_BOOLEAN MOD_FLUID_CMAKE_BOOL= WITH_MOD_FLUID MOD_OCEANSIM_IMPLIES= FFTW3 MOD_OCEANSIM_CMAKE_BOOL= WITH_MOD_OCEANSIM MOD_REMESH_CMAKE_BOOL= WITH_MOD_REMESH MOD_SMOKE_CMAKE_BOOL= WITH_MOD_SMOKE NLS_CMAKE_BOOL= WITH_INTERNATIONAL # Use iconv:wchar_t to force the usage of iconv from ports. # libboost_locale.so uses libiconv_open, while we only provide # iconv_open in 10.x+ NLS_USES= gettext iconv:lib,wchar_t OPENAL_CMAKE_BOOL= WITH_OPENAL OPENAL_USES= openal:al,alut OPENCOLORIO_CMAKE_BOOL= WITH_OPENCOLORIO OPENCOLORIO_LIB_DEPENDS= libOpenColorIO.so:graphics/opencolorio \ libyaml-cpp03.so:devel/yaml-cpp03 \ libtinyxml.so:textproc/tinyxml OPENEXR_CMAKE_BOOL= WITH_IMAGE_OPENEXR OPENEXR_LIB_DEPENDS= libIlmImf.so:graphics/openexr \ libHalf.so:graphics/ilmbase OPENIMAGEIO_IMPLIES= OPENEXR TIFF OPENIMAGEIO_CMAKE_BOOL= WITH_OPENIMAGEIO OPENIMAGEIO_LIB_DEPENDS= libOpenImageIO.so:graphics/openimageio OPENJPEG_CMAKE_BOOL= WITH_SYSTEM_OPENJPEG WITH_IMAGE_OPENJPEG OPENJPEG_LIB_DEPENDS= libopenjpeg.so:graphics/openjpeg15 # openmp usually works on amd64 #OPENMP_CMAKE_ON= -DWITH_OPENMP:BOOL=ON \ # -DOpenMP_C_FLAGS:STRING=-fopenmp -lm \ # -DOpenMP_CXX_FLAGS:STRING=-fopenmp -lm #OPENMP_CMAKE_OFF= -DWITH_OPENMP:BOOL=OFF #OPENMP_LIB_DEPENDS= libomp.so.0:devel/openmp #OPENMP_LDFLAGS= -L${LOCALBASE}/lib OPENSUBDIV_CMAKE_BOOL= WITH_OPENSUBDIV OPENSUBDIV_LIB_DEPENDS= libosdCPU.so:graphics/opensubdiv PLAYER_IMPLIES= GAMEENGINE PLAYER_CMAKE_BOOL= WITH_PLAYER RAYOPTIMIZATION_CMAKE_BOOL= WITH_RAYOPTIMIZATION SDL_CMAKE_BOOL= WITH_SDL SDL_USE= SDL=sdl2 SNDFILE_CMAKE_BOOL= WITH_CODEC_SNDFILE SNDFILE_LIB_DEPENDS= libsndfile.so:audio/libsndfile TIFF_CMAKE_BOOL= WITH_IMAGE_TIFF TIFF_LIB_DEPENDS= libtiff.so:graphics/tiff XINPUT_CMAKE_BOOL= WITH_X11_XINPUT XINPUT_USE= XORG=xi XF86VMODE_CMAKE_BOOL= WITH_X11_XF86VMODE XF86VMODE_USE= XORG=xi,xxf86vm .if defined(WITH_DEBUG) CMAKE_ARGS+= -DWITH_GHOST_DEBUG:BOOL=ON .endif post-patch-OPENCOLORIO-on: @${REINPLACE_CMD} -e 's|yaml-cpp|&03|' \ ${PATCH_WRKSRC}/build_files/cmake/Modules/FindOpenColorIO.cmake post-build: @(cd ${WRKSRC}/doc/manpage && \ ${PYTHON_CMD} blender.1.py \ ${INSTALL_WRKSRC}/bin/blender \ ${INSTALL_WRKSRC}/bin/${PORTNAME}.1) post-install-MENU-on: @-update-desktop-database -q post-install: ${INSTALL_MAN} ${INSTALL_WRKSRC}/bin/${PORTNAME}.1 \ ${STAGEDIR}${MAN1PREFIX}/man/man1 .include Index: head/graphics/blender/files/patch-osl110 =================================================================== --- head/graphics/blender/files/patch-osl110 (nonexistent) +++ head/graphics/blender/files/patch-osl110 (revision 486971) @@ -0,0 +1,168 @@ +--- intern/cycles/kernel/shaders/node_brick_texture.osl.orig 2018-12-03 16:56:43 UTC ++++ intern/cycles/kernel/shaders/node_brick_texture.osl +@@ -19,10 +19,10 @@ + + /* Brick */ + +-float brick_noise(int n) /* fast integer noise */ ++float brick_noise(int ns) /* fast integer noise */ + { + int nn; +- n = (n + 1013) & 2147483647; ++ int n = (ns + 1013) & 2147483647; + n = (n >> 13) ^ n; + nn = (n * (n * n * 60493 + 19990303) + 1376312589) & 2147483647; + return 0.5 * ((float)nn / 1073741824.0); +@@ -30,7 +30,7 @@ float brick_noise(int n) /* fast integer noise */ + + float brick(point p, float mortar_size, float mortar_smooth, float bias, + float BrickWidth, float row_height, float offset_amount, int offset_frequency, +- float squash_amount, int squash_frequency, float tint) ++ float squash_amount, int squash_frequency, output float tint) + { + int bricknum, rownum; + float offset = 0.0; +--- intern/cycles/kernel/shaders/node_checker_texture.osl.orig 2018-12-03 16:56:43 UTC ++++ intern/cycles/kernel/shaders/node_checker_texture.osl +@@ -19,11 +19,12 @@ + + /* Checker */ + +-float checker(point p) ++float checker(point ip) + { +- p[0] = (p[0] + 0.000001) * 0.999999; +- p[1] = (p[1] + 0.000001) * 0.999999; +- p[2] = (p[2] + 0.000001) * 0.999999; ++ point p; ++ p[0] = (ip[0] + 0.000001) * 0.999999; ++ p[1] = (ip[1] + 0.000001) * 0.999999; ++ p[2] = (ip[2] + 0.000001) * 0.999999; + + int xi = (int)fabs(floor(p[0])); + int yi = (int)fabs(floor(p[1])); +--- intern/cycles/kernel/shaders/node_environment_texture.osl.orig 2018-12-03 16:56:43 UTC ++++ intern/cycles/kernel/shaders/node_environment_texture.osl +@@ -25,8 +25,9 @@ vector environment_texture_direction_to_equirectangular(vector dir) + return vector(u, v, 0.0); + } + +-vector environment_texture_direction_to_mirrorball(vector dir) ++vector environment_texture_direction_to_mirrorball(vector idir) + { ++ vector dir = idir; + dir[1] -= 1.0; + + float div = 2.0 * sqrt(max(-0.5 * dir[1], 0.0)); +--- intern/cycles/kernel/shaders/node_musgrave_texture.osl.orig 2018-12-03 16:56:43 UTC ++++ intern/cycles/kernel/shaders/node_musgrave_texture.osl +@@ -26,13 +26,14 @@ + * from "Texturing and Modelling: A procedural approach" + */ + +-float noise_musgrave_fBm(point p, float H, float lacunarity, float octaves) ++float noise_musgrave_fBm(point ip, float H, float lacunarity, float octaves) + { + float rmd; + float value = 0.0; + float pwr = 1.0; + float pwHL = pow(lacunarity, -H); + int i; ++ point p = ip; + + for (i = 0; i < (int)octaves; i++) { + value += safe_noise(p, "signed") * pwr; +@@ -54,13 +55,14 @@ float noise_musgrave_fBm(point p, float H, float lacunarity, float octaves) + * octaves: number of frequencies in the fBm + */ + +-float noise_musgrave_multi_fractal(point p, float H, float lacunarity, float octaves) ++float noise_musgrave_multi_fractal(point ip, float H, float lacunarity, float octaves) + { + float rmd; + float value = 1.0; + float pwr = 1.0; + float pwHL = pow(lacunarity, -H); + int i; ++ point p = ip; + + for (i = 0; i < (int)octaves; i++) { + value *= (pwr * safe_noise(p, "signed") + 1.0); +@@ -83,12 +85,13 @@ float noise_musgrave_multi_fractal(point p, float H, float lacunarity, float oct + * offset: raises the terrain from `sea level' + */ + +-float noise_musgrave_hetero_terrain(point p, float H, float lacunarity, float octaves, float offset) ++float noise_musgrave_hetero_terrain(point ip, float H, float lacunarity, float octaves, float offset) + { + float value, increment, rmd; + float pwHL = pow(lacunarity, -H); + float pwr = pwHL; + int i; ++ point p = ip; + + /* first unscaled octave of function; later octaves are scaled */ + value = offset + safe_noise(p, "signed"); +@@ -118,13 +121,14 @@ float noise_musgrave_hetero_terrain(point p, float H, float lacunarity, float oc + * offset: raises the terrain from `sea level' + */ + +-float noise_musgrave_hybrid_multi_fractal(point p, float H, float lacunarity, ++float noise_musgrave_hybrid_multi_fractal(point ip, float H, float lacunarity, + float octaves, float offset, float gain) + { + float result, signal, weight, rmd; + float pwHL = pow(lacunarity, -H); + float pwr = pwHL; + int i; ++ point p = ip; + + result = safe_noise(p, "signed") + offset; + weight = gain * result; +@@ -156,13 +160,14 @@ float noise_musgrave_hybrid_multi_fractal(point p, float H, float lacunarity, + * offset: raises the terrain from `sea level' + */ + +-float noise_musgrave_ridged_multi_fractal(point p, float H, float lacunarity, ++float noise_musgrave_ridged_multi_fractal(point ip, float H, float lacunarity, + float octaves, float offset, float gain) + { + float result, signal, weight; + float pwHL = pow(lacunarity, -H); + float pwr = pwHL; + int i; ++ point p = ip; + + signal = offset - fabs(safe_noise(p, "signed")); + signal *= signal; +--- intern/cycles/kernel/shaders/node_noise_texture.osl.orig 2018-12-03 16:56:43 UTC ++++ intern/cycles/kernel/shaders/node_noise_texture.osl +@@ -19,9 +19,10 @@ + + /* Noise */ + +-float noise(point p, float distortion, float detail, float fac, color Color) ++float noise(point ip, float distortion, float detail, output color Color) + { + point r; ++ point p = ip; + int hard = 0; + + if (distortion != 0.0) { +@@ -32,7 +33,7 @@ float noise(point p, float distortion, float detail, float fac, color Color) + p += r; + } + +- fac = noise_turbulence(p, detail, hard); ++ float fac = noise_turbulence(p, detail, hard); + + Color = color(fac, noise_turbulence(point(p[1], p[0], p[2]), detail, hard), + noise_turbulence(point(p[1], p[2], p[0]), detail, hard)); +@@ -55,6 +56,6 @@ shader node_noise_texture( + if (use_mapping) + p = transform(mapping, p); + +- Fac = noise(p * Scale, Distortion, Detail, Fac, Color); ++ Fac = noise(p * Scale, Distortion, Detail, Color); + } + Property changes on: head/graphics/blender/files/patch-osl110 ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +ON \ No newline at end of property Index: head/graphics/blender/files/patch-source_blender_collada_DocumentImporter.cpp =================================================================== --- head/graphics/blender/files/patch-source_blender_collada_DocumentImporter.cpp (nonexistent) +++ head/graphics/blender/files/patch-source_blender_collada_DocumentImporter.cpp (revision 486971) @@ -0,0 +1,14 @@ +--- source/blender/collada/DocumentImporter.cpp.orig 2018-12-03 07:38:07 UTC ++++ source/blender/collada/DocumentImporter.cpp +@@ -1340,6 +1340,11 @@ bool DocumentImporter::writeAnimationLis + return anim_importer.write_animation_list(animationList); + } + ++bool DocumentImporter::writeAnimationClip(const COLLADAFW::AnimationClip *AnimationClip) ++{ ++ return true; ++} ++ + /** When this method is called, the writer must write the skin controller data. + * \return The writer should return true, if writing succeeded, false otherwise.*/ + bool DocumentImporter::writeSkinControllerData(const COLLADAFW::SkinControllerData *skin) Property changes on: head/graphics/blender/files/patch-source_blender_collada_DocumentImporter.cpp ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +ON \ No newline at end of property Index: head/graphics/blender/files/patch-source_blender_collada_DocumentImporter.h =================================================================== --- head/graphics/blender/files/patch-source_blender_collada_DocumentImporter.h (nonexistent) +++ head/graphics/blender/files/patch-source_blender_collada_DocumentImporter.h (revision 486971) @@ -0,0 +1,11 @@ +--- source/blender/collada/DocumentImporter.h.orig 2018-12-03 07:38:12 UTC ++++ source/blender/collada/DocumentImporter.h +@@ -107,6 +107,8 @@ public: + bool writeAnimation(const COLLADAFW::Animation*); + + bool writeAnimationList(const COLLADAFW::AnimationList*); ++ ++ bool writeAnimationClip( const COLLADAFW::AnimationClip* ); + + bool writeGeometry(const COLLADAFW::Geometry*); + Property changes on: head/graphics/blender/files/patch-source_blender_collada_DocumentImporter.h ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +ON \ No newline at end of property