From: "Sam James" <sam@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] repo/gentoo:master commit in: sci-libs/vtk/, sci-libs/vtk/files/
Date: Tue, 15 Dec 2020 02:13:12 +0000 (UTC) [thread overview]
Message-ID: <1607998388.767ff1a606565950d73c713ef498daaff12d6509.sam@gentoo> (raw)
commit: 767ff1a606565950d73c713ef498daaff12d6509
Author: Aisha Tammy <gentoo <AT> aisha <DOT> cc>
AuthorDate: Sun Dec 13 16:59:35 2020 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Tue Dec 15 02:13:08 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=767ff1a6
sci-libs/vtk: fix finding pugixml
Closes: https://bugs.gentoo.org/758611
Package-Manager: Portage-3.0.11, Repoman-3.0.2
Signed-off-by: Aisha Tammy <gentoo <AT> aisha.cc>
Closes: https://github.com/gentoo/gentoo/pull/18640
Signed-off-by: Sam James <sam <AT> gentoo.org>
sci-libs/vtk/files/vtk-8.2.0-pugixml.patch | 13 ++
sci-libs/vtk/vtk-8.2.0-r1.ebuild | 347 +++++++++++++++++++++++++++++
2 files changed, 360 insertions(+)
diff --git a/sci-libs/vtk/files/vtk-8.2.0-pugixml.patch b/sci-libs/vtk/files/vtk-8.2.0-pugixml.patch
new file mode 100644
index 00000000000..3c72bcf0003
--- /dev/null
+++ b/sci-libs/vtk/files/vtk-8.2.0-pugixml.patch
@@ -0,0 +1,13 @@
+diff --git a/IO/CityGML/CMakeLists.txt b/IO/CityGML/CMakeLists.txt
+index ce979ba..555f205 100644
+--- a/IO/CityGML/CMakeLists.txt
++++ b/IO/CityGML/CMakeLists.txt
+@@ -5,7 +5,7 @@ vtk_module_library(vtkIOCityGML ${Module_SRCS})
+ if(VTK_USE_SYSTEM_PUGIXML AND NOT pugixml_INCLUDE_DIRS)
+ find_package(pugixml REQUIRED)
+ get_target_property(pugixml_INCLUDE_DIRS pugixml INTERFACE_INCLUDE_DIRECTORIES)
+- get_target_property(pugixml_LIBRARIES pugixml LOCATION)
++ get_target_property(pugixml_LIBRARIES pugixml INTERFACE_LINK_LIBRARIES)
+ include_directories(${pugixml_INCLUDE_DIRS})
+ vtk_module_link_libraries(vtkIOCityGML LINK_PRIVATE ${pugixml_LIBRARIES})
+ endif()
diff --git a/sci-libs/vtk/vtk-8.2.0-r1.ebuild b/sci-libs/vtk/vtk-8.2.0-r1.ebuild
new file mode 100644
index 00000000000..c5fa5e5ead4
--- /dev/null
+++ b/sci-libs/vtk/vtk-8.2.0-r1.ebuild
@@ -0,0 +1,347 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6,7,8} )
+WEBAPP_OPTIONAL=yes
+WEBAPP_MANUAL_SLOT=yes
+
+# Short package version
+SPV="$(ver_cut 1-2)"
+inherit flag-o-matic java-pkg-opt-2 python-single-r1 qmake-utils toolchain-funcs cmake virtualx webapp
+
+DESCRIPTION="The Visualization Toolkit"
+HOMEPAGE="https://www.vtk.org/"
+SRC_URI="
+ https://www.vtk.org/files/release/${SPV}/VTK-${PV}.tar.gz
+ doc? ( https://www.vtk.org/files/release/${SPV}/vtkDocHtml-${PV}.tar.gz )
+ examples? (
+ https://www.vtk.org/files/release/${SPV}/VTKData-${PV}.tar.gz
+ https://www.vtk.org/files/release/${SPV}/VTKLargeData-${PV}.tar.gz
+ )"
+
+LICENSE="BSD LGPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~x86 ~amd64-linux ~x86-linux"
+IUSE="all-modules aqua boost doc examples ffmpeg gdal imaging java json mpi
+ odbc offscreen postgres python qt5 R rendering tbb tcl theora tk
+ video_cards_nvidia views web +X xdmf2"
+
+REQUIRED_USE="
+ all-modules? ( python xdmf2 boost )
+ java? ( qt5 )
+ python? ( ${PYTHON_REQUIRED_USE} )
+ tcl? ( rendering )
+ examples? ( python )
+ tk? ( tcl )
+ web? ( python )
+ ^^ ( X aqua offscreen )"
+
+RDEPEND="
+ app-arch/lz4
+ dev-cpp/eigen
+ dev-db/sqlite
+ dev-libs/double-conversion:0=
+ dev-libs/expat
+ dev-libs/jsoncpp:=
+ dev-libs/libxml2:2
+ >=dev-libs/pugixml-1.11
+ >=media-libs/freetype-2.5.4
+ media-libs/glew:0=
+ >=media-libs/libharu-2.3.0-r2
+ media-libs/libpng:0=
+ media-libs/libtheora
+ media-libs/mesa
+ media-libs/tiff:0
+ sci-libs/exodusii
+ sci-libs/hdf5:=
+ sci-libs/netcdf:0=
+ sci-libs/netcdf-cxx:3
+ sys-libs/zlib
+ virtual/jpeg:0
+ virtual/opengl
+ x11-libs/libX11
+ x11-libs/libXmu
+ x11-libs/libXt
+ boost? ( dev-libs/boost:=[mpi?] )
+ examples? (
+ dev-qt/qtcore:5
+ dev-qt/qtgui:5
+ )
+ ffmpeg? ( media-video/ffmpeg )
+ gdal? ( sci-libs/gdal )
+ java? ( >=virtual/jdk-1.7:* )
+ mpi? (
+ virtual/mpi[cxx,romio]
+ $(python_gen_cond_dep '
+ python? ( dev-python/mpi4py[${PYTHON_MULTI_USEDEP}] )
+ ')
+ )
+ odbc? ( dev-db/unixODBC )
+ offscreen? ( media-libs/mesa[osmesa] )
+ postgres? ( dev-db/postgresql:= )
+ python? (
+ ${PYTHON_DEPS}
+ $(python_gen_cond_dep '
+ dev-python/sip[${PYTHON_MULTI_USEDEP}]
+ ')
+ )
+ qt5? (
+ dev-qt/designer:5
+ dev-qt/qtcore:5
+ dev-qt/qtgui:5
+ dev-qt/qtopengl:5
+ dev-qt/qtsql:5
+ dev-qt/qtx11extras:5
+ $(python_gen_cond_dep '
+ python? ( dev-python/PyQt5[${PYTHON_MULTI_USEDEP}] )
+ ')
+ )
+ R? ( dev-lang/R )
+ tbb? ( dev-cpp/tbb )
+ tcl? ( dev-lang/tcl:0= )
+ tk? ( dev-lang/tk:0= )
+ video_cards_nvidia? ( x11-drivers/nvidia-drivers[tools,static-libs] )
+ web? (
+ ${WEBAPP_DEPEND}
+ $(python_gen_cond_dep '
+ dev-python/autobahn[${PYTHON_MULTI_USEDEP}]
+ dev-python/constantly[${PYTHON_MULTI_USEDEP}]
+ dev-python/hyperlink[${PYTHON_MULTI_USEDEP}]
+ dev-python/incremental[${PYTHON_MULTI_USEDEP}]
+ dev-python/six[${PYTHON_MULTI_USEDEP}]
+ dev-python/twisted[${PYTHON_MULTI_USEDEP}]
+ dev-python/txaio[${PYTHON_MULTI_USEDEP}]
+ dev-python/zope-interface[${PYTHON_MULTI_USEDEP}]
+ ')
+ )
+ xdmf2? ( sci-libs/xdmf2 )
+"
+DEPEND="${RDEPEND}"
+BDEPEND="doc? ( app-doc/doxygen )"
+
+S="${WORKDIR}"/VTK-${PV}
+
+PATCHES=(
+ "${FILESDIR}"/${PN}-8.1.0-openmpi-4-compatibility.patch
+ "${FILESDIR}"/${P}-qt-5.15.patch # bug 726960
+ "${FILESDIR}"/${P}-gcc-10.patch # bug 723374
+ "${FILESDIR}"/${P}-fno-common.patch # bug 721048
+ "${FILESDIR}"/${P}-py38.patch
+ "${FILESDIR}"/${P}-freetype-2.10.3-provide-FT_CALLBACK_DEF.patch # bug #751088
+ "${FILESDIR}"/${P}-pugixml.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
+}
+
+src_prepare() {
+ cmake_src_prepare
+
+ local x
+ # missing: VPIC freerange libproj4 mrmpi sqlite utf8 verdict xmdf2 xmdf3
+ for x in expat freetype hdf5 jpeg jsoncpp libharu libxml2 lz4 netcdf png tiff zlib; do
+ ebegin "Dropping bundled ${x}"
+ rm -r ThirdParty/${x}/vtk${x} || die
+ eend $?
+ done
+
+ if use doc; then
+ einfo "Removing .md5 files from documents."
+ rm -f "${WORKDIR}"/html/*.md5 || die "Failed to remove superfluous hashes"
+ sed -e "s|\${VTK_BINARY_DIR}/Utilities/Doxygen/doc|${WORKDIR}|" \
+ -i Utilities/Doxygen/CMakeLists.txt || die
+ fi
+}
+
+src_configure() {
+ # general configuration
+ local mycmakeargs=(
+ -Wno-dev
+ -DVTK_DIR="${S}"
+ -DVTK_INSTALL_LIBRARY_DIR=$(get_libdir)
+ -DVTK_INSTALL_PACKAGE_DIR="$(get_libdir)/cmake/${PN}-${SPV}"
+ -DVTK_INSTALL_DOC_DIR="${EPREFIX}/usr/share/doc/${PF}"
+ -DVTK_DATA_ROOT="${EPREFIX}/usr/share/${PN}/data"
+ -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
+ # Use bundled gl2ps (bundled version is a patched version of 1.3.9. Post 1.3.9 versions should be compatible)
+ -DVTK_USE_SYSTEM_GL2PS=OFF
+ -DVTK_USE_SYSTEM_HDF5=ON
+ -DVTK_USE_SYSTEM_JPEG=ON
+ -DVTK_USE_SYSTEM_LIBPROJ=OFF
+ -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=OFF
+ -DVTK_USE_SYSTEM_XDMF3=OFF
+ -DVTK_USE_SYSTEM_ZLIB=ON
+ -DVTK_USE_SYSTEM_ZOPE=ON
+ -DVTK_USE_SYSTEM_LIBRARIES=ON
+ # Use bundled diy2 (no gentoo package / upstream does not provide a Finddiy2.cmake or diy2Config.cmake / diy2-config.cmake)
+ -DVTK_USE_SYSTEM_DIY2=OFF
+ -DVTK_USE_GL2PS=ON
+ -DVTK_USE_LARGE_DATA=ON
+ -DVTK_USE_PARALLEL=ON
+ -DVTK_EXTRA_COMPILER_WARNINGS=ON
+ -DVTK_Group_StandAlone=ON
+ -DBUILD_DOCUMENTATION=$(usex doc)
+ -DBUILD_EXAMPLES=$(usex examples)
+ -DBUILD_VTK_BUILD_ALL_MODULES_FOR_TESTS=off
+ -DVTK_BUILD_ALL_MODULES=$(usex all-modules)
+ -DUSE_DOCUMENTATION_HTML_HELP=$(usex doc)
+ -DVTK_Group_Imaging=$(usex imaging)
+ -DVTK_Group_MPI=$(usex mpi)
+ -DVTK_Group_Rendering=$(usex rendering)
+ -DVTK_Group_Tk=$(usex tk)
+ -DVTK_Group_Views=$(usex views)
+ -DVTK_Group_Web=$(usex web)
+ -DVTK_SMP_IMPLEMENTATION_TYPE="$(usex tbb TBB Sequential)"
+ -DVTK_WWW_DIR="${ED}/${MY_HTDOCSDIR}"
+ -DVTK_WRAP_JAVA=$(usex java)
+ -DVTK_WRAP_PYTHON=$(usex python)
+ -DVTK_WRAP_PYTHON_SIP=$(usex python)
+ -DVTK_WRAP_TCL=$(usex tcl)
+ -DVTK_USE_BOOST=$(usex boost)
+ -DUSE_VTK_USE_BOOST=$(usex boost)
+ -DModule_vtkInfovisBoost=$(usex boost)
+ -DModule_vtkInfovisBoostGraphAlgorithms=$(usex boost)
+ -DVTK_USE_ODBC=$(usex odbc)
+ -DModule_vtkIOODBC=$(usex odbc)
+ -DVTK_USE_OFFSCREEN=$(usex offscreen)
+ -DVTK_OPENGL_HAS_OSMESA=$(usex offscreen)
+ -DVTK_USE_OGGTHEORA_ENCODER=$(usex theora)
+ -DVTK_USE_NVCONTROL=$(usex video_cards_nvidia)
+ -DModule_vtkFiltersStatisticsGnuR=$(usex R)
+ -DVTK_USE_X=$(usex X)
+ # IO
+ -DVTK_USE_FFMPEG_ENCODER=$(usex ffmpeg)
+ -DModule_vtkIOGDAL=$(usex gdal)
+ -DModule_vtkIOGeoJSON=$(usex json)
+ -DModule_vtkIOXdmf2=$(usex xdmf2)
+ -DBUILD_TESTING=$(usex examples)
+ # Apple stuff, does it really work?
+ -DVTK_USE_COCOA=$(usex aqua)
+ )
+
+ if use java; then
+ local javacargs=$(java-pkg_javac-args)
+ mycmakeargs+=( -DJAVAC_OPTIONS=${javacargs// /;} )
+ fi
+
+ if use mpi; then
+ mycmakeargs+=( -DVTK_USE_SYSTEM_MPI4PY=ON )
+ 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=${EPREFIX} --root=${D}"
+ -DVTK_USE_SYSTEM_SIX=ON
+ )
+ fi
+
+ if use qt5; 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="$(basename $(qt5_get_libdir))/qt5/plugins/designer"
+ -DDESIRED_QT_VERSION=5
+ -DVTK_QT_VERSION=5
+ -DQT_MOC_EXECUTABLE="$(qt5_get_bindir)/moc"
+ -DQT_UIC_EXECUTABLE="$(qt5_get_bindir)/uic"
+ -DQT_INCLUDE_DIR="${EPREFIX}/usr/include/qt5"
+ -DQT_QMAKE_EXECUTABLE="$(qt5_get_bindir)/qmake"
+ -DVTK_Group_Qt:BOOL=ON
+ -DCMAKE_DISABLE_FIND_PACKAGE_Qt5WebKitWidgets=ON
+ )
+ fi
+
+ if use R; then
+ mycmakeargs+=(
+ -DR_LIBRARY_BLAS=/usr/$(get_libdir)/R/lib/libR.so
+ -DR_LIBRARY_LAPACK=/usr/$(get_libdir)/R/lib/libR.so
+ )
+ fi
+
+ append-cppflags -D__STDC_CONSTANT_MACROS -D_UNICODE
+
+ 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_src_configure
+}
+
+src_install() {
+ use web && webapp_src_preinst
+
+ cmake_src_install
+
+ use java && java-pkg_regjar "${ED}"/usr/$(get_libdir)/${PN}.jar
+
+ # Stop web page images from being compressed
+ use doc && docompress -x /usr/share/doc/${PF}/doxygen
+
+ if use tcl; then
+ # install Tcl docs
+ docinto vtk_tcl
+ docinto .
+ fi
+
+ # install examples
+ if use examples; then
+ einfo "Installing examples"
+ mv -v {E,e}xamples || die
+ dodoc -r examples
+ docompress -x /usr/share/doc/${PF}/examples
+ fi
+
+ # environment
+ cat >> "${T}"/40${PN} <<- EOF || die
+ 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
+}
+
+# webapp.eclass exports these but we want it optional #534036
+pkg_postinst() {
+ use web && webapp_pkg_postinst
+}
+
+pkg_prerm() {
+ use web && webapp_pkg_prerm
+}
next reply other threads:[~2020-12-15 2:13 UTC|newest]
Thread overview: 19+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-12-15 2:13 Sam James [this message]
-- strict thread matches above, loose matches on Subject: below --
2024-09-08 13:51 [gentoo-commits] repo/gentoo:master commit in: sci-libs/vtk/, sci-libs/vtk/files/ Sam James
2024-09-07 14:27 Sam James
2023-05-03 22:23 Sam James
2023-02-27 16:46 Joonas Niilola
2022-12-12 6:09 Joonas Niilola
2022-06-26 7:09 Sam James
2022-04-02 13:06 Andreas Sturmlechner
2022-02-21 23:24 Sam James
2021-12-03 22:38 Vadim Misbakh-Soloviov
2021-05-31 11:40 Sam James
2021-05-31 11:40 Sam James
2020-11-08 13:59 Sam James
2020-06-06 9:42 Andreas Sturmlechner
2020-05-01 16:48 Matthias Maier
2017-07-06 13:37 Michael Palimaka
2017-07-06 12:49 Michael Palimaka
2017-06-02 14:59 Matthias Maier
2016-03-25 17:07 David Seifert
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1607998388.767ff1a606565950d73c713ef498daaff12d6509.sam@gentoo \
--to=sam@gentoo.org \
--cc=gentoo-commits@lists.gentoo.org \
--cc=gentoo-dev@lists.gentoo.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox