commit: b1c6afa07316c3b71e4a4c37637b69a351d49ac0 Author: Andrew Ammerlaan <andrewammerlaan <AT> gentoo <DOT> org> AuthorDate: Tue Dec 13 13:30:34 2022 +0000 Commit: Andrew Ammerlaan <andrewammerlaan <AT> gentoo <DOT> org> CommitDate: Tue Dec 13 13:36:52 2022 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b1c6afa0
sci-libs/opencascade: ensure vtk include dirs are found Closes: https://bugs.gentoo.org/885621 Signed-off-by: Andrew Ammerlaan <andrewammerlaan <AT> gentoo.org> sci-libs/opencascade/opencascade-7.5.2-r6.ebuild | 2 +- sci-libs/opencascade/opencascade-7.5.3-r8.ebuild | 2 +- sci-libs/opencascade/opencascade-7.6.3.ebuild | 2 +- sci-libs/opencascade/opencascade-7.7.0.ebuild | 10 ++++++++-- 4 files changed, 11 insertions(+), 5 deletions(-) diff --git a/sci-libs/opencascade/opencascade-7.5.2-r6.ebuild b/sci-libs/opencascade/opencascade-7.5.2-r6.ebuild index d4500132ab1f..f2acaba15e74 100644 --- a/sci-libs/opencascade/opencascade-7.5.2-r6.ebuild +++ b/sci-libs/opencascade/opencascade-7.5.2-r6.ebuild @@ -48,7 +48,7 @@ RDEPEND=" ffmpeg? ( media-video/ffmpeg:= ) freeimage? ( media-libs/freeimage ) tbb? ( <dev-cpp/tbb-2021.4.0 ) - vtk? ( sci-libs/vtk:=[rendering] ) + vtk? ( <sci-libs/vtk-9.2.0:=[rendering] ) " DEPEND="${RDEPEND}" diff --git a/sci-libs/opencascade/opencascade-7.5.3-r8.ebuild b/sci-libs/opencascade/opencascade-7.5.3-r8.ebuild index 87b782fa5e6a..bdd9b918a69a 100644 --- a/sci-libs/opencascade/opencascade-7.5.3-r8.ebuild +++ b/sci-libs/opencascade/opencascade-7.5.3-r8.ebuild @@ -48,7 +48,7 @@ RDEPEND=" ffmpeg? ( media-video/ffmpeg:= ) freeimage? ( media-libs/freeimage ) tbb? ( dev-cpp/tbb:= ) - vtk? ( sci-libs/vtk:=[rendering] ) + vtk? ( <sci-libs/vtk-9.2.0:=[rendering] ) " DEPEND="${RDEPEND}" diff --git a/sci-libs/opencascade/opencascade-7.6.3.ebuild b/sci-libs/opencascade/opencascade-7.6.3.ebuild index 398ea6df2e54..cd7888f8818b 100644 --- a/sci-libs/opencascade/opencascade-7.6.3.ebuild +++ b/sci-libs/opencascade/opencascade-7.6.3.ebuild @@ -49,7 +49,7 @@ RDEPEND=" ffmpeg? ( <media-video/ffmpeg-5:= ) freeimage? ( media-libs/freeimage ) tbb? ( dev-cpp/tbb:= ) - vtk? ( sci-libs/vtk:=[rendering] ) + vtk? ( <sci-libs/vtk-9.2.0:=[rendering] ) " DEPEND=" ${RDEPEND} diff --git a/sci-libs/opencascade/opencascade-7.7.0.ebuild b/sci-libs/opencascade/opencascade-7.7.0.ebuild index 072150e2df0a..c2f7e7dbf7a4 100644 --- a/sci-libs/opencascade/opencascade-7.7.0.ebuild +++ b/sci-libs/opencascade/opencascade-7.7.0.ebuild @@ -45,7 +45,7 @@ RDEPEND=" ffmpeg? ( <media-video/ffmpeg-5:= ) freeimage? ( media-libs/freeimage ) tbb? ( dev-cpp/tbb:= ) - vtk? ( sci-libs/vtk:=[rendering] ) + vtk? ( <sci-libs/vtk-9.3.0:=[rendering] ) " DEPEND=" ${RDEPEND} @@ -132,7 +132,13 @@ src_configure() { fi if use vtk; then - if has_version ">=sci-libs/vtk-9.1.0"; then + if has_version ">=sci-libs/vtk-9.2.0"; then + mycmakeargs+=( + -D3RDPARTY_VTK_DIR="${ESYSROOT}"/usr + -D3RDPARTY_VTK_INCLUDE_DIR="${ESYSROOT}"/usr/include/vtk-9.2 + -D3RDPARTY_VTK_LIBRARY_DIR="${ESYSROOT}"/usr/$(get_libdir) + ) + elif has_version ">=sci-libs/vtk-9.1.0"; then mycmakeargs+=( -D3RDPARTY_VTK_DIR="${ESYSROOT}"/usr -D3RDPARTY_VTK_INCLUDE_DIR="${ESYSROOT}"/usr/include/vtk-9.1
