sci-libs/opencascade: drop 7.5.3-r8

Cleanup old. No consumers left for this version in ::gentoo. There's one
consumer for that version in the ::science repo.

Signed-off-by: Bernd Waibel <waebbl-gentoo@posteo.net>
Closes: https://github.com/gentoo/gentoo/pull/29296
Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>
This commit is contained in:
Bernd Waibel
2023-01-27 12:32:35 +01:00
committed by Andreas Sturmlechner
parent 67f489da47
commit ff9032e688
6 changed files with 0 additions and 429 deletions

View File

@@ -1,3 +1,2 @@
DIST opencascade-7.5.3.tar.gz 47817862 BLAKE2B be438a08997c18c3cb2c08c520fff2f439cc8a406cc3f471be3b24f874ac3bd892c4afe6fa37f742ffb5da21b5a29f9c8f737e3160dcbda35a217286218eb5e1 SHA512 2d7cf284a1b3ce8d05151085b41579cc2f4e29489b7920769cd04f86a6d76e49f533b570226d3cf041c75582894ed8a6aff889312c7c507fffae47d3e57c5c47
DIST opencascade-7.6.3.tar.gz 48216090 BLAKE2B ff0b63250e77b0240bd99bba38cd0e6b0a8c88bf39e495f5d51d7913f097e2cad83a5ad121e9d56de11c74008249c99a41f4615269a085b7cf97c3d7f0477d6d SHA512 c708f76edb707ba18bdfe7442ed8fa500894ee6c1cd8d0313eb906b3aa7dfa40a575f04dbccd70e84395d670f2b93fb8529f3d59726449234e627b9f35b9dded
DIST opencascade-7.7.0.tar.gz 48393806 BLAKE2B b41da7bdd07aa6ef52f7833bef3e8a9fc2ca16cbf754773cb7adcc059c11c2a7937d279a2b6cf3096e7af6fbb42c6fdc2a5c98340d6b084d2ba100ba2c538f2a SHA512 6c90e2761f752241417ae6f18d819f51e66b32f3a50a97384f29ed73fa07f4cded84c71a6f6ba302d5e35c57e2fc13001619521eaf45757e4e5ff670d94bbf5c

View File

@@ -1,26 +0,0 @@
From c7d8a7374284186136d72fc285f9e55045b306fb Mon Sep 17 00:00:00 2001
From: Bernd Waibel <waebbl@gmail.com>
Date: Wed, 3 Feb 2021 23:31:23 +0100
Subject: [PATCH] allow default search path for Qt5
Signed-off-by: Bernd Waibel <waebbl@gmail.com>
---
adm/cmake/qt.cmake | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/adm/cmake/qt.cmake b/adm/cmake/qt.cmake
index 535e6a20..6c2141dd 100644
--- a/adm/cmake/qt.cmake
+++ b/adm/cmake/qt.cmake
@@ -24,7 +24,7 @@ set(CMAKE_PREFIX_PATH ${3RDPARTY_QT_DIR})
# Now we can apply standard CMake finder for Qt5. We do this mostly
# to have qt5_wrap_cpp() function available and Qt5_FOUND variable filled
-find_package(Qt5 QUIET COMPONENTS Widgets Quick Xml PATHS ${3RDPARTY_QT_DIR} NO_DEFAULT_PATH)
+find_package(Qt5 COMPONENTS Widgets Quick Xml REQUIRED)
if (NOT ${Qt5_FOUND})
# Now we can apply standard CMake finder for Qt. We do this mostly
# to have qt4_wrap_cpp() function available
--
2.30.0

View File

@@ -1,28 +0,0 @@
From dcf67dbc486a97256ea6df7b968f69346e7b3dba Mon Sep 17 00:00:00 2001
From: Bernd Waibel <waebbl@gmail.com>
Date: Wed, 3 Feb 2021 23:45:27 +0100
Subject: [PATCH] remove unnecessary Qt5 check
Signed-off-by: Bernd Waibel <waebbl@gmail.com>
---
adm/cmake/qt_macro.cmake | 4 ----
1 file changed, 4 deletions(-)
diff --git a/adm/cmake/qt_macro.cmake b/adm/cmake/qt_macro.cmake
index ec897384..363d9c52 100644
--- a/adm/cmake/qt_macro.cmake
+++ b/adm/cmake/qt_macro.cmake
@@ -2,10 +2,6 @@
macro (FIND_QT_PACKAGE PROJECT_LIBRARIES_DEBUG PROJECT_LIBRARIES_RELEASE PROJECT_INCLUDES)
- if ("${3RDPARTY_QT_DIR}" STREQUAL "")
- message (FATAL_ERROR "Empty Qt dir")
- endif()
-
if (${Qt5_FOUND})
#message (STATUS "Qt5 cmake configuration")
--
2.30.0

View File

@@ -1,26 +0,0 @@
From a8aa40ec021dac8310d77bcec71ee298f6773926 Mon Sep 17 00:00:00 2001
From: Bernd Waibel <waebbl@gmail.com>
Date: Thu, 4 Feb 2021 22:29:57 +0100
Subject: [PATCH] add Gentoo configuration type
Signed-off-by: Bernd Waibel <waebbl@gmail.com>
---
CMakeLists.txt | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 100d6133..887a1cd7 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -4,7 +4,7 @@ set (CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/adm/cmake")
set (CMAKE_SUPPRESS_REGENERATION TRUE)
-set (CMAKE_CONFIGURATION_TYPES Release Debug RelWithDebInfo CACHE INTERNAL "" FORCE)
+set (CMAKE_CONFIGURATION_TYPES Release Debug RelWithDebInfo Gentoo CACHE INTERNAL "" FORCE)
# macro: include patched file if it exists
macro (OCCT_INCLUDE_CMAKE_FILE BEING_INCLUDED_FILE)
--
2.30.0

View File

@@ -1,172 +0,0 @@
From f624c55d7b75ccbe3fdfef0db141fdbe1f6b383a Mon Sep 17 00:00:00 2001
From: anv <anv@opencascade.com>
Date: Tue, 27 Apr 2021 21:33:54 +0300
Subject: [PATCH 1/2] 0032331: Visualization - Exception when trying to display
some surfaces using iVtk with VTK 9
Updated memory allocation for vtkPolyData to use more suited method for VTK versions after 9.0
---
src/IVtkDraw/IVtkDraw_Interactor.cxx | 7 +++
src/IVtkTools/IVtkTools_SubPolyDataFilter.cxx | 50 ++++++++++++++++++-
2 files changed, 56 insertions(+), 1 deletion(-)
diff --git a/src/IVtkDraw/IVtkDraw_Interactor.cxx b/src/IVtkDraw/IVtkDraw_Interactor.cxx
index f9f68c37b6..1b68c959f5 100644
--- a/src/IVtkDraw/IVtkDraw_Interactor.cxx
+++ b/src/IVtkDraw/IVtkDraw_Interactor.cxx
@@ -20,6 +20,13 @@
#include <vtkWin32OpenGLRenderWindow.h>
#else
#include <GL/glx.h>
+
+// Preventing naming collisions between
+// GLX and VTK versions 9.0 and above
+#ifdef AllValues
+#undef AllValues
+#endif
+
#include <vtkXRenderWindowInteractor.h>
#include <vtkXOpenGLRenderWindow.h>
#endif
diff --git a/src/IVtkTools/IVtkTools_SubPolyDataFilter.cxx b/src/IVtkTools/IVtkTools_SubPolyDataFilter.cxx
index 26ded68af5..bd289d2b51 100644
--- a/src/IVtkTools/IVtkTools_SubPolyDataFilter.cxx
+++ b/src/IVtkTools/IVtkTools_SubPolyDataFilter.cxx
@@ -87,6 +87,11 @@ int IVtkTools_SubPolyDataFilter::RequestData (vtkInformation *vtkNotUsed(theRequ
// Prepare the list of ids from the set of ids.
// Iterate on input cells.
+#if (VTK_MAJOR_VERSION >= 9)
+ // Count number of different cells.
+ int aNbVerts = 0, aNbLines = 0, aNbPolys = 0, aNbStrips = 0;
+ int aNbVertPts = 0, aNbLinePts = 0, aNbPolyPts = 0, aNbStripPts = 0;
+#endif
if (!myIdsSet.IsEmpty())
{
for (vtkIdType anI = 0; anI < aSize; anI++)
@@ -95,13 +100,56 @@ int IVtkTools_SubPolyDataFilter::RequestData (vtkInformation *vtkNotUsed(theRequ
{
// Add a cell id to output if it's value is in the set.
anIdList->InsertNextId (anI);
+#if (VTK_MAJOR_VERSION >= 9)
+ switch (anInput->GetCellType(anI))
+ {
+ case VTK_VERTEX:
+ aNbVerts++;
+ aNbVertPts++;
+ break;
+ case VTK_POLY_VERTEX:
+ aNbVerts++;
+ aNbVertPts += anInput->GetCell(anI)->GetNumberOfPoints();
+ break;
+ case VTK_LINE:
+ aNbLines++;
+ aNbLinePts += 2;
+ break;
+ case VTK_POLY_LINE:
+ aNbLines++;
+ aNbLinePts += anInput->GetCell(anI)->GetNumberOfPoints();
+ break;
+ case VTK_TRIANGLE:
+ aNbPolys++;
+ aNbPolyPts += 3;
+ break;
+ case VTK_QUAD:
+ aNbPolys++;
+ aNbPolyPts += 4;
+ break;
+ case VTK_POLYGON:
+ aNbPolys++;
+ aNbPolyPts += anInput->GetCell(anI)->GetNumberOfPoints();
+ break;
+ case VTK_TRIANGLE_STRIP:
+ aNbStrips++;
+ aNbStripPts += anInput->GetCell(anI)->GetNumberOfPoints();
+ break;
+ }
+#endif
}
}
}
// Copy cells with their points according to the prepared list of cell ids.
anOutput->GetCellData()->AllocateArrays(anInput->GetCellData()->GetNumberOfArrays());
- anOutput->Allocate(anInput, anIdList->GetNumberOfIds()); // Allocate output cells
+ // Allocate output cells
+#if (VTK_MAJOR_VERSION >= 9)
+ anOutput->AllocateExact (aNbVerts, aNbVertPts, aNbLines, aNbLinePts, aNbPolys, aNbPolyPts, aNbStrips, aNbStripPts);
+#else
+ anOutput->Allocate (anInput, anIdList->GetNumberOfIds());
+#endif
+
// Pass data arrays.
// Create new arrays for output data
vtkSmartPointer<vtkCellData> anInData = anInput->GetCellData();
--
2.31.1
From 3a0d59614378af258b285c7a3cab66c4bb7cecd3 Mon Sep 17 00:00:00 2001
From: Roman Beranek <roman.beranek@prusa3d.com>
Date: Thu, 3 Jun 2021 15:41:45 +0200
Subject: [PATCH 2/2] undef AllValues after inclusion of GL/glx.h
Replicate the measure from 0032331 also for IVtkDraw.cxx and InterfaceGraphic.hxx
---
src/IVtkDraw/IVtkDraw.cxx | 17 +++++++++++------
src/InterfaceGraphic/InterfaceGraphic.hxx | 4 +++-
2 files changed, 14 insertions(+), 7 deletions(-)
diff --git a/src/IVtkDraw/IVtkDraw.cxx b/src/IVtkDraw/IVtkDraw.cxx
index 93d4a2fd1a..84bacdc55a 100644
--- a/src/IVtkDraw/IVtkDraw.cxx
+++ b/src/IVtkDraw/IVtkDraw.cxx
@@ -52,6 +52,17 @@
// prevent disabling some MSVC warning messages by VTK headers
#include <Standard_WarningsDisable.hxx>
+#ifndef _WIN32
+ #include <X11/X.h>
+ #include <X11/Shell.h>
+ #include <X11/Xlib.h>
+ #include <X11/Xutil.h>
+ #include <GL/glx.h>
+ #include <Xw_Window.hxx>
+ #ifdef AllValues
+ #undef AllValues
+ #endif
+#endif
#include <vtkAlgorithmOutput.h>
#include <vtkAppendPolyData.h>
#include <vtkBMPWriter.h>
@@ -75,12 +86,6 @@
#include <vtkTIFFWriter.h>
#include <vtkWindowToImageFilter.h>
#ifndef _WIN32
- #include <X11/X.h>
- #include <X11/Shell.h>
- #include <X11/Xlib.h>
- #include <X11/Xutil.h>
- #include <GL/glx.h>
- #include <Xw_Window.hxx>
#include <vtkXRenderWindowInteractor.h>
#include <vtkXOpenGLRenderWindow.h>
#include <tk.h>
diff --git a/src/InterfaceGraphic/InterfaceGraphic.hxx b/src/InterfaceGraphic/InterfaceGraphic.hxx
index c533f68cd5..bf02b3f397 100644
--- a/src/InterfaceGraphic/InterfaceGraphic.hxx
+++ b/src/InterfaceGraphic/InterfaceGraphic.hxx
@@ -39,7 +39,9 @@
#include <X11/Xutil.h>
#include <X11/Xatom.h>
#include <GL/glx.h>
-
+#ifdef AllValues
+#undef AllValues
+#endif
#endif
#endif // __INTERFACE_GRAPHIC_HXX
--
2.31.1

View File

@@ -1,176 +0,0 @@
# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
inherit cmake flag-o-matic
MY_PV="$(ver_rs 1- '_')"
PV_MAJ="$(ver_cut 1-2)"
DESCRIPTION="Development platform for CAD/CAE, 3D surface/solid modeling and data exchange"
HOMEPAGE="https://www.opencascade.com"
SRC_URI="https://git.dev.opencascade.org/gitweb/?p=occt.git;a=snapshot;h=refs/tags/V${MY_PV};sf=tgz -> ${P}.tar.gz"
S="${WORKDIR}/occt-V${MY_PV}"
LICENSE="|| ( Open-CASCADE-LGPL-2.1-Exception-1.0 LGPL-2.1 )"
SLOT="0/${PV_MAJ}"
KEYWORDS="amd64 ~arm64 ~x86"
IUSE="debug doc examples ffmpeg freeimage gles2-only json optimize tbb vtk"
REQUIRED_USE="?? ( optimize tbb )"
# There's no easy way to test. Testing needs a rather big environment
# properly set up.
RESTRICT="test"
# ffmpeg: https://dev.opencascade.org/content/build-error-when-compiling-against-ffmpeg-5
RDEPEND="
!app-eselect/eselect-opencascade
dev-lang/tcl:=
dev-lang/tk:=
dev-tcltk/itcl
dev-tcltk/itk
dev-tcltk/tix
media-libs/fontconfig
media-libs/freetype:2
media-libs/ftgl
virtual/glu
virtual/opengl
x11-libs/libXmu
examples? (
dev-qt/qtcore:5
dev-qt/qtgui:5
dev-qt/qtquickcontrols2:5
dev-qt/qtwidgets:5
dev-qt/qtxml:5
)
ffmpeg? ( media-video/ffmpeg:= )
freeimage? ( media-libs/freeimage )
tbb? ( dev-cpp/tbb:= )
vtk? ( <sci-libs/vtk-9.2.0:=[rendering] )
"
DEPEND="${RDEPEND}"
BDEPEND="
dev-cpp/eigen
dev-libs/rapidjson
doc? ( app-doc/doxygen )
examples? ( dev-qt/linguist-tools:5 )
"
PATCHES=(
"${FILESDIR}"/${PN}-7.5.1-0001-allow-default-search-path-for-Qt5.patch
"${FILESDIR}"/${PN}-7.5.1-0002-remove-unnecessary-Qt5-check.patch
"${FILESDIR}"/${PN}-7.5.1-0003-add-Gentoo-configuration-type.patch
"${FILESDIR}"/${PN}-7.5.1-0004-fix-installation-of-cmake-config-files.patch
"${FILESDIR}"/${PN}-7.5.1-0005-fix-write-permissions-on-scripts.patch
"${FILESDIR}"/${PN}-7.5.1-0006-fix-creation-of-custom.sh-script.patch
"${FILESDIR}"/${PN}-7.5.1-fix-AllValues-name-collision-with-vtk-9.0.patch
"${FILESDIR}"/${PN}-7.6.2-avoid-pre-stripping-binaries.patch
"${FILESDIR}"/${PN}-7.5.3-tbb-2021.patch
)
src_prepare() {
cmake_src_prepare
use debug && append-cppflags -DDEBUG
sed -e 's|/lib\$|/'$(get_libdir)'\$|' \
-i adm/templates/OpenCASCADEConfig.cmake.in || die
# There is an OCCT_UPDATE_TARGET_FILE cmake macro that fails due to some
# assumptions it makes about installation paths. Rather than fixing it, just
# get rid of the mechanism altogether - its purpose is to allow a
# side-by-side installation of release and debug libraries.
sed -e 's|\\${OCCT_INSTALL_BIN_LETTER}||' \
-i adm/cmake/occt_toolkit.cmake || die
}
src_configure() {
local mycmakeargs=(
-DBUILD_DOC_Overview=$(usex doc)
-DBUILD_Inspector=$(usex examples)
-DBUILD_RELEASE_DISABLE_EXCEPTIONS=OFF # bug #847916
-DINSTALL_DIR_BIN="$(get_libdir)/${PN}/bin"
-DINSTALL_DIR_CMAKE="$(get_libdir)/cmake/${PN}"
-DINSTALL_DIR_DATA="share/${PN}/data"
-DINSTALL_DIR_DOC="share/doc/${PF}"
-DINSTALL_DIR_INCLUDE="include/${PN}"
-DINSTALL_DIR_LIB="$(get_libdir)/${PN}"
-DINSTALL_DIR_RESOURCE="share/${PN}/resources"
-DINSTALL_DIR_SAMPLES="share/${PN}/samples"
-DINSTALL_DIR_SCRIPT="$(get_libdir)/${PN}/bin"
-DINSTALL_DIR_WITH_VERSION=OFF
-DINSTALL_SAMPLES=$(usex examples)
-DINSTALL_TEST_CASES=NO
-DUSE_D3D=NO
-DUSE_FFMPEG=$(usex ffmpeg)
-DUSE_FREEIMAGE=$(usex freeimage)
-DUSE_FREETYPE=ON
-DUSE_GLES2=$(usex gles2-only)
-DUSE_RAPIDJSON=$(usex json)
-DUSE_TBB=$(usex tbb)
-DUSE_VTK=$(usex vtk)
)
use doc && mycmakeargs+=( -DINSTALL_DOC_Overview=ON )
if use examples; then
mycmakeargs+=(
-D3RDPARTY_QT_DIR="${ESYSROOT}"/usr
-DBUILD_SAMPLES_QT=ON
)
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)
)
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)
)
fi
fi
cmake_src_configure
# prepare /etc/env.d file
sed -e "s|lib/|$(get_libdir)/|" \
-e "s|VAR_CASROOT|${EPREFIX}/usr|" \
< "${FILESDIR}"/${PN}.env.in > "${T}"/99${PN} || die
# use TBB for memory allocation optimizations
if use tbb; then
sed -e 's|^#MMGT_OPT=0$|MMGT_OPT=2|' -i "${T}"/99${PN} || die
fi
# use internal optimized memory manager and don't clear memory with this
# memory manager.
if use optimize ; then
sed -e 's|^#MMGT_OPT=0$|MMGT_OPT=1|' \
-e 's|^#MMGT_CLEAR=1$|MMGT_CLEAR=0|' \
-i "${T}"/99${PN} || die
fi
}
src_install() {
cmake_src_install
doenvd "${T}/99${PN}"
# remove examples
if use !examples; then
rm -r "${ED}/usr/share/${PN}/samples" || die
fi
docompress -x /usr/share/doc/${PF}/overview/html
}