commit: dfd14be1a2419a61711ebc0784cd1c2fabd1566c Author: Justin Lecher <jlec <AT> gentoo <DOT> org> AuthorDate: Fri Dec 26 12:00:56 2014 +0000 Commit: Justin Lecher <jlec <AT> gentoo <DOT> org> CommitDate: Fri Dec 26 12:00:56 2014 +0000 URL: http://sources.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=dfd14be1
sci-libs/vtk: Version Bump Package-Manager: portage-2.2.15 --- sci-libs/vtk/ChangeLog | 8 +- ...6.0.0-cg-path.patch => vtk-6.1.0-cg-path.patch} | 0 sci-libs/vtk/files/vtk-6.1.0-freetype.patch | 27 +++++ sci-libs/vtk/files/vtk-6.1.0-web.patch | 25 +++++ sci-libs/vtk/metadata.xml | 10 +- sci-libs/vtk/test | 48 +++++++++ sci-libs/vtk/vtk-6.1.0.ebuild | 120 ++++++++++++++------- 7 files changed, 199 insertions(+), 39 deletions(-) diff --git a/sci-libs/vtk/ChangeLog b/sci-libs/vtk/ChangeLog index 593ce9f..115d4d3 100644 --- a/sci-libs/vtk/ChangeLog +++ b/sci-libs/vtk/ChangeLog @@ -1,7 +1,13 @@ # ChangeLog for sci-libs/vtk -# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2 +# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 # $Header: /var/cvsroot/gentoo-x86/sci-libs/vtk/ChangeLog,v 1.108 2013/06/05 01:21:35 lu_zero Exp $ + 26 Dec 2014; Justin Lecher <[email protected]> vtk-6.1.0.ebuild, + -files/vtk-6.0.0-cg-path.patch, +files/vtk-6.1.0-cg-path.patch, + +files/vtk-6.1.0-freetype.patch, +files/vtk-6.1.0-web.patch, metadata.xml, + +test: + Version Bump + 16 Jul 2013; Justin Lecher <[email protected]> vtk-6.0.0.ebuild, -files/vtk-5.2.0-tcl-install.patch, -files/vtk-5.4.2-boost-property_map.patch, -files/vtk-5.4.2-cg-path.patch, diff --git a/sci-libs/vtk/files/vtk-6.0.0-cg-path.patch b/sci-libs/vtk/files/vtk-6.1.0-cg-path.patch similarity index 100% rename from sci-libs/vtk/files/vtk-6.0.0-cg-path.patch rename to sci-libs/vtk/files/vtk-6.1.0-cg-path.patch diff --git a/sci-libs/vtk/files/vtk-6.1.0-freetype.patch b/sci-libs/vtk/files/vtk-6.1.0-freetype.patch new file mode 100644 index 0000000..2470464 --- /dev/null +++ b/sci-libs/vtk/files/vtk-6.1.0-freetype.patch @@ -0,0 +1,27 @@ + Rendering/FreeType/vtkFreeTypeTools.cxx | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) + +diff --git a/Rendering/FreeType/vtkFreeTypeTools.cxx b/Rendering/FreeType/vtkFreeTypeTools.cxx +index fe0a1c2..30980ea 100644 +--- a/Rendering/FreeType/vtkFreeTypeTools.cxx ++++ b/Rendering/FreeType/vtkFreeTypeTools.cxx +@@ -1198,7 +1198,7 @@ bool vtkFreeTypeTools::CalculateBoundingBox(const T& str, + if (bitmap) + { + metaData.ascent = std::max(bitmapGlyph->top - 1, metaData.ascent); +- metaData.descent = std::min(-(bitmap->rows - (bitmapGlyph->top - 1)), ++ metaData.descent = std::min(-int((bitmap->rows - (bitmapGlyph->top - 1))), + metaData.descent); + } + ++heightString; +@@ -2001,8 +2001,8 @@ void vtkFreeTypeTools::GetLineMetrics(T begin, T end, MetaData &metaData, + if (bitmap) + { + bbox[0] = std::min(bbox[0], pen[0] + bitmapGlyph->left); +- bbox[1] = std::max(bbox[1], pen[0] + bitmapGlyph->left + bitmap->width); +- bbox[2] = std::min(bbox[2], pen[1] + bitmapGlyph->top - 1 - bitmap->rows); ++ bbox[1] = std::max(bbox[1], int(pen[0] + bitmapGlyph->left + bitmap->width)); ++ bbox[2] = std::min(bbox[2], int(pen[1] + bitmapGlyph->top - 1 - bitmap->rows)); + bbox[3] = std::max(bbox[3], pen[1] + bitmapGlyph->top - 1); + } + else diff --git a/sci-libs/vtk/files/vtk-6.1.0-web.patch b/sci-libs/vtk/files/vtk-6.1.0-web.patch new file mode 100644 index 0000000..a85f2cd --- /dev/null +++ b/sci-libs/vtk/files/vtk-6.1.0-web.patch @@ -0,0 +1,25 @@ +From 58373b120db6d51c6d5eace38447cdb45ff858d1 Mon Sep 17 00:00:00 2001 +From: Patric Schmitz <[email protected]> +Date: Tue, 28 Oct 2014 16:24:22 +0100 +Subject: [PATCH] Include vtkPythonPackages in Web/JavaScript/CMakeLists.txt + +Change-Id: Ie7bffa19bdaa78c5b090c886e50c1af76e2aadee +--- + Web/Applications/CMakeLists.txt | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/Web/Applications/CMakeLists.txt b/Web/Applications/CMakeLists.txt +index c9e7ad3..b4c9a60 100644 +--- a/Web/Applications/CMakeLists.txt ++++ b/Web/Applications/CMakeLists.txt +@@ -12,6 +12,7 @@ set(WEB_APPLICATIONS + + set(WEB_APPS_DEPENDS) + ++include(vtkPythonPackages) # for copy_files_recursive + foreach(_app ${WEB_APPLICATIONS}) + file(MAKE_DIRECTORY "${VTK_WWW_DIR}/apps/${_app}") + +-- +2.2.1 + diff --git a/sci-libs/vtk/metadata.xml b/sci-libs/vtk/metadata.xml index 50d848a..a6177ec 100644 --- a/sci-libs/vtk/metadata.xml +++ b/sci-libs/vtk/metadata.xml @@ -11,8 +11,16 @@ <flag name="boost">Add support for boost</flag> <flag name="chemistry">Add chemistry support</flag> <flag name="cg">Use nvidia's cg shaders</flag> - <flag name="patented">Build patented classes</flag> + <flag name="gdal">Support for gdal formated data</flag> + <flag name="imaging">Building Imaging modules</flag> + <flag name="json">Support for json formated data</flag> + <flag name="kaapi">Use <pkg>sci-libs/kaapi</pkg> to handle smp support</flag> <flag name="offscreen">Offscreen rendering through OSMesa</flag> + <flag name="patented">Build patented classes</flag> + <flag name="rendering">Building Redering modules</flag> + <flag name="tbb">Use <pkg>dev-cpp/tbb</pkg> to handle smp support</flag> + <flag name="views">Building Views modules</flag> + <flag name="web">Install web component</flag> <flag name="R">Enable support for dev-lang/R</flag> </use> </pkgmetadata> diff --git a/sci-libs/vtk/test b/sci-libs/vtk/test new file mode 100644 index 0000000..45063c9 --- /dev/null +++ b/sci-libs/vtk/test @@ -0,0 +1,48 @@ +USE='-R X -boost -cg -doc -examples -ffmpeg gdal -imaging -java -json kaapi mpi mysql -odbc -postgres python -qt4 rendering -smp tbb -tcl -theora -tk views web' gebuild vtk*ebuild clean install || exit 1 +USE='-R X -boost -cg -doc examples -ffmpeg -gdal -imaging -java -json kaapi -mpi mysql -odbc -postgres python -qt4 rendering -smp tbb tcl -theora -tk -views -web' gebuild vtk*ebuild clean install || exit 1 +USE='-R X -boost -cg -doc examples ffmpeg -gdal -imaging -java json kaapi mpi mysql odbc postgres -python -qt4 rendering -smp -tbb -tcl theora -tk views -web' gebuild vtk*ebuild clean install || exit 1 +USE='-R X -boost -cg -doc examples ffmpeg gdal imaging -java json kaapi mpi -mysql odbc postgres python qt4 rendering smp -tbb tcl -theora -tk -views -web' gebuild vtk*ebuild clean install || exit 1 +USE='-R X -boost -cg -doc examples ffmpeg gdal imaging java -json -kaapi -mpi mysql -odbc -postgres python qt4 rendering -smp tbb tcl theora tk views -web' gebuild vtk*ebuild clean install || exit 1 +USE='-R X -boost -cg doc examples -ffmpeg gdal -imaging -java json kaapi -mpi mysql odbc -postgres -python -qt4 rendering smp -tbb -tcl -theora -tk -views -web' gebuild vtk*ebuild clean install || exit 1 +USE='-R X -boost -cg doc examples -ffmpeg gdal -imaging java -json -kaapi -mpi -mysql odbc postgres -python qt4 -rendering smp tbb -tcl -theora -tk views -web' gebuild vtk*ebuild clean install || exit 1 +USE='-R X -boost -cg doc examples ffmpeg -gdal -imaging -java -json -kaapi -mpi -mysql odbc -postgres python -qt4 rendering smp tbb tcl -theora -tk -views -web' gebuild vtk*ebuild clean install || exit 1 +USE='-R X -boost cg -doc examples -ffmpeg -gdal -imaging -java -json -kaapi -mpi mysql -odbc -postgres python qt4 rendering -smp -tbb tcl theora -tk -views web' gebuild vtk*ebuild clean install || exit 1 +USE='-R X -boost cg -doc examples -ffmpeg gdal imaging -java -json -kaapi -mpi -mysql -odbc postgres python -qt4 rendering smp tbb tcl -theora -tk -views web' gebuild vtk*ebuild clean install || exit 1 +USE='-R X -boost cg -doc examples -ffmpeg gdal imaging -java -json -kaapi mpi mysql -odbc -postgres python -qt4 rendering -smp tbb tcl theora -tk -views -web' gebuild vtk*ebuild clean install || exit 1 +USE='-R X -boost cg -doc examples ffmpeg -gdal imaging -java json kaapi -mpi mysql odbc -postgres python qt4 rendering smp -tbb tcl theora tk -views web' gebuild vtk*ebuild clean install || exit 1 +USE='-R X -boost cg doc examples -ffmpeg -gdal imaging java json -kaapi -mpi -mysql -odbc -postgres -python qt4 rendering -smp tbb tcl theora -tk -views -web' gebuild vtk*ebuild clean install || exit 1 +USE='-R X -boost cg doc examples ffmpeg -gdal -imaging -java json -kaapi -mpi mysql -odbc -postgres python qt4 rendering -smp -tbb tcl -theora -tk views web' gebuild vtk*ebuild clean install || exit 1 +USE='-R X -boost cg doc examples ffmpeg -gdal -imaging -java json kaapi -mpi -mysql odbc -postgres -python qt4 -rendering smp -tbb -tcl theora -tk -views -web' gebuild vtk*ebuild clean install || exit 1 +USE='-R X boost -cg -doc examples -ffmpeg -gdal imaging -java -json kaapi mpi -mysql odbc -postgres python qt4 rendering smp -tbb tcl theora -tk views web' gebuild vtk*ebuild clean install || exit 1 +USE='-R X boost -cg doc -examples -ffmpeg gdal -imaging -java -json kaapi mpi mysql -odbc -postgres python qt4 rendering smp -tbb tcl theora -tk -views web' gebuild vtk*ebuild clean install || exit 1 +USE='-R X boost -cg doc -examples -ffmpeg gdal -imaging java -json -kaapi mpi -mysql odbc -postgres python qt4 rendering -smp -tbb -tcl theora -tk views web' gebuild vtk*ebuild clean install || exit 1 +USE='-R X boost -cg doc -examples ffmpeg gdal -imaging -java -json kaapi mpi mysql -odbc postgres python -qt4 rendering smp -tbb tcl -theora -tk -views web' gebuild vtk*ebuild clean install || exit 1 +USE='-R X boost -cg doc examples -ffmpeg gdal -imaging java json -kaapi -mpi mysql odbc postgres -python qt4 rendering -smp -tbb -tcl -theora -tk views -web' gebuild vtk*ebuild clean install || exit 1 +USE='-R X boost -cg doc examples ffmpeg -gdal -imaging -java json -kaapi -mpi mysql -odbc postgres python qt4 -rendering -smp -tbb -tcl -theora -tk views web' gebuild vtk*ebuild clean install || exit 1 +USE='-R X boost -cg doc examples ffmpeg gdal -imaging -java -json kaapi mpi -mysql -odbc postgres python -qt4 rendering -smp tbb tcl theora tk -views -web' gebuild vtk*ebuild clean install || exit 1 +USE='-R X boost -cg doc examples ffmpeg gdal -imaging -java json kaapi mpi -mysql odbc -postgres python -qt4 rendering smp -tbb tcl -theora -tk views web' gebuild vtk*ebuild clean install || exit 1 +USE='-R X boost cg -doc -examples -ffmpeg -gdal -imaging -java -json -kaapi mpi -mysql -odbc -postgres -python -qt4 rendering smp tbb tcl theora tk views -web' gebuild vtk*ebuild clean install || exit 1 +USE='-R X boost cg doc -examples -ffmpeg gdal imaging -java -json kaapi mpi -mysql -odbc postgres -python qt4 rendering -smp tbb tcl -theora tk views -web' gebuild vtk*ebuild clean install || exit 1 +USE='-R X boost cg doc examples -ffmpeg gdal -imaging -java -json -kaapi -mpi -mysql -odbc -postgres python -qt4 rendering -smp tbb -tcl -theora -tk -views web' gebuild vtk*ebuild clean install || exit 1 +USE='R X -boost -cg -doc examples -ffmpeg gdal imaging -java -json kaapi -mpi mysql odbc -postgres python -qt4 rendering -smp tbb -tcl -theora -tk -views -web' gebuild vtk*ebuild clean install || exit 1 +USE='R X -boost -cg -doc examples ffmpeg -gdal imaging -java -json -kaapi -mpi -mysql odbc postgres python -qt4 rendering -smp -tbb tcl -theora tk views -web' gebuild vtk*ebuild clean install || exit 1 +USE='R X -boost -cg -doc examples ffmpeg -gdal imaging java json kaapi mpi -mysql odbc -postgres python qt4 -rendering smp -tbb -tcl -theora -tk -views web' gebuild vtk*ebuild clean install || exit 1 +USE='R X -boost -cg -doc examples ffmpeg gdal -imaging java json kaapi mpi mysql -odbc -postgres python qt4 rendering smp -tbb tcl theora tk -views web' gebuild vtk*ebuild clean install || exit 1 +USE='R X -boost -cg doc examples -ffmpeg gdal -imaging java -json -kaapi -mpi -mysql -odbc postgres -python qt4 rendering -smp tbb -tcl theora -tk views -web' gebuild vtk*ebuild clean install || exit 1 +USE='R X -boost -cg doc examples -ffmpeg gdal imaging -java -json -kaapi mpi mysql odbc postgres python qt4 rendering -smp tbb -tcl theora -tk -views web' gebuild vtk*ebuild clean install || exit 1 +USE='R X -boost -cg doc examples ffmpeg -gdal imaging java -json -kaapi mpi mysql odbc -postgres python qt4 -rendering smp tbb -tcl theora -tk views web' gebuild vtk*ebuild clean install || exit 1 +USE='R X -boost cg -doc -examples -ffmpeg gdal imaging java json -kaapi -mpi mysql odbc -postgres python qt4 rendering -smp -tbb -tcl theora -tk views web' gebuild vtk*ebuild clean install || exit 1 +USE='R X -boost cg -doc examples ffmpeg -gdal -imaging -java -json kaapi mpi -mysql -odbc -postgres -python qt4 -rendering smp -tbb -tcl theora -tk views -web' gebuild vtk*ebuild clean install || exit 1 +USE='R X -boost cg doc -examples -ffmpeg gdal -imaging -java json -kaapi mpi mysql odbc postgres python qt4 -rendering smp tbb -tcl -theora -tk views web' gebuild vtk*ebuild clean install || exit 1 +USE='R X -boost cg doc -examples ffmpeg gdal -imaging -java -json -kaapi -mpi -mysql odbc postgres python -qt4 rendering -smp -tbb tcl -theora -tk -views web' gebuild vtk*ebuild clean install || exit 1 +USE='R X -boost cg doc examples -ffmpeg gdal -imaging -java json -kaapi mpi -mysql -odbc postgres python -qt4 -rendering -smp -tbb -tcl -theora -tk views -web' gebuild vtk*ebuild clean install || exit 1 +USE='R X -boost cg doc examples ffmpeg gdal -imaging -java -json -kaapi mpi mysql odbc postgres -python qt4 rendering -smp -tbb tcl -theora -tk views -web' gebuild vtk*ebuild clean install || exit 1 +USE='R X boost -cg -doc -examples -ffmpeg -gdal -imaging java -json kaapi mpi mysql odbc postgres -python qt4 rendering -smp tbb -tcl -theora -tk -views -web' gebuild vtk*ebuild clean install || exit 1 +USE='R X boost -cg doc -examples ffmpeg gdal imaging java -json kaapi mpi -mysql -odbc postgres -python qt4 -rendering smp -tbb -tcl theora -tk views -web' gebuild vtk*ebuild clean install || exit 1 +USE='R X boost -cg doc examples ffmpeg -gdal -imaging -java json kaapi -mpi -mysql -odbc -postgres python -qt4 rendering -smp -tbb -tcl theora -tk views web' gebuild vtk*ebuild clean install || exit 1 +USE='R X boost cg -doc -examples -ffmpeg gdal -imaging java json -kaapi mpi mysql -odbc postgres python qt4 rendering -smp tbb -tcl theora -tk views -web' gebuild vtk*ebuild clean install || exit 1 +USE='R X boost cg -doc examples ffmpeg -gdal -imaging -java -json kaapi -mpi mysql -odbc -postgres python qt4 rendering smp -tbb tcl theora -tk views -web' gebuild vtk*ebuild clean install || exit 1 +USE='R X boost cg -doc examples ffmpeg -gdal imaging -java json kaapi -mpi mysql odbc postgres python qt4 rendering smp -tbb tcl theora tk views web' gebuild vtk*ebuild clean install || exit 1 +USE='R X boost cg doc -examples -ffmpeg gdal -imaging java json kaapi mpi -mysql -odbc -postgres python qt4 -rendering smp -tbb -tcl theora -tk views -web' gebuild vtk*ebuild clean install || exit 1 +USE='R X boost cg doc -examples ffmpeg gdal imaging -java json -kaapi mpi mysql odbc postgres -python qt4 rendering -smp tbb -tcl -theora -tk -views -web' gebuild vtk*ebuild clean install || exit 1 +USE='R X boost cg doc examples ffmpeg -gdal imaging -java json -kaapi mpi -mysql -odbc postgres python -qt4 rendering -smp tbb tcl -theora -tk -views web' gebuild vtk*ebuild clean install || exit 1 diff --git a/sci-libs/vtk/vtk-6.1.0.ebuild b/sci-libs/vtk/vtk-6.1.0.ebuild index e243f37..1efc607 100644 --- a/sci-libs/vtk/vtk-6.1.0.ebuild +++ b/sci-libs/vtk/vtk-6.1.0.ebuild @@ -6,8 +6,10 @@ EAPI=5 PYTHON_COMPAT=( python{2_6,2_7} ) CMAKE_MAKEFILE_GENERATOR=ninja +WEBAPP_OPTIONAL=yes +WEBAPP_MANUAL_SLOT=yes -inherit eutils flag-o-matic java-pkg-opt-2 python-single-r1 qt4-r2 versionator toolchain-funcs cmake-utils virtualx +inherit eutils flag-o-matic java-pkg-opt-2 python-single-r1 qt4-r2 versionator toolchain-funcs cmake-utils virtualx webapp # Short package version SPV="$(get_version_component_range 1-2)" @@ -15,29 +17,37 @@ SPV="$(get_version_component_range 1-2)" DESCRIPTION="The Visualization Toolkit" HOMEPAGE="http://www.vtk.org/"; SRC_URI=" - http://www.${PN}.org/files/release/${SPV}/${P/_rc/.rc}.tar.gz - doc? ( http://www.${PN}.org/files/release/${SPV}/${PN}DocHtml-${PV}.tar.gz )" + http://www.${PN}.org/files/release/${SPV}/VTK-${PV}.tar.gz + doc? ( http://www.${PN}.org/files/release/${SPV}/${PN}DocHtml-${PV}.tar.gz ) + test? ( + http://www.${PN}.org/files/release/${SPV}/VTKData-${PV}.tar.gz + http://www.${PN}.org/files/release/${SPV}/VTKLargeData-${PV}.tar.gz + ) + " LICENSE="BSD LGPL-2" -KEYWORDS="~amd64 ~arm ~x86 ~amd64-linux ~x86-linux" +KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux" SLOT="0" IUSE=" - aqua boost cg doc examples imaging ffmpeg java mpi mysql odbc - offscreen postgres python qt4 rendering test theora tk tcl - video_cards_nvidia views R +X" + aqua boost cg doc examples imaging ffmpeg gdal java json kaapi mpi mysql + odbc offscreen postgres python qt4 rendering smp tbb test theora tk tcl + video_cards_nvidia views web R +X" REQUIRED_USE=" java? ( qt4 ) python? ( ${PYTHON_REQUIRED_USE} ) tcl? ( rendering ) + smp? ( ^^ ( kaapi tbb ) ) test? ( python ) tk? ( tcl ) - ^^ ( X aqua offscreen )" + web? ( python ) + ^^ ( X aqua offscreen ) + " RDEPEND=" dev-libs/expat dev-libs/libxml2:2 - media-libs/freetype + >=media-libs/freetype-2.5.4 media-libs/libpng media-libs/mesa media-libs/libtheora @@ -60,7 +70,9 @@ RDEPEND=" sci-libs/vtkdata ) ffmpeg? ( virtual/ffmpeg ) + gdal? ( sci-libs/gdal ) java? ( >=virtual/jre-1.5 ) + kaapi? ( <sci-libs/xkaapi-3 ) mpi? ( virtual/mpi[cxx,romio] ) mysql? ( virtual/mysql ) odbc? ( dev-db/unixODBC ) @@ -79,31 +91,40 @@ RDEPEND=" dev-qt/qtwebkit:4 python? ( dev-python/PyQt4[${PYTHON_USEDEP}] ) ) + tbb? ( dev-cpp/tbb ) tcl? ( dev-lang/tcl ) tk? ( dev-lang/tk ) video_cards_nvidia? ( media-video/nvidia-settings ) + web? ( + ${WEBAPP_DEPEND} + python? ( + dev-python/autobahn[${PYTHON_USEDEP}] + dev-python/twisted-core[${PYTHON_USEDEP}] + dev-python/zope-interface[${PYTHON_USEDEP}] + ) + ) R? ( dev-lang/R )" DEPEND="${RDEPEND} doc? ( app-doc/doxygen ) - java? ( >=virtual/jdk-1.5 ) - test? ( sci-libs/vtkdata )" + java? ( >=virtual/jdk-1.5 )" -S="${WORKDIR}"/VTK${PV} +S="${WORKDIR}"/VTK-${PV} PATCHES=( - "${FILESDIR}"/${P}-cg-path.patch + "${FILESDIR}"/${P}-freetype.patch "${FILESDIR}"/${P}-install.patch "${FILESDIR}"/${P}-system.patch "${FILESDIR}"/${P}-netcdf.patch - "${FILESDIR}"/${P}-vtkpython.patch + "${FILESDIR}"/${P}-web.patch "${FILESDIR}"/${P}-glext.patch ) -#RESTRICT=test +RESTRICT=test pkg_setup() { use java && java-pkg-opt-2_pkg_setup use python && python-single-r1_pkg_setup + use web && webapp_pkg_setup append-cppflags -D__STDC_CONSTANT_MACROS -D_UNICODE } @@ -115,22 +136,26 @@ src_prepare() { -i CMake/FindLIBPROJ4.cmake || die local x + # missing: alglib exodusII freerange ftgl jsoncpp libproj4 mrmpi verdict xdmf2 for x in expat freetype gl2ps hdf5 jpeg libxml2 netcdf oggtheora png tiff zlib; do rm -r ThirdParty/${x}/vtk${x} || die done - - if use examples || use test; then - # Replace relative path ../../../VTKData with - # otherwise it will break on symlinks. - grep -rl '\.\./\.\./\.\./\.\./VTKData' . | xargs \ - sed \ - -e "s|\.\./\.\./\.\./\.\./VTKData|${EPREFIX}/usr/share/vtk/data|g" \ - -e "s|\.\./\.\./\.\./\.\./\.\./VTKData|${EPREFIX}/usr/share/vtk/data|g" \ - -i || die - fi + rm -r \ + ThirdParty/AutobahnPython/autobahn \ + ThirdParty/Twisted/twisted \ + ThirdParty/ZopeInterface/zope \ + || die use java && export JAVA_HOME="${EPREFIX}/etc/java-config-2/current-system-vm" + if use mpi; then + export CC=mpicc + export CXX=mpicxx + export FC=mpif90 + export F90=mpif90 + export F77=mpif77 + fi + cmake-utils_src_prepare } @@ -145,6 +170,7 @@ src_configure() { -DCMAKE_INSTALL_PREFIX="${EPREFIX}/usr" -DVTK_CUSTOM_LIBRARY_SUFFIX="" -DBUILD_SHARED_LIBS=ON + -DVTK_USE_SYSTEM_AUTOBAHN=ON -DVTK_USE_SYSTEM_EXPAT=ON -DVTK_USE_SYSTEM_FREETYPE=ON -DVTK_USE_SYSTEM_FreeType=ON @@ -159,11 +185,15 @@ src_configure() { -DVTK_USE_SYSTEM_OGGTHEORA=ON -DVTK_USE_SYSTEM_PNG=ON -DVTK_USE_SYSTEM_TIFF=ON + -DVTK_USE_SYSTEM_TWISTED=ON # -DVTK_USE_SYSTEM_XDMF2=ON -DVTK_USE_SYSTEM_ZLIB=ON + -DVTK_USE_SYSTEM_ZOPE=ON -DVTK_USE_SYSTEM_LIBRARIES=ON -DVTK_USE_GL2PS=ON + -DVTK_USE_LARGE_DATA=ON -DVTK_USE_PARALLEL=ON + -DVTK_INSTALL_NO_DEVELOPMENT=ON ) mycmakeargs+=( @@ -174,7 +204,6 @@ src_configure() { mycmakeargs+=( $(cmake-utils_use_build doc DOCUMENTATION) $(cmake-utils_use_build examples EXAMPLES) - $(cmake-utils_use_build test TESTING) $(cmake-utils_use_build test VTK_BUILD_ALL_MODULES_FOR_TESTS) $(cmake-utils_use doc DOCUMENTATION_HTML_HELP) $(cmake-utils_use imaging VTK_Group_Imaging) @@ -183,6 +212,8 @@ src_configure() { $(cmake-utils_use rendering VTK_Group_Rendering) $(cmake-utils_use tk VTK_Group_Tk) $(cmake-utils_use views VTK_Group_Views) + $(cmake-utils_use web VTK_Group_Web) + $(cmake-utils_use web VTK_WWW_DIR="${ED}/${MY_HTDOCSDIR}") $(cmake-utils_use java VTK_WRAP_JAVA) $(cmake-utils_use python VTK_WRAP_PYTHON) $(cmake-utils_use python VTK_WRAP_PYTHON_SIP) @@ -196,16 +227,34 @@ src_configure() { $(cmake-utils_use odbc VTK_USE_ODBC) $(cmake-utils_use offscreen VTK_USE_OFFSCREEN) $(cmake-utils_use offscreen VTK_OPENGL_HAS_OSMESA) + $(cmake-utils_use smp vtkFiltersSMP) $(cmake-utils_use theora VTK_USE_OGGTHEORA_ENCODER) - $(cmake-utils_use ffmpeg VTK_USE_FFMPEG_ENCODER) $(cmake-utils_use video_cards_nvidia VTK_USE_NVCONTROL) $(cmake-utils_use R Module_vtkFiltersStatisticsGnuR) $(cmake-utils_use X VTK_USE_X) ) + # IO + mycmakeargs+=( + $(cmake-utils_use ffmpeg VTK_USE_FFMPEG_ENCODER) + $(cmake-utils_use gdal vtkIOGDAL) + $(cmake-utils_use json vtkIOGeoJSON) + ) # Apple stuff, does it really work? mycmakeargs+=( $(cmake-utils_use aqua VTK_USE_COCOA) ) + if use examples || use test; then + mycmakeargs+=( -DBUILD_TESTING=ON ) + fi + + if use kaapi; then + mycmakeargs+=( -DVTK_SMP_IMPLEMENTATION_TYPE="Kaapi" ) + elif use tbb; then + mycmakeargs+=( -DVTK_SMP_IMPLEMENTATION_TYPE="TBB" ) + else + mycmakeargs+=( -DVTK_SMP_IMPLEMENTATION_TYPE="Sequential" ) + fi + if use java; then # local _ejavahome=${EPREFIX}/etc/java-config-2/current-system-vm # @@ -225,6 +274,7 @@ src_configure() { fi if use python; then mycmakeargs+=( + -DVTK_INSTALL_PYTHON_MODULE_DIR="$(python_get_sitedir)" -DPYTHON_INCLUDE_DIR="$(python_get_includedir)" -DPYTHON_LIBRARY="$(python_get_library_path)" -DSIP_PYQT_DIR="${EPREFIX}/usr/share/sip" @@ -244,6 +294,7 @@ src_configure() { -DQT_WRAP_UI=ON -DVTK_INSTALL_QT_DIR=/$(get_libdir)/qt4/plugins/designer -DDESIRED_QT_VERSION=4 + -DVTK_QT_VERSION=4 -DQT_MOC_EXECUTABLE="${EPREFIX}/usr/bin/moc" -DQT_UIC_EXECUTABLE="${EPREFIX}/usr/bin/uic" -DQT_INCLUDE_DIR="${EPREFIX}/usr/include/qt4" @@ -261,14 +312,6 @@ src_configure() { fi cmake-utils_src_configure - - cat >> "${BUILD_DIR}"/Utilities/MaterialLibrary/ProcessShader.sh <<- EOF - #!${EPREFIX}/bin/bash - - export LD_LIBRARY_PATH="${BUILD_DIR}"/lib - "${BUILD_DIR}"/bin/vtkProcessShader \$@ - EOF - chmod 750 "${BUILD_DIR}"/Utilities/MaterialLibrary/ProcessShader.sh || die } src_test() { @@ -285,6 +328,7 @@ src_test() { } src_install() { + use web && webapp_src_preinst # install docs HTML_DOCS=( "${S}"/README.html ) @@ -310,8 +354,8 @@ src_install() { cd "${WORKDIR}"/html || die rm -f *.md5 || die "Failed to remove superfluous hashes" einfo "Installing API docs. This may take some time." - insinto "/usr/share/doc/${PF}/api-docs" - doins -r ./* + docinto html + dodoc -r ./* fi # environment @@ -321,4 +365,6 @@ src_install() { VTKHOME=${EPREFIX}/usr EOF doenvd "${T}"/40${PN} + + use web && webapp_src_install }
