diff options
| author | Marcus von Appen <mva@FreeBSD.org> | 2013-07-25 21:10:34 +0000 |
|---|---|---|
| committer | Marcus von Appen <mva@FreeBSD.org> | 2013-07-25 21:10:34 +0000 |
| commit | f57aabd96a1e6df9ed13c0efc557ef2a6dc07846 (patch) | |
| tree | af0eb52dc78e7fd993e24556287c9a51e6cbbbb7 /graphics/blender | |
| parent | e611e96789f7b8961be6308068d8d06b29d1827e (diff) | |
| download | ports-f57aabd96a1e6df9ed13c0efc557ef2a6dc07846.tar.gz ports-f57aabd96a1e6df9ed13c0efc557ef2a6dc07846.zip | |
Notes
Diffstat (limited to 'graphics/blender')
| -rw-r--r-- | graphics/blender/Makefile | 13 | ||||
| -rw-r--r-- | graphics/blender/distinfo | 4 | ||||
| -rw-r--r-- | graphics/blender/files/patch-source_blender_freestyle_intern_system_PseudoNoise.cpp | 20 |
3 files changed, 7 insertions, 30 deletions
diff --git a/graphics/blender/Makefile b/graphics/blender/Makefile index be377c9fcf5c..db1ead350c99 100644 --- a/graphics/blender/Makefile +++ b/graphics/blender/Makefile @@ -2,8 +2,7 @@ # $FreeBSD$ PORTNAME= blender -PORTVERSION= 2.67b -PORTREVISION= 1 +PORTVERSION= 2.68 CATEGORIES= graphics games MASTER_SITES= http://download.blender.org/source/ \ http://mirror.cs.umn.edu/blender.org/source/ \ @@ -29,7 +28,7 @@ CMAKE_ARGS+= -DWITH_PYTHON_INSTALL:BOOL=OFF \ SUB_FILES= blender blenderplayer MAN1= blender.1 -OUTDIR= ${INSTALL_WRKSRC}/bin/2.67 +OUTDIR= ${INSTALL_WRKSRC}/bin/2.68 .include "${.CURDIR}/Makefile.options" @@ -95,11 +94,7 @@ CMAKE_ARGS+= -DWITH_COMPOSITOR:BOOL=ON 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 @@ -362,8 +357,10 @@ post-install: @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} && ${COPYTREE_SHARE} datafiles/fonts ${DATADIR} + @(cd ${OUTDIR}; ${FIND} datafiles/fonts -type f) | ${SORT} | ${SED} "s|^|${DATADIR_REL}/|" >> ${TMPPLIST} + @(cd ${OUTDIR}; ${FIND} datafiles/fonts -type d) | ${SORT} -r | ${SED} "s|^|@dirrm ${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} diff --git a/graphics/blender/distinfo b/graphics/blender/distinfo index 16da8778ca7e..3fc19626ddc2 100644 --- a/graphics/blender/distinfo +++ b/graphics/blender/distinfo @@ -1,2 +1,2 @@ -SHA256 (blender-2.67b.tar.gz) = 7d6701d92ee7e3923771de10f610a3f8cca8b6d14b488d3044f8329878187d67 -SIZE (blender-2.67b.tar.gz) = 41368150 +SHA256 (blender-2.68.tar.gz) = 3c102ebc42f989c8509c704c87dec465ba0ded81c9cfb15e44414ba2702ce21c +SIZE (blender-2.68.tar.gz) = 40073577 diff --git a/graphics/blender/files/patch-source_blender_freestyle_intern_system_PseudoNoise.cpp b/graphics/blender/files/patch-source_blender_freestyle_intern_system_PseudoNoise.cpp deleted file mode 100644 index 0802bbcffbea..000000000000 --- a/graphics/blender/files/patch-source_blender_freestyle_intern_system_PseudoNoise.cpp +++ /dev/null @@ -1,20 +0,0 @@ ---- 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; |