Index: head/graphics/blender/Makefile =================================================================== --- head/graphics/blender/Makefile (revision 322144) +++ head/graphics/blender/Makefile (revision 322145) @@ -1,375 +1,375 @@ # Created by: Jimmy Olgeni # $FreeBSD$ PORTNAME= blender -PORTVERSION= 2.67 +PORTVERSION= 2.67b 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= mva@FreeBSD.org COMMENT= 3D modeling/rendering/animation/gaming package LIB_DEPENDS= jpeg:${PORTSDIR}/graphics/jpeg \ png15:${PORTSDIR}/graphics/png \ freetype:${PORTSDIR}/print/freetype2 USE_XORG= x11 xext xmu USE_GL= glew USES= cmake:outsource USE_PYTHON= 3.3 MAKE_JOBS_SAFE= yes CMAKE_ARGS+= -DWITH_PYTHON_INSTALL:BOOL=OFF \ -DWITH_PYTHON_INSTALL_NUMPY:BOOL=OFF SUB_FILES= blender blenderplayer MAN1= blender.1 OUTDIR= ${INSTALL_WRKSRC}/bin/2.67 .include "${.CURDIR}/Makefile.options" .include . if ${PORT_OPTIONS:MMOD_BOOLEAN} CMAKE_ARGS+= -DWITH_MOD_BOOLEAN:BOOL=ON LIB_DEPENDS+= boost_thread:${PORTSDIR}/devel/boost-libs .else CMAKE_ARGS+= -DWITH_MOD_BOOLEAN:BOOL=OFF .endif .if ${PORT_OPTIONS:MMOD_FLUID} CMAKE_ARGS+= -DWITH_MOD_FLUID:BOOL=ON .else CMAKE_ARGS+= -DWITH_MOD_FLUID:BOOL=OFF .endif .if ${PORT_OPTIONS:MMOD_REMESH} CMAKE_ARGS+= -DWITH_MOD_REMESH:BOOL=ON .else CMAKE_ARGS+= -DWITH_MOD_REMESH:BOOL=OFF .endif .if ${PORT_OPTIONS:MMOD_SMOKE} CMAKE_ARGS+= -DWITH_MOD_SMOKE:BOOL=ON .else CMAKE_ARGS+= -DWITH_MOD_SMOKE:BOOL=OFF .endif .if ${PORT_OPTIONS:MMOD_OCEANSIM} .if ${PORT_OPTIONS:MFFTW3} CMAKE_ARGS+= -DWITH_MOD_OCEANSIM:BOOL=ON .else BROKEN= MOD_OCEANSIM requires FFTW3 .endif .else CMAKE_ARGS+= -DWITH_MOD_OCEANSIM:BOOL=OFF .endif .if ${PORT_OPTIONS:MBULLET} CMAKE_ARGS+= -DWITH_BULLET:BOOL=ON .else CMAKE_ARGS+= -DWITH_BULLET:BOOL=OFF .endif .if ${PORT_OPTIONS:MCINEON} CMAKE_ARGS+= -DWITH_IMAGE_CINEON:BOOL=ON .else CMAKE_ARGS+= -DWITH_IMAGE_CINEON:BOOL=OFF .endif .if ${PORT_OPTIONS:MCAMERATRACK} CMAKE_ARGS+= -DWITH_LIBMV:BOOL=ON LIB_DEPENDS+= unwind:${PORTSDIR}/devel/libunwind .else CMAKE_ARGS+= -DWITH_LIBMV:BOOL=OFF .endif .if ${PORT_OPTIONS:MCOMPOSITOR} CMAKE_ARGS+= -DWITH_COMPOSITOR:BOOL=ON .else CMAKE_ARGS+= -DWITH_COMPOSITOR:BOOL=OFF .endif # openimageio to enable cycles requires 8.0 or higher .if ${PORT_OPTIONS:MCYCLES} .if ${OSVERSION} < 800000 IGNORE= cycles render engine only works in FreeBSD 8 or later .endif CMAKE_ARGS+= -DWITH_CYCLES:BOOL=ON .if !${PORT_OPTIONS:MOPENEXR} || !${PORT_OPTIONS:MTIFF} BROKEN= CYCLES requires OPENEXR and TIFF .endif LIB_DEPENDS+= OpenImageIO:${PORTSDIR}/graphics/openimageio .else CMAKE_ARGS+= -DWITH_CYCLES:BOOL=OFF .endif .if ${PORT_OPTIONS:MCYCLESOSL} .if !${PORT_OPTIONS:MCYCLES} IGNORE= support for the OpenShadingLanguage in cycles obviously requires CYCLES .endif CMAKE_ARGS+= -DWITH_CYCLES_OSL:BOOL=ON LIB_DEPENDS+= oslexec:${PORTSDIR}/graphics/openshadinglanguage .else CMAKE_ARGS+= -DWITH_CYCLES_OSL:BOOL=OFF .endif .if ${PORT_OPTIONS:MDDS} CMAKE_ARGS+= -DWITH_IMAGE_DDS:BOOL=ON .else CMAKE_ARGS+= -DWITH_IMAGE_DDS:BOOL=OFF .endif .if ${PORT_OPTIONS:MFFMPEG} CMAKE_ARGS+= -DWITH_CODEC_FFMPEG:BOOL=ON LIB_DEPENDS+= avutil:${PORTSDIR}/multimedia/ffmpeg .else CMAKE_ARGS+= -DWITH_CODEC_FFMPEG:BOOL=OFF .endif .if ${PORT_OPTIONS:MFFTW3} LIB_DEPENDS+= fftw3:${PORTSDIR}/math/fftw3 CMAKE_ARGS+= -DWITH_FFTW3:BOOL=ON .else CMAKE_ARGS+= -DWITH_FFTW3:BOOL=OFF .endif .if ${PORT_OPTIONS:MFRAMESERVER} CMAKE_ARGS+= -DWITH_IMAGE_FRAMESERVER:BOOL=ON .else CMAKE_ARGS+= -DWITH_IMAGE_FRAMESERVER:BOOL=OFF .endif .if ${PORT_OPTIONS:MGAMEENGINE} CMAKE_ARGS+= -DWITH_GAMEENGINE:BOOL=ON .else CMAKE_ARGS+= -DWITH_GAMEENGINE:BOOL=OFF .endif .if ${PORT_OPTIONS:MHDR} CMAKE_ARGS+= -DWITH_IMAGE_HDR:BOOL=ON .else CMAKE_ARGS+= -DWITH_IMAGE_HDR:BOOL=OFF .endif .if ${PORT_OPTIONS:MHEADLESS} .if ${PORT_OPTIONS:MXINPUT} || ${PORT_OPTIONS:MXF86VMODE} BROKEN= HEADLESS does not require any X11 dependency .endif CMAKE_ARGS+= -DWITH_HEADLESS:BOOL=ON .else CMAKE_ARGS+= -DWITH_HEADLESS:BOOL=OFF .endif .if ${PORT_OPTIONS:MINPUT_NDOF} CMAKE_ARGS+= -DWITH_INPUT_NDOF:BOOL=ON .else CMAKE_ARGS+= -DWITH_INPUT_NDOF:BOOL=OFF .endif .if ${PORT_OPTIONS:MJACK} LIB_DEPENDS+= jack:${PORTSDIR}/audio/jack CMAKE_ARGS+= -DWITH_JACK:BOOL=ON .else CMAKE_ARGS+= -DWITH_JACK:BOOL=OFF .endif .if ${PORT_OPTIONS:MLZO} CMAKE_ARGS+= -DWITH_LZO:BOOL=ON .else CMAKE_ARGS+= -DWITH_LZO:BOOL=OFF .endif .if ${PORT_OPTIONS:MLZMA} CMAKE_ARGS+= -DWITH_LZMA:BOOL=ON .else CMAKE_ARGS+= -DWITH_LZMA:BOOL=OFF .endif .if ${PORT_OPTIONS:MLIBMV} CMAKE_ARGS+= -DWITH_LIBMV:BOOL=ON .else CMAKE_ARGS+= -DWITH_LIBMV:BOOL=OFF .endif .if ${PORT_OPTIONS:MMENU} USE_GNOME= desktopfileutils .endif .if ${PORT_OPTIONS:MNLS} USES+= gettext iconv CMAKE_ARGS+= -DWITH_INTERNATIONAL:BOOL=ON .else CMAKE_ARGS+= -DWITH_INTERNATIONAL:BOOL=OFF .endif .if ${PORT_OPTIONS:MOPENAL} .if ${PORT_OPTIONS:MSAMPLERATE} USE_OPENAL= al alut CMAKE_ARGS+= -DWITH_OPENAL:BOOL=ON .else BROKEN= OPENAL requires SAMPLERATE .endif .else CMAKE_ARGS+= -DWITH_OPENAL:BOOL=OFF .endif .if ${PORT_OPTIONS:MOPENCOLORIO} LIB_DEPENDS+= OpenColorIO:${PORTSDIR}/graphics/opencolorio CMAKGE_ARGS+= -DWITH_OPENCOLORIO:BOOL=ON .else CMAKGE_ARGS+= -DWITH_OPENCOLORIO:BOOL=OFF .endif .if ${PORT_OPTIONS:MOPENEXR} LIB_DEPENDS+= IlmImf:${PORTSDIR}/graphics/OpenEXR CMAKGE_ARGS+= -DWITH_IMAGE_OPENEXR:BOOL=ON .else CMAKGE_ARGS+= -DWITH_IMAGE_OPENEXR:BOOL=OFF .endif .if ${PORT_OPTIONS:MOPENJPEG} LIB_DEPENDS+= openjpeg:${PORTSDIR}/graphics/openjpeg CMAKE_ARGS+= -DWITH_SYSTEM_OPENJPEG:BOOL=ON -DWITH_IMAGE_OPENJPEG:BOOL=ON .else CMAKE_ARGS+= -DWITH_IMAGE_OPENJPEG:BOOL=OFF .endif .if ${PORT_OPTIONS:MOPENMP} CMAKE_ARGS+= -DWITH_OPENMP:BOOL=ON .else CMAKE_ARGS+= -DWITH_OPENMP:BOOL=OFF .endif .if ${PORT_OPTIONS:MPLAYER} .if ${PORT_OPTIONS:MGAMEENGINE} CMAKE_ARGS+= -DWITH_PLAYER:BOOL=ON .else BROKEN= PLAYER requires GAMEENGINE .endif .else CMAKE_ARGS+= -DWITH_PLAYER:BOOL=OFF .endif .if ${PORT_OPTIONS:MRAYOPTIMIZATION} CMAKE_ARGS+= -DWITH_RAYOPTIMIZATION:BOOL=ON .else CMAKE_ARGS+= -DWITH_RAYOPTIMIZATION:BOOL=OFF .endif .if ${PORT_OPTIONS:MREDCODE} .if ${PORT_OPTIONS:MOPENJPEG} && ${PORT_OPTIONS:MFFMPEG} CMAKE_ARGS+= -DWITH_IMAGE_REDCODE:BOOL=ON .else BROKEN= REDCODE requires OPENJPEG and FFMPEG .endif .else CMAKE_ARGS+= -DWITH_IMAGE_REDCODE:BOOL=OFF .endif .if ${PORT_OPTIONS:MSAMPLERATE} LIB_DEPENDS+= samplerate:${PORTSDIR}/audio/libsamplerate CMAKE_ARGS+= -DWITH_SAMPLERATE:BOOL=ON .else CMAKE_ARGS+= -DWITH_SAMPLERATE:BOOL=OFF .endif .if ${PORT_OPTIONS:MSDL} .if ${PORT_OPTIONS:MSAMPLERATE} USE_SDL= sdl CMAKE_ARGS+= -DWITH_SDL:BOOL=ON .else BROKEN= SDL requires SAMPLERATE .endif .else CMAKE_ARGS+= -DWITH_SDL:BOOL=OFF .endif .if ${PORT_OPTIONS:MSNDFILE} LIB_DEPENDS+= sndfile:${PORTSDIR}/audio/libsndfile CMAKE_ARGS+= -DWITH_CODEC_SNDFILE:BOOL=ON .else CMAKE_ARGS+= -DWITH_CODEC_SNDFILE:BOOL=OFF .endif .if ${PORT_OPTIONS:MTIFF} LIB_DEPENDS+= tiff:${PORTSDIR}/graphics/tiff CMAKE_ARGS+= -DWITH_IMAGE_TIFF:BOOL=ON .else CMAKE_ARGS+= -DWITH_IMAGE_TIFF:BOOL=OFF .endif .if ${PORT_OPTIONS:MXINPUT} USE_XORG+= xi CMAKE_ARGS+= -DWITH_X11_XINPUT:BOOL=ON .else CMAKE_ARGS+= -DWITH_X11_XINPUT:BOOL=OFF .endif .if ${PORT_OPTIONS:MXF86VMODE} USE_XORG+= xi xxf86vm CMAKE_ARGS+= -DWITH_X11_XF86VMODE:BOOL=ON .else CMAKE_ARGS+= -DWITH_X11_XF86VMODE:BOOL=OFF .endif post-install: @${INSTALL_SCRIPT} ${WRKDIR}/blender ${PREFIX}/bin/blender @${INSTALL_PROGRAM} ${INSTALL_WRKSRC}/bin/blender \ ${PREFIX}/bin/blender-bin @${INSTALL_SCRIPT} ${INSTALL_WRKSRC}/bin/blender-thumbnailer.py \ ${PREFIX}/bin/blender-thumbnailer.py @${ECHO} bin/blender >> ${TMPPLIST} @${ECHO} bin/blender-bin >> ${TMPPLIST} @${ECHO} bin/blender-thumbnailer.py >> ${TMPPLIST} .if ${PORT_OPTIONS:MPLAYER} @${INSTALL_SCRIPT} ${WRKDIR}/blenderplayer ${PREFIX}/bin/blenderplayer @${INSTALL_PROGRAM} ${INSTALL_WRKSRC}/bin/blenderplayer \ ${PREFIX}/bin/blenderplayer-bin @${ECHO} bin/blenderplayer >> ${TMPPLIST} @${ECHO} bin/blenderplayer-bin >> ${TMPPLIST} .endif .if ${PORT_OPTIONS:MMENU} @${MKDIR} ${DESKTOPDIR} @${INSTALL_DATA} ${INSTALL_WRKSRC}/bin/${PORTNAME}.desktop \ ${DESKTOPDIR} @-update-desktop-database -q @${ECHO} share/applications/${PORTNAME}.desktop >> ${TMPPLIST} .endif @${MKDIR} ${DATADIR} @(cd ${OUTDIR} && ${COPYTREE_SHARE} scripts ${DATADIR}) @${INSTALL_DATA} ${INSTALL_WRKSRC}/bin/${PORTNAME}.svg \ ${PREFIX}/share/pixmaps/${PORTNAME}.svg @(cd ${OUTDIR}; ${FIND} scripts -type f) | ${SORT} | ${SED} "s|^|${DATADIR_REL}/|" >> ${TMPPLIST} @(cd ${OUTDIR}; ${FIND} scripts -type d) | ${SORT} -r | ${SED} "s|^|@dirrm ${DATADIR_REL}/|" >> ${TMPPLIST} @${ECHO} share/pixmaps/${PORTNAME}.svg >> ${TMPPLIST} .if ${PORT_OPTIONS:MOPENCOLORIO} @cd ${OUTDIR} && ${COPYTREE_SHARE} datafiles/colormanagement ${DATADIR} @(cd ${OUTDIR}; ${FIND} datafiles/colormanagement -type f) | ${SORT} | ${SED} "s|^|${DATADIR_REL}/|" >> ${TMPPLIST} @(cd ${OUTDIR}; ${FIND} datafiles/colormanagement -type d) | ${SORT} -r | ${SED} "s|^|@dirrm ${DATADIR_REL}/|" >> ${TMPPLIST} .endif .if ${PORT_OPTIONS:MNLS} @cd ${OUTDIR} && ${COPYTREE_SHARE} datafiles/locale ${DATADIR} @(cd ${OUTDIR}; ${FIND} datafiles/locale -type f -name languages) | ${SORT} | ${SED} "s|^|${DATADIR_REL}/|" >> ${TMPPLIST} @(cd ${OUTDIR}; ${FIND} datafiles/locale -type f -name ${PORTNAME}.mo) | ${SORT} | ${SED} "s|^|${DATADIR_REL}/|" >> ${TMPPLIST} @(cd ${OUTDIR}; ${FIND} datafiles/locale -type d) | ${SORT} -r | ${SED} "s|^|@dirrm ${DATADIR_REL}/|" >> ${TMPPLIST} .endif @${ECHO} @dirrm ${DATADIR_REL}/datafiles >> ${TMPPLIST} @${ECHO} @dirrm ${DATADIR_REL} >> ${TMPPLIST} .if !defined(NO_INSTALL_MANPAGES) @${INSTALL_MAN} ${INSTALL_WRKSRC}/bin/${PORTNAME}.1 \ ${MAN1PREFIX}/man/man1 .endif .include Index: head/graphics/blender/distinfo =================================================================== --- head/graphics/blender/distinfo (revision 322144) +++ head/graphics/blender/distinfo (revision 322145) @@ -1,2 +1,2 @@ -SHA256 (blender-2.67.tar.gz) = 14a9d4be5e4f4d6982202ba4039c7182b588a11cb9af83827ea590826ae6d418 -SIZE (blender-2.67.tar.gz) = 41381712 +SHA256 (blender-2.67b.tar.gz) = 7d6701d92ee7e3923771de10f610a3f8cca8b6d14b488d3044f8329878187d67 +SIZE (blender-2.67b.tar.gz) = 41368150 Index: head/graphics/blender/files/patch-source_blender_freestyle_intern_system_PseudoNoise.cpp =================================================================== --- head/graphics/blender/files/patch-source_blender_freestyle_intern_system_PseudoNoise.cpp (nonexistent) +++ head/graphics/blender/files/patch-source_blender_freestyle_intern_system_PseudoNoise.cpp (revision 322145) @@ -0,0 +1,20 @@ +--- source/blender/freestyle/intern/system/PseudoNoise.cpp.orig 2013-06-30 12:59:00.000000000 +0200 ++++ source/blender/freestyle/intern/system/PseudoNoise.cpp 2013-06-30 13:03:36.000000000 +0200 +@@ -46,7 +46,7 @@ + real PseudoNoise::linearNoise(real x) + { + real tmp; +- int i = abs(modf(x, &tmp)) * NB_VALUE_NOISE; ++ int i = (int)(fabs(modf(x, &tmp)) * NB_VALUE_NOISE); + real x1 = _values[i], x2 = _values[(i + 1) % NB_VALUE_NOISE]; + real t = modf(x * NB_VALUE_NOISE, &tmp); + return x1 * (1 - t) + x2 * t; +@@ -64,7 +64,7 @@ + real PseudoNoise::smoothNoise(real x) + { + real tmp; +- int i = abs(modf(x, &tmp)) * NB_VALUE_NOISE; ++ int i = (int)(fabs(modf(x, &tmp)) * NB_VALUE_NOISE); + int h = i - 1; + if (h < 0) { + h = NB_VALUE_NOISE + h; Property changes on: head/graphics/blender/files/patch-source_blender_freestyle_intern_system_PseudoNoise.cpp ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property