| 1 |
commit: 3a10bb3a17cd9fa3929de46ca53d76adff94adbd |
| 2 |
Author: Bernd Waibel <waebbl-gentoo <AT> posteo <DOT> net> |
| 3 |
AuthorDate: Sun Dec 18 16:12:35 2022 +0000 |
| 4 |
Commit: Sam James <sam <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sat Dec 31 15:36:07 2022 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3a10bb3a |
| 7 |
|
| 8 |
sci-libs/opencascade: build 7.6.3 against vtk-9.2 |
| 9 |
|
| 10 |
Backport patch from v7.7.0 |
| 11 |
|
| 12 |
Bug: https://bugs.gentoo.org/886343 |
| 13 |
Signed-off-by: Bernd Waibel <waebbl-gentoo <AT> posteo.net> |
| 14 |
Closes: https://github.com/gentoo/gentoo/pull/28704 |
| 15 |
Signed-off-by: Sam James <sam <AT> gentoo.org> |
| 16 |
|
| 17 |
...de-7.6.3.ebuild => opencascade-7.6.3-r1.ebuild} | 25 +++++++++++----------- |
| 18 |
1 file changed, 12 insertions(+), 13 deletions(-) |
| 19 |
|
| 20 |
diff --git a/sci-libs/opencascade/opencascade-7.6.3.ebuild b/sci-libs/opencascade/opencascade-7.6.3-r1.ebuild |
| 21 |
similarity index 88% |
| 22 |
rename from sci-libs/opencascade/opencascade-7.6.3.ebuild |
| 23 |
rename to sci-libs/opencascade/opencascade-7.6.3-r1.ebuild |
| 24 |
index cd7888f8818b..2090e9b45195 100644 |
| 25 |
--- a/sci-libs/opencascade/opencascade-7.6.3.ebuild |
| 26 |
+++ b/sci-libs/opencascade/opencascade-7.6.3-r1.ebuild |
| 27 |
@@ -38,7 +38,7 @@ RDEPEND=" |
| 28 |
media-libs/ftgl |
| 29 |
virtual/glu |
| 30 |
virtual/opengl |
| 31 |
- x11-libs/libXmu |
| 32 |
+ x11-libs/libX11 |
| 33 |
examples? ( |
| 34 |
dev-qt/qtcore:5 |
| 35 |
dev-qt/qtgui:5 |
| 36 |
@@ -49,7 +49,7 @@ RDEPEND=" |
| 37 |
ffmpeg? ( <media-video/ffmpeg-5:= ) |
| 38 |
freeimage? ( media-libs/freeimage ) |
| 39 |
tbb? ( dev-cpp/tbb:= ) |
| 40 |
- vtk? ( <sci-libs/vtk-9.2.0:=[rendering] ) |
| 41 |
+ vtk? ( <sci-libs/vtk-9.3.0:=[rendering] ) |
| 42 |
" |
| 43 |
DEPEND=" |
| 44 |
${RDEPEND} |
| 45 |
@@ -68,6 +68,7 @@ PATCHES=( |
| 46 |
"${FILESDIR}"/${PN}-7.5.1-0006-fix-creation-of-custom.sh-script.patch |
| 47 |
"${FILESDIR}"/${PN}-7.6.2-avoid-pre-stripping-binaries.patch |
| 48 |
"${FILESDIR}"/${PN}-7.5.3-tbb-2021.patch |
| 49 |
+ "${FILESDIR}"/${PN}-7.7.0-build-against-vtk-9.2.patch |
| 50 |
) |
| 51 |
|
| 52 |
src_prepare() { |
| 53 |
@@ -131,18 +132,16 @@ src_configure() { |
| 54 |
fi |
| 55 |
|
| 56 |
if use vtk; then |
| 57 |
- if has_version ">=sci-libs/vtk-9.1.0"; then |
| 58 |
- mycmakeargs+=( |
| 59 |
- -D3RDPARTY_VTK_DIR="${ESYSROOT}"/usr |
| 60 |
- -D3RDPARTY_VTK_INCLUDE_DIR="${ESYSROOT}"/usr/include/vtk-9.1 |
| 61 |
- -D3RDPARTY_VTK_LIBRARY_DIR="${ESYSROOT}"/usr/$(get_libdir) |
| 62 |
- ) |
| 63 |
+ mycmakeargs+=( |
| 64 |
+ -D3RDPARTY_VTK_DIR="${ESYSROOT}"/usr |
| 65 |
+ -D3RDPARTY_VTK_LIBRARY_DIR="${ESYSROOT}"/usr/$(get_libdir) |
| 66 |
+ ) |
| 67 |
+ if has_version ">=sci-libs/vtk-9.2.0"; then |
| 68 |
+ mycmakeargs+=( -D3RDPARTY_VTK_INCLUDE_DIR="${ESYSROOT}"/usr/include/vtk-9.2 ) |
| 69 |
+ elif has_version ">=sci-libs/vtk-9.1.0"; then |
| 70 |
+ mycmakeargs+=( -D3RDPARTY_VTK_INCLUDE_DIR="${ESYSROOT}"/usr/include/vtk-9.1 ) |
| 71 |
elif has_version ">=sci-libs/vtk-9.0.0"; then |
| 72 |
- mycmakeargs+=( |
| 73 |
- -D3RDPARTY_VTK_DIR="${ESYSROOT}"/usr |
| 74 |
- -D3RDPARTY_VTK_INCLUDE_DIR="${ESYSROOT}"/usr/include/vtk-9.0 |
| 75 |
- -D3RDPARTY_VTK_LIBRARY_DIR="${ESYSROOT}"/usr/$(get_libdir) |
| 76 |
- ) |
| 77 |
+ mycmakeargs+=( -D3RDPARTY_VTK_INCLUDE_DIR="${ESYSROOT}"/usr/include/vtk-9.0 ) |
| 78 |
fi |
| 79 |
fi |
Archives