From 635ae2dace00a408dbe66a389ee00c1265c415c1 Mon Sep 17 00:00:00 2001 From: Paul Zander Date: Fri, 18 Sep 2026 19:04:59 +0200 Subject: [PATCH] sci-libs/vtk: disable new modules requires: - sci-libs/onnxruntime::guru - media-libs/openusd::unpackaged Closes: https://bugs.gentoo.org/982674 Signed-off-by: Paul Zander Signed-off-by: Sam James --- sci-libs/vtk/vtk-9.6.2.ebuild | 27 +++++++++++++++++++-------- sci-libs/vtk/vtk-9999.ebuild | 26 +++++++++++++++++++------- 2 files changed, 38 insertions(+), 15 deletions(-) diff --git a/sci-libs/vtk/vtk-9.6.2.ebuild b/sci-libs/vtk/vtk-9.6.2.ebuild index 6979f2c46a1be..f29c84760b306 100644 --- a/sci-libs/vtk/vtk-9.6.2.ebuild +++ b/sci-libs/vtk/vtk-9.6.2.ebuild @@ -120,7 +120,11 @@ RDEPEND=" media-libs/tiff:= sci-libs/hdf5:=[mpi=] virtual/zlib:= - virtual/opengl[X] + all-modules? ( + app-arch/libarchive:= + dev-lang/tcl:= + media-gfx/alembic + ) boost? ( dev-libs/boost:=[mpi?] ) cgns? ( >=sci-libs/cgnslib-4.1.1:=[hdf5,mpi=] @@ -162,7 +166,7 @@ RDEPEND=" ) ) rendering? ( - media-libs/libglvnd[X] + virtual/opengl[X] x11-libs/gl2ps x11-libs/libXcursor x11-libs/libX11 @@ -170,7 +174,9 @@ RDEPEND=" tbb? ( dev-cpp/tbb:= ) tk? ( dev-lang/tk:= ) truetype? ( media-libs/fontconfig ) - video_cards_nvidia? ( x11-drivers/nvidia-drivers ) + cuda? ( + video_cards_nvidia? ( x11-drivers/nvidia-drivers ) + ) views? ( x11-libs/libX11 ) @@ -536,8 +542,6 @@ src_configure() { # -DVTK_MODULE_ENABLE_VTK_glad # -DVTK_MODULE_ENABLE_VTK_h5part -DVTK_MODULE_ENABLE_VTK_hdf5="YES" - # bug #982169 - -DHDF5_IS_PARALLEL="$(usex mpi "YES" "NO")" # -DVTK_MODULE_ENABLE_VTK_ioss -DVTK_MODULE_ENABLE_VTK_jpeg="YES" -DVTK_MODULE_ENABLE_VTK_jsoncpp="YES" @@ -590,7 +594,7 @@ src_configure() { -DVTK_USE_KOKKOS="no" # "$(usex hip)" # requires kokkos # use system libraries where possible -DVTK_USE_EXTERNAL=ON - # avoid finding package from either ::guru or ::sci + # avoid finding dev-libs/memkind from either ::guru or ::sci -DVTK_USE_MEMKIND=OFF -DVTK_USE_MPI="$(usex mpi)" -DVTK_USE_TK="$(usex tk)" @@ -612,8 +616,11 @@ src_configure() { -DVTK_MODULE_ENABLE_VTK_DomainsMicroscopy="NO" -DVTK_MODULE_ENABLE_VTK_fides="NO" -DVTK_MODULE_ENABLE_VTK_FiltersOpenTURNS="NO" + -DVTK_MODULE_ENABLE_VTK_FiltersONNX="NO" + -DVTK_MODULE_ENABLE_VTK_IOADIOS2="NO" -DVTK_MODULE_ENABLE_VTK_IOFides="NO" + -DVTK_MODULE_ENABLE_VTK_IOUSD="NO" -DVTK_MODULE_ENABLE_VTK_RenderingOpenVR="NO" -DVTK_MODULE_ENABLE_VTK_RenderingOpenXR="NO" @@ -767,7 +774,6 @@ src_configure() { -DVTK_MODULE_ENABLE_VTK_IOParallelNetCDF="$(usex netcdf "YES" "NO")" -DVTK_MODULE_ENABLE_VTK_IOParallelXML="YES" -DVTK_MODULE_ENABLE_VTK_ParallelMPI="YES" - -DVTK_MODULE_ENABLE_VTK_h5part="YES" -DVTK_MODULE_USE_EXTERNAL_VTK_verdict=OFF ) use imaging && mycmakeargs+=( -DVTK_MODULE_ENABLE_VTK_IOMPIImage="YES" ) @@ -778,7 +784,12 @@ src_configure() { -DVTK_MODULE_ENABLE_VTK_RenderingParallelLIC="YES" ) fi - use vtkm && mycmakeargs+=( -DVTKm_ENABLE_MPI=ON ) + fi + + if has_version ">=sci-libs/hdf5-2"; then + mycmakeargs+=( + -DHDF5_IS_PARALLEL="$(usex mpi)" + ) fi use mysql && mycmakeargs+=( -DVTK_MODULE_ENABLE_VTK_IOMySQL="YES" ) diff --git a/sci-libs/vtk/vtk-9999.ebuild b/sci-libs/vtk/vtk-9999.ebuild index 442d328f80cf6..a6cab980c71cf 100644 --- a/sci-libs/vtk/vtk-9999.ebuild +++ b/sci-libs/vtk/vtk-9999.ebuild @@ -104,7 +104,11 @@ RDEPEND=" media-libs/tiff:= sci-libs/hdf5:=[mpi=] virtual/zlib:= - virtual/opengl[X] + all-modules? ( + app-arch/libarchive:= + dev-lang/tcl:= + media-gfx/alembic + ) boost? ( dev-libs/boost:=[mpi?] ) cgns? ( >=sci-libs/cgnslib-4.1.1:=[hdf5,mpi=] @@ -146,7 +150,7 @@ RDEPEND=" ) ) rendering? ( - media-libs/libglvnd[X] + virtual/opengl[X] x11-libs/gl2ps x11-libs/libXcursor x11-libs/libX11 @@ -154,7 +158,9 @@ RDEPEND=" tbb? ( dev-cpp/tbb:= ) tk? ( dev-lang/tk:= ) truetype? ( media-libs/fontconfig ) - video_cards_nvidia? ( x11-drivers/nvidia-drivers ) + cuda? ( + video_cards_nvidia? ( x11-drivers/nvidia-drivers ) + ) views? ( x11-libs/libX11 ) @@ -427,7 +433,6 @@ src_configure() { fi local mycmakeargs=( - -DHDF5_IS_PARALLEL=1 -DCMAKE_DISABLE_FIND_PACKAGE_Git="yes" -DVTK_GIT_DESCRIBE="v${PV}" -DVTK_VERSION_FULL="${PV}" @@ -551,7 +556,7 @@ src_configure() { -DVTK_USE_KOKKOS="no" # "$(usex hip)" # requires kokkos # use system libraries where possible -DVTK_USE_EXTERNAL=ON - # avoid finding package from either ::guru or ::sci + # avoid finding dev-libs/memkind from either ::guru or ::sci -DVTK_USE_MEMKIND=OFF -DVTK_USE_MPI="$(usex mpi)" -DVTK_USE_TK="$(usex tk)" @@ -573,8 +578,11 @@ src_configure() { -DVTK_MODULE_ENABLE_VTK_DomainsMicroscopy="NO" -DVTK_MODULE_ENABLE_VTK_fides="NO" -DVTK_MODULE_ENABLE_VTK_FiltersOpenTURNS="NO" + -DVTK_MODULE_ENABLE_VTK_FiltersONNX="NO" + -DVTK_MODULE_ENABLE_VTK_IOADIOS2="NO" -DVTK_MODULE_ENABLE_VTK_IOFides="NO" + -DVTK_MODULE_ENABLE_VTK_IOUSD="NO" -DVTK_MODULE_ENABLE_VTK_RenderingOpenVR="NO" -DVTK_MODULE_ENABLE_VTK_RenderingOpenXR="NO" @@ -728,7 +736,6 @@ src_configure() { -DVTK_MODULE_ENABLE_VTK_IOParallelNetCDF="$(usex netcdf "YES" "NO")" -DVTK_MODULE_ENABLE_VTK_IOParallelXML="YES" -DVTK_MODULE_ENABLE_VTK_ParallelMPI="YES" - -DVTK_MODULE_ENABLE_VTK_h5part="YES" -DVTK_MODULE_USE_EXTERNAL_VTK_verdict=OFF ) use imaging && mycmakeargs+=( -DVTK_MODULE_ENABLE_VTK_IOMPIImage="YES" ) @@ -739,7 +746,12 @@ src_configure() { -DVTK_MODULE_ENABLE_VTK_RenderingParallelLIC="YES" ) fi - use vtkm && mycmakeargs+=( -DVTKm_ENABLE_MPI=ON ) + fi + + if has_version ">=sci-libs/hdf5-2"; then + mycmakeargs+=( + -DHDF5_IS_PARALLEL="$(usex mpi)" + ) fi use mysql && mycmakeargs+=( -DVTK_MODULE_ENABLE_VTK_IOMySQL="YES" )