svn commit: r309370 - in head/graphics/blender: . files
Marcus von Appen
mva at FreeBSD.org
Fri Dec 21 19:51:43 UTC 2012
Author: mva
Date: Fri Dec 21 19:51:42 2012
New Revision: 309370
URL: http://svnweb.freebsd.org/changeset/ports/309370
Log:
- Update to 2.65
Deleted:
head/graphics/blender/files/patch-source-blender-blenkernel-intern-writeffmpeg.c
head/graphics/blender/files/patch-source_blenderplayer_CMakeLists.txt
head/graphics/blender/pkg-plist
Modified:
head/graphics/blender/Makefile
head/graphics/blender/distinfo (contents, props changed)
Modified: head/graphics/blender/Makefile
==============================================================================
--- head/graphics/blender/Makefile Fri Dec 21 18:32:55 2012 (r309369)
+++ head/graphics/blender/Makefile Fri Dec 21 19:51:42 2012 (r309370)
@@ -1,12 +1,8 @@
-# New ports collection makefile for: blender
-# Date created: 14 November 2000
-# Whom: Jimmy Olgeni <olgeni at uli.it>
-#
+# Created by: Jimmy Olgeni <olgeni at uli.it>
# $FreeBSD$
PORTNAME= blender
-PORTVERSION= 2.63a
-PORTREVISION= 2
+PORTVERSION= 2.65
CATEGORIES= graphics games
MASTER_SITES= http://download.blender.org/source/ \
http://mirror.cs.umn.edu/blender.org/source/ \
@@ -15,38 +11,40 @@ MASTER_SITES= http://download.blender.or
MAINTAINER= mva at FreeBSD.org
COMMENT= 3D modeling/rendering/animation/gaming package
-LIB_DEPENDS= jpeg.11:${PORTSDIR}/graphics/jpeg \
+LIB_DEPENDS= jpeg:${PORTSDIR}/graphics/jpeg \
png15:${PORTSDIR}/graphics/png \
- freetype.9:${PORTSDIR}/print/freetype2
+ freetype:${PORTSDIR}/print/freetype2
USE_XORG= x11 xext xmu
USE_GL= glew
USE_CMAKE= yes
-USE_PYTHON= 3.2
+USE_PYTHON= 3.3
WANT_GNOME= yes
MAKE_JOBS_SAFE= yes
CMAKE_OUTSOURCE= yes
-CMAKE_ARGS+= -DWITH_BUILTIN_GLEW:BOOL=OFF -DWITH_PYTHON_INSTALL:BOOL=OFF
+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.63
+OUTDIR= ${INSTALL_WRKSRC}/bin/2.65
+
+LANG= ar cs de eo es es_ES fa fr he hr hu id it ja ky nl pt pt_BR ru \
+ sr sr at latin sv tr uk zh_CN zh_TW
-LANG= ar bg ca cs de el es es_ES fa fi fr hr id it ja ky ne pl pt \
- ru sr sr at latin sv tr uk zh_CN zh_TW
+OPTIONS_DEFINE= BOOLEAN BULLET CINEON CAMERATRACK CYCLES DDS FFMPEG FFTW3 \
+ GAMEENGINE HDR HEADLESS JACK NLS MENU OCEANSIM OPENAL \
+ OPENCOLORIO OPENEXR OPENJPEG OPENMP PLAYER REDCODE SAMPLERATE \
+ SDL SNDFILE TIFF XINPUT XF86VMODE
+OPTIONS_DEFAULT= BOOLEAN BULLET CINEON CYCLES DDS GAMEENGINE HDR JACK \
+ OPENAL OPENCOLORIO OPENEXR OPENJPEG OPENMP PLAYER SDL \
+ TIFF XINPUT XF86VMODE
-OPTIONS_DEFINE= BULLET CARVE CINEON CAMERATRACK CYCLES DDS FFMPEG FFTW3 \
- GAMEENGINE HDR HEADLESS JACK NLS MENU OCEANSIM OPENAL OPENEXR \
- OPENJPEG OPENMP PLAYER REDCODE SAMPLERATE SDL SNDFILE TIFF \
- XINPUT
-OPTIONS_DEFAULT= BULLET CARVE CINEON CAMERATRACK CYCLES DDS FFMPEG \
- FFTW3 GAMEENGINE HDR MENU OCEANSIM OPENAL OPENEXR \
- OPENJPEG OPENMP SAMPLERATE SDL TIFF XINPUT
-BULLET_DESC= Enable bullet physics engine
-CARVE_DESC= Carve boolean library support
+BOOLEAN_DESC= Boolean library support
+BULLET_DESC= Bullet physics engine
CINEON_DESC= CINEON and DPX graphics format support
CAMERATRACK_DESC= Camera tracking support
CYCLES_DESC= Cycles render engine support
@@ -54,27 +52,34 @@ DDS_DESC= DDS graphics format support
FFTW3_DESC= Floating point support using fftw
GAMEENGINE_DESC= Enable the game engine
HDR_DESC= Generic high dynamic-range (HDR) support
-HEADLESS_DESC= Disable user interface
+HEADLESS_DESC= Disable user interface (for render-farms)
MENU_DESC= Install desktop menu
OCEANSIM_DESC= Ocean simulation support
+OPENCOLORIO_DESC= OpenColorIO-based color management support
PLAYER_DESC= Enable blender player
REDCODE_DESC= RedCode graphics format support
SDL_DESC= Audio and Joystick support using SDL
-XINPUT_DESC= Enable X11 Xinput (tablet) support
+XINPUT_DESC= X11 Xinput (tablet) support
+XF86VMODE_DESC= X11 video mode switching support
+
+# TODO: provide switches for the following options
+#
+# WITH_IMAGE_FRAMESERVER WITH_LZO WITH_LZMA WITH_LIBMV WITH_INPUT_NDOF
+# WITH_RAYOPTIMIZATION WITH_CYCLES_OSL WITH_COMPOSITOR
.include <bsd.port.options.mk>
-.if ${PORT_OPTIONS:MBULLET}
-CMAKE_ARGS+= -DWITH_BULLET:BOOL=ON
+. if ${PORT_OPTIONS:MBOOLEAN}
+CMAKE_ARGS+= -DWITH_MOD_BOOLEAN:BOOL=ON
+LIB_DEPENDS+= boost_thread:${PORTSDIR}/devel/boost-libs
.else
-CMAKE_ARGS+= -DWITH_BULLET:BOOL=OFF
+CMAKE_ARGS+= -DWITH_MOD_BOOLEAN:BOOL=OFF
.endif
-.if ${PORT_OPTIONS:MCARVE}
-CMAKE_ARGS+= -DWITH_CARVE:BOOL=ON
-LIB_DEPENDS+= boost_thread.4:${PORTSDIR}/devel/boost-libs
+.if ${PORT_OPTIONS:MBULLET}
+CMAKE_ARGS+= -DWITH_BULLET:BOOL=ON
.else
-CMAKE_ARGS+= -DWITH_CARVE:BOOL=OFF
+CMAKE_ARGS+= -DWITH_BULLET:BOOL=OFF
.endif
.if ${PORT_OPTIONS:MCINEON}
@@ -94,14 +99,8 @@ CMAKE_ARGS+= -DWITH_LIBMV:BOOL=OFF
.if ${PORT_OPTIONS:MCYCLES}
.if ${OSVERSION} < 800000
IGNORE= cycles render engine only works in FreeBSD 8 or later
-.else
-CMAKE_ARGS+= -DWITH_CYCLES:BOOL=ON
-.if ${ARCH} == "i386" || ${OSVERSION} < 803000
-# this is needed for linking with openimageio
-USE_GCC= 4.6+
-LDFLAGS+= -L${LOCALBASE}/lib/gcc46 -rpath ${LOCALBASE}/lib/gcc46
-.endif
.endif
+CMAKE_ARGS+= -DWITH_CYCLES:BOOL=ON
LIB_DEPENDS+= OpenImageIO:${PORTSDIR}/graphics/openimageio
PLIST_SUB+= CYCLES=""
.else
@@ -117,7 +116,7 @@ CMAKE_ARGS+= -DWITH_IMAGE_DDS:BOOL=OFF
.if ${PORT_OPTIONS:MFFMPEG}
CMAKE_ARGS+= -DWITH_CODEC_FFMPEG:BOOL=ON
-LIB_DEPENDS+= avutil.1:${PORTSDIR}/multimedia/ffmpeg
+LIB_DEPENDS+= avutil:${PORTSDIR}/multimedia/ffmpeg
.else
CMAKE_ARGS+= -DWITH_CODEC_FFMPEG:BOOL=OFF
.endif
@@ -148,13 +147,9 @@ CMAKE_ARGS+= -DWITH_HEADLESS:BOOL=OFF
.endif
.if ${PORT_OPTIONS:MJACK}
-.if ${PORT_OPTIONS:MSAMPLERATE}
-LIB_DEPENDS+= jack.0:${PORTSDIR}/audio/jack
+LIB_DEPENDS+= jack:${PORTSDIR}/audio/jack
CMAKE_ARGS+= -DWITH_JACK:BOOL=ON
.else
-BROKEN= JACK requires SAMPLERATE
-.endif
-.else
CMAKE_ARGS+= -DWITH_JACK:BOOL=OFF
.endif
@@ -196,16 +191,23 @@ BROKEN= OPENAL requires SAMPLERATE
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.6:${PORTSDIR}/graphics/OpenEXR
+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.2:${PORTSDIR}/graphics/openjpeg
-CMAKE_ARGS+= -DWITH_IMAGE_OPENJPEG:BOOL=ON
+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
@@ -229,17 +231,17 @@ CMAKE_ARGS+= -DWITH_PLAYER:BOOL=OFF
.endif
.if ${PORT_OPTIONS:MREDCODE}
-.if ${PORT_OPTIONS:MOPENJPEG}
+.if ${PORT_OPTIONS:MOPENJPEG} && ${PORT_OPTIONS:MFFMPEG}
CMAKE_ARGS+= -DWITH_IMAGE_REDCODE:BOOL=ON
.else
-BROKEN= REDCODE requires OPENJPEG
+BROKEN= REDCODE requires OPENJPEG and FFMPEG
.endif
.else
CMAKE_ARGS+= -DWITH_IMAGE_REDCODE:BOOL=OFF
.endif
.if ${PORT_OPTIONS:MSAMPLERATE}
-LIB_DEPENDS+= samplerate.1:${PORTSDIR}/audio/libsamplerate
+LIB_DEPENDS+= samplerate:${PORTSDIR}/audio/libsamplerate
CMAKE_ARGS+= -DWITH_SAMPLERATE:BOOL=ON
.else
CMAKE_ARGS+= -DWITH_SAMPLERATE:BOOL=OFF
@@ -257,14 +259,14 @@ CMAKE_ARGS+= -DWITH_SDL:BOOL=OFF
.endif
.if ${PORT_OPTIONS:MSNDFILE}
-LIB_DEPENDS+= sndfile.1:${PORTSDIR}/audio/libsndfile
+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.4:${PORTSDIR}/graphics/tiff
+LIB_DEPENDS+= tiff:${PORTSDIR}/graphics/tiff
CMAKE_ARGS+= -DWITH_IMAGE_TIFF:BOOL=ON
.else
CMAKE_ARGS+= -DWITH_IMAGE_TIFF:BOOL=OFF
@@ -277,43 +279,70 @@ CMAKE_ARGS+= -DWITH_X11_XINPUT:BOOL=ON
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
- @${MKDIR} ${DATADIR}
@${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
- @${CP} -R ${OUTDIR}/scripts ${DATADIR}
+.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:NLS}
+.if ${PORT_OPTIONS:MNLS}
.for ii in ${LANG}
@${MKDIR} ${DATADIR}/datafiles/locale/${ii}/LC_MESSAGES
@${INSTALL_DATA} \
${OUTDIR}/datafiles/locale/${ii}/LC_MESSAGES/${PORTNAME}.mo \
${DATADIR}/datafiles/locale/${ii}/LC_MESSAGES/${PORTNAME}.mo
.endfor
+ @(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
-.if ${PORT_OPTIONS:MMENU}
- @${MKDIR} ${DESKTOPDIR}
- @${INSTALL_DATA} ${INSTALL_WRKSRC}/bin/${PORTNAME}.desktop \
- ${DESKTOPDIR}
- @-update-desktop-database -q
-.endif
-
.include <bsd.port.mk>
Modified: head/graphics/blender/distinfo
==============================================================================
--- head/graphics/blender/distinfo Fri Dec 21 18:32:55 2012 (r309369)
+++ head/graphics/blender/distinfo Fri Dec 21 19:51:42 2012 (r309370)
@@ -1,2 +1,2 @@
-SHA256 (blender-2.63a.tar.gz) = c479b1abfe5fd8a1a5d04b8d21fdbc0fc960d7855b24785b888c09792bca4c1a
-SIZE (blender-2.63a.tar.gz) = 26759658
+SHA256 (blender-2.65.tar.gz) = 8212919f0ee1ebbbacfb3b7ac78a1bc689f43260593699e8b5d54a0832914e00
+SIZE (blender-2.65.tar.gz) = 33238089
More information about the svn-ports-head
mailing list