diff options
author | Treeve Jelbert | 2015-12-01 16:46:25 +0100 |
---|---|---|
committer | Treeve Jelbert | 2015-12-01 16:46:45 +0100 |
commit | a971313ff2bf1dec4812558bbc17ff2356dc2a4c (patch) | |
tree | aa668c693e792d32134f5ff70e42047f06a7ae13 /science-libs | |
parent | 34fb478b6e32fae60a3ff7cba9462fd76bbd671c (diff) |
vtk: => 6.3.0
Diffstat (limited to 'science-libs')
-rwxr-xr-x | science-libs/vtk/BUILD | 4 | ||||
-rwxr-xr-x | science-libs/vtk/CONFIGURE | 1 | ||||
-rwxr-xr-x | science-libs/vtk/DEPENDS | 29 | ||||
-rwxr-xr-x | science-libs/vtk/DETAILS | 4 | ||||
-rw-r--r-- | science-libs/vtk/HISTORY | 7 |
5 files changed, 29 insertions, 16 deletions
diff --git a/science-libs/vtk/BUILD b/science-libs/vtk/BUILD index 67e73c2c5c..6dbde13d78 100755 --- a/science-libs/vtk/BUILD +++ b/science-libs/vtk/BUILD @@ -1,7 +1,7 @@ CFLAGS="${CFLAGS//-ffast-math}" && CXXFLAGS="${CXXFLAGS//-ffast-math}" && - -OPTS+=" -DBUILD_SHARED_LIBS=ON -DWTK_USE_HYBRID=ON" && +OPTS+=" -DVTK_USE_SYSTEM_LIBRARIES=1" +#OPTS+=" -DBUILD_SHARED_LIBS=ON -DVTK_USE_HYBRID=ON" && # Building examples fails on VTK 6.1.0 #OPTS+=' -DBUILD_EXAMPLES=ON' diff --git a/science-libs/vtk/CONFIGURE b/science-libs/vtk/CONFIGURE new file mode 100755 index 0000000000..b2f02c3032 --- /dev/null +++ b/science-libs/vtk/CONFIGURE @@ -0,0 +1 @@ +source $GRIMOIRE/CMAKE_CONFIGURE diff --git a/science-libs/vtk/DEPENDS b/science-libs/vtk/DEPENDS index b2e086af84..cb46b2efcf 100755 --- a/science-libs/vtk/DEPENDS +++ b/science-libs/vtk/DEPENDS @@ -5,20 +5,26 @@ optdep() { } optsyslib() { - optdep "$1" WITH_SYSTEM "$2" "Use system's $1 library" + local SS + if [[ -z $2 ]];then + SS=${1^^} + else + SS=$2 + fi + optdep "$1" VTK_USE_SYSTEM "$SS" "Use system's $1 library" } optwrap() { optdep "$1" VTK_WRAP "$2" "Wrap VTK classes into the $1 language" } -depends cmake && -depends xorg-libs && -depends tk && - -#optwrap JAVA && -optwrap python && -optwrap tcl && +depends -sub CXX gcc && +depends cmake && +depends OPENGL && +depends libx11 && +#optwrap JAVA && +optwrap python && +optwrap tcl && optsyslib zlib && optsyslib tiff && @@ -31,10 +37,9 @@ optsyslib gl2ps && optsyslib hdf5 && optsyslib netcdf && optsyslib libtheora OGGTHEORA && - -#optsyslib jsoncpp && -#optsyslib libproj4 && -#optsyslib xdmf2 && +optsyslib jsoncpp && +optsyslib libproj4 && +optsyslib xdmf2 XDMF && optional_depends doxygen \ -DBUILD_DOCUMENTATION=O{N,FF} \ diff --git a/science-libs/vtk/DETAILS b/science-libs/vtk/DETAILS index e52186c6e9..1d92431e51 100755 --- a/science-libs/vtk/DETAILS +++ b/science-libs/vtk/DETAILS @@ -1,11 +1,11 @@ SPELL=vtk - VERSION=6.1.0 + VERSION=6.3.0 + SOURCE_HASH=sha512:a05598ed2a70fae9f07a8d9172cb963194cf75d0fcd995c9ebb614a488d4272988212494b1e9aa87272c0ed732161bba8ff97a0cf6874391c1c5fcf7dc22c309 SOURCE=VTK-$VERSION.tar.gz SOURCE_DIRECTORY=$BUILD_DIRECTORY/VTK-$VERSION SOURCE_URL[0]=http://www.vtk.org/files/release/${VERSION%.*}/$SOURCE WEB_SITE=http://www.vtk.org/ LICENSE[0]=modified-bsd - SOURCE_HASH=sha512:3ab922166502348e5cdd68e14dbf4717c0405c9d8881c04aa8be8f95d8516af39cd02aaca5171c6de8af1b462ca386399b7a87a843ec62999f0f32c11788a2dc ENTERED=20020606 KEYWORDS="science libs" SHORT="library for visualization, image processing, 3D graphics" diff --git a/science-libs/vtk/HISTORY b/science-libs/vtk/HISTORY index 9b0a86728e..dbf99d2e09 100644 --- a/science-libs/vtk/HISTORY +++ b/science-libs/vtk/HISTORY @@ -1,3 +1,10 @@ +2015-09-29 Treeve Jelbert <treeve@sourcemage.org> + * DETAILS: version 6.3.0 + * DEPENDS: remove xorg-libs, add OPENGL, CXX, libx11 + fix optsyslib + * CONFIGURE: added + * BUILD: VTK_USE_SYSTEM_LIBRARIES + 2014-09-25 Ismael Luceno <ismael@sourcemage.org> * DETAILS: Fixed SOURCE, SOURCE_DIRECTORY, WEB_SITE and LICENSE Disabled building examples |