diff options
Diffstat (limited to 'sci-libs/vtk')
| -rw-r--r-- | sci-libs/vtk/ChangeLog | 334 | ||||
| -rw-r--r-- | sci-libs/vtk/Manifest | 17 | ||||
| -rw-r--r-- | sci-libs/vtk/files/vtk-5.0.3-mpi.patch | 74 | ||||
| -rw-r--r-- | sci-libs/vtk/files/vtk-5.0.4-gcc4.3.patch | 33 | ||||
| -rw-r--r-- | sci-libs/vtk/files/vtk-5.2.0-tcl-install.patch | 12 | ||||
| -rw-r--r-- | sci-libs/vtk/files/vtk-5.4.2-boost-property_map.patch | 194 | ||||
| -rw-r--r-- | sci-libs/vtk/files/vtk-5.4.2-cg-path.patch | 35 | ||||
| -rw-r--r-- | sci-libs/vtk/files/vtk-5.4.2-libpng14.patch | 20 | ||||
| -rw-r--r-- | sci-libs/vtk/files/vtk-5.6.0-R.patch | 57 | ||||
| -rw-r--r-- | sci-libs/vtk/files/vtk-5.6.0-boost-property_map.patch | 13 | ||||
| -rw-r--r-- | sci-libs/vtk/files/vtk-5.6.0-cg-path.patch | 36 | ||||
| -rw-r--r-- | sci-libs/vtk/files/vtk-5.6.0-libpng14.patch | 22 | ||||
| -rw-r--r-- | sci-libs/vtk/files/vtk-5.6.0-odbc.patch | 12 | ||||
| -rw-r--r-- | sci-libs/vtk/metadata.xml | 20 | ||||
| -rw-r--r-- | sci-libs/vtk/vtk-5.6.0-r3.ebuild | 253 |
15 files changed, 1132 insertions, 0 deletions
diff --git a/sci-libs/vtk/ChangeLog b/sci-libs/vtk/ChangeLog new file mode 100644 index 000000000..44536c1da --- /dev/null +++ b/sci-libs/vtk/ChangeLog @@ -0,0 +1,334 @@ +# ChangeLog for sci-libs/vtk +# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/sci-libs/vtk/ChangeLog,v 1.76 2010/06/17 02:25:18 jsbronder Exp $ + +*vtk-5.6.0-r3 (09 Jul 2010) + + 09 Jul 2010; François Bissey <f.r.bissey@massey.ac.nz> + +files/vtk-5.0.3-mpi.patch, +files/vtk-5.0.4-gcc4.3.patch, + +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, + +files/vtk-5.4.2-libpng14.patch, +vtk-5.6.0-r3.ebuild, + +files/vtk-5.6.0-R.patch, +files/vtk-5.6.0-boost-property_map.patch, + +files/vtk-5.6.0-cg-path.patch, +files/vtk-5.6.0-libpng14.patch, + +files/vtk-5.6.0-odbc.patch, +metadata.xml: + Enhanced vtk-5.6.0: includes support for mysql/postgres/odbc/ffmpeg. + + 17 Jun 2010; Justin Bronder <jsbronder@gentoo.org> vtk-5.4.2-r1.ebuild: + Remove sys-cluster/lam-mpi handling, see #324415. + + 09 Jun 2010; Justin Lecher <jlec@gentoo.org> -vtk-5.4.2.ebuild: + removed old version which having problems with PYTHON ABIs stuff + + 07 Jun 2010; Justin Lecher <jlec@gentoo.org> vtk-5.6.0-r2.ebuild: + Fixed ogg -> theora USE transition + + 31 May 2010; Justin Lecher <jlec@gentoo.org> metadata.xml: + Added myself as maintainer + +*vtk-5.6.0-r2 (29 May 2010) + + 29 May 2010; Justin Lecher <jlec@gentoo.org> -vtk-5.6.0-r1.ebuild, + +vtk-5.6.0-r2.ebuild: + Don't use bundled libtheora, moved USE ogg -> theora + + 29 May 2010; Justin Lecher <jlec@gentoo.org> vtk-5.6.0-r1.ebuild: + Added missing DEPS + + 29 May 2010; Justin Lecher <jlec@gentoo.org> vtk-5.6.0-r1.ebuild: + Corrected version of cmake in DEPEND for mpi + +*vtk-5.6.0-r1 (28 May 2010) + + 28 May 2010; Justin Lecher <jlec@gentoo.org> vtk-5.4.2.ebuild, + files/vtk-5.4.2-boost-property_map.patch, -vtk-5.6.0.ebuild, + +vtk-5.6.0-r1.ebuild, +files/vtk-5.6.0-R.patch, + files/vtk-5.6.0-boost-property_map.patch: + Fixed correct detection R libs + +*vtk-5.6.0 (28 May 2010) + + 28 May 2010; Justin Lecher <jlec@gentoo.org> vtk-5.4.2-r1.ebuild, + +vtk-5.6.0.ebuild, +files/vtk-5.6.0-boost-property_map.patch, + +files/vtk-5.6.0-cg-path.patch, +files/vtk-5.6.0-libpng14.patch: + Version Bump #321505; Added support for ogg R; prelimary support for + PREFIX + + 22 May 2010; Justin Lecher <jlec@gentoo.org> vtk-5.4.2.ebuild, + vtk-5.4.2-r1.ebuild: + Add x11-libs/qt-sql to deps, #301684 + + 25 Apr 2010; Justin Lecher <jlec@gentoo.org> vtk-5.4.2-r1.ebuild: + Python ABI fixes, #316229 + + 26 Mar 2010; Ben de Groot <yngwin@gentoo.org> vtk-5.4.2.ebuild, + vtk-5.4.2-r1.ebuild: + Don't inherit unused qt3 eclass (bug #310669) + + 11 Mar 2010; Samuli Suominen <ssuominen@gentoo.org> vtk-5.4.2-r1.ebuild, + +files/vtk-5.4.2-libpng14.patch: + Fix building with libpng14. + + 11 Feb 2010; Justin Lecher <jlec@gentoo.org> vtk-5.4.2.ebuild, + vtk-5.4.2-r1.ebuild: + Removed qt3 support as it is no longer in the tree + + 21 Jan 2010; Markus Dittrich <markusle@gentoo.org> vtk-5.4.2-r1.ebuild, + +files/vtk-5.4.2-boost-property_map.patch: + Added patch to allow compilation against boost-1.42 (fixes #301684). + + 16 Jan 2010; Markus Dittrich <markusle@gentoo.org> vtk-5.4.2-r1.ebuild: + Updated handling of mycmakeargs from cmake-utils.eclass. + +*vtk-5.4.2-r1 (19 Dec 2009) + + 19 Dec 2009; Markus Dittrich <markusle@gentoo.org> +vtk-5.4.2-r1.ebuild: + New revision uses cmake-utils eclass and is significantly cleaned up. + This should have also fixed bugs #295053 and #287591. + Thanks much to Francois Bissey <f.r.bissey@massey.ac.nz> for his help. + + 17 Dec 2009; Markus Dittrich <markusle@gentoo.org> vtk-5.4.2.ebuild: + Updated dependency on cmake to >=2.6 (fixes bug #295531). + + 04 Dec 2009; Markus Dittrich <markusle@gentoo.org> vtk-5.4.2.ebuild: + Added short notice regarding possible parallel make issues per bug + #244896. + + 24 Nov 2009; Markus Dittrich <markusle@gentoo.org> vtk-5.4.2.ebuild: + Removed boost from RDEPEND (fixes bug #293083). + + 18 Sep 2009; Petteri Räty <betelgeuse@gentoo.org> -vtk-5.0.4.ebuild, + -vtk-5.2.0-r1.ebuild: + Remove old versions using built_with_use. + + 01 Sep 2009; Markus Dittrich <markusle@gentoo.org> vtk-5.4.2.ebuild: + Added missing dependency on qt-opengl (fixes bug #283181). + +*vtk-5.4.2 (17 Jul 2009) + + 17 Jul 2009; Markus Dittrich <markusle@gentoo.org> -vtk-5.0.3.ebuild, + +files/vtk-5.4.2-cg-path.patch, +vtk-5.4.2.ebuild: + Version bump (fixes bug #269040). Also removed old version. + + 27 Oct 2008; Markus Dittrich <markusle@gentoo.org> vtk-5.2.0-r1.ebuild: + Attempt to fix sandbox violations (see bug #244378). + +*vtk-5.2.0-r1 (05 Oct 2008) + + 05 Oct 2008; Markus Dittrich <markusle@gentoo.org> + +files/vtk-5.2.0-tcl-install.patch, -vtk-5.2.0.ebuild, + +vtk-5.2.0-r1.ebuild: + Fixed improper install location of support files (see bug #239553). + +*vtk-5.2.0 (01 Oct 2008) + + 01 Oct 2008; Markus Dittrich <markusle@gentoo.org> +vtk-5.2.0.ebuild: + Version bump (fixes bug #238883). Thanks much to Steve Yin + <steve@chinavfx.net> for his ebuild. + + 07 Aug 2008; Ulrich Mueller <ulm@gentoo.org> metadata.xml: + Add USE flag description to metadata wrt GLEP 56. + + 28 Jul 2008; Carsten Lohrke <carlo@gentoo.org> vtk-5.0.3.ebuild: + QA: Get rid of deprecated qt?_min_version(). + + 27 Jul 2008; Carsten Lohrke <carlo@gentoo.org> vtk-5.0.4.ebuild: + Fix broken split Qt 4.4 dependencies, cf. bug 217161 comment 11. + + 08 Jul 2008; Thomas Anderson <gentoofan23@gentoo.org> vtk-5.0.4.ebuild: + Add a qt-gui dependency, it really is needed. + + 03 Jul 2008; Thomas Anderson <gentoofan23@gentoo.org> vtk-5.0.4.ebuild: + Migrate Dependencies to permit Split QT 4.4 to satisfy dependencies, bug + #217189 + + 24 May 2008; Markus Dittrich <markusle@gentoo.org> + +files/vtk-5.0.4-gcc4.3.patch, vtk-5.0.4.ebuild: + Added gcc-4.3 compatibility patch (see bug #223383). Thanks much to + Bert Karwatzki <spasswolf@web.de> for his patch. + + 09 Mar 2008; Markus Dittrich <markusle@gentoo.org> vtk-5.0.4.ebuild: + Backported support for tcl/tk-8.5 from cvs head (fixes bug 212700). + Thanks much to Pacho Ramos <pacho@condmat1.ciencias.uniovi.es> for + his patch. + +*vtk-5.0.4 (06 Mar 2008) + + 06 Mar 2008; Markus Dittrich <markusle@gentoo.org> +vtk-5.0.4.ebuild: + Version bump. + + 29 Feb 2008; Markus Dittrich <markusle@gentoo.org> vtk-5.0.3.ebuild: + Fixed bogus install location (see bug #211819). Thanks much to + Matthias Langer <mlangc@gmx.at> for his patch. + + 21 Feb 2008; Markus Dittrich <markusle@gentoo.org> + -files/vtk-5.0.1-python2.5-gentoo.patch, -files/vtk-5.0.3-lammpi.patch, + +files/vtk-5.0.3-mpi.patch, vtk-5.0.3.ebuild: + Removed support for mpich and added support for mpich2, openmpi, and + lam-mpi. Also fixed some QA issues and added qt4 eclass. + + 19 Aug 2007; Markus Dittrich <markusle@gentoo.org> vtk-5.0.3.ebuild: + Fixed incomplete RDEPEND. + + 01 Aug 2007; Markus Dittrich <markusle@gentoo.org> vtk-5.0.3.ebuild: + Added LGPL-2 to LICENSE since it is needed for gl2ps (see bug 146019). + + 22 Jul 2007; Donnie Berkholz <dberkholz@gentoo.org>; vtk-5.0.3.ebuild: + Drop virtual/x11 references. + + 11 Jun 2007; Petteri Räty <betelgeuse@gentoo.org> -vtk-5.0.2.ebuild: + Remove old version. + + 11 Jun 2007; Petteri Räty <betelgeuse@gentoo.org> vtk-5.0.3.ebuild: + Add java? ( >=virtual/jre-1.5 ) to RDEPEND. + + 28 May 2007; Markus Dittrich <markusle@gentoo.org> vtk-5.0.3.ebuild: + Added VTKHOME as exported environmental variable. + + 08 May 2007; Markus Dittrich <markusle@gentoo.org> vtk-5.0.3.ebuild: + Re-added compile flag for javac needed on amd64 (see bug #177506). + + 06 May 2007; Markus Dittrich <markusle@gentoo.org> + +files/vtk-5.0.3-lammpi.patch, vtk-5.0.3.ebuild: + Added patch fixing cmake files to properly detect and add lam-mpi + libraries. + + 04 May 2007; Markus Dittrich <markusle@gentoo.org> vtk-5.0.3.ebuild: + Check for qt3support useflag when building the examples under qt4 + (see bug #176847). + + 01 May 2007; Markus Dittrich <markusle@gentoo.org> metadata.xml, + vtk-5.0.3.ebuild: + Removed explicit java CLASSPATH and added the friendly java folks + to metadata (see bug #176547). + +*vtk-5.0.3 (23 Apr 2007) + + 23 Apr 2007; Markus Dittrich <markusle@gentoo.org> + -files/vtk-qt-gentoo.patch, -vtk-5.0.0.ebuild, -vtk-5.0.1.ebuild, + +vtk-5.0.3.ebuild: + Version bump and removed old versions. Thanks much to Sebastien + Fabbro <bicatali@gentoo.org> for his ebuild. + + 16 Apr 2007; Christian Faulhammer <opfer@gentoo.org> vtk-5.0.0.ebuild: + moved from USE tcltk to tk, see bug 17808 + +*vtk-5.0.2 (02 Dec 2006) + + 02 Dec 2006; Markus Dittrich <markusle@gentoo.org> +vtk-5.0.2.ebuild: + Version bump. + + 18 Nov 2006; Markus Dittrich <markusle@gentoo.org> vtk-5.0.1.ebuild: + Added -j1 back to ebuild since some people still experience problems + with parallel builds (see discussion on bug #146767). + + 14 Oct 2006; Joshua Nichols <nichoj@gentoo.org> vtk-5.0.0.ebuild: + Added call to java-pkg_pkg_setup, for bug #142708 + + 23 Sep 2006; Markus Dittrich <markusle@gentoo.org> + +files/vtk-5.0.1-python2.5-gentoo.patch, vtk-5.0.1.ebuild: + Added patch to fix compile problems with python-2.5 + (see bug #148727). + + 08 Sep 2006; Markus Dittrich <markusle@gentoo.org> + +files/vtk-qt-gentoo.patch, -files/vtk-qt3-qt4-gentoo.patch, + vtk-5.0.0.ebuild, vtk-5.0.1.ebuild: + Renamed the qt patch in an effort to get rid of the executable + permissions. Also cleaned up the ebuilds some. + + 08 Sep 2006; Markus Dittrich <markusle@gentoo.org> + files/vtk-qt3-qt4-gentoo.patch, -files/vtk-4.2.6-gcc34.patch, + -vtk-4.2.6.ebuild: + Removed old version since it doesn't build any more. Also fixed + permissions for the vtk-qt patch (see bug #146826). + + 20 Jul 2006; Markus Dittrich <markusle@gentoo.org> vtk-5.0.1.ebuild: + Moved to new java system. Removed -j1 from emake since it works + fine here with -j2. + +*vtk-5.0.1 (09 Jul 2006) + + 09 Jul 2006; Markus Dittrich <markusle@gentoo.org> vtk-4.2.6.ebuild, + vtk-5.0.0.ebuild, +vtk-5.0.1.ebuild: + Version bump. Also, split tcltk USE flag into tcl and tk and moved + to new style virtual/jdk. + + 23 Jun 2006; Markus Dittrich <markusle@gentoo.org> vtk-5.0.0.ebuild: + Added a warning to the ebuild that qt4 is the default in case both + qt3 and qt4 are selected as use flags (see bug #137658). + + 11 Jun 2006; Markus Dittrich <markusle@gentoo.org> vtk-5.0.0.ebuild: + Fix RDEPEND and cmake configuration such that tcl/tk is only + pulled in and used if USE=tcltk. This closes bug #136324. + + 27 Apr 2006; Alec Warner <antarus@gentoo.org> Manifest: + Fixing SHA256 digest, pass four + + 21 Apr 2006; Markus Dittrich <markusle@gentoo.org> vtk-5.0.0.ebuild: + Depend on cmake-2.2.x to be able to properly compile against QT4. + This fixes bug #130471. + + 07 Apr 2006; Markus Dittrich <markusle@gentoo.org> ChangeLog: + Removed from package.mask after testing. + + 27 Mar 2006; Markus Dittrich <markusle@gentoo.org> vtk-5.0.0.ebuild: + Added proper JAVA_AWT_LIBRARY cmake variable for amd64 platform. + Thanks to Sebastiaan <s.breedveld@erasmusmc.nl> for pointing this + out (c.f. bug #123178). + + 26 Mar 2006; Markus Dittrich <markusle@gentoo.org> + +files/vtk-qt3-qt4-gentoo.patch, vtk-5.0.0.ebuild: + Added a small fix for java compilation on amd64 as detailed + in bug #123178. Thanks to Sebastiaan <s.breedveld@erasmusmc.nl> for + the fix. Also enabled compilation of vtk against either QT3 or QT4. + + 06 Mar 2006; Markus Dittrich <markusle@gentoo.org> vtk-5.0.0.ebuild: + Fixed some QT3 issues and forced -j1 during emake. Thanks + much to Sebastiaan <s.breedveld@erasmusmc.nl> for his fixes + and testing. + +*vtk-5.0.0 (05 Mar 2006) + + 05 Mar 2006; Markus Dittrich <markusle@gentoo.org> +vtk-5.0.0.ebuild: + Version bump. Many thanks to Toon Verstraelen + <Toon.Verstraelen@UGent.be> and Sebastiaan + <s.breedveld@erasmusmc.nl> for their ebuilds and patches. + This fixes bug #123178. + + 26 Feb 2006; Markus Dittrich <markusle@gentoo.org> vtk-4.2.6.ebuild: + Added cmake command line flag to prevent insecure RUNPATHS + (c.f. bug #122875). + + 22 Jan 2006; Markus Dittrich <markusle@gentoo.org> vtk-4.2.6.ebuild: + Fix dependencies for modular X and replace instances of lib with + $(get_libdir). + + 17 Jan 2006; Markus Dittrich <markusle@gentoo.org> metadata.xml: + Changed maintainer to Markus Dittrich <markusle@gentoo.org>. + + 19 Dec 2005; Markus Dittrich <markusle@gentoo.org> vtk-4.2.6.ebuild: + Use python eclass functions to determine installed python version. + + 18 Dec 2005; Markus Dittrich <markusle@gentoo.org> vtk-4.2.6.ebuild: + Fixed compilation problems when using cmake-2.2.x and when compiling against + python 2.4.x. Also corrected installation path of vtk jar file. This fixes + bugs #112119, #103343, #113597. + + 08 Oct 2005; Thomas Matthijs <axxo@gentoo.org> vtk-4.2.6.ebuild: + use java-pkg_dojar not dojar + + 24 Aug 2005; Patrick Kursawe <phosphan@gentoo.org> vtk-4.2.6.ebuild: + No longer using cp -a (bug #103487) + + 20 Aug 2005; Olivier Fisette <ribosome@gentoo.org> vtk-4.2.6.ebuild: + Removed unused "data" USE flag (fixes bug #100418). + + 03 Jun 2005; Patrick Dawson <pkdawson@gentoo.org> vtk-4.2.6.ebuild: + Typo fix. + +*vtk-4.2.6 (10 May 2005) + + 10 May 2005; Patrick Dawson <pkdawson@gentoo.org> + +files/vtk-4.2.6-gcc34.patch, +vtk-4.2.6.ebuild: + Initial import. See bug #25335. + diff --git a/sci-libs/vtk/Manifest b/sci-libs/vtk/Manifest new file mode 100644 index 000000000..ebe384c6d --- /dev/null +++ b/sci-libs/vtk/Manifest @@ -0,0 +1,17 @@ +AUX vtk-5.0.3-mpi.patch 2653 RMD160 16c80c11c88cd4a671968da9ef3a29c67a979648 SHA1 c1979686901883aa05091845c05235ce8e24e89f SHA256 dd03a1e55674e6f0c3740b996e6a81a68a6e253c5dac60cf0f2fd2e3ead1dcf3 +AUX vtk-5.0.4-gcc4.3.patch 1222 RMD160 28a724ce4e999e68482bfcadc3e776ef37a1e6a6 SHA1 5db37dabd42dca1d93e483e2fd3356fb5a2c653e SHA256 66627b05fd0f71a51b1f5645edaaa369d11896245598acdb3a30818ec716806f +AUX vtk-5.2.0-tcl-install.patch 580 RMD160 e3654b90212a4f48f707cd4cfaf6069b9cbc4d49 SHA1 94269da0a6d83312d0fc00c3f7adf964531a7d20 SHA256 7373a02d9408f59546486b50efb8934fc2fa14067928e27bd46b2691b80d2fc6 +AUX vtk-5.4.2-boost-property_map.patch 7739 RMD160 98e9bc2431264ad5692b73dc05e54afa697e4108 SHA1 f38f98e9e28a51bb0553b5792cdde39a2c319b3d SHA256 5cbedc7afde2a3515a0bf580927c6a3a0d5b10efa39e649610b0f00a881a4119 +AUX vtk-5.4.2-cg-path.patch 1112 RMD160 8b4dca2322f62ed005585ed35cf5e11bc7ea0614 SHA1 903cd304bda40b64825ca0e806cd4d7c738f7165 SHA256 4097db18c46e1e27b6213ef7c82af07144b5a88ac19bdcf645ad7e8264cc9e10 +AUX vtk-5.4.2-libpng14.patch 548 RMD160 14217aaaad0b1d44d25574084ee2d3c75d52fbec SHA1 0da1e3168daffd3be3154102d8728135a596f707 SHA256 0aa999ba22804a9c3fe13488c0a014d45acf2a958d9a7336d38ae84e96addbda +AUX vtk-5.6.0-R.patch 2463 RMD160 be1ca5c2bd56ce2bf14d23817c1fe69901503345 SHA1 c08a10926064536f06e405b57ece07738896787d SHA256 ffdb077883fd054a1daefa9f1a073877f4f00a5fd4f0fc5bb7021feae5ad2e97 +AUX vtk-5.6.0-boost-property_map.patch 547 RMD160 3ae309e296febc8a5c5d86795fd7766fe12dcdf8 SHA1 e97b4273d94c1647c959469f6f1829101fabb108 SHA256 de594eb23b9a7c18c4c6bb67b507dd627e580fcc7e2ba8c151da94bf2949d3f1 +AUX vtk-5.6.0-cg-path.patch 1106 RMD160 a6cb9f4855dfe417d83e7bba04a02da88af869a6 SHA1 fa5afd4b1a943f255e2f20fa35f440518f9d9d95 SHA256 7ad4eb9a82664a2e9c51d8763e594634027051b54ce48bb1c2fca6d1a42635c9 +AUX vtk-5.6.0-libpng14.patch 734 RMD160 d54626d332130fe242b3a5b1300a650e45763d29 SHA1 e6480b68a14345d7dfa78f6d37ff7301366d99d8 SHA256 81565709c8cfb4df3c28d69df8094d15923d824345330ab5ba101a9780e6e9f9 +AUX vtk-5.6.0-odbc.patch 328 RMD160 888680f3e503f8ce624c73df9bb0402309c1384b SHA1 02022f5f345ccfe8a13d99201828edb0371d7cc5 SHA256 eca7a508fcd07eb6d40e609e3670d12ce2d2d39dda11b60f418acd279ca03c25 +DIST vtk-5.6.0.tar.gz 20709970 RMD160 b7abf3b9bb14a3db81608c7aa2721935ae653295 SHA1 355209c485304f1b0feefcda3585d45217ffd230 SHA256 2987938ad906c5fd30ddbf60889f899d1dd8c61d80320c55ac1acadc00a95d3e +DIST vtkDocHtml-5.6.0.tar.gz 103149113 RMD160 da6a562345c4c143470ddcc8b926820eec2a41cb SHA1 ce7c3ea6c6b674cef0bdd2c2aa036f576c61a477 SHA256 330ab1de0963bdcd0d0d1dbcd374a579874d867bff4b298d65d46855baf2d0c2 +DIST vtkdata-5.6.0.tar.gz 76716069 RMD160 8499816f6d714408c0f7f584fb4d781f4426e444 SHA1 e0aa26dafd653da1db21fc97ce15aa0599d9c5ad SHA256 e6eed8e5c8d8410d7c7cf007de8c5b56bde77d38fa0522c1ac7751138323c9cf +EBUILD vtk-5.6.0-r3.ebuild 7118 RMD160 599b05a244c7d87e707aaa0a548a9824a15f1492 SHA1 fd7f0aeada8216b34a39f361ef1d08aa578d6ac7 SHA256 781b490b5a749c0c92884bc0298283a20a14244e5ccbe8052a20d0908c22d7b0 +MISC ChangeLog 13190 RMD160 faef3e143fba76a1eb202f394642c341aabe9429 SHA1 8c6cac31ba6b9173a3512c39945878ea4c393ebb SHA256 2397a90ff18fd0cfcbf39a84b47d3621c3d42e919cb2c3a6f0244e026018e536 +MISC metadata.xml 574 RMD160 ccd927f3a387710bbf53f3f0f88c971dc814c605 SHA1 8160c080306039e0b3b18ced75ae6b81b8590ddc SHA256 9a3ca872da01db519865e7753e9c0922fe56972f4d6e27cbf5622afd41d23300 diff --git a/sci-libs/vtk/files/vtk-5.0.3-mpi.patch b/sci-libs/vtk/files/vtk-5.0.3-mpi.patch new file mode 100644 index 000000000..fec1d67bd --- /dev/null +++ b/sci-libs/vtk/files/vtk-5.0.3-mpi.patch @@ -0,0 +1,74 @@ +diff -Naur VTK/Parallel/CMakeLists.txt VTK.new/Parallel/CMakeLists.txt +--- VTK/Parallel/CMakeLists.txt 2007-03-28 15:38:46.000000000 -0500 ++++ VTK.new/Parallel/CMakeLists.txt 2008-02-21 15:16:04.000000000 -0500 +@@ -78,6 +78,8 @@ + + IF (VTK_USE_MPI) + INCLUDE (${CMAKE_ROOT}/Modules/FindMPI.cmake) ++ INCLUDE(${VTK_SOURCE_DIR}/Parallel/FindLAMMPI.cmake) ++ INCLUDE(${VTK_SOURCE_DIR}/Parallel/FindOpenmpi.cmake) + SET ( Kit_SRCS + ${Kit_SRCS} + vtkMPICommunicator.cxx +@@ -94,6 +96,18 @@ + IF (MPI_EXTRA_LIBRARY) + SET(KIT_LIBS ${KIT_LIBS} "${MPI_EXTRA_LIBRARY}") + ENDIF (MPI_EXTRA_LIBRARY) ++ IF (LAMMPI_LIBRARY) ++ SET(KIT_LIBS ${KIT_LIBS} "${LAMMPI_LIBRARY}") ++ ENDIF (LAMMPI_LIBRARY) ++ IF (LAMMPI_EXTRA_LIBRARY) ++ SET(KIT_LIBS ${KIT_LIBS} "${LAMMPI_EXTRA_LIBRARY}") ++ ENDIF (LAMMPI_EXTRA_LIBRARY) ++ IF (OPENMPI_LIBRARY) ++ SET(KIT_LIBS ${KIT_LIBS} "${OPENMPI_LIBRARY}") ++ ENDIF (OPENMPI_LIBRARY) ++ IF (OPENMPI_EXTRA_LIBRARY) ++ SET(KIT_LIBS ${KIT_LIBS} "${OPENMPI_EXTRA_LIBRARY}") ++ ENDIF (OPENMPI_EXTRA_LIBRARY) + ENDIF (VTK_USE_MPI) + + SET(Kit_EXTRA_SRCS) +diff -Naur VTK/Parallel/FindLAMMPI.cmake VTK.new/Parallel/FindLAMMPI.cmake +--- VTK/Parallel/FindLAMMPI.cmake 1969-12-31 19:00:00.000000000 -0500 ++++ VTK.new/Parallel/FindLAMMPI.cmake 2008-02-21 15:13:38.000000000 -0500 +@@ -0,0 +1,17 @@ ++# - Find LamMPI ++FIND_LIBRARY(LAMMPI_LIBRARY ++ NAMES lam ++ PATHS /usr/lib /usr/lib64 ++ "$ENV{ProgramFiles}/MPICH/SDK/Lib" ++ "$ENV{ProgramFiles}/MPICH2/Lib" ++ "C:/Program Files/MPICH/SDK/Lib" ++) ++ ++FIND_LIBRARY(LAMMPI_EXTRA_LIBRARY ++ NAMES lammpi++ ++ PATHS /usr/lib /usr/lib64 ++ "$ENV{ProgramFiles}/MPICH/SDK/Lib" ++ "C:/Program Files/MPICH/SDK/Lib" ++ DOC "If a second mpi library is necessary, specify it here.") ++ ++MARK_AS_ADVANCED(LAMMPI_LIBRARY LAMMPI_EXTRA_LIBRARY) +diff -Naur VTK/Parallel/FindOpenmpi.cmake VTK.new/Parallel/FindOpenmpi.cmake +--- VTK/Parallel/FindOpenmpi.cmake 1969-12-31 19:00:00.000000000 -0500 ++++ VTK.new/Parallel/FindOpenmpi.cmake 2008-02-21 15:14:23.000000000 -0500 +@@ -0,0 +1,18 @@ ++# - Find openmpi ++FIND_PATH(MPI_INCLUDE_PATH mpi.h ++ /usr/include ++ /usr/include/openmpi ++) ++ ++FIND_LIBRARY(OPENMPI_LIBRARY ++ NAMES mpi ++ PATHS /usr/lib /usr/lib64 ++) ++ ++FIND_LIBRARY(OPENMPI_EXTRA_LIBRARY ++ NAMES mpi_cxx ++ PATHS /usr/lib /usr/lib64 ++ DOC "If a second mpi library is necessary, specify it here.") ++ ++MARK_AS_ADVANCED(OPENMPI_LIBRARY OPENMPI_EXTRA_LIBRARY) ++ diff --git a/sci-libs/vtk/files/vtk-5.0.4-gcc4.3.patch b/sci-libs/vtk/files/vtk-5.0.4-gcc4.3.patch new file mode 100644 index 000000000..f921ee319 --- /dev/null +++ b/sci-libs/vtk/files/vtk-5.0.4-gcc4.3.patch @@ -0,0 +1,33 @@ +diff -Naur VTK/Utilities/DICOMParser/DICOMAppHelper.cxx VTK.new/Utilities/DICOMParser/DICOMAppHelper.cxx +--- VTK/Utilities/DICOMParser/DICOMAppHelper.cxx 2007-05-03 13:12:13.000000000 -0400 ++++ VTK.new/Utilities/DICOMParser/DICOMAppHelper.cxx 2008-05-24 13:44:18.000000000 -0400 +@@ -34,6 +34,7 @@ + #include <string> + #include <math.h> + #include <algorithm> ++#include <cstring> + #if defined(__BORLANDC__) + #include <mem.h> // for memcpy + #endif +diff -Naur VTK/Utilities/DICOMParser/DICOMFile.cxx VTK.new/Utilities/DICOMParser/DICOMFile.cxx +--- VTK/Utilities/DICOMParser/DICOMFile.cxx 2005-07-26 16:02:22.000000000 -0400 ++++ VTK.new/Utilities/DICOMParser/DICOMFile.cxx 2008-05-24 13:44:18.000000000 -0400 +@@ -24,6 +24,7 @@ + + #include <stdio.h> + #include <string> ++#include <cstring> + + #include "DICOMConfig.h" + #include "DICOMFile.h" +diff -Naur VTK/Utilities/DICOMParser/DICOMParser.cxx VTK.new/Utilities/DICOMParser/DICOMParser.cxx +--- VTK/Utilities/DICOMParser/DICOMParser.cxx 2006-03-24 10:59:50.000000000 -0500 ++++ VTK.new/Utilities/DICOMParser/DICOMParser.cxx 2008-05-24 13:44:19.000000000 -0400 +@@ -37,6 +37,7 @@ + #endif + + #include <string> ++#include <cstring> + + #include "DICOMConfig.h" + #include "DICOMParser.h" diff --git a/sci-libs/vtk/files/vtk-5.2.0-tcl-install.patch b/sci-libs/vtk/files/vtk-5.2.0-tcl-install.patch new file mode 100644 index 000000000..c7da78678 --- /dev/null +++ b/sci-libs/vtk/files/vtk-5.2.0-tcl-install.patch @@ -0,0 +1,12 @@ +diff -Naur VTK/CMakeLists.txt VTK.new/CMakeLists.txt +--- VTK/CMakeLists.txt 2008-05-13 17:50:09.000000000 -0400 ++++ VTK.new/CMakeLists.txt 2008-10-05 10:34:42.000000000 -0400 +@@ -182,7 +182,7 @@ + # Compute the proper location for installing the Tcl package. This + # must be a fixed relative path below the library install location and + # is therefore not settable by parent projects. +-SET(VTK_INSTALL_TCL_DIR ${VTK_INSTALL_LIB_DIR}) ++SET(VTK_INSTALL_TCL_DIR ${VTK_INSTALL_PACKAGE_DIR}) + + IF(NOT VTK_INSTALL_JAVA_DIR) + SET(VTK_INSTALL_JAVA_DIR ${VTK_INSTALL_PACKAGE_DIR}/java) diff --git a/sci-libs/vtk/files/vtk-5.4.2-boost-property_map.patch b/sci-libs/vtk/files/vtk-5.4.2-boost-property_map.patch new file mode 100644 index 000000000..90c6d6a1f --- /dev/null +++ b/sci-libs/vtk/files/vtk-5.4.2-boost-property_map.patch @@ -0,0 +1,194 @@ +diff --git a/Infovis/Testing/Cxx/TestBoostAdapter.cxx b/Infovis/Testing/Cxx/TestBoostAdapter.cxx +index 6af2855..484a9e0 100644 +--- a/Infovis/Testing/Cxx/TestBoostAdapter.cxx ++++ b/Infovis/Testing/Cxx/TestBoostAdapter.cxx +@@ -36,8 +36,8 @@ + #include <boost/graph/strong_components.hpp> + #include <boost/graph/dijkstra_shortest_paths.hpp> + #include <boost/graph/transitive_closure.hpp> +-#include <boost/property_map.hpp> +-#include <boost/vector_property_map.hpp> ++#include <boost/property_map/property_map.hpp> ++#include <boost/property_map/vector_property_map.hpp> + + #include "vtkGraph.h" + #include "vtkBoostGraphAdapter.h" +diff --git a/Infovis/vtkBoostBiconnectedComponents.cxx b/Infovis/vtkBoostBiconnectedComponents.cxx +index 6799dd0..dd759d5 100644 +--- a/Infovis/vtkBoostBiconnectedComponents.cxx ++++ b/Infovis/vtkBoostBiconnectedComponents.cxx +@@ -32,7 +32,7 @@ + #include "vtkGraph.h" + #include "vtkBoostGraphAdapter.h" + #include <boost/graph/biconnected_components.hpp> +-#include <boost/vector_property_map.hpp> ++#include <boost/property_map/vector_property_map.hpp> + #include <boost/version.hpp> + #include <vtksys/stl/vector> + #include <vtksys/stl/utility> +diff --git a/Infovis/vtkBoostBrandesCentrality.cxx b/Infovis/vtkBoostBrandesCentrality.cxx +index e214a72..443c039 100644 +--- a/Infovis/vtkBoostBrandesCentrality.cxx ++++ b/Infovis/vtkBoostBrandesCentrality.cxx +@@ -36,7 +36,7 @@ + + #include <boost/graph/adjacency_list.hpp> + #include <boost/graph/betweenness_centrality.hpp> +-#include <boost/vector_property_map.hpp> ++#include <boost/property_map/vector_property_map.hpp> + + using namespace boost; + +diff --git a/Infovis/vtkBoostBreadthFirstSearch.cxx b/Infovis/vtkBoostBreadthFirstSearch.cxx +index 7fab585..6e56a7c 100644 +--- a/Infovis/vtkBoostBreadthFirstSearch.cxx ++++ b/Infovis/vtkBoostBreadthFirstSearch.cxx +@@ -46,8 +46,8 @@ + + #include <boost/graph/visitors.hpp> + #include <boost/graph/breadth_first_search.hpp> +-#include <boost/property_map.hpp> +-#include <boost/vector_property_map.hpp> ++#include <boost/property_map/property_map.hpp> ++#include <boost/property_map/vector_property_map.hpp> + #include <boost/pending/queue.hpp> + + #include <vtksys/stl/utility> // for pair +diff --git a/Infovis/vtkBoostBreadthFirstSearchTree.cxx b/Infovis/vtkBoostBreadthFirstSearchTree.cxx +index 5c64516..64ee7b5 100644 +--- a/Infovis/vtkBoostBreadthFirstSearchTree.cxx ++++ b/Infovis/vtkBoostBreadthFirstSearchTree.cxx +@@ -39,7 +39,7 @@ + #include "vtkTree.h" + + #include <boost/graph/breadth_first_search.hpp> +-#include <boost/vector_property_map.hpp> ++#include <boost/property_map/vector_property_map.hpp> + #include <boost/pending/queue.hpp> + + using namespace boost; +diff --git a/Infovis/vtkBoostConnectedComponents.cxx b/Infovis/vtkBoostConnectedComponents.cxx +index 69e9d8f..c88f4ab 100644 +--- a/Infovis/vtkBoostConnectedComponents.cxx ++++ b/Infovis/vtkBoostConnectedComponents.cxx +@@ -33,7 +33,7 @@ + + #include "vtkBoostGraphAdapter.h" + #include <boost/graph/strong_components.hpp> +-#include <boost/vector_property_map.hpp> ++#include <boost/property_map/vector_property_map.hpp> + + using namespace boost; + +diff --git a/Infovis/vtkBoostKruskalMinimumSpanningTree.cxx b/Infovis/vtkBoostKruskalMinimumSpanningTree.cxx +index b0c89de..7ea3aa9 100644 +--- a/Infovis/vtkBoostKruskalMinimumSpanningTree.cxx ++++ b/Infovis/vtkBoostKruskalMinimumSpanningTree.cxx +@@ -40,7 +40,7 @@ PURPOSE. See the above copyright notice for more information. + #include "vtkTree.h" + + #include <boost/graph/kruskal_min_spanning_tree.hpp> +-#include <boost/vector_property_map.hpp> ++#include <boost/property_map/vector_property_map.hpp> + #include <boost/pending/queue.hpp> + + using namespace boost; +diff --git a/Infovis/vtkBoostPrimMinimumSpanningTree.cxx b/Infovis/vtkBoostPrimMinimumSpanningTree.cxx +index 935d0f7..48716fd 100644 +--- a/Infovis/vtkBoostPrimMinimumSpanningTree.cxx ++++ b/Infovis/vtkBoostPrimMinimumSpanningTree.cxx +@@ -39,7 +39,7 @@ PURPOSE. See the above copyright notice for more information. + #include "vtkTree.h" + + #include <boost/graph/prim_minimum_spanning_tree.hpp> +-#include <boost/vector_property_map.hpp> ++#include <boost/property_map/vector_property_map.hpp> + #include <boost/pending/queue.hpp> + + using namespace boost; +diff --git a/Infovis/vtkTreeLayoutStrategy.cxx b/Infovis/vtkTreeLayoutStrategy.cxx +index 6efa586..222afe9 100644 +--- a/Infovis/vtkTreeLayoutStrategy.cxx ++++ b/Infovis/vtkTreeLayoutStrategy.cxx +@@ -375,8 +375,8 @@ void vtkTreeLayoutStrategy::PrintSelf(ostream& os, vtkIndent indent) + #include "vtkTreeToBoostAdapter.h" + #include <boost/graph/visitors.hpp> + #include <boost/graph/depth_first_search.hpp> +-#include <boost/property_map.hpp> +-#include <boost/vector_property_map.hpp> ++#include <boost/property_map/property_map.hpp> ++#include <boost/property_map/vector_property_map.hpp> + #include <boost/pending/queue.hpp> + + using namespace boost; +diff --git a/Parallel/vtkPBGLBreadthFirstSearch.cxx b/Parallel/vtkPBGLBreadthFirstSearch.cxx +index 2b4681b..eebeaa9 100644 +--- a/Parallel/vtkPBGLBreadthFirstSearch.cxx ++++ b/Parallel/vtkPBGLBreadthFirstSearch.cxx +@@ -50,8 +50,8 @@ + #include <boost/graph/distributed/breadth_first_search.hpp> + #include <boost/parallel/algorithm.hpp> + #include <boost/graph/visitors.hpp> +-#include <boost/property_map.hpp> +-#include <boost/vector_property_map.hpp> ++#include <boost/property_map/property_map.hpp> ++#include <boost/property_map/vector_property_map.hpp> + #include <boost/pending/queue.hpp> + + #include <vtksys/stl/utility> // for pair +diff --git a/Parallel/vtkPBGLGraphAdapter.h b/Parallel/vtkPBGLGraphAdapter.h +index 7b467b0..bacfd3a 100644 +--- a/Parallel/vtkPBGLGraphAdapter.h ++++ b/Parallel/vtkPBGLGraphAdapter.h +@@ -31,7 +31,7 @@ + #include <boost/graph/distributed/mpi_process_group.hpp> + #include <boost/graph/properties.hpp> + #include <boost/graph/parallel/container_traits.hpp> +-#include <boost/parallel/local_property_map.hpp> ++#include <boost/property_map/parallel/local_property_map.hpp> + #include <boost/serialization/base_object.hpp> + #include <boost/functional/hash.hpp> + //ETX +diff --git a/Parallel/vtkPBGLMinimumSpanningTree.cxx b/Parallel/vtkPBGLMinimumSpanningTree.cxx +index da4647e..f9c3229 100644 +--- a/Parallel/vtkPBGLMinimumSpanningTree.cxx ++++ b/Parallel/vtkPBGLMinimumSpanningTree.cxx +@@ -48,8 +48,8 @@ + #include <boost/graph/distributed/dehne_gotz_min_spanning_tree.hpp> + #include <boost/graph/distributed/vertex_list_adaptor.hpp> + #include <boost/parallel/global_index_map.hpp> +-#include <boost/property_map.hpp> +-#include <boost/vector_property_map.hpp> ++#include <boost/property_map/property_map.hpp> ++#include <boost/property_map/vector_property_map.hpp> + #include <boost/pending/queue.hpp> + + #include <vtksys/stl/utility> // for pair +diff --git a/Parallel/vtkPBGLShortestPaths.cxx b/Parallel/vtkPBGLShortestPaths.cxx +index 074143f..8517304 100644 +--- a/Parallel/vtkPBGLShortestPaths.cxx ++++ b/Parallel/vtkPBGLShortestPaths.cxx +@@ -49,8 +49,8 @@ + + #include <boost/graph/distributed/delta_stepping_shortest_paths.hpp> + #include <boost/parallel/algorithm.hpp> +-#include <boost/property_map.hpp> +-#include <boost/vector_property_map.hpp> ++#include <boost/property_map/property_map.hpp> ++#include <boost/property_map/vector_property_map.hpp> + + #include <vtksys/stl/utility> // for pair + +diff --git a/Parallel/vtkPBGLVertexColoring.cxx b/Parallel/vtkPBGLVertexColoring.cxx +index 9aa87a0..301a245 100644 +--- a/Parallel/vtkPBGLVertexColoring.cxx ++++ b/Parallel/vtkPBGLVertexColoring.cxx +@@ -47,7 +47,7 @@ + + #include <boost/graph/distributed/boman_et_al_graph_coloring.hpp> + #include <boost/parallel/algorithm.hpp> +-#include <boost/property_map.hpp> ++#include <boost/property_map/property_map.hpp> + + #include <vtksys/stl/utility> // for pair + diff --git a/sci-libs/vtk/files/vtk-5.4.2-cg-path.patch b/sci-libs/vtk/files/vtk-5.4.2-cg-path.patch new file mode 100644 index 000000000..53d43ee80 --- /dev/null +++ b/sci-libs/vtk/files/vtk-5.4.2-cg-path.patch @@ -0,0 +1,35 @@ +diff -Naur VTK/CMake/FindCg.cmake VTK.new/CMake/FindCg.cmake +--- VTK/CMake/FindCg.cmake 2005-10-04 11:25:51.000000000 -0400 ++++ VTK.new/CMake/FindCg.cmake 2009-07-17 14:10:30.000000000 -0400 +@@ -82,6 +82,7 @@ + FIND_PROGRAM( CG_COMPILER cgc + /usr/bin + /usr/local/bin ++ /opt/nvidia-cg-toolkit/bin + DOC "The Cg Compiler" + ) + GET_FILENAME_COMPONENT(CG_COMPILER_DIR "${CG_COMPILER}" PATH) +@@ -89,6 +90,7 @@ + FIND_PATH( CG_INCLUDE_PATH Cg/cg.h + /usr/include + /usr/local/include ++ /opt/nvidia-cg-toolkit/include + ${CG_COMPILER_SUPER_DIR}/include + DOC "The directory where Cg/cg.h resides" + ) +@@ -98,6 +100,7 @@ + /usr/lib + /usr/local/lib64 + /usr/local/lib ++ /opt/nvidia-cg-toolkit/lib + ${CG_COMPILER_SUPER_DIR}/lib64 + ${CG_COMPILER_SUPER_DIR}/lib + DOC "The Cg runtime library" +@@ -108,6 +111,7 @@ + /usr/lib + /usr/local/lib64 + /usr/local/lib ++ /opt/nvidia-cg-toolkit/lib + ${CG_COMPILER_SUPER_DIR}/lib64 + ${CG_COMPILER_SUPER_DIR}/lib + DOC "The Cg runtime library" diff --git a/sci-libs/vtk/files/vtk-5.4.2-libpng14.patch b/sci-libs/vtk/files/vtk-5.4.2-libpng14.patch new file mode 100644 index 000000000..1f12ae926 --- /dev/null +++ b/sci-libs/vtk/files/vtk-5.4.2-libpng14.patch @@ -0,0 +1,20 @@ +--- IO/vtkPNGReader.cxx ++++ IO/vtkPNGReader.cxx +@@ -116,7 +116,7 @@ + // minimum of a byte per pixel + if (color_type == PNG_COLOR_TYPE_GRAY && bit_depth < 8) + { +- png_set_gray_1_2_4_to_8(png_ptr); ++ png_set_expand_gray_1_2_4_to_8(png_ptr); + } + + // add alpha if any alpha found +@@ -225,7 +225,7 @@ + // minimum of a byte per pixel + if (color_type == PNG_COLOR_TYPE_GRAY && bit_depth < 8) + { +- png_set_gray_1_2_4_to_8(png_ptr); ++ png_set_expand_gray_1_2_4_to_8(png_ptr); + } + + // add alpha if any alpha found diff --git a/sci-libs/vtk/files/vtk-5.6.0-R.patch b/sci-libs/vtk/files/vtk-5.6.0-R.patch new file mode 100644 index 000000000..1327121c2 --- /dev/null +++ b/sci-libs/vtk/files/vtk-5.6.0-R.patch @@ -0,0 +1,57 @@ +diff --git a/CMake/FindR.cmake b/CMake/FindR.cmake +index ee49570..c830db0 100644 +--- a/CMake/FindR.cmake ++++ b/CMake/FindR.cmake +@@ -18,13 +18,12 @@ IF (R_COMMAND) + ENDIF (R_COMMAND) + SET(CMAKE_FIND_APPBUNDLE ${TEMP_CMAKE_FIND_APPBUNDLE}) + +-FIND_PATH(R_INCLUDE_DIR R.h PATHS /usr/local/lib /usr/local/lib64 PATH_SUFFIXES R/include DOC "Path to file R.h") ++FIND_PATH(R_INCLUDE_DIR R.h PATHS /usr/lib /usr/lib64 PATH_SUFFIXES R/include DOC "Path to file R.h") + FIND_LIBRARY(R_LIBRARY_BASE R PATHS ${R_BASE_DIR} PATH_SUFFIXES /lib DOC "R library (example libR.a, libR.dylib, etc.).") +-FIND_LIBRARY(R_LIBRARY_BLAS Rblas PATHS ${R_BASE_DIR} PATH_SUFFIXES /lib DOC "Rblas library (example libRblas.a, libRblas.dylib, etc.).") +-FIND_LIBRARY(R_LIBRARY_LAPACK Rlapack PATHS ${R_BASE_DIR} PATH_SUFFIXES /lib DOC "Rlapack library (example libRlapack.a, libRlapack.dylib, etc.).") ++FIND_LIBRARY(R_LIBRARY_MATH Rmath PATHS ${R_BASE_DIR} PATH_SUFFIXES /lib DOC "Rmath library (example libRmath.a, libRmath.dylib, etc.).") + FIND_LIBRARY(R_LIBRARY_READLINE readline DOC "(Optional) system readline library. Only required if the R libraries were build with readline support.") + +-SET(R_LIBRARIES ${R_LIBRARY_BASE} ${R_LIBRARY_BLAS} ${R_LIBRARY_LAPACK} ${R_LIBRARY_BASE}) ++SET(R_LIBRARIES ${R_LIBRARY_BASE} ${R_LIBRARY_MATH} ${R_LIBRARY_BASE}) + IF (R_LIBRARY_READLINE) + SET(R_LIBRARIES ${R_LIBRARIES} ${R_LIBRARY_READLINE}) + ENDIF (R_LIBRARY_READLINE) +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 9d4e881..1a828a4 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -1054,8 +1054,18 @@ IF(VTK_WRAP_JAVA) + ENDIF(JAVA_AWT_LIBRARY) + ENDIF(VTK_WRAP_JAVA) + ++IF(VTK_USE_GNU_R) ++ FIND_PACKAGE(R) ++ENDIF(VTK_USE_GNU_R) + +- ++IF(VTK_USE_BOOST) ++ if (VTK_USE_PARALLEL_BGL) ++ FIND_PACKAGE(Boost 1.39.0 REQUIRED ++ COMPONENTS mpi serialization filesystem system graph_parallel) ++ else (VTK_USE_PARALLEL_BGL) ++ FIND_PACKAGE(Boost REQUIRED) ++ endif (VTK_USE_PARALLEL_BGL) ++ENDIF(VTK_USE_BOOST) + #----------------------------------------------------------------------------- + # The entire VTK tree should use the same include path. + +diff --git a/Graphics/vtkRInterface.cxx b/Graphics/vtkRInterface.cxx +index 324e845..56a4869 100644 +--- a/Graphics/vtkRInterface.cxx ++++ b/Graphics/vtkRInterface.cxx +@@ -23,6 +23,7 @@ + #undef HAVE_UINTPTR_T + #ifdef HAVE_VTK_UINTPTR_T + #define HAVE_UINTPTR_T HAVE_VTK_UINTPTR_T ++#include <stdint.h> + #endif + + #include "vtkInformation.h" diff --git a/sci-libs/vtk/files/vtk-5.6.0-boost-property_map.patch b/sci-libs/vtk/files/vtk-5.6.0-boost-property_map.patch new file mode 100644 index 000000000..9319378ac --- /dev/null +++ b/sci-libs/vtk/files/vtk-5.6.0-boost-property_map.patch @@ -0,0 +1,13 @@ +diff --git a/Infovis/vtkTreeLayoutStrategy.cxx b/Infovis/vtkTreeLayoutStrategy.cxx +index 4a764ea..74d0b53 100644 +--- a/Infovis/vtkTreeLayoutStrategy.cxx ++++ b/Infovis/vtkTreeLayoutStrategy.cxx +@@ -388,7 +388,7 @@ void vtkTreeLayoutStrategy::PrintSelf(ostream& os, vtkIndent indent) + #include "vtkTreeToBoostAdapter.h" + #include <boost/graph/visitors.hpp> + #include <boost/graph/depth_first_search.hpp> +-#include <boost/property_map.hpp> ++#include <boost/property_map/property_map.hpp> + #include <boost/pending/queue.hpp> + + using namespace boost; diff --git a/sci-libs/vtk/files/vtk-5.6.0-cg-path.patch b/sci-libs/vtk/files/vtk-5.6.0-cg-path.patch new file mode 100644 index 000000000..984bf5008 --- /dev/null +++ b/sci-libs/vtk/files/vtk-5.6.0-cg-path.patch @@ -0,0 +1,36 @@ +diff --git a/CMake/FindCg.cmake b/CMake/FindCg.cmake +index ceb41de..5eb6003 100644 +--- a/CMake/FindCg.cmake ++++ b/CMake/FindCg.cmake +@@ -82,6 +82,7 @@ ELSE (APPLE) + FIND_PROGRAM( CG_COMPILER cgc + /usr/bin + /usr/local/bin ++ /opt/nvidia-cg-toolkit/bin + DOC "The Cg Compiler" + ) + GET_FILENAME_COMPONENT(CG_COMPILER_DIR "${CG_COMPILER}" PATH) +@@ -89,6 +90,7 @@ ELSE (APPLE) + FIND_PATH( CG_INCLUDE_PATH Cg/cg.h + /usr/include + /usr/local/include ++ /opt/nvidia-cg-toolkit/include + ${CG_COMPILER_SUPER_DIR}/include + DOC "The directory where Cg/cg.h resides" + ) +@@ -98,6 +100,7 @@ ELSE (APPLE) + /usr/lib + /usr/local/lib64 + /usr/local/lib ++ /opt/nvidia-cg-toolkit/lib + ${CG_COMPILER_SUPER_DIR}/lib64 + ${CG_COMPILER_SUPER_DIR}/lib + DOC "The Cg runtime library" +@@ -108,6 +111,7 @@ ELSE (APPLE) + /usr/lib + /usr/local/lib64 + /usr/local/lib ++ /opt/nvidia-cg-toolkit/lib + ${CG_COMPILER_SUPER_DIR}/lib64 + ${CG_COMPILER_SUPER_DIR}/lib + DOC "The Cg runtime library" diff --git a/sci-libs/vtk/files/vtk-5.6.0-libpng14.patch b/sci-libs/vtk/files/vtk-5.6.0-libpng14.patch new file mode 100644 index 000000000..db1f87d3a --- /dev/null +++ b/sci-libs/vtk/files/vtk-5.6.0-libpng14.patch @@ -0,0 +1,22 @@ +diff --git a/IO/vtkPNGReader.cxx b/IO/vtkPNGReader.cxx +index d1f5c2f..0bf00e4 100644 +--- a/IO/vtkPNGReader.cxx ++++ b/IO/vtkPNGReader.cxx +@@ -116,7 +116,7 @@ void vtkPNGReader::ExecuteInformation() + // minimum of a byte per pixel + if (color_type == PNG_COLOR_TYPE_GRAY && bit_depth < 8) + { +- png_set_gray_1_2_4_to_8(png_ptr); ++ png_set_expand_gray_1_2_4_to_8(png_ptr); + } + + // add alpha if any alpha found +@@ -225,7 +225,7 @@ void vtkPNGReaderUpdate2(vtkPNGReader *self, OT *outPtr, + // minimum of a byte per pixel + if (color_type == PNG_COLOR_TYPE_GRAY && bit_depth < 8) + { +- png_set_gray_1_2_4_to_8(png_ptr); ++ png_set_expand_gray_1_2_4_to_8(png_ptr); + } + + // add alpha if any alpha found diff --git a/sci-libs/vtk/files/vtk-5.6.0-odbc.patch b/sci-libs/vtk/files/vtk-5.6.0-odbc.patch new file mode 100644 index 000000000..be24af11a --- /dev/null +++ b/sci-libs/vtk/files/vtk-5.6.0-odbc.patch @@ -0,0 +1,12 @@ +diff -Naur CMake/FindODBC.cmake.orig CMake/FindODBC.cmake +--- CMake/FindODBC.cmake.orig 2008-10-08 13:51:36.000000000 -0400 ++++ CMake/FindODBC.cmake 2010-01-21 22:11:26.000000000 -0500 +@@ -30,7 +30,7 @@ + ) + + FIND_LIBRARY( ODBC_LIBRARY +- NAMES iodbc unixodbc ++ NAMES iodbc unixodbc odbc + PATHS + /usr/lib + /usr/lib/odbc diff --git a/sci-libs/vtk/metadata.xml b/sci-libs/vtk/metadata.xml new file mode 100644 index 000000000..4671a1cbe --- /dev/null +++ b/sci-libs/vtk/metadata.xml @@ -0,0 +1,20 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<pkgmetadata> +<herd>sci</herd> +<herd>java</herd> +<maintainer> + <email>markusle@gentoo.org</email> + <name>Markus Dittrich</name> +</maintainer> +<maintainer> + <email>jlec@gentoo.org</email> + <name>Justin Lecher</name> +</maintainer> +<use> + <flag name='boost'>Add support for boost</flag> + <flag name='cg'>Use nvidia's cg shaders</flag> + <flag name='patented'>Build patented classes</flag> + <flag name='R'>Enable support for dev-lang/R</flag> +</use> +</pkgmetadata> diff --git a/sci-libs/vtk/vtk-5.6.0-r3.ebuild b/sci-libs/vtk/vtk-5.6.0-r3.ebuild new file mode 100644 index 000000000..450009cc9 --- /dev/null +++ b/sci-libs/vtk/vtk-5.6.0-r3.ebuild @@ -0,0 +1,253 @@ +# Copyright 1999-2010 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: $ + +EAPI="3" +PYTHON_DEPEND="python? 2" + +inherit eutils flag-o-matic java-pkg-opt-2 python qt4 versionator toolchain-funcs cmake-utils + +# Short package version +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}.tar.gz + examples? ( http://www.${PN}.org/files/release/${SPV}/${PN}data-${PV}.tar.gz ) + doc? ( http://www.${PN}.org/doc/release/${SPV}/${PN}DocHtml-${PV}.tar.gz )" + +LICENSE="BSD LGPL-2" +KEYWORDS="~amd64 ~x86" +SLOT="0" +IUSE="boost cg doc examples ffmpeg java mpi patented python qt4 tcl theora tk threads R mysql postgres odbc" +RDEPEND=" + mpi? ( virtual/mpi[cxx,romio] ) + cg? ( media-gfx/nvidia-cg-toolkit ) + tcl? ( >=dev-lang/tcl-8.2.3 ) + tk? ( >=dev-lang/tk-8.2.3 ) + java? ( >=virtual/jre-1.5 ) + qt4? ( + x11-libs/qt-core:4 + x11-libs/qt-gui:4 + x11-libs/qt-opengl:4 + x11-libs/qt-sql:4 + x11-libs/qt-webkit:4 ) + examples? ( + x11-libs/qt-core:4[qt3support] + x11-libs/qt-gui:4[qt3support] ) + theora? ( media-libs/libtheora ) + ffmpeg? ( media-video/ffmpeg ) + R? ( dev-lang/R ) + mysql? ( virtual/mysql ) + postgres? ( dev-db/postgresql-base ) + odbc? ( dev-db/unixODBC ) + dev-libs/expat + dev-libs/libxml2 + media-libs/freetype + media-libs/jpeg + media-libs/libpng + media-libs/mesa + media-libs/tiff + sys-libs/zlib + virtual/opengl + x11-libs/libX11 + x11-libs/libXmu + x11-libs/libXt" + +DEPEND="${RDEPEND} + java? ( >=virtual/jdk-1.5 ) + boost? ( >=dev-libs/boost-1.40.0[mpi?] ) + mpi? ( >=dev-util/cmake-2.8.1-r2 ) + >=dev-util/cmake-2.6" + +S="${WORKDIR}"/VTK + +pkg_setup() { + echo + einfo "Please note that the VTK build occasionally fails when" + einfo "using parallel make. Hence, if you experience a build" + einfo "failure please try re-emerging with MAKEOPTS=\"-j1\" first." + echo + + java-pkg-opt-2_pkg_setup + + use python && python_set_active_version 2 + use qt4 && qt4_pkg_setup +} + +src_prepare() { + epatch "${FILESDIR}"/${P}-cg-path.patch + epatch "${FILESDIR}"/${PN}-5.2.0-tcl-install.patch + epatch "${FILESDIR}"/${P}-boost-property_map.patch + epatch "${FILESDIR}"/${P}-libpng14.patch + epatch "${FILESDIR}"/${P}-R.patch + epatch "${FILESDIR}"/${P}-odbc.patch + sed -e "s:@VTK_TCL_LIBRARY_DIR@:/usr/$(get_libdir):" \ + -i Wrapping/Tcl/pkgIndex.tcl.in \ + || die "Failed to fix tcl pkgIndex file" +} + +src_configure() { + # general configuration + local mycmakeargs=( + -Wno-dev + -DVTK_INSTALL_PACKAGE_DIR=/$(get_libdir)/${PN}-${SPV} + -DCMAKE_SKIP_RPATH=YES + -DVTK_DIR="${S}" + -DVTK_INSTALL_LIB_DIR=/$(get_libdir)/ + -DVTK_DATA_ROOT:PATH="${EPREFIX}"/usr/share/${PN}/data + -DCMAKE_INSTALL_PREFIX="${EPREFIX}"/usr + -DBUILD_SHARED_LIBS=ON + -DVTK_USE_SYSTEM_EXPAT=ON + -DVTK_USE_SYSTEM_FREETYPE=ON + -DVTK_USE_SYSTEM_JPEG=ON + -DVTK_USE_SYSTEM_LIBXML2=ON + -DVTK_USE_SYSTEM_PNG=ON + -DVTK_USE_SYSTEM_TIFF=ON + -DVTK_USE_SYSTEM_ZLIB=ON + -DBUILD_TESTING=OFF + -DBUILD_EXAMPLES=OFF + -DVTK_USE_HYBRID=ON + -DVTK_USE_GL2PS=ON + -DVTK_USE_RENDERING=ON) + + # use flag triggered options + mycmakeargs+=( + $(cmake-utils_use boost VTK_USE_BOOST) + $(cmake-utils_use cg VTK_USE_CG_SHADERS) + $(cmake-utils_use doc DOCUMENTATION_HTML_HELP) + $(cmake-utils_use_build doc DOCUMENTATION) + $(cmake-utils_use java VTK_USE_JAVA) + $(cmake-utils_use mpi VTK_USE_MPI) + $(cmake-utils_use patented VTK_USE_PATENTED) + $(cmake-utils_use qt4 VTK_USE_QT) + $(cmake-utils_use tcl VTK_WRAP_TCL) + $(cmake-utils_use theora VTK_USE_OGGTHEORA_ENCODER) + $(cmake-utils_use ffmpeg VTK_USE_FFMPEG_ENCODER) + $(cmake-utils_use tk VTK_USE_TK) + $(cmake-utils_use threads VTK_USE_PARALLEL) + $(cmake-utils_use R VTK_USE_GNU_R) + $(cmake-utils_use mysql VTK_USE_MYSQL) + $(cmake-utils_use postgres VTK_USE_POSTGRES) + $(cmake-utils_use odbc VTK_USE_ODBC)) + + use theora && + mycmakeargs+=(-DVTK_USE_SYSTEM_OGGTHEORA=ON) + + # mpi needs the parallel framework + if use mpi && use !threads; then + mycmakeargs+=(-DVTK_USE_PARALLEL=ON) + fi + + if use java; then + mycmakeargs+=( + -DVTK_WRAP_JAVA=ON + -DJAVA_AWT_INCLUDE_PATH=`java-config -O`/include + -DJAVA_INCLUDE_PATH:PATH=`java-config -O`/include + -DJAVA_INCLUDE_PATH2:PATH=`java-config -O`/include/linux) + + if [ "${ARCH}" == "amd64" ]; then + mycmakeargs+=(-DJAVA_AWT_LIBRARY=`java-config -O`/jre/lib/${ARCH}/libjawt.so) + else + mycmakeargs+=(-DJAVA_AWT_LIBRARY:PATH=`java-config -O`/jre/lib/i386/libjawt.so) + fi + fi + + if use python; then + mycmakeargs+=( + -DVTK_WRAP_PYTHON=ON + -DPYTHON_INCLUDE_PATH=$(python_get_includedir) + -DPYTHON_LIBRARY=$(python_get_library) + -DVTK_PYTHON_SETUP_ARGS:STRING=--root="${D}") + fi + + if use qt4 ; then + mycmakeargs+=( + -DVTK_USE_GUISUPPORT=ON + -DVTK_USE_QVTK=ON + -DVTK_USE_QVTK_QTOPENGL=ON + -DQT_WRAP_CPP=ON + -DQT_WRAP_UI=ON + -DVTK_INSTALL_QT_DIR=/$(get_libdir)/qt4/plugins/${PN} + -DDESIRED_QT_VERSION=4 + -DQT_MOC_EXECUTABLE="${EPREFIX}"/usr/bin/moc + -DQT_UIC_EXECUTABLE="${EPREFIX}"/usr/bin/uic + -DQT_INCLUDE_DIR="${EPREFIX}"/usr/include/qt4 + -DQT_QMAKE_EXECUTABLE="${EPREFIX}"/usr/bin/qmake) + fi + + cmake-utils_src_configure +} + +src_install() { + cmake-utils_src_install + + # install docs + dohtml "${S}"/README.html || die "Failed to install docs" + + # install Tcl docs + docinto vtk_tcl + dodoc "${S}"/Wrapping/Tcl/README || \ + die "Failed to install Tcl docs" + + # install examples + if use examples; then + dodir /usr/share/${PN} || \ + die "Failed to create data/examples directory" + + cp -pPR "${S}"/Examples "${D}"/usr/share/${PN}/examples || \ + die "Failed to copy example files" + + # fix example's permissions + find "${D}"/usr/share/${PN}/examples -type d -exec \ + chmod 0755 {} \; || \ + die "Failed to fix example directories permissions" + find "${D}"/usr/share/${PN}/examples -type f -exec \ + chmod 0644 {} \; || \ + die "Failed to fix example files permissions" + + cp -pPR "${WORKDIR}"/VTKData "${D}"/usr/share/${PN}/data || \ + die "Failed to copy data files" + + # fix data's permissions + find "${D}"/usr/share/${PN}/data -type d -exec \ + chmod 0755 {} \; || \ + die "Failed to fix data directories permissions" + find "${D}"/usr/share/${PN}/data -type f -exec \ + chmod 0644 {} \; || \ + die "Failed to fix data files permissions" + fi + + #install big docs + if use doc; then + cd "${WORKDIR}"/html + 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 ./* || die "Failed to install docs" + fi + + # environment + echo "VTK_DATA_ROOT=/usr/share/${PN}/data" >> "${T}"/40${PN} + echo "VTK_DIR=/usr/$(get_libdir)/${PN}-${SPV}" >> "${T}"/40${PN} + echo "VTKHOME=/usr" >> "${T}"/40${PN} + doenvd "${T}"/40${PN} +} + +pkg_postinst() { + if use patented; then + ewarn "Using patented code in VTK may require a license." + ewarn "For more information, please read:" + ewarn "http://public.kitware.com/cgi-bin/vtkfaq?req=show&file=faq07.005.htp" + fi + + if use python; then + python_mod_optimize vtk + fi +} + +pkg_postrm() { + if use python; then + python_mod_cleanup vtk + fi +} |