| 1 |
commit: 9dfca568223d096d343f7649c82c98bf1ad6d5b8 |
| 2 |
Author: Andreas Schäfer <gentryx <AT> gmx <DOT> de> |
| 3 |
AuthorDate: Sun Feb 2 07:46:09 2014 +0000 |
| 4 |
Commit: Reinis Danne <rei4dan <AT> gmail <DOT> com> |
| 5 |
CommitDate: Sun Feb 2 07:46:09 2014 +0000 |
| 6 |
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=9dfca568 |
| 7 |
|
| 8 |
added use-flags for silo and netcdf to VisIt |
| 9 |
|
| 10 |
--- |
| 11 |
.../visit/files/visit-2.7.1-findsilo.patch | 12 ++++++++++++ |
| 12 |
sci-visualization/visit/metadata.xml | 3 +++ |
| 13 |
sci-visualization/visit/visit-2.7.1.ebuild | 19 ++++++++++++++----- |
| 14 |
3 files changed, 29 insertions(+), 5 deletions(-) |
| 15 |
|
| 16 |
diff --git a/sci-visualization/visit/files/visit-2.7.1-findsilo.patch b/sci-visualization/visit/files/visit-2.7.1-findsilo.patch |
| 17 |
new file mode 100644 |
| 18 |
index 0000000..04d73c3 |
| 19 |
--- /dev/null |
| 20 |
+++ b/sci-visualization/visit/files/visit-2.7.1-findsilo.patch |
| 21 |
@@ -0,0 +1,12 @@ |
| 22 |
+diff -ru visit2.7.1-old/src/CMake/FindSilo.cmake visit2.7.1-new/src/CMake/FindSilo.cmake |
| 23 |
+--- visit2.7.1-old/src/CMake/FindSilo.cmake 2013-11-20 20:30:44.000000000 +0100 |
| 24 |
++++ visit2.7.1-new/src/CMake/FindSilo.cmake 2014-02-01 02:22:29.410541850 +0100 |
| 25 |
+@@ -90,7 +90,7 @@ |
| 26 |
+ NO_CMAKE_PATH |
| 27 |
+ NO_SYSTEM_ENVIRONMENT_PATH) |
| 28 |
+ IF(SILOH5_LIBRARY_EXISTS) |
| 29 |
+- SET_UP_THIRD_PARTY(SILO lib include siloh5) |
| 30 |
++ SET_UP_THIRD_PARTY(SILO lib include siloh5 hdf5 z) |
| 31 |
+ ELSE(SILOH5_LIBRARY_EXISTS) |
| 32 |
+ SET_UP_THIRD_PARTY(SILO lib include silo) |
| 33 |
+ ENDIF(SILOH5_LIBRARY_EXISTS) |
| 34 |
|
| 35 |
diff --git a/sci-visualization/visit/metadata.xml b/sci-visualization/visit/metadata.xml |
| 36 |
index 1ee8959..65f194d 100644 |
| 37 |
--- a/sci-visualization/visit/metadata.xml |
| 38 |
+++ b/sci-visualization/visit/metadata.xml |
| 39 |
@@ -14,5 +14,8 @@ |
| 40 |
<flag name="cgns"> |
| 41 |
Builds the reader for the CFD General Notation System file format. |
| 42 |
</flag> |
| 43 |
+ <flag name="silo"> |
| 44 |
+ Adds support for reading .silo files. |
| 45 |
+ </flag> |
| 46 |
</use> |
| 47 |
</pkgmetadata> |
| 48 |
|
| 49 |
diff --git a/sci-visualization/visit/visit-2.7.1.ebuild b/sci-visualization/visit/visit-2.7.1.ebuild |
| 50 |
index 4b9c34d..e749abc 100644 |
| 51 |
--- a/sci-visualization/visit/visit-2.7.1.ebuild |
| 52 |
+++ b/sci-visualization/visit/visit-2.7.1.ebuild |
| 53 |
@@ -14,7 +14,7 @@ SRC_URI="http://portal.nersc.gov/svn/visit/trunk/releases/${PV}/visit${PV}.tar.g |
| 54 |
SLOT="0" |
| 55 |
LICENSE="BSD" |
| 56 |
KEYWORDS="~amd64" |
| 57 |
-IUSE="hdf5 tcmalloc cgns" |
| 58 |
+IUSE="hdf5 tcmalloc cgns silo netcdf" |
| 59 |
REQUIRED_USE="${PYTHON_REQUIRED_USE}" |
| 60 |
|
| 61 |
RDEPEND=" |
| 62 |
@@ -23,12 +23,15 @@ RDEPEND=" |
| 63 |
hdf5? ( sci-libs/hdf5 ) |
| 64 |
tcmalloc? ( dev-util/google-perftools ) |
| 65 |
cgns? ( sci-libs/cgnslib ) |
| 66 |
+ silo? ( sci-libs/silo ) |
| 67 |
+ netcdf? ( sci-libs/netcdf ) |
| 68 |
>=sci-libs/vtk-6.0.0[imaging,python,rendering,${PYTHON_USEDEP}]" |
| 69 |
DEPEND="${RDEPEND}" |
| 70 |
|
| 71 |
S="${WORKDIR}/${PN}${PV}/src" |
| 72 |
PATCHES=( |
| 73 |
"${FILESDIR}/${P}-findpython.patch" |
| 74 |
+ "${FILESDIR}/${P}-findsilo.patch" |
| 75 |
"${FILESDIR}/${P}-findvtk.patch" |
| 76 |
"${FILESDIR}/${P}-vtklibs.patch" |
| 77 |
"${FILESDIR}/${P}-dont_symlink_visit_dir.patch" |
| 78 |
@@ -38,7 +41,7 @@ src_configure() { |
| 79 |
local mycmakeargs=( |
| 80 |
-DCMAKE_INSTALL_PREFIX=/opt/visit |
| 81 |
-DPYTHON_INCLUDE_DIR="$(python_get_includedir)" |
| 82 |
- -DPYTHON_DIR="${EPREFIX}/usr/" |
| 83 |
+ -DPYTHON_DIR="${EPREFIX}/usr" |
| 84 |
-DVISIT_PYTHON_SKIP_INSTALL=true |
| 85 |
-DVISIT_VTK_SKIP_INSTALL=true |
| 86 |
-DVISIT_THREAD=true |
| 87 |
@@ -46,13 +49,19 @@ src_configure() { |
| 88 |
-DVISIT_ZLIB_DIR="${EPREFIX}/usr" |
| 89 |
) |
| 90 |
if use hdf5; then |
| 91 |
- mycmakeargs+=( -DHDF5_DIR="${EPREFIX}/usr/" ) |
| 92 |
+ mycmakeargs+=( -DHDF5_DIR="${EPREFIX}/usr" ) |
| 93 |
fi |
| 94 |
if use tcmalloc; then |
| 95 |
- mycmakeargs+=( -DTCMALLOC_DIR="${EPREFIX}/usr/" ) |
| 96 |
+ mycmakeargs+=( -DTCMALLOC_DIR="${EPREFIX}/usr" ) |
| 97 |
fi |
| 98 |
if use cgns; then |
| 99 |
- mycmakeargs+=( -DCGNS_DIR="${EPREFIX}/usr/" ) |
| 100 |
+ mycmakeargs+=( -DCGNS_DIR="${EPREFIX}/usr" ) |
| 101 |
+ fi |
| 102 |
+ if use silo; then |
| 103 |
+ mycmakeargs+=( -DSILO_DIR="${EPREFIX}/usr" ) |
| 104 |
+ fi |
| 105 |
+ if use netcdf; then |
| 106 |
+ mycmakeargs+=( -DNETCDF_DIR="${EPREFIX}/usr" ) |
| 107 |
fi |
| 108 |
|
| 109 |
cmake-utils_src_configure |
Archives