commit: 0a4cc92a669d7b576ded05f31a247ea6a2e1c5c0 Author: Paul Zander <negril.nx+gentoo <AT> gmail <DOT> com> AuthorDate: Sun Nov 9 23:05:59 2025 +0000 Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> CommitDate: Fri Jan 2 16:52:45 2026 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0a4cc92a
sci-libs/opencascade: drop ffmpeg, mv gles2-only->gles2, freetype->truetype skip more tests update opencascade-7.8.1-vtk_components.patch Closes: https://bugs.gentoo.org/946076 Signed-off-by: Paul Zander <negril.nx+gentoo <AT> gmail.com> Part-of: https://github.com/gentoo/gentoo/pull/44585 Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org> .../files/opencascade-7.8.1-vtk_components.patch | 15 +++++++++++-- sci-libs/opencascade/opencascade-9999.ebuild | 26 ++++++++++------------ 2 files changed, 25 insertions(+), 16 deletions(-) diff --git a/sci-libs/opencascade/files/opencascade-7.8.1-vtk_components.patch b/sci-libs/opencascade/files/opencascade-7.8.1-vtk_components.patch index 03a6277c6fa8..5e7d5588c447 100644 --- a/sci-libs/opencascade/files/opencascade-7.8.1-vtk_components.patch +++ b/sci-libs/opencascade/files/opencascade-7.8.1-vtk_components.patch @@ -1,8 +1,16 @@ +From b473d89e3c87aeae13e9fe9e0b8ef3a287161235 Mon Sep 17 00:00:00 2001 +From: Paul Zander <[email protected]> +Date: Tue, 20 May 2025 14:13:14 +0200 +Subject: [PATCH] vtk components + +Only include the components we actually use. +This prevents a circular loop occt -> vtk -> occt. + diff --git a/adm/cmake/vtk.cmake b/adm/cmake/vtk.cmake -index 7d25a37..79257d1 100644 +index 48650fe7d..6c168bf59 100644 --- a/adm/cmake/vtk.cmake +++ b/adm/cmake/vtk.cmake -@@ -60,7 +60,18 @@ if (3RDPARTY_VTK_DIR AND EXISTS "${3RDPARTY_VTK_DIR}") +@@ -74,7 +74,18 @@ if (3RDPARTY_VTK_DIR AND EXISTS "${3RDPARTY_VTK_DIR}") set (ENV{VTK_DIR} "${3RDPARTY_VTK_DIR}") endif() @@ -22,3 +30,6 @@ index 7d25a37..79257d1 100644 if (3RDPARTY_VTK_DIR AND EXISTS "${3RDPARTY_VTK_DIR}") set (ENV{VTK_DIR} ${CACHED_VTK_DIR}) +-- +2.49.0 + diff --git a/sci-libs/opencascade/opencascade-9999.ebuild b/sci-libs/opencascade/opencascade-9999.ebuild index 4358439f6e95..79719cfa4dff 100644 --- a/sci-libs/opencascade/opencascade-9999.ebuild +++ b/sci-libs/opencascade/opencascade-9999.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2024 Gentoo Authors +# Copyright 1999-2025 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -31,27 +31,21 @@ fi LICENSE="|| ( Open-CASCADE-LGPL-2.1-Exception-1.0 LGPL-2.1 )" SLOT="0/$(ver_cut 1-2)" -IUSE="X debug doc examples ffmpeg freeimage freetype gles2-only inspector jemalloc json +opengl optimize tbb test testprograms tk vtk" +IUSE="X debug doc examples freeimage gles2 inspector jemalloc json opengl optimize tbb test testprograms tk truetype vtk" REQUIRED_USE=" ?? ( optimize tbb ) - ?? ( opengl gles2-only ) test? ( freeimage json opengl ) " # There's no easy way to test. Testing needs a rather big environment properly set up. RESTRICT="!test? ( test )" -# ffmpeg: https://tracker.dev.opencascade.org/view.php?id=32871 RDEPEND=" dev-lang/tcl:= - tk? ( dev-lang/tk:= ) dev-libs/double-conversion - freetype? ( - media-libs/fontconfig - media-libs/freetype:2 - ) - gles2-only? ( + tk? ( dev-lang/tk:= ) + gles2? ( media-libs/libglvnd ) opengl? ( @@ -67,7 +61,6 @@ RDEPEND=" dev-qt/qtwidgets:5 dev-qt/qtxml:5 ) - ffmpeg? ( <media-video/ffmpeg-5:= ) freeimage? ( media-libs/freeimage ) inspector? ( dev-qt/qtcore:5 @@ -78,6 +71,10 @@ RDEPEND=" ) jemalloc? ( dev-libs/jemalloc ) tbb? ( dev-cpp/tbb:= ) + truetype? ( + media-libs/fontconfig + media-libs/freetype:2 + ) vtk? ( dev-lang/tk:= sci-libs/vtk:=[rendering] @@ -179,11 +176,12 @@ src_configure() { # no package yet in tree -DUSE_DRACO="no" - -DUSE_FFMPEG="$(usex ffmpeg)" + # ffmpeg: https://tracker.dev.opencascade.org/view.php?id=32871 + -DUSE_FFMPEG="no" -DUSE_FREEIMAGE="$(usex freeimage)" - -DUSE_FREETYPE="$(usex freetype)" + -DUSE_FREETYPE="$(usex truetype)" # Indicates whether OpenGL ES 2.0 should be used in OCCT visualization module - -DUSE_GLES2="$(usex gles2-only)" + -DUSE_GLES2="$(usex gles2)" # Indicates whether OpenGL desktop should be used in OCCT visualization module -DUSE_OPENGL="$(usex opengl)" # no package in tree
