* [gentoo-commits] gentoo-x86 commit in sci-libs/vtk: vtk-6.1.0.ebuild ChangeLog metadata.xml vtk-6.0.0.ebuild vtk-5.10.0.ebuild vtk-5.10.1.ebuild
@ 2014-12-26 12:19 Justin Lecher (jlec)
0 siblings, 0 replies; only message in thread
From: Justin Lecher (jlec) @ 2014-12-26 12:19 UTC (permalink / raw
To: gentoo-commits
jlec 14/12/26 12:19:44
Modified: ChangeLog metadata.xml vtk-6.0.0.ebuild
Added: vtk-6.1.0.ebuild
Removed: vtk-5.10.0.ebuild vtk-5.10.1.ebuild
Log:
sci-libs/vtk: Version BUmp, #500814; fixes GLintptr declaration problems, #523786; Add slot operators to dependencies, #531040; drop old which obsoletes, #477638, #497224, #520310
(Portage version: 2.2.15/cvs/Linux x86_64, signed Manifest commit with key B9D4F231BD1558AB!)
Revision Changes Path
1.120 sci-libs/vtk/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-libs/vtk/ChangeLog?rev=1.120&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-libs/vtk/ChangeLog?rev=1.120&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-libs/vtk/ChangeLog?r1=1.119&r2=1.120
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sci-libs/vtk/ChangeLog,v
retrieving revision 1.119
retrieving revision 1.120
diff -u -r1.119 -r1.120
--- ChangeLog 3 Nov 2014 13:58:24 -0000 1.119
+++ ChangeLog 26 Dec 2014 12:19:44 -0000 1.120
@@ -1,6 +1,17 @@
# ChangeLog for sci-libs/vtk
# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/vtk/ChangeLog,v 1.119 2014/11/03 13:58:24 titanofold Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/vtk/ChangeLog,v 1.120 2014/12/26 12:19:44 jlec Exp $
+
+*vtk-6.1.0 (26 Dec 2014)
+
+ 26 Dec 2014; Justin Lecher <jlec@gentoo.org> -vtk-5.10.0.ebuild,
+ -vtk-5.10.1.ebuild, vtk-6.0.0.ebuild, +vtk-6.1.0.ebuild,
+ +files/vtk-6.1.0-freetype.patch, +files/vtk-6.1.0-glext.patch,
+ +files/vtk-6.1.0-install.patch, +files/vtk-6.1.0-netcdf.patch,
+ +files/vtk-6.1.0-system.patch, +files/vtk-6.1.0-web.patch, metadata.xml:
+ Version BUmp, #500814; fixes GLintptr declaration problems, #523786; Add slot
+ operators to dependencies, #531040; drop old which obsoletes, #477638,
+ #497224, #520310
03 Nov 2014; Aaron W. Swenson <titanofold@gentoo.org> vtk-5.10.0.ebuild,
vtk-5.10.1.ebuild, vtk-6.0.0.ebuild:
1.13 sci-libs/vtk/metadata.xml
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-libs/vtk/metadata.xml?rev=1.13&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-libs/vtk/metadata.xml?rev=1.13&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-libs/vtk/metadata.xml?r1=1.12&r2=1.13
Index: metadata.xml
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sci-libs/vtk/metadata.xml,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- metadata.xml 11 Jan 2014 16:55:50 -0000 1.12
+++ metadata.xml 26 Dec 2014 12:19:44 -0000 1.13
@@ -9,13 +9,16 @@
</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="gdal">Support for gdal formated data</flag>
<flag name="imaging">Building Imaging modules</flag>
+ <flag name="json">Support for json formated data</flag>
+ <flag name="kaapi">Use <pkg>sci-libs/kaapi</pkg> to handle smp support</flag>
<flag name="offscreen">Offscreen rendering through OSMesa</flag>
<flag name="rendering">Building Redering modules</flag>
+ <flag name="tbb">Use <pkg>dev-cpp/tbb</pkg> to handle smp support</flag>
<flag name="views">Building Views modules</flag>
+ <flag name="web">Install web component</flag>
<flag name="R">Enable support for dev-lang/R</flag>
</use>
</pkgmetadata>
1.9 sci-libs/vtk/vtk-6.0.0.ebuild
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-libs/vtk/vtk-6.0.0.ebuild?rev=1.9&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-libs/vtk/vtk-6.0.0.ebuild?rev=1.9&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-libs/vtk/vtk-6.0.0.ebuild?r1=1.8&r2=1.9
Index: vtk-6.0.0.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sci-libs/vtk/vtk-6.0.0.ebuild,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- vtk-6.0.0.ebuild 3 Nov 2014 13:58:24 -0000 1.8
+++ vtk-6.0.0.ebuild 26 Dec 2014 12:19:44 -0000 1.9
@@ -1,6 +1,6 @@
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/vtk/vtk-6.0.0.ebuild,v 1.8 2014/11/03 13:58:24 titanofold Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/vtk/vtk-6.0.0.ebuild,v 1.9 2014/12/26 12:19:44 jlec Exp $
EAPI=5
@@ -43,7 +43,7 @@
media-libs/libtheora
media-libs/tiff
sci-libs/exodusii
- sci-libs/hdf5
+ sci-libs/hdf5:=
sci-libs/netcdf-cxx:3
sys-libs/zlib
virtual/jpeg
1.1 sci-libs/vtk/vtk-6.1.0.ebuild
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-libs/vtk/vtk-6.1.0.ebuild?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-libs/vtk/vtk-6.1.0.ebuild?rev=1.1&content-type=text/plain
Index: vtk-6.1.0.ebuild
===================================================================
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/sci-libs/vtk/vtk-6.1.0.ebuild,v 1.1 2014/12/26 12:19:44 jlec Exp $
EAPI=5
PYTHON_COMPAT=( python{2_6,2_7} )
CMAKE_MAKEFILE_GENERATOR=ninja
WEBAPP_OPTIONAL=yes
WEBAPP_MANUAL_SLOT=yes
inherit eutils flag-o-matic java-pkg-opt-2 python-single-r1 qt4-r2 versionator toolchain-funcs cmake-utils virtualx webapp
# 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}/VTK-${PV}.tar.gz
doc? ( http://www.${PN}.org/files/release/${SPV}/${PN}DocHtml-${PV}.tar.gz )
test? (
http://www.${PN}.org/files/release/${SPV}/VTKData-${PV}.tar.gz
http://www.${PN}.org/files/release/${SPV}/VTKLargeData-${PV}.tar.gz
)
"
LICENSE="BSD LGPL-2"
KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
SLOT="0"
IUSE="
aqua boost cg doc examples imaging ffmpeg gdal java json kaapi mpi mysql
odbc offscreen postgres python qt4 rendering smp tbb test theora tk tcl
video_cards_nvidia views web R +X"
REQUIRED_USE="
java? ( qt4 )
python? ( ${PYTHON_REQUIRED_USE} )
tcl? ( rendering )
smp? ( ^^ ( kaapi tbb ) )
test? ( python )
tk? ( tcl )
web? ( python )
^^ ( X aqua offscreen )
"
RDEPEND="
dev-libs/expat
dev-libs/libxml2:2
>=media-libs/freetype-2.5.4
media-libs/libpng
media-libs/mesa
media-libs/libtheora
media-libs/tiff
sci-libs/exodusii
sci-libs/hdf5:=
sci-libs/netcdf-cxx:3
sys-libs/zlib
virtual/jpeg
virtual/opengl
>=x11-libs/gl2ps-1.3.8
x11-libs/libX11
x11-libs/libXmu
x11-libs/libXt
boost? ( >=dev-libs/boost-1.40.0[mpi?] )
cg? ( media-gfx/nvidia-cg-toolkit )
examples? (
dev-qt/qtcore:4
dev-qt/qtgui:4
sci-libs/vtkdata
)
ffmpeg? ( virtual/ffmpeg )
gdal? ( sci-libs/gdal )
java? ( >=virtual/jre-1.5 )
kaapi? ( <sci-libs/xkaapi-3 )
mpi? ( virtual/mpi[cxx,romio] )
mysql? ( virtual/mysql )
odbc? ( dev-db/unixODBC )
offscreen? ( media-libs/mesa[osmesa] )
postgres? ( virtual/postgresql )
python? (
${PYTHON_DEPS}
dev-python/sip[${PYTHON_USEDEP}]
)
qt4? (
dev-qt/designer:4
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}] )
)
tbb? ( dev-cpp/tbb )
tcl? ( dev-lang/tcl )
tk? ( dev-lang/tk )
video_cards_nvidia? ( media-video/nvidia-settings )
web? (
${WEBAPP_DEPEND}
python? (
dev-python/autobahn[${PYTHON_USEDEP}]
dev-python/twisted-core[${PYTHON_USEDEP}]
dev-python/zope-interface[${PYTHON_USEDEP}]
)
)
R? ( dev-lang/R )"
DEPEND="${RDEPEND}
doc? ( app-doc/doxygen )
java? ( >=virtual/jdk-1.5 )"
S="${WORKDIR}"/VTK-${PV}
PATCHES=(
"${FILESDIR}"/${P}-freetype.patch
"${FILESDIR}"/${P}-install.patch
"${FILESDIR}"/${P}-system.patch
"${FILESDIR}"/${P}-netcdf.patch
"${FILESDIR}"/${P}-web.patch
"${FILESDIR}"/${P}-glext.patch
)
RESTRICT=test
pkg_setup() {
use java && java-pkg-opt-2_pkg_setup
use python && python-single-r1_pkg_setup
use web && webapp_pkg_setup
append-cppflags -D__STDC_CONSTANT_MACROS -D_UNICODE
}
src_prepare() {
sed \
-e 's:libproj4:libproj:g' \
-e 's:lib_proj.h:lib_abi.h:g' \
-i CMake/FindLIBPROJ4.cmake || die
local x
# missing: alglib exodusII freerange ftgl jsoncpp libproj4 mrmpi verdict xdmf2
for x in expat freetype gl2ps hdf5 jpeg libxml2 netcdf oggtheora png tiff zlib; do
rm -r ThirdParty/${x}/vtk${x} || die
done
rm -r \
ThirdParty/AutobahnPython/autobahn \
ThirdParty/Twisted/twisted \
ThirdParty/ZopeInterface/zope \
|| die
use java && export JAVA_HOME="${EPREFIX}/etc/java-config-2/current-system-vm"
if use mpi; then
export CC=mpicc
export CXX=mpicxx
export FC=mpif90
export F90=mpif90
export F77=mpif77
fi
cmake-utils_src_prepare
}
src_configure() {
# general configuration
local mycmakeargs=(
-Wno-dev
# -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"
-DVTK_CUSTOM_LIBRARY_SUFFIX=""
-DBUILD_SHARED_LIBS=ON
-DVTK_USE_SYSTEM_AUTOBAHN=ON
-DVTK_USE_SYSTEM_EXPAT=ON
-DVTK_USE_SYSTEM_FREETYPE=ON
-DVTK_USE_SYSTEM_FreeType=ON
-DVTK_USE_SYSTEM_GL2PS=ON
-DVTK_USE_SYSTEM_HDF5=ON
-DVTK_USE_SYSTEM_JPEG=ON
-DVTK_USE_SYSTEM_LIBPROJ4=OFF
# -DLIBPROJ4_DIR="${EPREFIX}/usr"
-DVTK_USE_SYSTEM_LIBXML2=ON
-DVTK_USE_SYSTEM_LibXml2=ON
-DVTK_USE_SYSTEM_NETCDF=ON
-DVTK_USE_SYSTEM_OGGTHEORA=ON
-DVTK_USE_SYSTEM_PNG=ON
-DVTK_USE_SYSTEM_TIFF=ON
-DVTK_USE_SYSTEM_TWISTED=ON
# -DVTK_USE_SYSTEM_XDMF2=ON
-DVTK_USE_SYSTEM_ZLIB=ON
-DVTK_USE_SYSTEM_ZOPE=ON
-DVTK_USE_SYSTEM_LIBRARIES=ON
-DVTK_USE_GL2PS=ON
-DVTK_USE_LARGE_DATA=ON
-DVTK_USE_PARALLEL=ON
-DVTK_INSTALL_NO_DEVELOPMENT=ON
)
mycmakeargs+=(
-DVTK_EXTRA_COMPILER_WARNINGS=ON
-DVTK_Group_StandAlone=ON
)
mycmakeargs+=(
$(cmake-utils_use_build doc DOCUMENTATION)
$(cmake-utils_use_build examples EXAMPLES)
$(cmake-utils_use_build test VTK_BUILD_ALL_MODULES_FOR_TESTS)
$(cmake-utils_use doc DOCUMENTATION_HTML_HELP)
$(cmake-utils_use imaging VTK_Group_Imaging)
$(cmake-utils_use mpi VTK_Group_MPI)
$(cmake-utils_use qt4 VTK_Group_Qt)
$(cmake-utils_use rendering VTK_Group_Rendering)
$(cmake-utils_use tk VTK_Group_Tk)
$(cmake-utils_use views VTK_Group_Views)
$(cmake-utils_use web VTK_Group_Web)
$(cmake-utils_use web VTK_WWW_DIR="${ED}/${MY_HTDOCSDIR}")
$(cmake-utils_use java VTK_WRAP_JAVA)
$(cmake-utils_use python VTK_WRAP_PYTHON)
$(cmake-utils_use python VTK_WRAP_PYTHON_SIP)
$(cmake-utils_use tcl VTK_WRAP_TCL)
# -DVTK_BUILD_ALL_MODULES=ON
)
mycmakeargs+=(
$(cmake-utils_use boost VTK_USE_BOOST)
$(cmake-utils_use cg VTK_USE_CG_SHADERS)
$(cmake-utils_use odbc VTK_USE_ODBC)
$(cmake-utils_use offscreen VTK_USE_OFFSCREEN)
$(cmake-utils_use offscreen VTK_OPENGL_HAS_OSMESA)
$(cmake-utils_use smp vtkFiltersSMP)
$(cmake-utils_use theora VTK_USE_OGGTHEORA_ENCODER)
$(cmake-utils_use video_cards_nvidia VTK_USE_NVCONTROL)
$(cmake-utils_use R Module_vtkFiltersStatisticsGnuR)
$(cmake-utils_use X VTK_USE_X)
)
# IO
mycmakeargs+=(
$(cmake-utils_use ffmpeg VTK_USE_FFMPEG_ENCODER)
$(cmake-utils_use gdal vtkIOGDAL)
$(cmake-utils_use json vtkIOGeoJSON)
)
# Apple stuff, does it really work?
mycmakeargs+=( $(cmake-utils_use aqua VTK_USE_COCOA) )
if use examples || use test; then
mycmakeargs+=( -DBUILD_TESTING=ON )
fi
if use kaapi; then
mycmakeargs+=( -DVTK_SMP_IMPLEMENTATION_TYPE="Kaapi" )
elif use tbb; then
mycmakeargs+=( -DVTK_SMP_IMPLEMENTATION_TYPE="TBB" )
else
mycmakeargs+=( -DVTK_SMP_IMPLEMENTATION_TYPE="Sequential" )
fi
if use java; then
# local _ejavahome=${EPREFIX}/etc/java-config-2/current-system-vm
#
# mycmakeargs+=(
# -DJAVAC=${EPREFIX}/usr/bin/javac
# -DJAVAC=$(java-config -c)
# -DJAVA_AWT_INCLUDE_PATH=${JAVA_HOME}/include
# -DJAVA_INCLUDE_PATH:PATH=${JAVA_HOME}/include
# -DJAVA_INCLUDE_PATH2:PATH=${JAVA_HOME}/include/linux
# )
#
if [ "${ARCH}" == "amd64" ]; then
mycmakeargs+=( -DJAVA_AWT_LIBRARY="${JAVA_HOME}/jre/lib/${ARCH}/libjawt.so;${JAVA_HOME}/jre/lib/${ARCH}/xawt/libmawt.so" )
else
mycmakeargs+=( -DJAVA_AWT_LIBRARY="${JAVA_HOME}/jre/lib/i386/libjawt.so;${JAVA_HOME}/jre/lib/i386/xawt/libmawt.so" )
fi
fi
if use python; then
mycmakeargs+=(
-DVTK_INSTALL_PYTHON_MODULE_DIR="$(python_get_sitedir)"
-DPYTHON_INCLUDE_DIR="$(python_get_includedir)"
-DPYTHON_LIBRARY="$(python_get_library_path)"
-DSIP_PYQT_DIR="${EPREFIX}/usr/share/sip"
-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="--prefix=${PREFIX} --root=${D}"
)
fi
if use qt4; then
mycmakeargs+=(
-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/designer
-DDESIRED_QT_VERSION=4
-DVTK_QT_VERSION=4
-DQT_MOC_EXECUTABLE="${EPREFIX}/usr/bin/moc"
-DQT_UIC_EXECUTABLE="${EPREFIX}/usr/bin/uic"
-DQT_INCLUDE_DIR="${EPREFIX}/usr/include/qt4"
-DQT_QMAKE_EXECUTABLE="${EPREFIX}/usr/bin/qmake"
)
fi
if use R; then
mycmakeargs+=(
# -DR_LIBRARY_BLAS=$($(tc-getPKG_CONFIG) --libs blas)
# -DR_LIBRARY_LAPACK=$($(tc-getPKG_CONFIG) --libs lapack)
-DR_LIBRARY_BLAS=/usr/lib64/R/lib/libR.so
-DR_LIBRARY_LAPACK=/usr/lib64/R/lib/libR.so
)
fi
cmake-utils_src_configure
}
src_test() {
local tcllib
ln -sf "${BUILD_DIR}"/lib "${BUILD_DIR}"/lib/Release || die
for tcllib in "${BUILD_DIR}"/lib/lib*TCL*so; do
ln -sf $(basename "${tcllib}").1 "${tcllib/.so/-${SPV}.so}" || die
done
export LD_LIBRARY_PATH="${BUILD_DIR}"/lib:"${JAVA_HOME}"/jre/lib/${ARCH}/:"${JAVA_HOME}"/jre/lib/${ARCH}/xawt/
local VIRTUALX_COMMAND="cmake-utils_src_test"
# local VIRTUALX_COMMAND="cmake-utils_src_test -R Java"
# local VIRTUALX_COMMAND="cmake-utils_src_test -I 364,365"
virtualmake
}
src_install() {
use web && webapp_src_preinst
# install docs
HTML_DOCS=( "${S}"/README.html )
cmake-utils_src_install
use java && java-pkg_regjar "${ED}"/usr/$(get_libdir)/${PN}.jar
if use tcl; then
# install Tcl docs
docinto vtk_tcl
dodoc "${S}"/Wrapping/Tcl/README
fi
# install examples
if use examples; then
insinto /usr/share/${PN}
mv -v Examples examples || die
doins -r examples
fi
#install big docs
if use doc; then
cd "${WORKDIR}"/html || die
rm -f *.md5 || die "Failed to remove superfluous hashes"
einfo "Installing API docs. This may take some time."
docinto html
dodoc -r ./*
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}
use web && webapp_src_install
}
^ permalink raw reply [flat|nested] only message in thread
only message in thread, other threads:[~2014-12-26 12:19 UTC | newest]
Thread overview: (only message) (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2014-12-26 12:19 [gentoo-commits] gentoo-x86 commit in sci-libs/vtk: vtk-6.1.0.ebuild ChangeLog metadata.xml vtk-6.0.0.ebuild vtk-5.10.0.ebuild vtk-5.10.1.ebuild Justin Lecher (jlec)
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox