# 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.67 2010/05/22 09:19:22 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/vtk/ChangeLog,v 1.68 2010/05/28 11:51:24 jlec Exp $
+
+*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:
AUX vtk-5.4.2-boost-property_map.patch 3421 RMD160 a46265b2c4d0c4968037be65f2c52b6436c37499 SHA1 09ccc19c0c8503329c42fc8024142d4f632f54d5 SHA256 e905b931bb719c1f94017f0c76b1994aa785ac0a881b4c96bfbaeb6bc95af65b
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-boost-property_map.patch 1083 RMD160 3e342c60bf40160109b4ea581415a6d23a2b9308 SHA1 18b5b6530e701e4a0915292dc4d0cdc43a40aa1e SHA256 a7507808bbb3332c6201a77803c88b2811a31484d54791971c078fd4b70314ee
+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
DIST vtk-5.4.2.tar.gz 18265310 RMD160 607df8babe7413b92a5bd4d8c264fd69798df83f SHA1 508106a15c32326aa9ac737c7f0e7212c150d55f SHA256 037c0582ee7483e0b495e45a00c4f08784691ef82c4ea159ef86731c3beda73d
+DIST vtk-5.6.0.tar.gz 20709970 RMD160 b7abf3b9bb14a3db81608c7aa2721935ae653295 SHA1 355209c485304f1b0feefcda3585d45217ffd230 SHA256 2987938ad906c5fd30ddbf60889f899d1dd8c61d80320c55ac1acadc00a95d3e
DIST vtkDocHtml-5.4.2.tar.gz 229828672 RMD160 d6372984b74ede33713501219fecd6768edcfad3 SHA1 13da1373bb95f34b1f868b307f0e84fef6626020 SHA256 54dfe1c242c488db1d1099bbf9114f49ee2bd07859c067e77e2d6bd3c077ee25
+DIST vtkDocHtml-5.6.0.tar.gz 103149113 RMD160 da6a562345c4c143470ddcc8b926820eec2a41cb SHA1 ce7c3ea6c6b674cef0bdd2c2aa036f576c61a477 SHA256 330ab1de0963bdcd0d0d1dbcd374a579874d867bff4b298d65d46855baf2d0c2
DIST vtkdata-5.4.2.tar.gz 52810062 RMD160 0cc24fc7a6a9bb80c619a0555eb288cc97554001 SHA1 5030523c0a9e17c47bf94fe9005e5c91069a571a SHA256 84c9895b72aec96977b8043a4be26ff58e14ae04ab2be9f19a02ca613dc3be26
-EBUILD vtk-5.4.2-r1.ebuild 6440 RMD160 a77fedd6b2dca0c1866dc71725f6c480b3a7dd05 SHA1 857fb573a1c85fee35ce6359d293820eb04b0870 SHA256 e2840f507b89bdcac967ca7d5d969addf47eba0825a9b3566e0dca5ec54cc69b
+DIST vtkdata-5.6.0.tar.gz 76716069 RMD160 8499816f6d714408c0f7f584fb4d781f4426e444 SHA1 e0aa26dafd653da1db21fc97ce15aa0599d9c5ad SHA256 e6eed8e5c8d8410d7c7cf007de8c5b56bde77d38fa0522c1ac7751138323c9cf
+EBUILD vtk-5.4.2-r1.ebuild 6405 RMD160 e2e66c8f39da61dba40b176fb6f6bdd352d5350f SHA1 5523828af953afb4b1eae85873aa8f24a142e11d SHA256 14adbdd1417fb7572355c5f19859209163ac46db29d89fb5a646feb54fb7629b
EBUILD vtk-5.4.2.ebuild 9247 RMD160 3547c38a9a64f5ac3c2d0fd206698211dfa7e08e SHA1 2153b18b06f54d908c220aaec2e3e61574c8e31a SHA256 5cd83226710f1aece303f35860107d079732139ee73e5dc10d14fe661fc3735a
-MISC ChangeLog 11176 RMD160 6550c0275cca306586ca4ac14a7989194963ea16 SHA1 d66c27224c2d69647f972e3c4cedf3b737648ffc SHA256 0f6ac2ac8ec904fac1c538396cbfb550cfa58e49218d308ce61fedad0e164506
-MISC metadata.xml 432 RMD160 2b5009d16ed172daa9ae089e59ceadabeaab5884 SHA1 4163aa67aa3d1d46b8efc21d2af85a2105f6a77c SHA256 8dadae25a4cdeedb63f94cbaf7fc6a8ce7a1950feae7047e859839d2eee30747
+EBUILD vtk-5.6.0.ebuild 6603 RMD160 a808c29709cfc0545d6d3eb156ede2be22635572 SHA1 41729a6d4298476139f39ccecf54a61350eb1803 SHA256 22b293eb76984f09da6c153629659ac53571d443c4ea7923f7caf84904145f98
+MISC ChangeLog 11482 RMD160 4d7bfaccf2da4b095d4bd5d81e523c0f374c555b SHA1 294abea2f774df5d70c2d01c84b9e60568b343b5 SHA256 4f0d7e52cd4c82de3b4a8f072fbcf7aea907835f620eb9b941e7dbaecfb6cad9
+MISC metadata.xml 485 RMD160 f2b347cadff446a8d4e49715b0a855bb300d550e SHA1 98806a4e1cea8d9c95ed22f51ea8b2bcc931831e SHA256 b51fb6c14caf9400d08471ff6f445ba1ec4e748029c9d03bd3a2a6410122803c
-----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.14 (GNU/Linux)
+Version: GnuPG v2.0.15 (GNU/Linux)
-iEYEARECAAYFAkv3oaAACgkQgAnW8HDreRamfgCfaDgGs+91GdhVAv8rSEIctRI+
-A5sAnRvGoazOR7GW/+5/qEo4e+NBZhyc
-=Q08v
+iEYEARECAAYFAkv/rkMACgkQgAnW8HDreRadxgCeJY75Dk5JCt1qQsElD/zQSwur
+mZYAn01lDAAs1tfA7E1cCHtm5Of/NhJC
+=hwnf
-----END PGP SIGNATURE-----
--- /dev/null
+diff --git a/Infovis/vtkBoostGraphAdapter.h b/Infovis/vtkBoostGraphAdapter.h
+index 5d113ac..d84cb98 100644
+--- a/Infovis/vtkBoostGraphAdapter.h
++++ b/Infovis/vtkBoostGraphAdapter.h
+@@ -50,7 +50,7 @@ namespace boost {
+ // These need to be defined before including other boost stuff
+
+ // Forward declarations are required here, so that we aren't forced
+- // to include boost/property_map.hpp.
++ // to include boost/property_map/property_map.hpp.
+ template<typename> class property_traits;
+ class read_write_property_map_tag;
+
+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;
--- /dev/null
+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"
--- /dev/null
+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
<name>Markus Dittrich</name>
</maintainer>
<use>
- <flag name='patented'>Build patented classes</flag>
<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>
# Copyright 1999-2010 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/vtk/vtk-5.4.2-r1.ebuild,v 1.10 2010/05/22 09:19:22 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/vtk/vtk-5.4.2-r1.ebuild,v 1.11 2010/05/28 11:51:24 jlec Exp $
EAPI="3"
PYTHON_DEPEND="python? 2"
sys-cluster/openmpi
sys-cluster/lam-mpi
sys-cluster/mpich2[cxx] ) )
- python? ( >=dev-lang/python-2.0 )
cg? ( media-gfx/nvidia-cg-toolkit )
tcl? ( >=dev-lang/tcl-8.2.3 )
tk? ( >=dev-lang/tk-8.2.3 )
--- /dev/null
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/vtk/vtk-5.6.0.ebuild,v 1.1 2010/05/28 11:51:24 jlec Exp $
+
+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 java mpi ogg patented python qt4 tcl tk threads R"
+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-opengl:4
+ x11-libs/qt-gui:4
+ x11-libs/qt-sql )
+ examples? (
+ x11-libs/qt-core:4[qt3support]
+ x11-libs/qt-gui:4[qt3support] )
+ R? ( dev-lang/R )
+ dev-libs/expat
+ dev-libs/libxml2
+ media-libs/freetype
+ media-libs/jpeg
+ media-libs/libpng
+ media-libs/tiff
+ virtual/opengl
+ x11-libs/libXmu"
+
+DEPEND="${RDEPEND}
+ java? ( >=virtual/jdk-1.5 )
+ boost? ( >=dev-libs/boost-1.40.0 )
+ mpi? ( >=dev-util/cmake-2.8 )
+ >=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
+ 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_FREETYPE=ON
+ -DVTK_USE_SYSTEM_JPEG=ON
+ -DVTK_USE_SYSTEM_PNG=ON
+ -DVTK_USE_SYSTEM_TIFF=ON
+ -DVTK_USE_SYSTEM_ZLIB=ON
+ -DVTK_USE_SYSTEM_EXPAT=ON
+ -DVTK_USE_SYSTEM_LIBXML2=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 ogg VTK_USE_OGGTHEORA_ENCODER)
+ $(cmake-utils_use patented VTK_USE_PATENTED)
+ $(cmake-utils_use qt4 VTK_USE_QT)
+ $(cmake-utils_use tcl VTK_WRAP_TCL)
+ $(cmake-utils_use tk VTK_USE_TK)
+ $(cmake-utils_use threads VTK_USE_PARALLEL)
+ $(cmake-utils_use R VTK_USE_GNU_R) )
+
+ # 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
+}
projects / gentoo.git / commitdiff