commit: 3db769c9725026eabb9b697856ef2bd57b6ebe4d Author: Paul Zander <negril.nx+gentoo <AT> gmail <DOT> com> AuthorDate: Mon Nov 4 14:31:44 2024 +0000 Commit: Sam James <sam <AT> gentoo <DOT> org> CommitDate: Tue Nov 5 02:02:48 2024 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3db769c9
media-libs/opencv: rework vtk depspec #929217 The VTK <-> OpenCASCADE interaction is cumbersome with their circular inclusion and non-namespaced exporting of defines in cmake files. Since we do not want `OpenCASCADE` polluting our build environment with e.g. `-DHAVE_FFMPEG=true`, we require `VTK` to be build without `OpenCASCADE` support or `OpenCASCADE` to be build without ffmpeg support. Closes: https://bugs.gentoo.org/929217 Signed-off-by: Paul Zander <negril.nx+gentoo <AT> gmail.com> Signed-off-by: Sam James <sam <AT> gentoo.org> media-libs/opencv/opencv-4.10.0.ebuild | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/media-libs/opencv/opencv-4.10.0.ebuild b/media-libs/opencv/opencv-4.10.0.ebuild index 53c8949d37ed..ea1242c5e0b7 100644 --- a/media-libs/opencv/opencv-4.10.0.ebuild +++ b/media-libs/opencv/opencv-4.10.0.ebuild @@ -259,7 +259,16 @@ COMMON_DEPEND=" tiff? ( media-libs/tiff:=[${MULTILIB_USEDEP}] ) v4l? ( >=media-libs/libv4l-0.8.3[${MULTILIB_USEDEP}] ) vaapi? ( media-libs/libva[${MULTILIB_USEDEP}] ) - vtk? ( sci-libs/vtk:=[rendering,cuda=] ) + vtk? ( + sci-libs/vtk:=[rendering,cuda=] + || ( + ( + sci-libs/vtk[opencascade(+)] + sci-libs/opencascade[-ffmpeg] + ) + sci-libs/vtk[-opencascade(-)] + ) + ) webp? ( media-libs/libwebp:=[${MULTILIB_USEDEP}] ) xine? ( media-libs/xine-lib ) "
