diff options
| author |   Bernd Waibel <waebbl-gentoo@posteo.net> | 2022-12-18 17:12:35 +0100 |
|---|---|---|
| committer |   Sam James <sam@gentoo.org> | 2022-12-31 15:36:07 +0000 |
| commit | 3a10bb3a17cd9fa3929de46ca53d76adff94adbd (patch) | |
| tree | 3ee14dddc2bb47817a91a13a58093f2eb7a45fd6 /sci-libs | |
| parent | sci-libs/opencascade: build 7.7.0 against vtk-9.2 (diff) | |
| download | gentoo-3a10bb3a17cd9fa3929de46ca53d76adff94adbd.tar.gz gentoo-3a10bb3a17cd9fa3929de46ca53d76adff94adbd.tar.bz2 gentoo-3a10bb3a17cd9fa3929de46ca53d76adff94adbd.zip | |
sci-libs/opencascade: build 7.6.3 against vtk-9.2
Backport patch from v7.7.0
Bug: https://bugs.gentoo.org/886343
Signed-off-by: Bernd Waibel <waebbl-gentoo@posteo.net>
Closes: https://github.com/gentoo/gentoo/pull/28704
Signed-off-by: Sam James <sam@gentoo.org>
Diffstat (limited to 'sci-libs')
| -rw-r--r-- | sci-libs/opencascade/opencascade-7.6.3-r1.ebuild (renamed from sci-libs/opencascade/opencascade-7.6.3.ebuild) | 25 |
1 files changed, 12 insertions, 13 deletions
diff --git a/sci-libs/opencascade/opencascade-7.6.3.ebuild b/sci-libs/opencascade/opencascade-7.6.3-r1.ebuild index cd7888f8818b..2090e9b45195 100644 --- a/sci-libs/opencascade/opencascade-7.6.3.ebuild +++ b/sci-libs/opencascade/opencascade-7.6.3-r1.ebuild @@ -38,7 +38,7 @@ RDEPEND=" media-libs/ftgl virtual/glu virtual/opengl - x11-libs/libXmu + x11-libs/libX11 examples? ( dev-qt/qtcore:5 dev-qt/qtgui:5 @@ -49,7 +49,7 @@ RDEPEND=" ffmpeg? ( <media-video/ffmpeg-5:= ) freeimage? ( media-libs/freeimage ) tbb? ( dev-cpp/tbb:= ) - vtk? ( <sci-libs/vtk-9.2.0:=[rendering] ) + vtk? ( <sci-libs/vtk-9.3.0:=[rendering] ) " DEPEND=" ${RDEPEND} @@ -68,6 +68,7 @@ PATCHES=( "${FILESDIR}"/${PN}-7.5.1-0006-fix-creation-of-custom.sh-script.patch "${FILESDIR}"/${PN}-7.6.2-avoid-pre-stripping-binaries.patch "${FILESDIR}"/${PN}-7.5.3-tbb-2021.patch + "${FILESDIR}"/${PN}-7.7.0-build-against-vtk-9.2.patch ) src_prepare() { @@ -131,18 +132,16 @@ src_configure() { fi if use vtk; then - if 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 - -D3RDPARTY_VTK_LIBRARY_DIR="${ESYSROOT}"/usr/$(get_libdir) - ) + mycmakeargs+=( + -D3RDPARTY_VTK_DIR="${ESYSROOT}"/usr + -D3RDPARTY_VTK_LIBRARY_DIR="${ESYSROOT}"/usr/$(get_libdir) + ) + if has_version ">=sci-libs/vtk-9.2.0"; then + mycmakeargs+=( -D3RDPARTY_VTK_INCLUDE_DIR="${ESYSROOT}"/usr/include/vtk-9.2 ) + elif has_version ">=sci-libs/vtk-9.1.0"; then + mycmakeargs+=( -D3RDPARTY_VTK_INCLUDE_DIR="${ESYSROOT}"/usr/include/vtk-9.1 ) elif has_version ">=sci-libs/vtk-9.0.0"; then - mycmakeargs+=( - -D3RDPARTY_VTK_DIR="${ESYSROOT}"/usr - -D3RDPARTY_VTK_INCLUDE_DIR="${ESYSROOT}"/usr/include/vtk-9.0 - -D3RDPARTY_VTK_LIBRARY_DIR="${ESYSROOT}"/usr/$(get_libdir) - ) + mycmakeargs+=( -D3RDPARTY_VTK_INCLUDE_DIR="${ESYSROOT}"/usr/include/vtk-9.0 ) fi fi |