diff options
24 files changed, 1694 insertions, 0 deletions
diff --git a/sci-libs/vtk/ChangeLog b/sci-libs/vtk/ChangeLog new file mode 100644 index 000000000..3763fd959 --- /dev/null +++ b/sci-libs/vtk/ChangeLog @@ -0,0 +1,470 @@ +# ChangeLog for sci-libs/vtk +# Copyright 1999-2013 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 $ + +*vtk-6.0.0 (11 Jul 2013) + + 11 Jul 2013; Justin Lecher <jlec@gentoo.org> +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, + +files/vtk-5.4.2-libpng14.patch, +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-ffmpeg.patch, +files/vtk-5.6.0-libpng14.patch, + +files/vtk-5.6.0-odbc.patch, +files/vtk-5.6.1-ffmpeg.patch, + +files/vtk-5.6.1-gcc-46.patch, +files/vtk-5.6.1-libav-0.8.patch, + +files/vtk-5.6.1-libpng15.patch, +files/vtk-5.8.0-R.patch, + +files/vtk-5.8.0-boost.patch, +files/vtk-5.10.1-ffmpeg-1.patch, + +files/vtk-5.10.1-libav-9.patch, +files/vtk-5.10.1-tcl8.6.patch, + +files/vtk-6.0.0-cg-path.patch, +metadata.xml: + First working version + + 05 Jun 2013; Luca Barbato <lu_zero@gentoo.org> vtk-5.10.1.ebuild, + +files/vtk-5.10.1-libav-9.patch: + libav 9 (and upcoming 10) support. + + 02 Mar 2013; Markos Chandras <hwoarang@gentoo.org> vtk-5.10.0.ebuild, + vtk-5.10.1.ebuild: + Move Qt dependencies to the new category + + 31 Jan 2013; Justin Lecher <jlec@gentoo.org> files/vtk-5.10.1-tcl8.6.patch: + Backport upstream patch for tcl/tk-8.6.0, #454762 + + 17 Jan 2013; Alexis Ballier <aballier@gentoo.org> vtk-5.10.1.ebuild, + +files/vtk-5.10.1-ffmpeg-1.patch: + Fix build with latest ffmpeg. Part of bug #450464. + + 15 Jan 2013; Justin Lecher <jlec@gentoo.org> vtk-5.10.1.ebuild, + +files/vtk-5.10.1-tcl8.6.patch: + Better fix for tcl support + + 14 Jan 2013; Justin Lecher <jlec@gentoo.org> vtk-5.10.1.ebuild: + Solve problems with USE=examples, #447146 + + 10 Jan 2013; Justin Lecher <jlec@gentoo.org> vtk-5.10.1.ebuild: + Add compatibility fix for tcl8.6 + +*vtk-5.10.1 (13 Dec 2012) + + 13 Dec 2012; Justin Lecher <jlec@gentoo.org> +vtk-5.10.1.ebuild, + metadata.xml: + Version Bump + + 06 Dec 2012; Sébastien Fabbro <bicatali@gentoo.org> vtk-5.10.0.ebuild: + Keyword amd64-linux and x86-linux + + 04 Sep 2012; Justin Lecher <jlec@gentoo.org> -vtk-5.6.1.ebuild, + -vtk-5.8.0.ebuild: + Drop old + +*vtk-5.10.0 (07 Jun 2012) + + 07 Jun 2012; Justin Lecher <jlec@gentoo.org> files/vtk-5.8.0-boost.patch, + +vtk-5.10.0.ebuild, metadata.xml: + Version Bump, #420103; Update boost patch, #412945 + + 20 Mar 2012; Jeroen Roovers <jer@gentoo.org> vtk-5.8.0.ebuild: + Sort IUSE entries. Remove IUSE=tk duplicate by zvasylvv (bug #408871). + + 27 Feb 2012; Justin Lecher <jlec@gentoo.org> vtk-5.8.0.ebuild: + Fix typo in Changelog and commit fix for #401839 + + 13 Feb 2012; Kacper Kowalik <xarthisius@gentoo.org> vtk-5.8.0.ebuild: + Add missing dependency on media-video/nvidia-settings + + 10 Feb 2012; Justin Lecher <jlec@gentoo.org> vtk-5.8.0.ebuild, + +files/vtk-5.8.0-boost.patch: + Backport patch for boost-1.48, #400901 + + 10 Feb 2012; Justin Lecher <jlec@gentoo.org> -vtk-5.4.2-r1.ebuild, + -vtk-5.6.0-r2.ebuild, -vtk-5.6.0-r3.ebuild, vtk-5.6.1.ebuild, + vtk-5.8.0.ebuild: + Use selected python ABI, #401839, patch by JTRiley; dropped old + + 29 Dec 2011; Justin Lecher <jlec@gentoo.org> vtk-5.8.0.ebuild: + Correct PYTHON_SETUP_ARGS to VTK_PYTHON_SETUP_ARGS, #396297 + + 29 Dec 2011; Justin Lecher <jlec@gentoo.org> vtk-5.8.0.ebuild: + Add missing deps for hdf5 and PyQt4/sip support + +*vtk-5.8.0 (27 Dec 2011) + + 27 Dec 2011; Justin Lecher <jlec@gentoo.org> +vtk-5.8.0.ebuild, + +files/vtk-5.8.0-R.patch: + Version Bump, #396119 + + 16 Nov 2011; Justin Lecher <jlec@gentoo.org> vtk-5.6.1.ebuild, + +files/vtk-5.6.1-libav-0.8.patch, metadata.xml: + Add debian patch for building against libav-0.8, #380681 + + 13 Sep 2011; Samuli Suominen <ssuominen@gentoo.org> vtk-5.6.1.ebuild, + +files/vtk-5.6.1-libpng15.patch: + Fix building with libpng15 wrt #378393 by Diego Elio Pettenò + + 04 Aug 2011; Fabian Groffen <grobian@gentoo.org> vtk-5.6.1.ebuild: + Allow to find Python from Prefix, bug #376917 + + 20 Jul 2011; Pacho Ramos <pacho@gentoo.org> metadata.xml: + Drop maintainer due retirement, bug #105599 + + 25 Apr 2011; Justin Lecher <jlec@gentoo.org> vtk-5.6.0-r2.ebuild, + vtk-5.6.0-r3.ebuild, vtk-5.6.1.ebuild, files/vtk-5.6.1-ffmpeg.patch, + +files/vtk-5.6.1-gcc-46.patch: + Correct patch for USE=ffmpeg, 327957; Fix for gcc-4.6 + + 17 Apr 2011; Justin Lecher <jlec@gentoo.org> vtk-5.6.0-r3.ebuild, + vtk-5.6.1.ebuild: + Fix ofr installation of examples, #363919 + +*vtk-5.6.1 (16 Apr 2011) +*vtk-5.6.0-r3 (16 Apr 2011) + + 16 Apr 2011; Justin Lecher <jlec@gentoo.org> vtk-5.6.0-r2.ebuild, + +vtk-5.6.0-r3.ebuild, +files/vtk-5.6.0-ffmpeg.patch, +vtk-5.6.1.ebuild, + +files/vtk-5.6.1-ffmpeg.patch: + Version Bump, Fixes for ffmpeg, Fortify source, py-2.7; #362701, #350318, + #344065, #338819, #334705, #327957 + + 31 Mar 2011; Tomáš Chvátal <scarabeus@gentoo.org> vtk-5.6.0-r2.ebuild: + Depend on virtual/ffmpeg instead of media-video/ffmpeg. + + 02 Mar 2011; Justin Lecher <jlec@gentoo.org> vtk-5.4.2-r1.ebuild, + vtk-5.6.0-r2.ebuild: + Correct Slots for gtk 3 introduction to tree + + 09 Nov 2010; Kacper Kowalik <xarthisius@gentoo.org> +vtk-5.4.2-r1.ebuild, + +files/vtk-5.4.2-boost-property_map.patch, +files/vtk-5.4.2-cg-path.patch, + +files/vtk-5.4.2-libpng14.patch: + Bring back vtk-5.4.x as sci-visualization/mayavi:1 depends on it. + media-libs/jpeg -> virtual/jpeg + + 08 Nov 2010; Kacper Kowalik <xarthisius@gentoo.org> + -files/vtk-5.0.3-mpi.patch, -files/vtk-5.0.4-gcc4.3.patch, + -vtk-5.4.2-r1.ebuild, -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-r2.ebuild: + media-libs/jpeg -> virtual/jpeg. Drop old. + + 24 Jul 2010; Justin Lecher <jlec@gentoo.org> vtk-5.6.0-r2.ebuild: + Fix for compilation with USE=ffmpeg, #327517 + + 11 Jul 2010; Justin Lecher <jlec@gentoo.org> vtk-5.6.0-r2.ebuild, + +files/vtk-5.6.0-odbc.patch: + Imported support for dbs from sci overlay, 327601, thanks yFrancois Bissey + + 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..1dadbe944 --- /dev/null +++ b/sci-libs/vtk/Manifest @@ -0,0 +1,3 @@ +DIST vtk-6.0.0.tar.gz 24170173 SHA256 426df543cffeacf21154dddcd2a6efbd91a586570a07a0db4c426d3e0acd10e4 SHA512 ac238e2d228df4fc4d324826b8729af9ab3274039d5abf834f013fb4deaddc116ba2b1b24fb93aaf4b1bfc4bb321d19bc05566883cf3db1f982c9650d77583e8 WHIRLPOOL b8619e254f97392dae01b8e2376bd70a07ce21504580d29844fcf1ab5621d85ba12bfd6047b4f90afd2b648d8b6c17e4ce5d789d6e1f84b5a4f847de5ee376b9 +DIST vtkDocHtml-6.0.0.tar.gz 204228463 SHA256 f5324c4c197b0cacd19bf1e5721bb012d753d49526e224d9f2dd7412f34e4434 SHA512 b6d5660f3ae6046c63b22b613cab6822f45f6b30a09522277e32f941c75dc48e8c92abc4d7f02b17e3f4d8e625de6dce7f000acc79e2d588a13d1577c139291a WHIRLPOOL b951c4ee62639c6bada2e02c2fceddbdb730c76d80c61a6ed013d8d9878b78a697158f41f53d68b5d62e4baa1f9ecb88e2437490da7610970622a40ecb14db1f +DIST vtkdata-6.0.0.tar.gz 99106820 SHA256 d5cb638804cc09838e05876f1701d2e9cf7aa3a5c63885da7c2ddf52b2fbb04d SHA512 b76eb8389047de1b74c585b8a3064d499758886f8e44063cb0d73fdc29b1a7cfbb1926bca869ccfbfaada3cffbb74a78a01fa081fd230002af7c4d79aa8a90af WHIRLPOOL 213a9ad270cf528cdfd9b601eaceba185d8388f629023fcd59603324539251c55c34685943122c07efd4e8b54217686399d9ec9d4e6e2780f33fcb510b148dc6 diff --git a/sci-libs/vtk/files/vtk-5.10.1-ffmpeg-1.patch b/sci-libs/vtk/files/vtk-5.10.1-ffmpeg-1.patch new file mode 100644 index 000000000..2cefb1259 --- /dev/null +++ b/sci-libs/vtk/files/vtk-5.10.1-ffmpeg-1.patch @@ -0,0 +1,49 @@ +https://bugs.gentoo.org/show_bug.cgi?id=450464 + +Index: VTK5.10.1/IO/vtkFFMPEGWriter.cxx +=================================================================== +--- VTK5.10.1.orig/IO/vtkFFMPEGWriter.cxx ++++ VTK5.10.1/IO/vtkFFMPEGWriter.cxx +@@ -192,13 +192,6 @@ int vtkFFMPEGWriterInternal::Start() + c->bit_rate_tolerance = this->Writer->GetBitRateTolerance(); + } + +- //apply the chosen parameters +- if (av_set_parameters(this->avFormatContext, NULL) < 0) +- { +- vtkGenericWarningMacro (<< "Invalid output format parameters." ); +- return 0; +- } +- + //manufacture a codec with the chosen parameters + AVCodec *codec = avcodec_find_encoder(c->codec_id); + if (!codec) +@@ -259,14 +252,17 @@ int vtkFFMPEGWriterInternal::Start() + + + //Finally, open the file and start it off. +- if (url_fopen(&this->avFormatContext->pb, this->avFormatContext->filename, URL_WRONLY) < 0) ++ if (avio_open(&this->avFormatContext->pb, this->avFormatContext->filename, AVIO_FLAG_WRITE) < 0) + { + vtkGenericWarningMacro (<< "Could not open " << this->Writer->GetFileName() << "." ); + return 0; + } + this->openedFile = 1; + +- av_write_header(this->avFormatContext); ++ if(avformat_write_header(this->avFormatContext, NULL) < 0) { ++ vtkGenericWarningMacro (<< "Failed to write header." ); ++ return 0; ++ } + return 1; + } + +@@ -391,7 +387,7 @@ void vtkFFMPEGWriterInternal::End() + #ifdef VTK_FFMPEG_OLD_URL_FCLOSE + url_fclose(&this->avFormatContext->pb); + #else +- url_fclose(this->avFormatContext->pb); ++ avio_close(this->avFormatContext->pb); + #endif + this->openedFile = 0; + } diff --git a/sci-libs/vtk/files/vtk-5.10.1-libav-9.patch b/sci-libs/vtk/files/vtk-5.10.1-libav-9.patch new file mode 100644 index 000000000..eb7b71c5e --- /dev/null +++ b/sci-libs/vtk/files/vtk-5.10.1-libav-9.patch @@ -0,0 +1,117 @@ +diff -burN VTK5.10.1.old/IO/vtkFFMPEGWriter.cxx VTK5.10.1/IO/vtkFFMPEGWriter.cxx +--- VTK5.10.1.old/IO/vtkFFMPEGWriter.cxx 2013-05-25 01:26:52.768954436 +0200 ++++ VTK5.10.1/IO/vtkFFMPEGWriter.cxx 2013-05-25 11:13:53.112672449 +0200 +@@ -60,9 +60,6 @@ + + AVStream *avStream; + +- unsigned char *codecBuf; +- int codecBufSize; +- + AVFrame *rgbInput; + AVFrame *yuvOutput; + +@@ -83,7 +80,6 @@ + + this->avStream = NULL; + +- this->codecBuf = NULL; + this->rgbInput = NULL; + this->yuvOutput = NULL; + +@@ -140,7 +136,7 @@ + strcpy(this->avFormatContext->filename, this->Writer->GetFileName()); + + //create a stream for that file +- this->avStream = av_new_stream(this->avFormatContext, 0); ++ this->avStream = avformat_new_stream(this->avFormatContext, NULL); + if (!this->avStream) + { + vtkGenericWarningMacro (<< "Could not create video stream."); +@@ -199,7 +195,7 @@ + vtkGenericWarningMacro (<< "Codec not found." ); + return 0; + } +- if (avcodec_open(c, codec) < 0) ++ if (avcodec_open2(c, codec, NULL) < 0) + { + vtkGenericWarningMacro (<< "Could not open codec."); + return 0; +@@ -207,15 +203,6 @@ + + //create buffers for the codec to work with. + +- //working compression space +- this->codecBufSize = 2*c->width*c->height*4; //hopefully this is enough +- this->codecBuf = new unsigned char[this->codecBufSize]; +- if (!this->codecBuf) +- { +- vtkGenericWarningMacro (<< "Could not make codec working space." ); +- return 0; +- } +- + //for the output of the writer's input... + this->rgbInput = avcodec_alloc_frame(); + if (!this->rgbInput) +@@ -316,38 +303,24 @@ + return 0; + } + #endif +- ++ AVPacket pkt = { 0 }; ++ int got_frame; + + //run the encoder +- int toAdd = avcodec_encode_video(cc, +- this->codecBuf, +- this->codecBufSize, +- this->yuvOutput); ++ int ret = avcodec_encode_video2(cc, ++ &pkt, ++ this->yuvOutput, ++ &got_frame); + + //dump the compressed result to file +- if (toAdd) ++ if (got_frame) + { +- //create an avpacket to output the compressed result +- AVPacket pkt; +- av_init_packet(&pkt); +- +- //to do playback at actual recorded rate, this will need more work +- pkt.pts = cc->coded_frame->pts; +- //pkt.dts = ?; not dure what decompression time stamp should be +- pkt.data = this->codecBuf; +- pkt.size = toAdd; + pkt.stream_index = this->avStream->index; +- if (cc->coded_frame->key_frame) //treat keyframes well +- { +- pkt.flags |= AV_PKT_FLAG_KEY; +- } +- pkt.duration = 0; //presentation duration in time_base units or 0 if NA +- pkt.pos = -1; //byte position in stream or -1 if NA + +- toAdd = av_write_frame(this->avFormatContext, &pkt); ++ ret = av_write_frame(this->avFormatContext, &pkt); + } + +- if (toAdd) //should not have anything left over ++ if (ret < 0) //should not have anything left over + { + vtkGenericWarningMacro (<< "Problem encoding frame." ); + return 0; +@@ -373,12 +346,6 @@ + this->rgbInput = NULL; + } + +- if (this->codecBuf) +- { +- av_free(this->codecBuf); +- this->codecBuf = NULL; +- } +- + if (this->avFormatContext) + { + if (this->openedFile) +Binary files VTK5.10.1.old/IO/.vtkFFMPEGWriter.cxx.swp and VTK5.10.1/IO/.vtkFFMPEGWriter.cxx.swp differ diff --git a/sci-libs/vtk/files/vtk-5.10.1-tcl8.6.patch b/sci-libs/vtk/files/vtk-5.10.1-tcl8.6.patch new file mode 100644 index 000000000..ed7ec08c2 --- /dev/null +++ b/sci-libs/vtk/files/vtk-5.10.1-tcl8.6.patch @@ -0,0 +1,57 @@ + Common/vtkTclUtil.cxx | 19 ++++++++++++++----- + 1 file changed, 14 insertions(+), 5 deletions(-) + +diff --git a/Common/vtkTclUtil.cxx b/Common/vtkTclUtil.cxx +index 390b0a4..2b7bccb 100644 +--- a/Common/vtkTclUtil.cxx ++++ b/Common/vtkTclUtil.cxx +@@ -21,6 +21,12 @@ + #include <string> + #include <vtksys/SystemTools.hxx> + ++#if (TCL_MAJOR_VERSION == 8) && (TCL_MINOR_VERSION < 6) ++#define vtkTclGetErrorLine(m) (m->errorLine) ++#else ++#define vtkTclGetErrorLine(m) (Tcl_GetErrorLine(m)) ++#endif ++ + extern "C" + { + #if (TCL_MAJOR_VERSION == 8) && (TCL_MINOR_VERSION >= 4) +@@ -490,13 +496,15 @@ VTKTCL_EXPORT void vtkTclVoidFunc(void *arg) + vtkGenericWarningMacro("Error returned from vtk/tcl callback:\n" << + arg2->command << endl << + Tcl_GetVar(arg2->interp,(char *)("errorInfo"),0) << +- " at line number " << arg2->interp->errorLine); ++ " at line number " << ++ vtkTclGetErrorLine(arg2->interp)); + } + else + { + vtkGenericWarningMacro("Error returned from vtk/tcl callback:\n" << + arg2->command << endl << +- " at line number " << arg2->interp->errorLine); ++ " at line number " << ++ vtkTclGetErrorLine(arg2->interp)); + } + } + } +@@ -723,14 +731,15 @@ void vtkTclCommand::Execute(vtkObject *, unsigned long, void *) + vtkGenericWarningMacro("Error returned from vtk/tcl callback:\n" << + this->StringCommand << endl << + Tcl_GetVar(this->Interp,(char *)("errorInfo"),0) << +- " at line number " << this->Interp->errorLine); ++ " at line number " << ++ vtkTclGetErrorLine(this->Interp)); + } + else + { + vtkGenericWarningMacro("Error returned from vtk/tcl callback:\n" << + this->StringCommand << endl << +- " at line number " << +- this->Interp->errorLine); ++ " at line number " << ++ vtkTclGetErrorLine(this->Interp)); + } + } + else if (res == -1) 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-ffmpeg.patch b/sci-libs/vtk/files/vtk-5.6.0-ffmpeg.patch new file mode 100644 index 000000000..2b600c067 --- /dev/null +++ b/sci-libs/vtk/files/vtk-5.6.0-ffmpeg.patch @@ -0,0 +1,42 @@ + CMake/vtkFFMPEGTestAvAlloc.cxx | 2 +- + CMake/vtkFFMPEGTestURLFClose.cxx | 2 +- + IO/vtkFFMPEGWriter.cxx | 2 +- + 3 files changed, 3 insertions(+), 3 deletions(-) + +diff --git a/CMake/vtkFFMPEGTestAvAlloc.cxx b/CMake/vtkFFMPEGTestAvAlloc.cxx +index ad691e3..1025c22 100644 +--- a/CMake/vtkFFMPEGTestAvAlloc.cxx ++++ b/CMake/vtkFFMPEGTestAvAlloc.cxx +@@ -1,6 +1,6 @@ + extern "C" { + #ifdef HAS_OLD_HEADER +-# include <ffmpeg/avformat.h> ++# include <libavformat/avformat.h> + #else + # include <libavformat/avformat.h> + #endif +diff --git a/CMake/vtkFFMPEGTestURLFClose.cxx b/CMake/vtkFFMPEGTestURLFClose.cxx +index 0bf4314..8c1df58 100644 +--- a/CMake/vtkFFMPEGTestURLFClose.cxx ++++ b/CMake/vtkFFMPEGTestURLFClose.cxx +@@ -1,6 +1,6 @@ + extern "C" { + #ifdef HAS_OLD_HEADER +-# include <ffmpeg/avformat.h> ++# include <libavformat/avformat.h> + #else + # include <libavformat/avformat.h> + #endif +diff --git a/IO/vtkFFMPEGWriter.cxx b/IO/vtkFFMPEGWriter.cxx +index b109c08..e056418 100644 +--- a/IO/vtkFFMPEGWriter.cxx ++++ b/IO/vtkFFMPEGWriter.cxx +@@ -22,7 +22,7 @@ + + extern "C" { + #ifdef VTK_FFMPEG_HAS_OLD_HEADER +-# include <ffmpeg/avformat.h> ++# include <libavformat/avformat.h> + #else + # include <libavformat/avformat.h> + #endif 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/files/vtk-5.6.1-ffmpeg.patch b/sci-libs/vtk/files/vtk-5.6.1-ffmpeg.patch new file mode 100644 index 000000000..34ec52885 --- /dev/null +++ b/sci-libs/vtk/files/vtk-5.6.1-ffmpeg.patch @@ -0,0 +1,42 @@ + CMake/vtkFFMPEGTestAvAlloc.cxx | 2 +- + CMake/vtkFFMPEGTestURLFClose.cxx | 2 +- + IO/vtkFFMPEGWriter.cxx | 2 +- + 3 files changed, 3 insertions(+), 3 deletions(-) + +diff --git a/CMake/vtkFFMPEGTestAvAlloc.cxx b/CMake/vtkFFMPEGTestAvAlloc.cxx +index ad691e3..32489d5 100644 +--- a/CMake/vtkFFMPEGTestAvAlloc.cxx ++++ b/CMake/vtkFFMPEGTestAvAlloc.cxx +@@ -1,6 +1,6 @@ + extern "C" { + #ifdef HAS_OLD_HEADER +-# include <ffmpeg/avformat.h> ++# include <libavformat/avformat.h> + #else + # include <libavformat/avformat.h> + #endif +diff --git a/CMake/vtkFFMPEGTestURLFClose.cxx b/CMake/vtkFFMPEGTestURLFClose.cxx +index 0bf4314..1c10a93 100644 +--- a/CMake/vtkFFMPEGTestURLFClose.cxx ++++ b/CMake/vtkFFMPEGTestURLFClose.cxx +@@ -1,6 +1,6 @@ + extern "C" { + #ifdef HAS_OLD_HEADER +-# include <ffmpeg/avformat.h> ++# include <libavformat/avformat.h> + #else + # include <libavformat/avformat.h> + #endif +diff --git a/IO/vtkFFMPEGWriter.cxx b/IO/vtkFFMPEGWriter.cxx +index 52673ef..ffbb78f 100644 +--- a/IO/vtkFFMPEGWriter.cxx ++++ b/IO/vtkFFMPEGWriter.cxx +@@ -22,7 +22,7 @@ + + extern "C" { + #ifdef VTK_FFMPEG_HAS_OLD_HEADER +-# include <ffmpeg/avformat.h> ++# include <libavformat/avformat.h> + #else + # include <libavformat/avformat.h> + #endif diff --git a/sci-libs/vtk/files/vtk-5.6.1-gcc-46.patch b/sci-libs/vtk/files/vtk-5.6.1-gcc-46.patch new file mode 100644 index 000000000..263e24f69 --- /dev/null +++ b/sci-libs/vtk/files/vtk-5.6.1-gcc-46.patch @@ -0,0 +1,29 @@ + Common/vtkPythonUtil.cxx | 2 ++ + Utilities/vtkmetaio/metaUtils.cxx | 1 + + 2 files changed, 3 insertions(+), 0 deletions(-) + +diff --git a/Common/vtkPythonUtil.cxx b/Common/vtkPythonUtil.cxx +index 7bc7660..d218e0d 100644 +--- a/Common/vtkPythonUtil.cxx ++++ b/Common/vtkPythonUtil.cxx +@@ -31,6 +31,8 @@ + #include <vtkstd/map> + #include <vtkstd/string> + ++#include <cstddef> ++ + // Silent warning like + // "dereferencing type-punned pointer will break strict-aliasing rules" + // it happens because this kind of expression: (long *)&ptr +diff --git a/Utilities/vtkmetaio/metaUtils.cxx b/Utilities/vtkmetaio/metaUtils.cxx +index 08d3e8d..bbcc9ec 100644 +--- a/Utilities/vtkmetaio/metaUtils.cxx ++++ b/Utilities/vtkmetaio/metaUtils.cxx +@@ -37,6 +37,7 @@ + #include <stdlib.h> + #include <string.h> + #include <string> ++#include <cstddef> + + #if defined (__BORLANDC__) && (__BORLANDC__ >= 0x0580) + #include <mem.h> diff --git a/sci-libs/vtk/files/vtk-5.6.1-libav-0.8.patch b/sci-libs/vtk/files/vtk-5.6.1-libav-0.8.patch new file mode 100644 index 000000000..523919d6f --- /dev/null +++ b/sci-libs/vtk/files/vtk-5.6.1-libav-0.8.patch @@ -0,0 +1,66 @@ +Description: Upstream changes introduced in version 5.6.1-6.1 + This patch has been created by dpkg-source during the package build. + Here's the last changelog entry, hopefully it gives details on why + those changes were made: + . + vtk (5.6.1-6.1) unstable; urgency=low + . + [ Michael Schutte ] + * Non-maintainer upload. + * Remove absolute paths to required libraries from + /usr/lib/vtk-5.6/VTKLibraryDepends.cmake after building, closes: + #506992. Due to the multiarch transition, the original behavior + frequently causes reverse build-deps to FTBFS. This change should + probably be reverted once all required libraries are multiarched. + . + [ Steve M. Robbins ] + * Override lintian diagnostic about embedded libraries ftgl and sqlite. + * IO/vtkFFMPEGWriter.cxx: Applied fix from #638246 to build with libav + 0.7. + . + The person named in the Author field signed this changelog entry. +Author: Steve M. Robbins <smr@debian.org> +Bug-Debian: http://bugs.debian.org/506992 + +--- +The information above should follow the Patch Tagging Guidelines, please +checkout http://dep.debian.net/deps/dep3/ to learn about the format. Here +are templates for supplementary fields that you might want to add: + +Origin: <vendor|upstream|other>, <url of original patch> +Bug: <url in upstream bugtracker> +Bug-Debian: http://bugs.debian.org/<bugnumber> +Bug-Ubuntu: https://launchpad.net/bugs/<bugnumber> +Forwarded: <no|not-needed|url proving that it has been forwarded> +Reviewed-By: <name and email of someone who approved the patch> +Last-Update: <YYYY-MM-DD> + +--- vtk-5.6.1.orig/IO/vtkFFMPEGWriter.cxx ++++ vtk-5.6.1/IO/vtkFFMPEGWriter.cxx +@@ -123,7 +123,7 @@ int vtkFFMPEGWriterInternal::Start() + } + + //choose avi media file format +- this->avOutputFormat = guess_format("avi", NULL, NULL); ++ this->avOutputFormat = av_guess_format("avi", NULL, NULL); + if (!this->avOutputFormat) + { + vtkGenericWarningMacro (<< "Could not open the avi media file format."); +@@ -150,7 +150,7 @@ int vtkFFMPEGWriterInternal::Start() + //Set up the codec. + AVCodecContext *c = this->avStream->codec; + c->codec_id = (CodecID)this->avOutputFormat->video_codec; +- c->codec_type = CODEC_TYPE_VIDEO; ++ c->codec_type = AVMEDIA_TYPE_VIDEO; + c->width = this->Dim[0]; + c->height = this->Dim[1]; + c->pix_fmt = PIX_FMT_YUVJ420P; +@@ -329,7 +329,7 @@ int vtkFFMPEGWriterInternal::Write(vtkIm + pkt.stream_index = this->avStream->index; + if (cc->coded_frame->key_frame) //treat keyframes well + { +- pkt.flags |= PKT_FLAG_KEY; ++ pkt.flags |= AV_PKT_FLAG_KEY; + } + pkt.duration = 0; //presentation duration in time_base units or 0 if NA + pkt.pos = -1; //byte position in stream or -1 if NA diff --git a/sci-libs/vtk/files/vtk-5.6.1-libpng15.patch b/sci-libs/vtk/files/vtk-5.6.1-libpng15.patch new file mode 100644 index 000000000..5bb5cbfb8 --- /dev/null +++ b/sci-libs/vtk/files/vtk-5.6.1-libpng15.patch @@ -0,0 +1,22 @@ +http://bugs.gentoo.org/378393 + +--- VTK/IO/vtkPNGWriter.cxx ++++ VTK/IO/vtkPNGWriter.cxx +@@ -147,7 +147,7 @@ + void vtkPNGWriteErrorFunction(png_structp png_ptr, + png_const_charp vtkNotUsed(error_msg)) + { +- longjmp(png_ptr->jmpbuf, 1); ++ longjmp(png_jmpbuf(png_ptr), 1); + } + } + +@@ -223,7 +223,7 @@ + png_init_io(png_ptr, this->TempFP); + png_set_error_fn(png_ptr, png_ptr, + vtkPNGWriteErrorFunction, vtkPNGWriteWarningFunction); +- if (setjmp(png_ptr->jmpbuf)) ++ if (setjmp(png_jmpbuf(png_ptr))) + { + fclose(this->TempFP); + this->SetErrorCode(vtkErrorCode::OutOfDiskSpaceError); diff --git a/sci-libs/vtk/files/vtk-5.8.0-R.patch b/sci-libs/vtk/files/vtk-5.8.0-R.patch new file mode 100644 index 000000000..ce6dcde59 --- /dev/null +++ b/sci-libs/vtk/files/vtk-5.8.0-R.patch @@ -0,0 +1,45 @@ +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/sci-libs/vtk/files/vtk-5.8.0-boost.patch b/sci-libs/vtk/files/vtk-5.8.0-boost.patch new file mode 100644 index 000000000..30a0e9a4c --- /dev/null +++ b/sci-libs/vtk/files/vtk-5.8.0-boost.patch @@ -0,0 +1,39 @@ +diff --git a/Infovis/vtkBoostBreadthFirstSearchTree.cxx b/Infovis/vtkBoostBreadthFirstSearchTree.cxx +index c789f6b..13e7cb6 100644 +--- a/Infovis/vtkBoostBreadthFirstSearchTree.cxx ++++ b/Infovis/vtkBoostBreadthFirstSearchTree.cxx +@@ -47,6 +47,21 @@ using namespace boost; + vtkStandardNewMacro(vtkBoostBreadthFirstSearchTree); + + ++#if BOOST_VERSION >= 104800 // Boost 1.48.x ++namespace { ++ vtkIdType unwrap_edge_id(vtkEdgeType const &e) { ++ return e.Id; ++ } ++ vtkIdType unwrap_edge_id(boost::detail::reverse_graph_edge_descriptor<vtkEdgeType> const &e) { ++# if BOOST_VERSION == 104800 ++ return e.underlying_desc.Id; ++# else ++ return e.underlying_descx.Id; ++# endif ++ } ++} ++#endif ++ + // Redefine the bfs visitor, the only visitor we + // are using is the tree_edge visitor. + template <typename IdMap> +@@ -95,7 +106,12 @@ public: + + // Copy the vertex and edge data from the graph to the tree. + tree->GetVertexData()->CopyData(graph->GetVertexData(), v, tree_v); ++#if BOOST_VERSION < 104800 // Boost 1.48.x + tree->GetEdgeData()->CopyData(graph->GetEdgeData(), e.Id, tree_e.Id); ++#else ++ tree->GetEdgeData()->CopyData(graph->GetEdgeData(), ++ unwrap_edge_id(e), tree_e.Id); ++#endif + } + + private: diff --git a/sci-libs/vtk/files/vtk-6.0.0-cg-path.patch b/sci-libs/vtk/files/vtk-6.0.0-cg-path.patch new file mode 100644 index 000000000..c83a06b2f --- /dev/null +++ b/sci-libs/vtk/files/vtk-6.0.0-cg-path.patch @@ -0,0 +1,16 @@ + Utilities/MaterialLibrary/CMakeLists.txt | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/Utilities/MaterialLibrary/CMakeLists.txt b/Utilities/MaterialLibrary/CMakeLists.txt +index 330a189..ede97be 100644 +--- a/Utilities/MaterialLibrary/CMakeLists.txt ++++ b/Utilities/MaterialLibrary/CMakeLists.txt +@@ -116,7 +116,7 @@ MACRO(get_modules modules prefix files ) + ENDMACRO(get_modules) + + SET(CMD_DEP ProcessShader) +-SET(CMD ProcessShader) ++SET(CMD ./ProcessShader.sh) + + IF (VTK_USE_CG_SHADERS) + # Create the Cg library. diff --git a/sci-libs/vtk/metadata.xml b/sci-libs/vtk/metadata.xml new file mode 100644 index 000000000..d61334b67 --- /dev/null +++ b/sci-libs/vtk/metadata.xml @@ -0,0 +1,17 @@ +<?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>jlec@gentoo.org</email> + <name>Justin Lecher</name> + </maintainer> + <use> + <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="R">Enable support for dev-lang/R</flag> + </use> +</pkgmetadata> diff --git a/sci-libs/vtk/vtk-6.0.0.ebuild b/sci-libs/vtk/vtk-6.0.0.ebuild new file mode 100644 index 000000000..e8d08927f --- /dev/null +++ b/sci-libs/vtk/vtk-6.0.0.ebuild @@ -0,0 +1,279 @@ +# Copyright 1999-2013 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/sci-libs/vtk/vtk-5.10.1.ebuild,v 1.6 2013/03/02 23:24:14 hwoarang Exp $ + +EAPI=5 + +PYTHON_COMPAT=( python{2_6,2_7} ) + +WANT_CMAKE="always" + +inherit eutils flag-o-matic java-pkg-opt-2 python-single-r1 qt4-r2 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/_rc/.rc}.tar.gz + doc? ( http://www.${PN}.org/files/release/${SPV}/${PN}DocHtml-${PV}.tar.gz ) + examples? ( http://www.${PN}.org/files/release/${SPV}/${PN}data-${PV}.tar.gz )" + +LICENSE="BSD LGPL-2" +KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux" +SLOT="0" +IUSE="boost chemistry cg doc examples ffmpeg java mpi mysql odbc patented postgres python qt4 R test theora threads tk video_cards_nvidia X" + +REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )" + +RDEPEND=" + dev-libs/expat + dev-libs/libxml2:2 + media-libs/freetype + media-libs/libpng + media-libs/mesa + media-libs/tiff + sci-libs/hdf5 + sys-libs/zlib + virtual/jpeg + virtual/opengl + x11-libs/libX11 + x11-libs/libXmu + x11-libs/libXt + cg? ( media-gfx/nvidia-cg-toolkit ) + examples? ( + dev-qt/qtcore:4[qt3support] + dev-qt/qtgui:4[qt3support] ) + ffmpeg? ( virtual/ffmpeg ) + java? ( >=virtual/jre-1.5 ) + mpi? ( virtual/mpi[cxx,romio] ) + mysql? ( virtual/mysql ) + odbc? ( dev-db/unixODBC ) + postgres? ( dev-db/postgresql-base ) + python? ( + ${PYTHON_DEPS} + dev-python/sip[${PYTHON_USEDEP}] ) + qt4? ( + dev-qt/qtcore:4 + dev-qt/qtgui:4 + dev-qt/qtopengl:4 + dev-qt/qtsql:4 + dev-qt/qtwebkit:4 + python? ( dev-python/PyQt4[${PYTHON_USEDEP}] ) + ) + tk? ( dev-lang/tk ) + theora? ( media-libs/libtheora ) + tk? ( dev-lang/tk ) + video_cards_nvidia? ( media-video/nvidia-settings ) + R? ( dev-lang/R )" +DEPEND="${RDEPEND} + java? ( >=virtual/jdk-1.5 ) + boost? ( >=dev-libs/boost-1.40.0[mpi?] ) + dev-util/cmake" + +S="${WORKDIR}"/VTK${PV/_rc/.rc} + +PATCHES=( + "${FILESDIR}"/${P}-cg-path.patch +# "${FILESDIR}"/${PN}-5.6.0-cg-path.patch +# "${FILESDIR}"/${PN}-5.2.0-tcl-install.patch +# "${FILESDIR}"/${PN}-5.8.0-R.patch +# "${FILESDIR}"/${PN}-5.6.0-odbc.patch +# "${FILESDIR}"/${PN}-5.6.1-ffmpeg.patch +# "${FILESDIR}"/${PN}-5.6.1-libav-0.8.patch +# "${FILESDIR}"/${PN}-5.10.1-tcl8.6.patch +# "${FILESDIR}"/${PN}-5.10.1-ffmpeg-1.patch + ) + +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-single-r1_pkg_setup + append-cppflags -D__STDC_CONSTANT_MACROS +} + +src_prepare() { + cmake-utils_src_prepare +} + +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_LIBRARY_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_GL2PS=ON + -DVTK_USE_SYSTEM_HDF5=ON + -DVTK_USE_SYSTEM_JPEG=ON +# -DVTK_USE_SYSTEM_LIBPROJ4=ON + -DVTK_USE_SYSTEM_LibXml2=ON + -DVTK_USE_SYSTEM_PNG=ON + -DVTK_USE_SYSTEM_TIFF=ON + -DVTK_USE_SYSTEM_ZLIB=ON +# -DVTK_USE_SYSTEM_xdmf2=ON + -DHDF5_LIBRARY="${EPREFIX}/usr/$(get_libdir)" + -DHDF5_INCLUDE_DIRS="${EPREFIX}/usr/include" + -DBUILD_TESTING=OFF + -DBUILD_EXAMPLES=OFF + -DVTK_USE_HYBRID=ON + -DVTK_USE_GL2PS=ON + -DVTK_USE_RENDERING=ON + -DLD_LIBRARY_PATCH="${BUILD_DIR}/lib" + ) + + # 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 mysql VTK_USE_MYSQL) + $(cmake-utils_use patented VTK_USE_PATENTED) + $(cmake-utils_use postgres VTK_USE_POSTGRES) + $(cmake-utils_use odbc VTK_USE_ODBC) + $(cmake-utils_use qt4 VTK_USE_QT) + $(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 video_cards_nvidia VTK_USE_NVCONTROL) + $(cmake-utils_use X VTK_USE_X) + $(cmake-utils_use X VTK_USE_GUISUPPORT) + $(cmake-utils_use R VTK_USE_GNU_R) + $(cmake-utils_use chemistry VTK_USE_CHEMISTRY) + ) + + use tk && + mycmakeargs+=( + -DVTK_WRAP_TCL=ON + -DVTK_WRAP_TK=ON + -DVTK_TCL_INCLUDE_DIR="${EPREFIX}/usr/include" + -DVTK_TCL_LIBRARY="${EPREFIX}/usr/$(get_libdir)" + -DVTK_TK_INCLUDE_DIR="${EPREFIX}/usr/include" + -DVTK_TK_LIBRARY="${EPREFIX}/usr/$(get_libdir)" + -DVTK_INSTALL_TCL_DIR="$(get_libdir)" + ) + + 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+=( + -DPYTHON_INCLUDE_DIR="$(python_get_includedir)" + -DPYTHON_LIBRARY="$(python_get_library_path)" + -DVTK_WRAP_PYTHON=ON + -DVTK_WRAP_PYTHON_SIP=ON + -DSIP_PYQT_DIR="${EPREFIX}/usr/share/sip" + -DSIP_INCLUDE_DIR="$(python_get_includedir)" + -DVTK_PYTHON_INCLUDE_DIR="$(python_get_includedir)" + -DVTK_PYTHON_LIBRARY="$(python_get_library_path)" + -DVTK_PYTHON_SETUP_ARGS:STRING=--root="${D}") + fi + + if use qt4 ; then + mycmakeargs+=( + -DVTK_USE_GUISUPPORT=ON + -DVTK_USE_QVTK=ON + -DVTK_USE_QVTK_OPENGL=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 + + cat >> "${BUILD_DIR}"/Utilities/MaterialLibrary/ProcessShader.sh <<- EOF + #!${EPREFIX}/bin/bash + + export LD_LIBRARY_PATH="${BUILD_DIR}"/lib + "${BUILD_DIR}"/bin/vtkProcessShader-${SPV} \$@ + EOF + chmod 750 "${BUILD_DIR}"/Utilities/MaterialLibrary/ProcessShader.sh || die +} + +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 + insinto /usr/share/${PN} + mv -v Examples examples + doins -r examples || die + mv -v "${WORKDIR}"/{VTKData${PV},data} || die + doins -r "${WORKDIR}"/data || die + 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 + cat >> "${T}"/40${PN} <<- EOF + VTK_DATA_ROOT=${EPREFIX}/usr/share/${PN}/data + VTK_DIR=${EPREFIX}/usr/$(get_libdir)/${PN}-${SPV} + VTKHOME=${EPREFIX}/usr + EOF + 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 +} |