* [gentoo-commits] repo/gentoo:master commit in: sci-libs/opencascade/, sci-libs/opencascade/files/
@ 2017-06-07 7:09 Michael Weber
0 siblings, 0 replies; 17+ messages in thread
From: Michael Weber @ 2017-06-07 7:09 UTC (permalink / raw
To: gentoo-commits
commit: 29c93fad765e6a21197b9e8cb6c3b2df2c037ab8
Author: Michael Weber <xmw <AT> gentoo <DOT> org>
AuthorDate: Wed Jun 7 07:08:05 2017 +0000
Commit: Michael Weber <xmw <AT> gentoo <DOT> org>
CommitDate: Wed Jun 7 07:09:40 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=29c93fad
sci-libs/opencascade: Revbump with patches for >=sci-libs/vtk-6.3 (thanks Juergen Rose, bug 605304). EAPI 6.
Package-Manager: Portage-2.3.6, Repoman-2.3.2
.../files/opencascade-6.9.1-vtk-6.3.patch | 70 ++++++++++++++++++++++
.../files/opencascade-6.9.1-vtk-configure.patch | 13 ++++
sci-libs/opencascade/opencascade-6.9.1-r1.ebuild | 9 +--
...6.9.1-r1.ebuild => opencascade-6.9.1-r2.ebuild} | 25 +++++---
4 files changed, 104 insertions(+), 13 deletions(-)
diff --git a/sci-libs/opencascade/files/opencascade-6.9.1-vtk-6.3.patch b/sci-libs/opencascade/files/opencascade-6.9.1-vtk-6.3.patch
new file mode 100644
index 00000000000..e6b011b1e03
--- /dev/null
+++ b/sci-libs/opencascade/files/opencascade-6.9.1-vtk-6.3.patch
@@ -0,0 +1,70 @@
+--- work/opencascade-6.9.1/configure.ac
++++ work/opencascade-6.9.1/configure.ac
+@@ -1044,7 +1044,7 @@
+ fi
+ if test "x$vtk_lib" != "x"; then
+ CSF_VTK_LIB="-L$vtk_lib -lvtkCommonCore -lvtkCommonDataModel -lvtkCommonExecutionModel -lvtkCommonMath -lvtkCommonTransforms "
+- CSF_VTK_LIB="${CSF_VTK_LIB} -lvtkRenderingCore -lvtkRenderingOpenGL -lvtkFiltersGeneral -lvtkIOCore -lvtkIOImage -lvtkImagingCore -lvtkInteractionStyle "
++ CSF_VTK_LIB="${CSF_VTK_LIB} -lvtkRenderingCore -lvtkRenderingOpenGL2 -lvtkFiltersGeneral -lvtkIOCore -lvtkIOImage -lvtkImagingCore -lvtkInteractionStyle "
+ else
+ HAVE_VTK=no
+ fi
+--- opencascade-6.9.1/src/IVtkVTK/IVtkVTK_View.cxx
++++ opencascade-6.9.1/src/IVtkVTK/IVtkVTK_View.cxx
+@@ -151,7 +151,7 @@ bool IVtkVTK_View::DisplayToWorld (const gp_XY& theDisplayPnt, gp_XYZ& theWorldP
+ myRenderer->SetDisplayPoint (theDisplayPnt.X(), theDisplayPnt.Y(), 0.0);
+ myRenderer->DisplayToWorld();
+
+- vtkFloatingPointType* const aCoords = myRenderer->GetWorldPoint();
++ double* const aCoords = myRenderer->GetWorldPoint();
+ if (aCoords[3] == 0.0) // Point at infinity in homogeneous coordinates
+ {
+ return false;
+--- opencascade-6.9.1/src/IVtkTools/IVtkTools_ShapePicker.cxx
++++ opencascade-6.9.1/src/IVtkTools/IVtkTools_ShapePicker.cxx
+@@ -73,15 +73,15 @@ float IVtkTools_ShapePicker::GetTolerance( ) const
+ // Method: convertDisplayToWorld
+ // Purpose: Convert display coordinates to world coordinates
+ //============================================================================
+-bool IVtkTools_ShapePicker::convertDisplayToWorld (vtkRenderer *theRenderer,
+- vtkFloatingPointType theDisplayCoord[3],
+- vtkFloatingPointType theWorldCoord[3])
++bool IVtkTools_ShapePicker::convertDisplayToWorld (vtkRenderer *theRenderer,
++ double theDisplayCoord[3],
++ double theWorldCoord[3])
+ {
+ // Convert the selection point into world coordinates.
+ theRenderer->SetDisplayPoint (theDisplayCoord[0], theDisplayCoord[1], theDisplayCoord[2]);
+ theRenderer->DisplayToWorld();
+
+- vtkFloatingPointType* const aCoords = theRenderer->GetWorldPoint();
++ double* const aCoords = theRenderer->GetWorldPoint();
+ if (aCoords[3] == 0.0)
+ {
+ return false;
+--- opencascade-6.9.1/src/IVtkTools/IVtkTools_ShapePicker.hxx
++++ opencascade-6.9.1/src/IVtkTools/IVtkTools_ShapePicker.hxx
+@@ -124,8 +124,8 @@ protected:
+
+ //! Convert display coordinates to world coordinates
+ static bool convertDisplayToWorld (vtkRenderer *theRenderer,
+- vtkFloatingPointType theDisplayCoord[3],
+- vtkFloatingPointType theWorldCoord[3] );
++ double theDisplayCoord[3],
++ double theWorldCoord[3] );
+
+ private: // not copyable
+ IVtkTools_ShapePicker (const IVtkTools_ShapePicker&);
+--- opencascade-6.9.1/inc/IVtkTools_ShapePicker.hxx
++++ opencascade-6.9.1/inc/IVtkTools_ShapePicker.hxx
+@@ -124,8 +124,8 @@
+
+ //! Convert display coordinates to world coordinates
+ static bool convertDisplayToWorld (vtkRenderer *theRenderer,
+- vtkFloatingPointType theDisplayCoord[3],
+- vtkFloatingPointType theWorldCoord[3] );
++ double theDisplayCoord[3],
++ double theWorldCoord[3] );
+
+ private: // not copyable
+ IVtkTools_ShapePicker (const IVtkTools_ShapePicker&);
diff --git a/sci-libs/opencascade/files/opencascade-6.9.1-vtk-configure.patch b/sci-libs/opencascade/files/opencascade-6.9.1-vtk-configure.patch
new file mode 100644
index 00000000000..3c2711d3813
--- /dev/null
+++ b/sci-libs/opencascade/files/opencascade-6.9.1-vtk-configure.patch
@@ -0,0 +1,13 @@
+--- opencascade-6.9.1/configure.ac
++++ opencascade-6.9.1/configure.ac
+@@ -1043,8 +1043,8 @@
+ HAVE_VTK=no
+ fi
+ if test "x$vtk_lib" != "x"; then
+- CSF_VTK_LIB="-L$vtk_lib -lvtkCommonCore-6.1 -lvtkCommonDataModel-6.1 -lvtkCommonExecutionModel-6.1 -lvtkCommonMath-6.1 -lvtkCommonTransforms-6.1 "
+- CSF_VTK_LIB="${CSF_VTK_LIB} -lvtkRenderingCore-6.1 -lvtkRenderingOpenGL-6.1 -lvtkFiltersGeneral-6.1 -lvtkIOCore-6.1 -lvtkIOImage-6.1 -lvtkImagingCore-6.1 -lvtkInteractionStyle-6.1 "
++ CSF_VTK_LIB="-L$vtk_lib -lvtkCommonCore -lvtkCommonDataModel -lvtkCommonExecutionModel -lvtkCommonMath -lvtkCommonTransforms "
++ CSF_VTK_LIB="${CSF_VTK_LIB} -lvtkRenderingCore -lvtkRenderingOpenGL -lvtkFiltersGeneral -lvtkIOCore -lvtkIOImage -lvtkImagingCore -lvtkInteractionStyle "
+ else
+ HAVE_VTK=no
+ fi
diff --git a/sci-libs/opencascade/opencascade-6.9.1-r1.ebuild b/sci-libs/opencascade/opencascade-6.9.1-r1.ebuild
index 02db66a9487..dd0a0cb70c1 100644
--- a/sci-libs/opencascade/opencascade-6.9.1-r1.ebuild
+++ b/sci-libs/opencascade/opencascade-6.9.1-r1.ebuild
@@ -1,7 +1,7 @@
# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-EAPI=5
+EAPI=6
inherit autotools eutils check-reqs multilib java-pkg-opt-2 flag-o-matic
@@ -35,16 +35,17 @@ RDEPEND="${DEPEND}"
CHECKREQS_MEMORY="256M"
CHECKREQS_DISK_BUILD="3584M"
+PATCHES=( "${FILESDIR}"/${PN}-6.8.0-fixed-DESTDIR.patch )
+
pkg_setup() {
check-reqs_pkg_setup
java-pkg-opt-2_pkg_setup
}
src_prepare() {
- java-pkg-opt-2_src_prepare
+ default
- epatch \
- "${FILESDIR}"/${PN}-6.8.0-fixed-DESTDIR.patch
+ java-pkg-opt-2_src_prepare
# Feed environment variables used by Opencascade compilation
my_install_dir=${EROOT}usr/$(get_libdir)/${P}/ros
diff --git a/sci-libs/opencascade/opencascade-6.9.1-r1.ebuild b/sci-libs/opencascade/opencascade-6.9.1-r2.ebuild
similarity index 89%
copy from sci-libs/opencascade/opencascade-6.9.1-r1.ebuild
copy to sci-libs/opencascade/opencascade-6.9.1-r2.ebuild
index 02db66a9487..3f0de66418d 100644
--- a/sci-libs/opencascade/opencascade-6.9.1-r1.ebuild
+++ b/sci-libs/opencascade/opencascade-6.9.1-r2.ebuild
@@ -1,9 +1,9 @@
# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-EAPI=5
+EAPI=6
-inherit autotools eutils check-reqs multilib java-pkg-opt-2 flag-o-matic
+inherit autotools eutils check-reqs multilib java-pkg-opt-2 flag-o-matic versionator
DESCRIPTION="Development platform for CAD/CAE, 3D surface/solid modeling and data exchange"
HOMEPAGE="http://www.opencascade.org/"
@@ -14,7 +14,6 @@ SLOT="${PV}"
KEYWORDS="~amd64 ~x86"
IUSE="debug doc examples freeimage gl2ps java qt4 +tbb +vtk"
-MY_VTK="vtk-6.1"
DEPEND="app-eselect/eselect-opencascade
dev-lang/tcl:0=
dev-lang/tk:0=
@@ -29,22 +28,31 @@ DEPEND="app-eselect/eselect-opencascade
gl2ps? ( x11-libs/gl2ps )
java? ( >=virtual/jdk-0:= )
tbb? ( dev-cpp/tbb )
- vtk? ( || ( =sci-libs/${MY_VTK}*[imaging] =sci-libs/${MY_VTK}*[qt4] =sci-libs/${MY_VTK}*[rendering] =sci-libs/${MY_VTK}*[views] =sci-libs/${MY_VTK}*[all-modules] ) )"
+ vtk? ( || ( sci-libs/vtk[imaging] sci-libs/vtk[qt4] sci-libs/vtk[rendering] sci-libs/vtk[views] sci-libs/vtk[all-modules] ) )"
RDEPEND="${DEPEND}"
CHECKREQS_MEMORY="256M"
CHECKREQS_DISK_BUILD="3584M"
+PATCHES=( "${FILESDIR}"/${PN}-6.8.0-fixed-DESTDIR.patch
+ "${FILESDIR}"/${PN}-6.9.1-vtk-configure.patch )
+
pkg_setup() {
check-reqs_pkg_setup
java-pkg-opt-2_pkg_setup
}
src_prepare() {
- java-pkg-opt-2_src_prepare
+ default
- epatch \
- "${FILESDIR}"/${PN}-6.8.0-fixed-DESTDIR.patch
+ MY_VTK_P=$(best_version sci-libs/vtk)
+ MY_VTK_PV=${MY_VTK_P/sci-libs\/vtk-}
+ MY_VTK_SUB=vtk-$(get_version_component_range 1-2 ${MY_VTK_PV})
+ if has_version ">=sci-libs/vtk-6.3" ; then #bug 605304
+ epatch "${FILESDIR}"/${PN}-6.9.1-vtk-6.3.patch
+ fi
+
+ java-pkg-opt-2_src_prepare
# Feed environment variables used by Opencascade compilation
my_install_dir=${EROOT}usr/$(get_libdir)/${P}/ros
@@ -105,7 +113,6 @@ TCL_LIBRARY=${my_sys_lib}/tcl$(grep TCL_VER /usr/include/tcl.h | sed 's/^.*"\(.*
-e "s/AM_CONFIG_HEADER/AC_CONFIG_HEADERS/" \
-e "s:\$qt/include:\$qt/include/qt4:g"\
-e "s:\$qt/lib:\$qt/$(get_libdir)/qt4:g"\
- -e "/CSF_VTK_LIB=/s:-${MY_VTK/vtk-}::g" \
-i configure.ac || die
eautoreconf
}
@@ -122,7 +129,7 @@ src_configure() {
$(usex tbb "--with-tbb-include=${EROOT}usr" "") \
$(usex tbb "--with-tbb-library=${EROOT}usr" "") \
$(use java && echo "--with-java-include=$(java-config -O)/include" || echo "--without-java-include") \
- $(usex vtk "--with-vtk-include=${EROOT}usr/include/${MY_VTK}" "") \
+ $(usex vtk "--with-vtk-include=${EROOT}usr/include/${MY_VTK_SUB}" "") \
$(usex vtk "--with-vtk-library=${EROOT}usr/$(get_libdir)" "") \
$(use_enable debug) \
$(use_enable !debug production)
^ permalink raw reply related [flat|nested] 17+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sci-libs/opencascade/, sci-libs/opencascade/files/
@ 2018-04-05 12:31 Andreas Sturmlechner
0 siblings, 0 replies; 17+ messages in thread
From: Andreas Sturmlechner @ 2018-04-05 12:31 UTC (permalink / raw
To: gentoo-commits
commit: 34251046e57f6eefc3576839fb1c333c8420a604
Author: switch87 <gert <AT> pellin <DOT> be>
AuthorDate: Thu Mar 15 21:05:46 2018 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Thu Apr 5 12:24:22 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=34251046
sci-libs/opencascade: Fix build with >=vtk-8.1.0
Closes: https://bugs.gentoo.org/650596
Closes: https://github.com/gentoo/gentoo/pull/7470
.../files/opencascade-6.9.1-vtk-8.1.patch | 48 ++++++++++++++++++++++
sci-libs/opencascade/opencascade-6.9.1-r2.ebuild | 4 +-
2 files changed, 50 insertions(+), 2 deletions(-)
diff --git a/sci-libs/opencascade/files/opencascade-6.9.1-vtk-8.1.patch b/sci-libs/opencascade/files/opencascade-6.9.1-vtk-8.1.patch
new file mode 100644
index 00000000000..d1f560320c6
--- /dev/null
+++ b/sci-libs/opencascade/files/opencascade-6.9.1-vtk-8.1.patch
@@ -0,0 +1,48 @@
+--- a/src/IVtkVTK/IVtkVTK_ShapeData.cxx
++++ b/src/IVtkVTK/IVtkVTK_ShapeData.cxx
+@@ -80,9 +80,9 @@ void IVtkVTK_ShapeData::InsertVertex (const IVtk_IdType theShapeID,
+ vtkIdType aPointIdVTK = thePointId;
+ myPolyData->InsertNextCell (VTK_VERTEX, 1, &aPointIdVTK);
+ const vtkIdType aShapeIDVTK = theShapeID;
+- mySubShapeIDs->InsertNextTupleValue (&aShapeIDVTK);
++ mySubShapeIDs->InsertNextTypedTuple (&aShapeIDVTK);
+ const vtkIdType aType = theMeshType;
+- myMeshTypes->InsertNextTupleValue (&aType);
++ myMeshTypes->InsertNextTypedTuple (&aType);
+ }
+
+ //================================================================
+@@ -97,9 +97,9 @@ void IVtkVTK_ShapeData::InsertLine (const IVtk_IdType theShapeID,
+ vtkIdType aPoints[2] = { thePointId1, thePointId2 };
+ myPolyData->InsertNextCell (VTK_LINE, 2, aPoints);
+ const vtkIdType aShapeIDVTK = theShapeID;
+- mySubShapeIDs->InsertNextTupleValue (&aShapeIDVTK);
++ mySubShapeIDs->InsertNextTypedTuple (&aShapeIDVTK);
+ const vtkIdType aType = theMeshType;
+- myMeshTypes->InsertNextTupleValue (&aType);
++ myMeshTypes->InsertNextTypedTuple (&aType);
+ }
+
+ //================================================================
+@@ -124,9 +124,9 @@ void IVtkVTK_ShapeData::InsertLine (const IVtk_IdType theShapeID,
+
+ myPolyData->InsertNextCell (VTK_POLY_LINE, anIdList);
+ const vtkIdType aShapeIDVTK = theShapeID;
+- mySubShapeIDs->InsertNextTupleValue (&aShapeIDVTK);
++ mySubShapeIDs->InsertNextTypedTuple (&aShapeIDVTK);
+ const vtkIdType aType = theMeshType;
+- myMeshTypes->InsertNextTupleValue (&aType);
++ myMeshTypes->InsertNextTypedTuple (&aType);
+ anIdList->Delete();
+ }
+ }
+@@ -144,7 +144,7 @@ void IVtkVTK_ShapeData::InsertTriangle (const IVtk_IdType theShapeID,
+ vtkIdType aPoints[3] = { thePointId1, thePointId2, thePointId3 };
+ myPolyData->InsertNextCell (VTK_TRIANGLE, 3, aPoints);
+ const vtkIdType aShapeIDVTK = theShapeID;
+- mySubShapeIDs->InsertNextTupleValue (&aShapeIDVTK);
++ mySubShapeIDs->InsertNextTypedTuple (&aShapeIDVTK);
+ const vtkIdType aType = theMeshType;
+- myMeshTypes->InsertNextTupleValue (&aType);
++ myMeshTypes->InsertNextTypedTuple (&aType);
+ }
diff --git a/sci-libs/opencascade/opencascade-6.9.1-r2.ebuild b/sci-libs/opencascade/opencascade-6.9.1-r2.ebuild
index 8eff7a5ab1a..bf868ce0ef5 100644
--- a/sci-libs/opencascade/opencascade-6.9.1-r2.ebuild
+++ b/sci-libs/opencascade/opencascade-6.9.1-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -31,13 +31,13 @@ DEPEND="
tbb? ( dev-cpp/tbb )
vtk? ( || ( sci-libs/vtk[imaging] sci-libs/vtk[rendering] sci-libs/vtk[views] sci-libs/vtk[all-modules] ) )"
RDEPEND="${DEPEND}"
-
CHECKREQS_MEMORY="256M"
CHECKREQS_DISK_BUILD="3584M"
PATCHES=(
"${FILESDIR}"/${PN}-6.8.0-fixed-DESTDIR.patch
"${FILESDIR}"/${PN}-6.9.1-vtk-configure.patch
+ "${FILESDIR}"/${PN}-6.9.1-vtk-8.1.patch
)
pkg_setup() {
^ permalink raw reply related [flat|nested] 17+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sci-libs/opencascade/, sci-libs/opencascade/files/
@ 2018-11-29 20:19 Andreas Sturmlechner
0 siblings, 0 replies; 17+ messages in thread
From: Andreas Sturmlechner @ 2018-11-29 20:19 UTC (permalink / raw
To: gentoo-commits
commit: 22c33947b0ef4c26437b62ebdd76e2ad19fdb8b1
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Thu Nov 29 20:02:59 2018 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Thu Nov 29 20:18:46 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=22c33947
sci-libs/opencascade: Fix build with ffmpeg-4
Reported-by: Boris Vingradov <no111u3 <AT> gmail.com>
Closes: https://bugs.gentoo.org/672248
Package-Manager: Portage-2.3.52, Repoman-2.3.12
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
.../files/opencascade-7.3.0-ffmpeg4.patch | 38 ++++++++++++++++++++++
sci-libs/opencascade/opencascade-7.3.0.ebuild | 3 +-
2 files changed, 40 insertions(+), 1 deletion(-)
diff --git a/sci-libs/opencascade/files/opencascade-7.3.0-ffmpeg4.patch b/sci-libs/opencascade/files/opencascade-7.3.0-ffmpeg4.patch
new file mode 100644
index 00000000000..fc572a4f5bc
--- /dev/null
+++ b/sci-libs/opencascade/files/opencascade-7.3.0-ffmpeg4.patch
@@ -0,0 +1,38 @@
+Author: jbeich
+Date: Wed May 2 13:25:55 UTC 2018
+New revision: 468831
+
+src/Image/Image_VideoRecorder.cxx:279:25: error: use of undeclared identifier 'CODEC_FLAG_GLOBAL_HEADER'
+ aCodecCtx->flags |= CODEC_FLAG_GLOBAL_HEADER;
+ ^
+src/Image/Image_VideoRecorder.cxx:452:38: error: use of undeclared identifier 'AVFMT_RAWPICTURE'
+ if ((myAVContext->oformat->flags & AVFMT_RAWPICTURE) != 0
+ ^
+
+--- a/src/Image/Image_VideoRecorder.cxx 2017-08-30 13:28:21 UTC
++++ b/src/Image/Image_VideoRecorder.cxx
+@@ -276,7 +276,7 @@ Standard_Boolean Image_VideoRecorder::addVideoStream (
+ // some formats want stream headers to be separate
+ if (myAVContext->oformat->flags & AVFMT_GLOBALHEADER)
+ {
+- aCodecCtx->flags |= CODEC_FLAG_GLOBAL_HEADER;
++ aCodecCtx->flags |= AV_CODEC_FLAG_GLOBAL_HEADER;
+ }
+ return Standard_True;
+ #else
+@@ -449,6 +449,7 @@ Standard_Boolean Image_VideoRecorder::writeVideoFrame
+ AVPacket aPacket;
+ memset (&aPacket, 0, sizeof(aPacket));
+ av_init_packet (&aPacket);
++#ifdef AVFMT_RAWPICTURE
+ if ((myAVContext->oformat->flags & AVFMT_RAWPICTURE) != 0
+ && !theToFlush)
+ {
+@@ -461,6 +462,7 @@ Standard_Boolean Image_VideoRecorder::writeVideoFrame
+ aResAv = av_interleaved_write_frame (myAVContext, &aPacket);
+ }
+ else
++#endif
+ {
+ // encode the image
+ myFrame->pts = myFrameCount;
diff --git a/sci-libs/opencascade/opencascade-7.3.0.ebuild b/sci-libs/opencascade/opencascade-7.3.0.ebuild
index 48f4c0775e4..6d40cf35bba 100644
--- a/sci-libs/opencascade/opencascade-7.3.0.ebuild
+++ b/sci-libs/opencascade/opencascade-7.3.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -50,6 +50,7 @@ S="${WORKDIR}/occt-V${MY_PV}"
PATCHES=(
"${FILESDIR}/${P}-vtk-compat.patch"
"${FILESDIR}/${P}-fixed-DESTDIR.patch"
+ "${FILESDIR}/${P}-ffmpeg4.patch" # bug 672248
)
pkg_setup() {
^ permalink raw reply related [flat|nested] 17+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sci-libs/opencascade/, sci-libs/opencascade/files/
@ 2018-11-29 20:19 Andreas Sturmlechner
0 siblings, 0 replies; 17+ messages in thread
From: Andreas Sturmlechner @ 2018-11-29 20:19 UTC (permalink / raw
To: gentoo-commits
commit: 19716b32ad42b4dc3a0e7a7b3d8e3a100be84f01
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Thu Nov 29 20:14:09 2018 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Thu Nov 29 20:18:46 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=19716b32
sci-libs/opencascade: Drop 6.9.1-r2
Closes: https://bugs.gentoo.org/651772
Package-Manager: Portage-2.3.52, Repoman-2.3.12
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
sci-libs/opencascade/Manifest | 1 -
.../files/opencascade-6.8.0-fixed-DESTDIR.patch | 47 ------
.../files/opencascade-6.9.1-vtk-6.3.patch | 70 --------
.../files/opencascade-6.9.1-vtk-8.1.patch | 48 ------
.../files/opencascade-6.9.1-vtk-configure.patch | 13 --
sci-libs/opencascade/opencascade-6.9.1-r2.ebuild | 177 ---------------------
6 files changed, 356 deletions(-)
diff --git a/sci-libs/opencascade/Manifest b/sci-libs/opencascade/Manifest
index 922670cf0cf..52dffdbc97c 100644
--- a/sci-libs/opencascade/Manifest
+++ b/sci-libs/opencascade/Manifest
@@ -1,2 +1 @@
-DIST opencascade-6.9.1.tgz 209589289 BLAKE2B 266d68042dbbb8c9bc5f167b9aefaf84b3f1568c25530acb36271443429e67972aae913ebcea09c9ea27164e2e3f007eb287350d7ad69486755cdcb713fdb1af SHA512 92f0fffb110344feebaba9dd4a3427419ea9e6db7b09556b7dcdb1248f2a868e3337587abf9921392435031431f3876cea4d4709fd9926604dcebbd6d26f8963
DIST opencascade-7.3.0.tar.gz 48576720 BLAKE2B bf63ba77aabc8a8c92d694f78f24bab71c07e68e7ba4b8d5d90966733dbd9c0c83a76e35f059e798d4a60640d663330cd13a828b19ec02a5372053ab39a74aa6 SHA512 17eb1810b43a8b001867563f97801ceb38a7878fa53d9b39b46a5cf3dd676310fa80e83e90668a99ec6aff9d4f09733fb6c7be83c1e3ab4eaa9fda55888050da
diff --git a/sci-libs/opencascade/files/opencascade-6.8.0-fixed-DESTDIR.patch b/sci-libs/opencascade/files/opencascade-6.8.0-fixed-DESTDIR.patch
deleted file mode 100644
index 1f37eace760..00000000000
--- a/sci-libs/opencascade/files/opencascade-6.8.0-fixed-DESTDIR.patch
+++ /dev/null
@@ -1,47 +0,0 @@
---- opencascade-6.8.0/Makefile.am
-+++ opencascade-6.8.0/Makefile.am
-@@ -82,27 +82,27 @@
- cd $(top_builddir)/adm/lin/amk && $(MAKE) $(AM_MAKEFLAGS) Draw
-
- install-exec-local:
-- $(INSTALL) -d $(prefix)/$(platform)
-- if [ -e $(prefix)/bin -a ! -e $(prefix)/$(platform)/bin ]; then \
-- cd $(prefix)/$(platform) && ln -s ../bin bin; \
-+ $(INSTALL) -d $(DESTDIR)$(prefix)/$(platform)
-+ if [ -e $(DESTDIR)$(prefix)/bin -a ! -e $(DESTDIR)$(prefix)/$(platform)/bin ]; then \
-+ cd $(DESTDIR)$(prefix)/$(platform) && ln -s ../bin bin; \
- fi
-- if [ -e $(prefix)/lib -a ! -e $(prefix)/$(platform)/lib ]; then \
-- cd $(prefix)/$(platform) && ln -s ../lib lib; \
-+ if [ -e $(DESTDIR)$(prefix)/lib -a ! -e $(DESTDIR)$(prefix)/$(platform)/lib ]; then \
-+ cd $(DESTDIR)$(prefix)/$(platform) && ln -s ../lib lib; \
- fi
-- buildd=`pwd`; cd $(top_srcdir); sourced=`pwd`; cd $(prefix); installd=`pwd`; cd $$buildd; \
-+ buildd=`pwd`; cd $(top_srcdir); sourced=`pwd`; cd $(DESTDIR)$(prefix); installd=`pwd`; cd $$buildd; \
- if [ "$$installd" != "$$sourced" ]; then \
-- $(INSTALL) -d $(prefix)/inc; \
-- cp -frL $(top_srcdir)/inc $(prefix); \
-- cp -frL $$buildd/config.h $(prefix); \
-+ $(INSTALL) -d $(DESTDIR)$(prefix)/inc; \
-+ cp -frL $(top_srcdir)/inc $(DESTDIR)$(prefix); \
-+ cp -frL $$buildd/config.h $(DESTDIR)$(prefix); \
- for d in $(FoundationClasses_DIRS) $(ModelingData_DIRS) $(ModelingAlgorithms_DIRS) $(Visualization_DIRS) $(ApplicationFramework_DIRS) $(DataExchange_DIRS) $(Draw_DIRS); do \
-- $(INSTALL) -d $(prefix)/src/$$d; \
-- cp -frL $(top_srcdir)/src/$$d $(prefix)/src; \
-+ $(INSTALL) -d $(DESTDIR)$(prefix)/src/$$d; \
-+ cp -frL $(top_srcdir)/src/$$d $(DESTDIR)$(prefix)/src; \
- done; \
- fi
-- if [ -e $(prefix)/inc/config.h ]; then \
-- rm -f $(prefix)/inc/config.h; \
-+ if [ -e $(DESTDIR)$(prefix)/inc/config.h ]; then \
-+ rm -f $(DESTDIR)$(prefix)/inc/config.h; \
- fi
-- cd $(prefix)/inc && ln -s ../config.h config.h
-- cd $(top_srcdir) && cp *.sh $(prefix)
-+ cd $(DESTDIR)$(prefix)/inc && ln -s ../config.h config.h
-+ cd $(top_srcdir) && cp *.sh $(DESTDIR)$(prefix)
-
--.PHONY: FoundationClasses ModelingData ModelingAlgorithms Visualization ApplicationFramework DataExchange Draw
-\ No newline at end of file
-+.PHONY: FoundationClasses ModelingData ModelingAlgorithms Visualization ApplicationFramework DataExchange Draw
diff --git a/sci-libs/opencascade/files/opencascade-6.9.1-vtk-6.3.patch b/sci-libs/opencascade/files/opencascade-6.9.1-vtk-6.3.patch
deleted file mode 100644
index 8e1d3361dde..00000000000
--- a/sci-libs/opencascade/files/opencascade-6.9.1-vtk-6.3.patch
+++ /dev/null
@@ -1,70 +0,0 @@
---- opencascade-6.9.1/configure.ac
-+++ opencascade-6.9.1/configure.ac
-@@ -1044,7 +1044,7 @@
- fi
- if test "x$vtk_lib" != "x"; then
- CSF_VTK_LIB="-L$vtk_lib -lvtkCommonCore -lvtkCommonDataModel -lvtkCommonExecutionModel -lvtkCommonMath -lvtkCommonTransforms "
-- CSF_VTK_LIB="${CSF_VTK_LIB} -lvtkRenderingCore -lvtkRenderingOpenGL -lvtkFiltersGeneral -lvtkIOCore -lvtkIOImage -lvtkImagingCore -lvtkInteractionStyle "
-+ CSF_VTK_LIB="${CSF_VTK_LIB} -lvtkRenderingCore -lvtkRenderingOpenGL2 -lvtkFiltersGeneral -lvtkIOCore -lvtkIOImage -lvtkImagingCore -lvtkInteractionStyle "
- else
- HAVE_VTK=no
- fi
---- opencascade-6.9.1/src/IVtkVTK/IVtkVTK_View.cxx
-+++ opencascade-6.9.1/src/IVtkVTK/IVtkVTK_View.cxx
-@@ -151,7 +151,7 @@ bool IVtkVTK_View::DisplayToWorld (const gp_XY& theDisplayPnt, gp_XYZ& theWorldP
- myRenderer->SetDisplayPoint (theDisplayPnt.X(), theDisplayPnt.Y(), 0.0);
- myRenderer->DisplayToWorld();
-
-- vtkFloatingPointType* const aCoords = myRenderer->GetWorldPoint();
-+ double* const aCoords = myRenderer->GetWorldPoint();
- if (aCoords[3] == 0.0) // Point at infinity in homogeneous coordinates
- {
- return false;
---- opencascade-6.9.1/src/IVtkTools/IVtkTools_ShapePicker.cxx
-+++ opencascade-6.9.1/src/IVtkTools/IVtkTools_ShapePicker.cxx
-@@ -73,15 +73,15 @@ float IVtkTools_ShapePicker::GetTolerance( ) const
- // Method: convertDisplayToWorld
- // Purpose: Convert display coordinates to world coordinates
- //============================================================================
--bool IVtkTools_ShapePicker::convertDisplayToWorld (vtkRenderer *theRenderer,
-- vtkFloatingPointType theDisplayCoord[3],
-- vtkFloatingPointType theWorldCoord[3])
-+bool IVtkTools_ShapePicker::convertDisplayToWorld (vtkRenderer *theRenderer,
-+ double theDisplayCoord[3],
-+ double theWorldCoord[3])
- {
- // Convert the selection point into world coordinates.
- theRenderer->SetDisplayPoint (theDisplayCoord[0], theDisplayCoord[1], theDisplayCoord[2]);
- theRenderer->DisplayToWorld();
-
-- vtkFloatingPointType* const aCoords = theRenderer->GetWorldPoint();
-+ double* const aCoords = theRenderer->GetWorldPoint();
- if (aCoords[3] == 0.0)
- {
- return false;
---- opencascade-6.9.1/src/IVtkTools/IVtkTools_ShapePicker.hxx
-+++ opencascade-6.9.1/src/IVtkTools/IVtkTools_ShapePicker.hxx
-@@ -124,8 +124,8 @@ protected:
-
- //! Convert display coordinates to world coordinates
- static bool convertDisplayToWorld (vtkRenderer *theRenderer,
-- vtkFloatingPointType theDisplayCoord[3],
-- vtkFloatingPointType theWorldCoord[3] );
-+ double theDisplayCoord[3],
-+ double theWorldCoord[3] );
-
- private: // not copyable
- IVtkTools_ShapePicker (const IVtkTools_ShapePicker&);
---- opencascade-6.9.1/inc/IVtkTools_ShapePicker.hxx
-+++ opencascade-6.9.1/inc/IVtkTools_ShapePicker.hxx
-@@ -124,8 +124,8 @@
-
- //! Convert display coordinates to world coordinates
- static bool convertDisplayToWorld (vtkRenderer *theRenderer,
-- vtkFloatingPointType theDisplayCoord[3],
-- vtkFloatingPointType theWorldCoord[3] );
-+ double theDisplayCoord[3],
-+ double theWorldCoord[3] );
-
- private: // not copyable
- IVtkTools_ShapePicker (const IVtkTools_ShapePicker&);
diff --git a/sci-libs/opencascade/files/opencascade-6.9.1-vtk-8.1.patch b/sci-libs/opencascade/files/opencascade-6.9.1-vtk-8.1.patch
deleted file mode 100644
index d1f560320c6..00000000000
--- a/sci-libs/opencascade/files/opencascade-6.9.1-vtk-8.1.patch
+++ /dev/null
@@ -1,48 +0,0 @@
---- a/src/IVtkVTK/IVtkVTK_ShapeData.cxx
-+++ b/src/IVtkVTK/IVtkVTK_ShapeData.cxx
-@@ -80,9 +80,9 @@ void IVtkVTK_ShapeData::InsertVertex (const IVtk_IdType theShapeID,
- vtkIdType aPointIdVTK = thePointId;
- myPolyData->InsertNextCell (VTK_VERTEX, 1, &aPointIdVTK);
- const vtkIdType aShapeIDVTK = theShapeID;
-- mySubShapeIDs->InsertNextTupleValue (&aShapeIDVTK);
-+ mySubShapeIDs->InsertNextTypedTuple (&aShapeIDVTK);
- const vtkIdType aType = theMeshType;
-- myMeshTypes->InsertNextTupleValue (&aType);
-+ myMeshTypes->InsertNextTypedTuple (&aType);
- }
-
- //================================================================
-@@ -97,9 +97,9 @@ void IVtkVTK_ShapeData::InsertLine (const IVtk_IdType theShapeID,
- vtkIdType aPoints[2] = { thePointId1, thePointId2 };
- myPolyData->InsertNextCell (VTK_LINE, 2, aPoints);
- const vtkIdType aShapeIDVTK = theShapeID;
-- mySubShapeIDs->InsertNextTupleValue (&aShapeIDVTK);
-+ mySubShapeIDs->InsertNextTypedTuple (&aShapeIDVTK);
- const vtkIdType aType = theMeshType;
-- myMeshTypes->InsertNextTupleValue (&aType);
-+ myMeshTypes->InsertNextTypedTuple (&aType);
- }
-
- //================================================================
-@@ -124,9 +124,9 @@ void IVtkVTK_ShapeData::InsertLine (const IVtk_IdType theShapeID,
-
- myPolyData->InsertNextCell (VTK_POLY_LINE, anIdList);
- const vtkIdType aShapeIDVTK = theShapeID;
-- mySubShapeIDs->InsertNextTupleValue (&aShapeIDVTK);
-+ mySubShapeIDs->InsertNextTypedTuple (&aShapeIDVTK);
- const vtkIdType aType = theMeshType;
-- myMeshTypes->InsertNextTupleValue (&aType);
-+ myMeshTypes->InsertNextTypedTuple (&aType);
- anIdList->Delete();
- }
- }
-@@ -144,7 +144,7 @@ void IVtkVTK_ShapeData::InsertTriangle (const IVtk_IdType theShapeID,
- vtkIdType aPoints[3] = { thePointId1, thePointId2, thePointId3 };
- myPolyData->InsertNextCell (VTK_TRIANGLE, 3, aPoints);
- const vtkIdType aShapeIDVTK = theShapeID;
-- mySubShapeIDs->InsertNextTupleValue (&aShapeIDVTK);
-+ mySubShapeIDs->InsertNextTypedTuple (&aShapeIDVTK);
- const vtkIdType aType = theMeshType;
-- myMeshTypes->InsertNextTupleValue (&aType);
-+ myMeshTypes->InsertNextTypedTuple (&aType);
- }
diff --git a/sci-libs/opencascade/files/opencascade-6.9.1-vtk-configure.patch b/sci-libs/opencascade/files/opencascade-6.9.1-vtk-configure.patch
deleted file mode 100644
index 3c2711d3813..00000000000
--- a/sci-libs/opencascade/files/opencascade-6.9.1-vtk-configure.patch
+++ /dev/null
@@ -1,13 +0,0 @@
---- opencascade-6.9.1/configure.ac
-+++ opencascade-6.9.1/configure.ac
-@@ -1043,8 +1043,8 @@
- HAVE_VTK=no
- fi
- if test "x$vtk_lib" != "x"; then
-- CSF_VTK_LIB="-L$vtk_lib -lvtkCommonCore-6.1 -lvtkCommonDataModel-6.1 -lvtkCommonExecutionModel-6.1 -lvtkCommonMath-6.1 -lvtkCommonTransforms-6.1 "
-- CSF_VTK_LIB="${CSF_VTK_LIB} -lvtkRenderingCore-6.1 -lvtkRenderingOpenGL-6.1 -lvtkFiltersGeneral-6.1 -lvtkIOCore-6.1 -lvtkIOImage-6.1 -lvtkImagingCore-6.1 -lvtkInteractionStyle-6.1 "
-+ CSF_VTK_LIB="-L$vtk_lib -lvtkCommonCore -lvtkCommonDataModel -lvtkCommonExecutionModel -lvtkCommonMath -lvtkCommonTransforms "
-+ CSF_VTK_LIB="${CSF_VTK_LIB} -lvtkRenderingCore -lvtkRenderingOpenGL -lvtkFiltersGeneral -lvtkIOCore -lvtkIOImage -lvtkImagingCore -lvtkInteractionStyle "
- else
- HAVE_VTK=no
- fi
diff --git a/sci-libs/opencascade/opencascade-6.9.1-r2.ebuild b/sci-libs/opencascade/opencascade-6.9.1-r2.ebuild
deleted file mode 100644
index b8abc59a41a..00000000000
--- a/sci-libs/opencascade/opencascade-6.9.1-r2.ebuild
+++ /dev/null
@@ -1,177 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit autotools eutils check-reqs multilib java-pkg-opt-2 flag-o-matic versionator
-
-DESCRIPTION="Development platform for CAD/CAE, 3D surface/solid modeling and data exchange"
-HOMEPAGE="http://www.opencascade.org/"
-SRC_URI="http://www.opencascade.com/sites/default/files/private/occt/OCC_${PV}_release/opencascade-${PV}.tgz"
-
-LICENSE="|| ( Open-CASCADE-LGPL-2.1-Exception-1.0 LGPL-2.1 )"
-SLOT="${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE="debug doc examples freeimage gl2ps java +tbb +vtk"
-
-DEPEND="
- app-eselect/eselect-opencascade
- dev-lang/tcl:0=
- dev-lang/tk:0=
- dev-tcltk/itcl
- dev-tcltk/itk
- dev-tcltk/tix
- media-libs/ftgl
- virtual/glu
- virtual/opengl
- x11-libs/libXmu
- freeimage? ( media-libs/freeimage )
- gl2ps? ( x11-libs/gl2ps )
- java? ( >=virtual/jdk-0:= )
- tbb? ( dev-cpp/tbb )
- vtk? ( || ( sci-libs/vtk[imaging] sci-libs/vtk[rendering] sci-libs/vtk[views] sci-libs/vtk[all-modules] ) )"
-RDEPEND="${DEPEND}"
-CHECKREQS_MEMORY="256M"
-CHECKREQS_DISK_BUILD="3584M"
-
-PATCHES=(
- "${FILESDIR}"/${PN}-6.8.0-fixed-DESTDIR.patch
- "${FILESDIR}"/${PN}-6.9.1-vtk-configure.patch
- "${FILESDIR}"/${PN}-6.9.1-vtk-8.1.patch
-)
-
-pkg_setup() {
- check-reqs_pkg_setup
- java-pkg-opt-2_pkg_setup
-}
-
-src_prepare() {
- default
-
- MY_VTK_P=$(best_version sci-libs/vtk)
- MY_VTK_PV=${MY_VTK_P/sci-libs\/vtk-}
- MY_VTK_SUB=vtk-$(get_version_component_range 1-2 ${MY_VTK_PV})
- if has_version ">=sci-libs/vtk-6.3" ; then #bug 605304
- eapply "${FILESDIR}"/${PN}-6.9.1-vtk-6.3.patch
- fi
-
- java-pkg-opt-2_src_prepare
-
- # Feed environment variables used by Opencascade compilation
- my_install_dir=${EROOT}usr/$(get_libdir)/${P}/ros
- local my_env_install="#!/bin/sh -f
-if [ -z \"\$PATH\" ]; then
- export PATH=VAR_CASROOT/Linux/bin
-else
- export PATH=VAR_CASROOT/Linux/bin:\$PATH
-fi
-if [ -z \"\$LD_LIBRARY_PATH\" ]; then
- export LD_LIBRARY_PATH=VAR_CASROOT/Linux/lib
-else
- export LD_LIBRARY_PATH=VAR_CASROOT/Linux/lib:\$LD_LIBRARY_PATH
-fi"
- local my_sys_lib=${EROOT}usr/$(get_libdir)
- local my_env="CASROOT=VAR_CASROOT
-CSF_MDTVFontDirectory=VAR_CASROOT/src/FontMFT
-CSF_LANGUAGE=us
-MMGT_CLEAR=1
-CSF_EXCEPTION_PROMPT=1
-CSF_SHMessage=VAR_CASROOT/src/SHMessage
-CSF_MDTVTexturesDirectory=VAR_CASROOT/src/Textures
-CSF_XSMessage=VAR_CASROOT/src/XSMessage
-CSF_StandardDefaults=VAR_CASROOT/src/StdResource
-CSF_PluginDefaults=VAR_CASROOT/src/StdResource
-CSF_XCAFDefaults=VAR_CASROOT/src/StdResource
-CSF_StandardLiteDefaults=VAR_CASROOT/src/StdResource
-CSF_GraphicShr=VAR_CASROOT/Linux/lib/libTKOpenGl.so
-CSF_UnitsLexicon=VAR_CASROOT/src/UnitsAPI/Lexi_Expr.dat
-CSF_UnitsDefinition=VAR_CASROOT/src/UnitsAPI/Units.dat
-CSF_IGESDefaults=VAR_CASROOT/src/XSTEPResource
-CSF_STEPDefaults=VAR_CASROOT/src/XSTEPResource
-CSF_XmlOcafResource=VAR_CASROOT/src/XmlOcafResource
-CSF_MIGRATION_TYPES=VAR_CASROOT/src/StdResource/MigrationSheet.txt
-TCLHOME=${EROOT}usr/bin
-TCLLIBPATH=${my_sys_lib}
-ITK_LIBRARY=${my_sys_lib}/itk$(grep ITK_VER /usr/include/itk.h | sed 's/^.*"\(.*\)".*/\1/')
-ITCL_LIBRARY=${my_sys_lib}/itcl$(grep ITCL_VER /usr/include/itcl.h | sed 's/^.*"\(.*\)".*/\1/')
-TIX_LIBRARY=${my_sys_lib}/tix$(grep TIX_VER /usr/include/tix.h | sed 's/^.*"\(.*\)".*/\1/')
-TK_LIBRARY=${my_sys_lib}/tk$(grep TK_VER /usr/include/tk.h | sed 's/^.*"\(.*\)".*/\1/')
-TCL_LIBRARY=${my_sys_lib}/tcl$(grep TCL_VER /usr/include/tcl.h | sed 's/^.*"\(.*\)".*/\1/')"
-
- ( echo "${my_env_install}"
- echo "${my_env}" | sed -e "s:^:export :" ) \
- | sed -e "s:VAR_CASROOT:${S}:g" > env.sh || die
- source env.sh
-
- ( echo "PATH=${my_install_dir}/lin/bin"
- echo "LDPATH=${my_install_dir}/lin/$(get_libdir)"
- echo "${my_env}" | sed \
- -e "s:VAR_CASROOT:${my_install_dir}/lin:g" \
- -e "s:/Linux/lib/:/$(get_libdir)/:g" || die
- ) > 50${PN}
-
- append-cxxflags "-fpermissive"
-
- sed -e "/^AM_C_PROTOTYPES$/d" \
- -e "s/AM_CONFIG_HEADER/AC_CONFIG_HEADERS/" \
- -e "/\$qt directory is not exists/s/AC_MSG_ERROR/AC_MSG_NOTICE/" \
- -i configure.ac || die
-
- # no longer needed https://tracker.dev.opencascade.org/view.php?id=28971
- if has_version ">=sys-libs/glibc-2.26" ; then
- sed -e '/#include <xlocale.h>/d' \
- -i inc/Standard_CLocaleSentry.hxx || die
- fi
-
- eautoreconf
-}
-
-src_configure() {
- econf \
- --prefix=${my_install_dir}/lin --exec-prefix=${my_install_dir}/lin \
- --with-tcl="${EROOT}usr/$(get_libdir)" --with-tk="${EROOT}usr/$(get_libdir)" \
- --with-freetype="${EROOT}usr" \
- --with-ftgl="${EROOT}usr" \
- --without-qt \
- $(usex freeimage "--with-freeimage=${EROOT}usr" "") \
- $(usex gl2ps "--with-gl2ps=${EROOT}usr" "") \
- $(usex tbb "--with-tbb-include=${EROOT}usr" "") \
- $(usex tbb "--with-tbb-library=${EROOT}usr" "") \
- $(use java && echo "--with-java-include=$(java-config -O)/include" || echo "--without-java-include") \
- $(usex vtk "--with-vtk-include=${EROOT}usr/include/${MY_VTK_SUB}" "") \
- $(usex vtk "--with-vtk-library=${EROOT}usr/$(get_libdir)" "") \
- $(use_enable debug) \
- $(use_enable !debug production)
-}
-
-src_install() {
- emake DESTDIR="${D}" install
-
- prune_libtool_files
-
- # Symlinks for keeping original OpenCascade folder structure and
- # add a link lib to $(get_libdir) if we are e.g. on amd64 multilib
- if [ "$(get_libdir)" != "lib" ]; then
- dosym "$(get_libdir)" "${my_install_dir}/lin/lib"
- fi
-
- insinto /etc/env.d/${PN}
- newins 50${PN} ${PV}
-
- if use examples ; then
- insinto /usr/share/doc/${PF}/examples
- doins -r data
- doins -r samples
- fi
- if use doc; then
- insinto /usr/share/doc/${PF}
- doins -r doc/{overview,pdf,refman}
- fi
-}
-
-pkg_postinst() {
- eselect ${PN} set ${PV}
- elog "After upgrading OpenCASCADE you may have to rebuild packages depending on it."
- elog "You get a list by running \"equery depends sci-libs/opencascade\""
- elog "revdep-rebuild does NOT suffice."
-}
^ permalink raw reply related [flat|nested] 17+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sci-libs/opencascade/, sci-libs/opencascade/files/
@ 2019-11-17 7:46 Joonas Niilola
0 siblings, 0 replies; 17+ messages in thread
From: Joonas Niilola @ 2019-11-17 7:46 UTC (permalink / raw
To: gentoo-commits
commit: 4909a322be06b7abd27e2954ea5f89e5c3ffc46b
Author: Bernd Waibel <waebbl <AT> gmail <DOT> com>
AuthorDate: Sat Oct 19 09:17:54 2019 +0000
Commit: Joonas Niilola <juippis <AT> gentoo <DOT> org>
CommitDate: Sun Nov 17 07:45:47 2019 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4909a322
sci-libs/opencascade: bump to version 7.4.0
Closes: https://bugs.gentoo.org/696596
Package-Manager: Portage-2.3.76, Repoman-2.3.17
Signed-off-by: Bernd Waibel <waebbl <AT> gmail.com>
Closes: https://github.com/gentoo/gentoo/pull/13596
Signed-off-by: Joonas Niilola <juippis <AT> gentoo.org>
sci-libs/opencascade/Manifest | 1 +
.../files/opencascade-7.4.0-find-qt.patch | 85 +++++++++++++
.../files/opencascade-7.4.0-fix-install.patch | 133 ++++++++++++++++++++
.../opencascade/files/opencascade-7.4.0.env.in | 103 +++++++++++++++
sci-libs/opencascade/metadata.xml | 27 +++-
sci-libs/opencascade/opencascade-7.4.0.ebuild | 140 +++++++++++++++++++++
6 files changed, 484 insertions(+), 5 deletions(-)
diff --git a/sci-libs/opencascade/Manifest b/sci-libs/opencascade/Manifest
index 52dffdbc97c..d999b843d5d 100644
--- a/sci-libs/opencascade/Manifest
+++ b/sci-libs/opencascade/Manifest
@@ -1 +1,2 @@
DIST opencascade-7.3.0.tar.gz 48576720 BLAKE2B bf63ba77aabc8a8c92d694f78f24bab71c07e68e7ba4b8d5d90966733dbd9c0c83a76e35f059e798d4a60640d663330cd13a828b19ec02a5372053ab39a74aa6 SHA512 17eb1810b43a8b001867563f97801ceb38a7878fa53d9b39b46a5cf3dd676310fa80e83e90668a99ec6aff9d4f09733fb6c7be83c1e3ab4eaa9fda55888050da
+DIST opencascade-7.4.0.tar.gz 49210449 BLAKE2B c92afe7551e9a066ad0940dcf49278b556a726f0534131706b3a11cb0986ba32818e162df3982283f6815eb9d67d7e91f909485d78f2b8d638da1934ffbc2f7f SHA512 eb0d47848d48f42a159ae5d7a4144483ba1f59f634844bd2053e48e04af30a30ba7056112cd38a1730d193a8d736b898f9608dd574cbe6829dbe7257a002772a
diff --git a/sci-libs/opencascade/files/opencascade-7.4.0-find-qt.patch b/sci-libs/opencascade/files/opencascade-7.4.0-find-qt.patch
new file mode 100644
index 00000000000..1ebc1106a31
--- /dev/null
+++ b/sci-libs/opencascade/files/opencascade-7.4.0-find-qt.patch
@@ -0,0 +1,85 @@
+From 7304c888e57a581e9dc8ef2005e960ec579d58f4 Mon Sep 17 00:00:00 2001
+From: Bernd Waibel <waebbl@gmail.com>
+Date: Sat, 9 Nov 2019 17:15:27 +0100
+Subject: [PATCH] Gentoo-specific: disable internal 3RDPARTY_QT_DIR
+
+The patch disables searching for internal 3rd-party Qt. Instead
+system installed Qt is used. The call to find_package uses REQUIRED
+flag for this.
+
+Signed-off-by: Bernd Waibel <waebbl@gmail.com>
+---
+ adm/cmake/qt.cmake | 24 ++++++++++++------------
+ adm/cmake/qt_macro.cmake | 6 +++---
+ 2 files changed, 15 insertions(+), 15 deletions(-)
+
+diff --git a/adm/cmake/qt.cmake b/adm/cmake/qt.cmake
+index 6958bab5..b6a9b794 100644
+--- a/adm/cmake/qt.cmake
++++ b/adm/cmake/qt.cmake
+@@ -3,27 +3,27 @@
+ # Qt is searched manually first (just determine root)
+ message (STATUS "Processing Qt 3-rd party")
+
+-if (NOT DEFINED ${3RDPARTY_QT_DIR} AND ${3RDPARTY_QT_DIR} STREQUAL "")
+- FIND_PRODUCT_DIR ("${3RDPARTY_DIR}" Qt 3RDPARTY_QT_DIR_NAME)
++#if (NOT DEFINED ${3RDPARTY_QT_DIR} AND ${3RDPARTY_QT_DIR} STREQUAL "")
++# FIND_PRODUCT_DIR ("${3RDPARTY_DIR}" Qt 3RDPARTY_QT_DIR_NAME)
+
+- if (NOT DEFINED ${3RDPARTY_QT_DIR_NAME} AND ${3RDPARTY_QT_DIR_NAME} STREQUAL "")
+- message (FATAL_ERROR "... Qt root directory was not found")
+- endif()
++# if (NOT DEFINED ${3RDPARTY_QT_DIR_NAME} AND ${3RDPARTY_QT_DIR_NAME} STREQUAL "")
++# message (FATAL_ERROR "... Qt root directory was not found")
++# endif()
+
+ # Combine directory name with absolute path and show in GUI
+- set (3RDPARTY_QT_DIR "${3RDPARTY_DIR}/${3RDPARTY_QT_DIR_NAME}" CACHE PATH "The directory containing Qt" FORCE)
+- message (STATUS "Info: Qt is used from folder: ${3RDPARTY_QT_DIR}")
+-endif()
++# set (3RDPARTY_QT_DIR "${3RDPARTY_DIR}/${3RDPARTY_QT_DIR_NAME}" CACHE PATH "The directory containing Qt" FORCE)
++# message (STATUS "Info: Qt is used from folder: ${3RDPARTY_QT_DIR}")
++#endif()
+
+-set (USED_3RDPARTY_QT_DIR "${3RDPARTY_QT_DIR}")
++#set (USED_3RDPARTY_QT_DIR "${3RDPARTY_QT_DIR}")
+
+ # Now set CMAKE_PREFIX_PATH to point to local Qt installation.
+ # Without this setting find_package() will not work
+-set(CMAKE_PREFIX_PATH ${3RDPARTY_QT_DIR})
++#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
+@@ -31,4 +31,4 @@ if (NOT ${Qt5_FOUND})
+ #message (STATUS "Qt4 cmake configuration")
+ else()
+ #message (STATUS "Qt5 cmake configuration")
+-endif()
+\ No newline at end of file
++endif()
+diff --git a/adm/cmake/qt_macro.cmake b/adm/cmake/qt_macro.cmake
+index ec897384..8bd314a4 100644
+--- a/adm/cmake/qt_macro.cmake
++++ b/adm/cmake/qt_macro.cmake
+@@ -2,9 +2,9 @@
+
+ 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 ("${3RDPARTY_QT_DIR}" STREQUAL "")
++# message (FATAL_ERROR "Empty Qt dir")
++# endif()
+
+ if (${Qt5_FOUND})
+ #message (STATUS "Qt5 cmake configuration")
+--
+2.23.0
+
diff --git a/sci-libs/opencascade/files/opencascade-7.4.0-fix-install.patch b/sci-libs/opencascade/files/opencascade-7.4.0-fix-install.patch
new file mode 100644
index 00000000000..edf3545a74b
--- /dev/null
+++ b/sci-libs/opencascade/files/opencascade-7.4.0-fix-install.patch
@@ -0,0 +1,133 @@
+From 95c7c85f776d6e4764f2146c8385d6e29762043d Mon Sep 17 00:00:00 2001
+From: Bernd Waibel <waebbl@gmail.com>
+Date: Sat, 16 Nov 2019 18:28:11 +0100
+Subject: [PATCH] Gentoo-specific: patch installation paths
+
+Patch parts of cmake to install into proper locations and handle slotting.
+
+Signed-off-by: Bernd Waibel <waebbl@gmail.com>
+---
+ CMakeLists.txt | 28 +++++++++++++++-------------
+ adm/cmake/occt_macros.cmake | 2 +-
+ 2 files changed, 16 insertions(+), 14 deletions(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 0b445de9..1fd5779e 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -15,6 +15,8 @@ macro (OCCT_INCLUDE_CMAKE_FILE BEING_INCLUDED_FILE)
+ endif()
+ endmacro()
+
++SET(CMAKE_INSTALL_DO_STRIP OFF)
++
+ # include variable description
+ OCCT_INCLUDE_CMAKE_FILE ("adm/cmake/vardescr")
+
+@@ -231,7 +233,7 @@ endif()
+ # place the libraries to <prefix>/lib folder for unix and leave old structure for windows
+ if (NOT DEFINED INSTALL_DIR_LIB)
+ if ("${INSTALL_DIR_LAYOUT}" STREQUAL "Unix")
+- set (INSTALL_DIR_LIB "lib" CACHE PATH "${INSTALL_DIR_LIB_DESCR}")
++ set (INSTALL_DIR_LIB "lib${LIB_SUFFIX}" CACHE PATH "${INSTALL_DIR_LIB_DESCR}")
+ else()
+ set (INSTALL_DIR_LIB "${OS_WITH_BIT}/${COMPILER}/lib" CACHE PATH "${INSTALL_DIR_LIB_DESCR}")
+ endif()
+@@ -315,9 +317,9 @@ endif()
+ if (NOT DEFINED INSTALL_DIR_CMAKE)
+ if ("${INSTALL_DIR_LAYOUT}" STREQUAL "Unix")
+ if (INSTALL_DIR_WITH_VERSION)
+- set (INSTALL_DIR_CMAKE "lib/cmake/opencascade-${OCC_VERSION_STRING_EXT}" CACHE PATH "${INSTALL_DIR_CMAKE_DESCR}")
++ set (INSTALL_DIR_CMAKE "lib${LIB_SUFFIX}/cmake/opencascade-${OCC_VERSION_STRING_EXT}" CACHE PATH "${INSTALL_DIR_CMAKE_DESCR}")
+ else()
+- set (INSTALL_DIR_CMAKE "lib/cmake/opencascade" CACHE PATH "${INSTALL_DIR_CMAKE_DESCR}")
++ set (INSTALL_DIR_CMAKE "lib${LIB_SUFFIX}/cmake/opencascade-${OCC_VERSION_STRING_EXT}" CACHE PATH "${INSTALL_DIR_CMAKE_DESCR}")
+ endif()
+ else()
+ set (INSTALL_DIR_CMAKE "cmake" CACHE PATH "${INSTALL_DIR_CMAKE_DESCR}")
+@@ -868,10 +870,10 @@ if (${DRAWEXE_INDEX} GREATER -1)
+ # copy draw script to install script folder
+ if (BUILD_PATCH AND EXISTS "${BUILD_PATCH}/adm/templates/draw.${SCRIPT_EXT}")
+ install (FILES "${BUILD_PATCH}/adm/templates/draw.${SCRIPT_EXT}" DESTINATION "${INSTALL_DIR_SCRIPT}"
+- PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ GROUP_WRITE GROUP_EXECUTE WORLD_READ WORLD_WRITE WORLD_EXECUTE)
++ PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE)
+ else()
+ install (FILES "${CMAKE_SOURCE_DIR}/adm/templates/draw.${SCRIPT_EXT}" DESTINATION "${INSTALL_DIR_SCRIPT}"
+- PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ GROUP_WRITE GROUP_EXECUTE WORLD_READ WORLD_WRITE WORLD_EXECUTE)
++ PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE)
+ endif()
+
+ # copy draw script to CMake binary folder
+@@ -892,9 +894,9 @@ if (EXISTS "${INSTALL_DIR}/${INSTALL_DIR_SCRIPT}/custom.${SCRIPT_EXT}")
+
+ set (CUSTOM_CONTENT "${CUSTOM_CONTENT} ${ADDITIONAL_CUSTOM_CONTENT}")
+
+- file (WRITE "${INSTALL_DIR}/${INSTALL_DIR_SCRIPT}/custom.${SCRIPT_EXT}" "${CUSTOM_CONTENT}")
++ file (WRITE "${CMAKE_BINARY_DIR}/custom.${SCRIPT_EXT}" "${CUSTOM_CONTENT}")
+ else()
+- OCCT_CONFIGURE_AND_INSTALL ("adm/templates/custom.${SCRIPT_EXT}.main" "custom.${SCRIPT_EXT}" "custom.${SCRIPT_EXT}" "${INSTALL_DIR_SCRIPT}")
++ OCCT_CONFIGURE_AND_INSTALL ("adm/templates/custom.${SCRIPT_EXT}.main" "custom.${SCRIPT_EXT}" "custom.${SCRIPT_EXT}" "$ENV{DESTDIR}${INSTALL_DIR}/${INSTALL_DIR_SCRIPT}")
+ endif()
+
+ if (WIN32)
+@@ -1067,10 +1069,10 @@ if (BUILD_TOOL_TOOLKITS)
+ # copy tinspector script to install script folder
+ if (BUILD_PATCH AND EXISTS "${BUILD_PATCH}/adm/templates/inspector.${SCRIPT_EXT}")
+ install (FILES "${BUILD_PATCH}/adm/templates/inspector.${SCRIPT_EXT}" DESTINATION "${INSTALL_DIR_SCRIPT}"
+- PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ GROUP_WRITE GROUP_EXECUTE WORLD_READ WORLD_WRITE WORLD_EXECUTE)
++ PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE)
+ else()
+ install (FILES "${CMAKE_SOURCE_DIR}/adm/templates/inspector.${SCRIPT_EXT}" DESTINATION "${INSTALL_DIR_SCRIPT}"
+- PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ GROUP_WRITE GROUP_EXECUTE WORLD_READ WORLD_WRITE WORLD_EXECUTE)
++ PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE)
+ endif()
+
+ set (OpenCASCADE_BINARY_DIR "${INSTALL_DIR}/${INSTALL_DIR_BIN}")
+@@ -1122,7 +1124,7 @@ foreach (OCCT_CONFIGURATION ${CMAKE_CONFIGURATION_TYPES})
+ endforeach()
+ # install OpenCASCADE config file with compile definitions and C/C++ flags ONLY for current configuration
+ install (CODE "string (TOLOWER \"\${CMAKE_INSTALL_CONFIG_NAME}\" CMAKE_INSTALL_CONFIG_NAME_LOWER)")
+-install (CODE "configure_file(\"${CMAKE_BINARY_DIR}/OpenCASCADECompileDefinitionsAndFlags-\${CMAKE_INSTALL_CONFIG_NAME_LOWER}.cmake\" \"${INSTALL_DIR}/${INSTALL_DIR_CMAKE}/OpenCASCADECompileDefinitionsAndFlags-\${CMAKE_INSTALL_CONFIG_NAME_LOWER}.cmake\" COPYONLY)")
++install (CODE "configure_file(\"${CMAKE_BINARY_DIR}/OpenCASCADECompileDefinitionsAndFlags-\${CMAKE_INSTALL_CONFIG_NAME_LOWER}.cmake\" \"\$ENV{DESTDIR}${INSTALL_DIR_CMAKE}/opencascade-${OCC_VERSION_STRING_EXT}/OpenCASCADECompileDefinitionsAndFlags-\${CMAKE_INSTALL_CONFIG_NAME_LOWER}.cmake\" COPYONLY)")
+
+ foreach (OCCT_MODULE ${OCCT_MODULES})
+ if (BUILD_MODULE_${OCCT_MODULE})
+@@ -1163,7 +1165,7 @@ endif()
+
+ # Configure and install cmake config file
+ configure_file("${CMAKE_SOURCE_DIR}/adm/templates/OpenCASCADEConfig.cmake.in" "OpenCASCADEConfig.cmake" @ONLY)
+-install(FILES "${CMAKE_BINARY_DIR}/OpenCASCADEConfig.cmake" DESTINATION "${INSTALL_DIR_CMAKE}")
++install(FILES "${CMAKE_BINARY_DIR}/OpenCASCADEConfig.cmake" DESTINATION "${INSTALL_DIR_CMAKE}/opencascade-${OCC_VERSION_STRING_EXT}")
+
+ # Configure cmake version file
+ include(CMakePackageConfigHelpers)
+@@ -1172,11 +1174,11 @@ write_basic_package_version_file( ${CMAKE_BINARY_DIR}/OpenCASCADEConfigVersion.c
+ COMPATIBILITY ExactVersion )
+
+ # Install cmake version file
+-install (FILES "${CMAKE_BINARY_DIR}/OpenCASCADEConfigVersion.cmake" DESTINATION "${INSTALL_DIR_CMAKE}")
++install (FILES "${CMAKE_BINARY_DIR}/OpenCASCADEConfigVersion.cmake" DESTINATION "${INSTALL_DIR_CMAKE}/opencascade-${OCC_VERSION_STRING_EXT}")
+
+ # Install the export set for use with the install-tree for each configuration
+ foreach (OCCT_MODULE ${OCCT_MODULES_ENABLED})
+- install(EXPORT OpenCASCADE${OCCT_MODULE}Targets DESTINATION "${INSTALL_DIR_CMAKE}")
++ install(EXPORT OpenCASCADE${OCCT_MODULE}Targets DESTINATION "${INSTALL_DIR_CMAKE}/opencascade-${OCC_VERSION_STRING_EXT}")
+ endforeach()
+
+ # Update generated OpenCASCADETargets-*.cmake files
+diff --git a/adm/cmake/occt_macros.cmake b/adm/cmake/occt_macros.cmake
+index 8220ecd5..228d801b 100644
+--- a/adm/cmake/occt_macros.cmake
++++ b/adm/cmake/occt_macros.cmake
+@@ -598,7 +598,7 @@ macro (OCCT_UPDATE_TARGET_FILE)
+ "cmake_policy(PUSH)
+ cmake_policy(SET CMP0007 NEW)
+ string (TOLOWER \"\${CMAKE_INSTALL_CONFIG_NAME}\" CMAKE_INSTALL_CONFIG_NAME_LOWERCASE)
+- file (GLOB ALL_OCCT_TARGET_FILES \"${INSTALL_DIR}/${INSTALL_DIR_CMAKE}/OpenCASCADE*Targets-\${CMAKE_INSTALL_CONFIG_NAME_LOWERCASE}.cmake\")
++ file (GLOB ALL_OCCT_TARGET_FILES \"\$ENV{DESTDIR}${INSTALL_DIR_CMAKE}/opencascade-${OCC_VERSION_STRING_EXT}/OpenCASCADE*Targets-\${CMAKE_INSTALL_CONFIG_NAME_LOWERCASE}.cmake\")
+ foreach(TARGET_FILENAME \${ALL_OCCT_TARGET_FILES})
+ file (STRINGS \"\${TARGET_FILENAME}\" TARGET_FILE_CONTENT)
+ file (REMOVE \"\${TARGET_FILENAME}\")
+--
+2.23.0
+
diff --git a/sci-libs/opencascade/files/opencascade-7.4.0.env.in b/sci-libs/opencascade/files/opencascade-7.4.0.env.in
new file mode 100644
index 00000000000..2eefe188c1a
--- /dev/null
+++ b/sci-libs/opencascade/files/opencascade-7.4.0.env.in
@@ -0,0 +1,103 @@
+#
+# This file sets needed and optional environment variables for
+# Open CASCADE Technology
+#
+# See: https://dev.opencascade.org/doc/overview/html/index.html#OCCT_OVW_SECTION_4_2
+# for further documentation.
+#
+# Some of the values are set at compile time depending on what USE flags
+# were enabled. Those values are marked as such.
+
+# define the root directory of Open CASCADE Technology (needed)
+CASROOT=VAR_CASROOT
+# PATH and LDPATH are used to find the binaries and libraries of OCCT (needed)
+PATH=VAR_CASROOT/bin
+LDPATH=VAR_CASROOT/lib
+
+#############################################################################
+# The MMGT_* variables are used to determine how memory management will work
+# in OCCT. All of those are optional. If they are not set here, their default
+# values will be used.
+#
+# Uncomment or change the ones you need to adapt from its default.
+#############################################################################
+# MMGT_OPT = {0,1,2} (default: 0) set at compile time
+# if set to 0 (the default), every memory block is allocated in C
+# memory heap directly (via malloc() and free()). Will be set, if
+# neither the the 'optimize' nor the 'tbb' USE flags are set.
+# if set to 1, the memory manager performs it's own internal optimization.
+# Will be set, if the 'optimize' USE flag is set.
+# if set to 2, Intel(R) TBB optimized memory manager is used. Will be set,
+# if the 'tbb' USE flag is set.
+#MMGT_OPT=0
+
+# MMGT_CLEAR = {0,1} (default: 1)
+# if set to 0, memory block is returned as it is. Will be set, if the
+# 'optimize' USE flag is set
+# if set to 1, every allocated memory block is cleared by zeros
+#MMGT_CLEAR=1
+
+# MMGT_CELLSIZE (default: 200)
+# defines the maximal size of blocks allocated in large pools of memory.
+#MMGT_CELLSIZE=200
+
+# MMGT_NBPAGES (default: 10000)
+# defines the size of memory chunks allocated for small blocks in pages
+# (OS dependant)
+#MMGT_NBPAGES=10000
+
+# MMGT_THRESHOLD (default: 40000)
+# defines the maximal size of blocks that are recycled internally instead
+# of being returned to the heap.
+#MMGT_THRESHOLD=40000
+
+# MMGT_MMAP = {0,1} (default: 1)
+# if set to 0, large memory blocks will be allocated in the C heap by
+# malloc()
+# if set to 1, large memory blocks are allocated using memory mapping
+# functions of the operating system.
+#MMGT_MMAP=1
+
+# CSF_LANGUAGE (default: us) optional
+# defines the default language of messages indicated by a two-letter
+# country code. Currently it's not verified if this work with other
+# than the default languages, so we keep it commented.
+#CSF_LANGUAGE=us
+
+# CSF_DEBUG_BOP (default: undefined) optional
+# if defined then it should specify the directory where diagnostic data
+# on problems occured in Boolean operations will be saved. Not defined by
+# default.
+#
+# NOTE: Only enable for debugging purposes. If set, this variable has a
+# large impact on the performance of boolean operations.
+#CSF_DEBUG_BOP=/var/tmp
+
+# CSF_EXCEPTION_PROMPT (default: 1) optional
+# not documented upstream (maybe a flag indicating whether the user shall
+# be prompted in the case of exceptions)
+CSF_EXCEPTION_PROMPT=1
+
+# The following CSF_* variables define various directories and files where
+# OCCT is looking for resources.
+CSF_GraphicShr=VAR_CASROOT/lib/libTKOpenGl.so
+CSF_MIGRATION_TYPES=VAR_CASROOT/share/opencascade/resources/StdResource/MigrationSheet.txt
+CSF_MDTVTexturesDirectory=VAR_CASROOT/share/opencascade/resources/Textures
+CSF_PluginDefaults=VAR_CASROOT/share/opencascade/resources/StdResource
+CSF_StandardDefaults=VAR_CASROOT/share/opencascade/resources/StdResource
+CSF_StandardLiteDefaults=VAR_CASROOT/share/opencascade/resources/StdResource
+CSF_XCAFDefaults=VAR_CASROOT/share/opencascade/resources/StdResource
+CSF_XmlOcafResource=VAR_CASROOT/share/opencascade/resources/XmlOcafResource
+# The below values might be optional.
+CSF_IGESDefaults=VAR_CASROOT/share/opencascade/resources/XSTEPResource
+CSF_ShadersDirectory=VAR_CASROOT/share/opencascade/resources/Shaders
+CSF_SHMessage=VAR_CASROOT/share/opencascade/resources/SHMessage
+CSF_STEPDefaults=VAR_CASROOT/share/opencascade/resources/XSTEPResource
+CSF_UnitsDefinition=/usr/lib64/opencascade-7.3.0/ros/share/opencascade/resources/UnitsAPI/Units.dat
+CSF_XSMessage=/usr/lib64/opencascade-7.3.0/ros/share/opencascade/resources/XSMessage
+
+# TODO: check those
+# they were defined in the original ebuild but the directories and files
+# are not present in the current installation.
+#CSF_MDTVFontDirectory=VAR_CASROOT/src/FontMFT
+#CSF_UnitsLexicon=VAR_CASROOT/src/UnitsAPI/Lexi_Expr.dat
diff --git a/sci-libs/opencascade/metadata.xml b/sci-libs/opencascade/metadata.xml
index cfb5bac89f9..c601fab04b3 100644
--- a/sci-libs/opencascade/metadata.xml
+++ b/sci-libs/opencascade/metadata.xml
@@ -10,10 +10,27 @@
<name>Proxy Maintainers</name>
</maintainer>
<use>
- <flag name="freeimage">Enable support for image i/o via media-libs/freeimage</flag>
- <flag name="gl2ps">Use gl2ps PostScript printing library</flag>
- <flag name="gles2">Use OpenGL ES 2.0</flag>
- <flag name="tbb">Enable multithreading with the Intel Threads Building Block dev-cpp/tbb</flag>
- <flag name="vtk">Enable Visualization Toolkit</flag>
+ <flag name="freeimage">
+ Enable support for image i/o via media-libs/freeimage
+ </flag>
+ <flag name="gl2ps">
+ Use gl2ps PostScript printing library
+ </flag>
+ <flag name="gles2">
+ Use OpenGL ES 2.0
+ </flag>
+ <flag name="inspector">
+ Build the OCCT inspector tool for low-level data inspection
+ </flag>
+ <flag name="optimize">
+ Don't clear allocated memory. Use optimized memory manager unless
+ tbb USE flag is set.
+ </flag>
+ <flag name="tbb">
+ Enable multithreading with the Intel Threads Building Block dev-cpp/tbb
+ </flag>
+ <flag name="vtk">
+ Enable Visualization Toolkit
+ </flag>
</use>
</pkgmetadata>
diff --git a/sci-libs/opencascade/opencascade-7.4.0.ebuild b/sci-libs/opencascade/opencascade-7.4.0.ebuild
new file mode 100644
index 00000000000..5c0a6496857
--- /dev/null
+++ b/sci-libs/opencascade/opencascade-7.4.0.ebuild
@@ -0,0 +1,140 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+# TODO:
+# check the src files referenced in 51opencascade, i.e. resources and the like
+# check where cmake gets it's '-s' linker flag to avoid pre-stripping (QA)
+
+EAPI=7
+
+inherit check-reqs cmake-utils flag-o-matic java-pkg-opt-2 multilib
+
+DESCRIPTION="Development platform for CAD/CAE, 3D surface/solid modeling and data exchange"
+HOMEPAGE="https://www.opencascade.com"
+MY_PV="$(ver_rs 1- '_')"
+SRC_URI="https://git.dev.opencascade.org/gitweb/?p=occt.git;a=snapshot;h=refs/tags/V${MY_PV};sf=tgz -> ${P}.tar.gz"
+
+LICENSE="|| ( Open-CASCADE-LGPL-2.1-Exception-1.0 LGPL-2.1 )"
+SLOT="${PV}"
+KEYWORDS="~amd64 ~x86"
+# gl2ps
+IUSE="debug doc examples ffmpeg freeimage gles2 inspector java optimize qt5 tbb +vtk"
+
+REQUIRED_USE="
+ inspector? ( qt5 )
+ ?? ( optimize tbb )
+"
+
+# gl2ps? ( x11-libs/gl2ps )
+RDEPEND="
+ app-eselect/eselect-opencascade
+ dev-cpp/eigen
+ dev-lang/tcl:0=
+ dev-lang/tk:0=
+ dev-tcltk/itcl
+ dev-tcltk/itk
+ dev-tcltk/tix
+ media-libs/freetype:2
+ media-libs/ftgl
+ virtual/glu
+ virtual/opengl
+ x11-libs/libXmu
+ ffmpeg? ( virtual/ffmpeg )
+ freeimage? ( media-libs/freeimage )
+ java? ( virtual/jdk:1.8 )
+ qt5? (
+ dev-qt/qtcore:5
+ dev-qt/qtgui:5
+ dev-qt/qtquickcontrols2:5
+ dev-qt/qtwidgets:5
+ dev-qt/qtxml:5
+ )
+ tbb? ( dev-cpp/tbb )
+ vtk? ( >=sci-libs/vtk-8.1.0[rendering] )
+"
+DEPEND="${RDEPEND}"
+BDEPEND="doc? ( app-doc/doxygen )"
+
+# There's no easy way to test. Testing needs a rather big environment
+# properly set up.
+RESTRICT="test"
+
+CHECKREQS_MEMORY="256M"
+CHECKREQS_DISK_BUILD="3584M"
+
+CMAKE_BUILD_TYPE=Release
+
+S="${WORKDIR}/occt-V${MY_PV}"
+
+PATCHES=(
+ "${FILESDIR}/${P}-find-qt.patch"
+ "${FILESDIR}/${P}-fix-install.patch"
+)
+
+pkg_setup() {
+ check-reqs_pkg_setup
+ use java && java-pkg-opt-2_pkg_setup
+}
+
+src_prepare() {
+ cmake-utils_src_prepare
+ use java && java-pkg-opt-2_src_prepare
+}
+
+src_configure() {
+ local mycmakeargs=(
+ -DBUILD_DOC_Overview=$(usex doc)
+ -DBUILD_Inspector=$(usex inspector)
+ -DBUILD_WITH_DEBUG=$(usex debug)
+ -DCMAKE_CONFIGURATION_TYPES="Gentoo"
+ -DCMAKE_INSTALL_PREFIX="/usr/$(get_libdir)/${PF}/ros"
+ -DINSTALL_DIR_DOC="/usr/share/doc/${PF}"
+ -DINSTALL_DIR_CMAKE="/usr/$(get_libdir)/cmake"
+ -DINSTALL_DOC_Overview=$(usex doc)
+ -DINSTALL_SAMPLES=$(usex examples)
+ -DINSTALL_TEST_CASES=NO
+ -DUSE_D3D=no
+ -DUSE_FFMPEG=$(usex ffmpeg)
+ -DUSE_FREEIMAGE=$(usex freeimage)
+# -DUSE_GL2PS=$(usex gl2ps)
+ -DUSE_GLES2=$(usex gles2)
+ -DUSE_TBB=$(usex tbb)
+ -DUSE_VTK=$(usex vtk)
+ )
+
+ use examples && mycmakeargs+=( -DBUILD_SAMPLES_QT=$(usex qt5) )
+
+ cmake-utils_src_configure
+
+ # prepare /etc/env.d file
+ sed -e 's|VAR_CASROOT|'${EROOT%}'/usr/'$(get_libdir)'/'${P}'/ros|g' < "${FILESDIR}/${P}.env.in" >> "${T}/${PV}" || die
+ sed -i -e 's|ros/lib|ros/'$(get_libdir)'|' "${T}/${PV}" || die
+
+ # use TBB for memory allocation optimizations?
+ use tbb && (sed -i -e 's|^#MMGT_OPT=0$|MMGT_OPT=2|' "${T}/${PV}" || die)
+
+ if use optimize ; then
+ # use internal optimized memory manager?
+ sed -i -e 's|^#MMGT_OPT=0$|MMGT_OPT=1|' "${T}/${PV}" || die
+ # don't clear memory ?
+ sed -i -e 's|^#MMGT_CLEAR=1$|MMGT_CLEAR=0|' "${T}/${PV}" || die
+ fi
+}
+
+src_install() {
+ cmake-utils_src_install
+
+ # respect slotting
+ insinto "/etc/env.d/${PN}"
+ doins "${T}/${PV}"
+
+ # remove examples
+ use examples || (rm -rf "${ED}/usr/$(get_libdir)/${P}/ros/share/${PN}/samples" || die)
+ use java || (rm -rf "${ED}/usr/$(get_libdir)/${P}/ros/share/${PN}/samples/java" || die)
+ use qt5 || (rm -rf "${ED}/usr/$(get_libdir)/${P}/ros/share/${PN}/samples/qt" || die)
+}
+
+pkg_postinst() {
+ eselect ${PN} set ${PV} || die "failed to switch to updated implementation"
+ einfo "You can switch between available ${PN} implementations using eselect ${PN}"
+}
^ permalink raw reply related [flat|nested] 17+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sci-libs/opencascade/, sci-libs/opencascade/files/
@ 2020-04-01 14:38 Joonas Niilola
0 siblings, 0 replies; 17+ messages in thread
From: Joonas Niilola @ 2020-04-01 14:38 UTC (permalink / raw
To: gentoo-commits
commit: c2f3367d854b4fb511750932e9f3424d68da7202
Author: Bernd Waibel <waebbl <AT> gmail <DOT> com>
AuthorDate: Fri Mar 27 16:21:41 2020 +0000
Commit: Joonas Niilola <juippis <AT> gentoo <DOT> org>
CommitDate: Wed Apr 1 14:37:33 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c2f3367d
sci-libs/opencascade: drop old
Package-Manager: Portage-2.3.96, Repoman-2.3.22
Signed-off-by: Bernd Waibel <waebbl <AT> gmail.com>
Closes: https://github.com/gentoo/gentoo/pull/15140
Signed-off-by: Joonas Niilola <juippis <AT> gentoo.org>
sci-libs/opencascade/Manifest | 1 -
.../files/opencascade-7.3.0-ffmpeg4.patch | 38 ------
.../files/opencascade-7.3.0-fixed-DESTDIR.patch | 31 -----
.../files/opencascade-7.3.0-vtk-compat.patch | 13 --
sci-libs/opencascade/metadata.xml | 3 -
sci-libs/opencascade/opencascade-7.3.0.ebuild | 141 ---------------------
6 files changed, 227 deletions(-)
diff --git a/sci-libs/opencascade/Manifest b/sci-libs/opencascade/Manifest
index d999b843d5d..3c6a4c44796 100644
--- a/sci-libs/opencascade/Manifest
+++ b/sci-libs/opencascade/Manifest
@@ -1,2 +1 @@
-DIST opencascade-7.3.0.tar.gz 48576720 BLAKE2B bf63ba77aabc8a8c92d694f78f24bab71c07e68e7ba4b8d5d90966733dbd9c0c83a76e35f059e798d4a60640d663330cd13a828b19ec02a5372053ab39a74aa6 SHA512 17eb1810b43a8b001867563f97801ceb38a7878fa53d9b39b46a5cf3dd676310fa80e83e90668a99ec6aff9d4f09733fb6c7be83c1e3ab4eaa9fda55888050da
DIST opencascade-7.4.0.tar.gz 49210449 BLAKE2B c92afe7551e9a066ad0940dcf49278b556a726f0534131706b3a11cb0986ba32818e162df3982283f6815eb9d67d7e91f909485d78f2b8d638da1934ffbc2f7f SHA512 eb0d47848d48f42a159ae5d7a4144483ba1f59f634844bd2053e48e04af30a30ba7056112cd38a1730d193a8d736b898f9608dd574cbe6829dbe7257a002772a
diff --git a/sci-libs/opencascade/files/opencascade-7.3.0-ffmpeg4.patch b/sci-libs/opencascade/files/opencascade-7.3.0-ffmpeg4.patch
deleted file mode 100644
index fc572a4f5bc..00000000000
--- a/sci-libs/opencascade/files/opencascade-7.3.0-ffmpeg4.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-Author: jbeich
-Date: Wed May 2 13:25:55 UTC 2018
-New revision: 468831
-
-src/Image/Image_VideoRecorder.cxx:279:25: error: use of undeclared identifier 'CODEC_FLAG_GLOBAL_HEADER'
- aCodecCtx->flags |= CODEC_FLAG_GLOBAL_HEADER;
- ^
-src/Image/Image_VideoRecorder.cxx:452:38: error: use of undeclared identifier 'AVFMT_RAWPICTURE'
- if ((myAVContext->oformat->flags & AVFMT_RAWPICTURE) != 0
- ^
-
---- a/src/Image/Image_VideoRecorder.cxx 2017-08-30 13:28:21 UTC
-+++ b/src/Image/Image_VideoRecorder.cxx
-@@ -276,7 +276,7 @@ Standard_Boolean Image_VideoRecorder::addVideoStream (
- // some formats want stream headers to be separate
- if (myAVContext->oformat->flags & AVFMT_GLOBALHEADER)
- {
-- aCodecCtx->flags |= CODEC_FLAG_GLOBAL_HEADER;
-+ aCodecCtx->flags |= AV_CODEC_FLAG_GLOBAL_HEADER;
- }
- return Standard_True;
- #else
-@@ -449,6 +449,7 @@ Standard_Boolean Image_VideoRecorder::writeVideoFrame
- AVPacket aPacket;
- memset (&aPacket, 0, sizeof(aPacket));
- av_init_packet (&aPacket);
-+#ifdef AVFMT_RAWPICTURE
- if ((myAVContext->oformat->flags & AVFMT_RAWPICTURE) != 0
- && !theToFlush)
- {
-@@ -461,6 +462,7 @@ Standard_Boolean Image_VideoRecorder::writeVideoFrame
- aResAv = av_interleaved_write_frame (myAVContext, &aPacket);
- }
- else
-+#endif
- {
- // encode the image
- myFrame->pts = myFrameCount;
diff --git a/sci-libs/opencascade/files/opencascade-7.3.0-fixed-DESTDIR.patch b/sci-libs/opencascade/files/opencascade-7.3.0-fixed-DESTDIR.patch
deleted file mode 100644
index c0a6363e19f..00000000000
--- a/sci-libs/opencascade/files/opencascade-7.3.0-fixed-DESTDIR.patch
+++ /dev/null
@@ -1,31 +0,0 @@
---- a/CMakeLists.txt 2016-11-25 11:50:18.000000000 +0100
-+++ b/CMakeLists.txt 2017-03-18 08:44:10.406668714 +0100
-@@ -885,7 +885,7 @@ if (EXISTS "${INSTALL_DIR}/${INSTALL_DIR_SCRIPT}/custom.${SCRIPT_EXT}")
-
- set (CUSTOM_CONTENT "${CUSTOM_CONTENT} ${ADDITIONAL_CUSTOM_CONTENT}")
-
-- file (WRITE "${INSTALL_DIR}/${INSTALL_DIR_SCRIPT}/custom.${SCRIPT_EXT}" "${CUSTOM_CONTENT}")
-+ file (WRITE \"\$ENV{DESTDIR}${INSTALL_DIR}/${INSTALL_DIR_SCRIPT}/custom.${SCRIPT_EXT}\" "${CUSTOM_CONTENT}")
- else()
- OCCT_CONFIGURE_AND_INSTALL ("adm/templates/custom.${SCRIPT_EXT}.main" "custom.${SCRIPT_EXT}" "custom.${SCRIPT_EXT}" "${INSTALL_DIR_SCRIPT}")
- endif()
-@@ -906,7 +906,7 @@
- endforeach()
- # install OpenCASCADE config file with compile definitions and C/C++ flags ONLY for current configuration
- install (CODE "string (TOLOWER \"\${CMAKE_INSTALL_CONFIG_NAME}\" CMAKE_INSTALL_CONFIG_NAME_LOWER)")
--install (CODE "configure_file(\"${CMAKE_BINARY_DIR}/OpenCASCADECompileDefinitionsAndFlags-\${CMAKE_INSTALL_CONFIG_NAME_LOWER}.cmake\" \"${INSTALL_DIR}/${INSTALL_DIR_CMAKE}/OpenCASCADECompileDefinitionsAndFlags-\${CMAKE_INSTALL_CONFIG_NAME_LOWER}.cmake\" COPYONLY)")
-+install (CODE "configure_file(\"${CMAKE_BINARY_DIR}/OpenCASCADECompileDefinitionsAndFlags-\${CMAKE_INSTALL_CONFIG_NAME_LOWER}.cmake\" \"\$ENV{DESTDIR}/${INSTALL_DIR_CMAKE}/OpenCASCADECompileDefinitionsAndFlags-\${CMAKE_INSTALL_CONFIG_NAME_LOWER}.cmake\" COPYONLY)")
-
- foreach (OCCT_MODULE ${OCCT_MODULES})
- if (BUILD_MODULE_${OCCT_MODULE})
---- a/adm/cmake/occt_macros.cmake 2016-11-25 11:50:18.000000000 +0100
-+++ b/adm/cmake/occt_macros.cmake 2017-03-18 08:44:10.406668714 +0100
-@@ -558,7 +558,7 @@
- "cmake_policy(PUSH)
- cmake_policy(SET CMP0007 NEW)
- string (TOLOWER \"\${CMAKE_INSTALL_CONFIG_NAME}\" CMAKE_INSTALL_CONFIG_NAME_LOWERCASE)
-- file (GLOB ALL_OCCT_TARGET_FILES \"${INSTALL_DIR}/${INSTALL_DIR_CMAKE}/OpenCASCADE*Targets-\${CMAKE_INSTALL_CONFIG_NAME_LOWERCASE}.cmake\")
-+ file (GLOB ALL_OCCT_TARGET_FILES \"\$ENV{DESTDIR}${INSTALL_DIR}/${INSTALL_DIR_CMAKE}/OpenCASCADE*Targets-\${CMAKE_INSTALL_CONFIG_NAME_LOWERCASE}.cmake\")
- foreach(TARGET_FILENAME \${ALL_OCCT_TARGET_FILES})
- file (STRINGS \"\${TARGET_FILENAME}\" TARGET_FILE_CONTENT)
- file (REMOVE \"\${TARGET_FILENAME}\")
diff --git a/sci-libs/opencascade/files/opencascade-7.3.0-vtk-compat.patch b/sci-libs/opencascade/files/opencascade-7.3.0-vtk-compat.patch
deleted file mode 100644
index 71700a57f1d..00000000000
--- a/sci-libs/opencascade/files/opencascade-7.3.0-vtk-compat.patch
+++ /dev/null
@@ -1,13 +0,0 @@
---- a/src/IVtkVTK/IVtkVTK_ShapeData.cxx 2018-09-15 01:57:25.086783255 +0300
-+++ b/src/IVtkVTK/IVtkVTK_ShapeData.cxx 2018-09-15 01:58:20.877779839 +0300
-@@ -29,6 +29,10 @@
- #pragma warning(pop)
- #endif
-
-+#ifdef vtkGenericDataArray_h
-+#define InsertNextTupleValue InsertNextTypedTuple
-+#endif
-+
- IMPLEMENT_STANDARD_RTTIEXT(IVtkVTK_ShapeData,IVtk_IShapeData)
-
- //================================================================
diff --git a/sci-libs/opencascade/metadata.xml b/sci-libs/opencascade/metadata.xml
index c601fab04b3..471a91a9796 100644
--- a/sci-libs/opencascade/metadata.xml
+++ b/sci-libs/opencascade/metadata.xml
@@ -13,9 +13,6 @@
<flag name="freeimage">
Enable support for image i/o via media-libs/freeimage
</flag>
- <flag name="gl2ps">
- Use gl2ps PostScript printing library
- </flag>
<flag name="gles2">
Use OpenGL ES 2.0
</flag>
diff --git a/sci-libs/opencascade/opencascade-7.3.0.ebuild b/sci-libs/opencascade/opencascade-7.3.0.ebuild
deleted file mode 100644
index 15dce82b6a9..00000000000
--- a/sci-libs/opencascade/opencascade-7.3.0.ebuild
+++ /dev/null
@@ -1,141 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit check-reqs cmake-utils eapi7-ver java-pkg-opt-2
-
-MY_PV="$(ver_rs 1- '_')"
-
-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"
-
-LICENSE="|| ( Open-CASCADE-LGPL-2.1-Exception-1.0 LGPL-2.1 )"
-SLOT="${PV}"
-KEYWORDS="~amd64 ~x86"
-
-IUSE="debug doc examples ffmpeg freeimage gl2ps gles2 java +tbb +vtk"
-
-RDEPEND="app-eselect/eselect-opencascade
- dev-lang/tcl:0=
- dev-lang/tk:0=
- dev-tcltk/itcl
- dev-tcltk/itk
- dev-tcltk/tix
- media-libs/freetype:2
- media-libs/ftgl
- virtual/glu
- virtual/opengl
- x11-libs/libXmu
- ffmpeg? ( virtual/ffmpeg )
- freeimage? ( media-libs/freeimage )
- gl2ps? ( x11-libs/gl2ps )
- java? ( >=virtual/jdk-0:= )
- tbb? ( dev-cpp/tbb )
- vtk? ( sci-libs/vtk[rendering] )
-"
-
-DEPEND="${RDEPEND}
- doc? ( app-doc/doxygen )
-"
-
-CHECKREQS_MEMORY="256M"
-CHECKREQS_DISK_BUILD="3584M"
-
-CMAKE_BUILD_TYPE=Release
-
-S="${WORKDIR}/occt-V${MY_PV}"
-
-PATCHES=(
- "${FILESDIR}/${P}-vtk-compat.patch"
- "${FILESDIR}/${P}-fixed-DESTDIR.patch"
- "${FILESDIR}/${P}-ffmpeg4.patch" # bug 672248
-)
-
-pkg_setup() {
- check-reqs_pkg_setup
- use java && java-pkg-opt-2_pkg_setup
-}
-
-src_prepare() {
- cmake-utils_src_prepare
- use java && java-pkg-opt-2_src_prepare
-
- # Do not pre-strip files
- sed -i 's/_FLAGS_RELEASE} -s/_FLAGS_RELEASE}/g' adm/cmake/occt_defs_flags.cmake || die
-
- # Prepare environment variables used by Opencascade
- echo "CASROOT=${EROOT}usr/$(get_libdir)/${P}
-PATH=${EROOT}usr/$(get_libdir)/${P}/bin
-LDPATH=${EROOT}usr/$(get_libdir)/${P}/lib
-
-CSF_EXCEPTION_PROMPT=1
-CSF_GraphicShr=${EROOT}usr/$(get_libdir)/${P}/lib/libTKOpenGl.so
-CSF_IGESDefaults=${EROOT}usr/$(get_libdir)/${P}/share/opencascade/resources/XSTEPResource
-CSF_LANGUAGE=us
-CSF_MDTVTexturesDirectory=${EROOT}usr/$(get_libdir)/${P}/share/opencascade/resources/Textures
-CSF_MIGRATION_TYPES=${EROOT}usr/$(get_libdir)/${P}/share/opencascade/resources/StdResource/MigrationSheet.txt
-CSF_PluginDefaults=${EROOT}usr/$(get_libdir)/${P}/share/opencascade/resources/StdResource
-CSF_ShadersDirectory=${EROOT}usr/$(get_libdir)/${P}/share/opencascade/resources/Shaders
-CSF_SHMessage=${EROOT}usr/$(get_libdir)/${P}/share/opencascade/resources/SHMessage
-CSF_StandardDefaults=${EROOT}usr/$(get_libdir)/${P}/share/opencascade/resources/StdResource
-CSF_StandardLiteDefaults=${EROOT}usr/$(get_libdir)/${P}/share/opencascade/resources/StdResource
-CSF_STEPDefaults=${EROOT}usr/$(get_libdir)/${P}/share/opencascade/resources/XSTEPResource
-CSF_UnitsDefinition=${EROOT}usr/$(get_libdir)/${P}/share/opencascade/resources/UnitsAPI/Units.dat
-CSF_XCAFDefaults=${EROOT}usr/$(get_libdir)/${P}/share/opencascade/resources/StdResource
-CSF_XmlOcafResource=${EROOT}usr/$(get_libdir)/${P}/share/opencascade/resources/XmlOcafResource
-CSF_XSMessage=${EROOT}usr/$(get_libdir)/${P}/share/opencascade/resources/XSMessage
-
-MMGT_CLEAR=1
-# use TBB for memory allocation optimizations
-MMGT_OPT=2
-# The next MMGT_* variables are at their default values.
-# They are here for documentation, so you can change them if needed
-#MMGT_MMAP=1
-#MMGT_CELLSIZE=200
-#MMGT_NBPAGES=10000
-#MMGT_THRESHOLD=40000
-" > "${S}/${PV}"
-
-}
-
-src_configure() {
- local mycmakeargs=(
- -DBUILD_DOC_Overview=$(usex doc)
- -DBUILD_WITH_DEBUG=$(usex debug)
- -DCMAKE_INSTALL_PREFIX="/usr/$(get_libdir)/${P}"
- -DINSTALL_DIR_CMAKE="/usr/$(get_libdir)/cmake"
- -DINSTALL_DIR_DOC="/usr/share/doc/${P}"
- -DINSTALL_SAMPLES=$(usex examples)
- -DUSE_FFMPEG=$(usex ffmpeg)
- -DUSE_FREEIMAGE=$(usex freeimage)
- -DUSE_GL2PS=$(usex gl2ps)
- -DUSE_GLES2=$(usex gles2)
- -DUSE_TBB=$(usex tbb)
- -DUSE_VTK=$(usex vtk)
- )
-
- cmake-utils_src_configure
-}
-
-src_install() {
- cmake-utils_src_install
-
- fperms go-w "/usr/$(get_libdir)/${P}/bin/draw.sh"
-
- if ! use examples; then
- rm -rf "${ED%/}/usr/$(get_libdir)/${P}/share/${PN}/samples" || die
- fi
-
- insinto "/etc/env.d/${PN}"
- doins "${S}/${PV}"
-}
-
-pkg_postinst() {
- eselect ${PN} set ${PV}
- elog "You can switch between available ${PN} implementations using eselect ${PN}."
- elog "After upgrading OpenCASCADE you may have to rebuild packages depending on it."
- elog "You get a list by running \"equery depends sci-libs/opencascade\""
- elog "revdep-rebuild does NOT suffice."
-}
^ permalink raw reply related [flat|nested] 17+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sci-libs/opencascade/, sci-libs/opencascade/files/
@ 2021-03-01 8:26 Joonas Niilola
0 siblings, 0 replies; 17+ messages in thread
From: Joonas Niilola @ 2021-03-01 8:26 UTC (permalink / raw
To: gentoo-commits
commit: a05456f36a8e1c4c3c37695f3e9a621fccb4e801
Author: Bernd Waibel <waebbl-gentoo <AT> posteo <DOT> net>
AuthorDate: Wed Feb 24 21:07:32 2021 +0000
Commit: Joonas Niilola <juippis <AT> gentoo <DOT> org>
CommitDate: Mon Mar 1 08:25:54 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a05456f3
sci-libs/opencascade: fix flow control
dev-util/cmake >= 3.20.0_rc1 has restricted flow control
checks. This patch fixes an issue with these new version
on unbalanced flow control statements.
Closes: https://bugs.gentoo.org/771300
Package-Manager: Portage-3.0.15, Repoman-3.0.2
Signed-off-by: Bernd Waibel <waebbl-gentoo <AT> posteo.net>
Signed-off-by: Joonas Niilola <juippis <AT> gentoo.org>
...pencascade-7.4.0-fix-flow-control-nesting.patch | 31 ++++++++++++++++++++++
sci-libs/opencascade/opencascade-7.4.0-r4.ebuild | 1 +
2 files changed, 32 insertions(+)
diff --git a/sci-libs/opencascade/files/opencascade-7.4.0-fix-flow-control-nesting.patch b/sci-libs/opencascade/files/opencascade-7.4.0-fix-flow-control-nesting.patch
new file mode 100644
index 00000000000..7e2bb1d7b2a
--- /dev/null
+++ b/sci-libs/opencascade/files/opencascade-7.4.0-fix-flow-control-nesting.patch
@@ -0,0 +1,31 @@
+From e69c42386239bcc08143607df12b8bb3f1ff14ba Mon Sep 17 00:00:00 2001
+From: Bernd Waibel <waebbl-gentoo@posteo.net>
+Date: Wed, 24 Feb 2021 20:06:02 +0100
+Subject: [PATCH] adm/cmake/vtk.cmake: fix flow control nesting
+
+Fix an unbalanced nesting of flow control statements
+for >=cmake-3.20.0
+
+Signed-off-by: Bernd Waibel <waebbl-gentoo@posteo.net>
+---
+ adm/cmake/vtk.cmake | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/adm/cmake/vtk.cmake b/adm/cmake/vtk.cmake
+index c5692fd6..00b7ff4a 100644
+--- a/adm/cmake/vtk.cmake
++++ b/adm/cmake/vtk.cmake
+@@ -156,8 +156,8 @@ if (VTK_FOUND)
+ endif()
+ endif()
+ endif()
+- endif()
+- endforeach()
++ endforeach()
++ endif()
+ endif()
+
+ if (3RDPARTY_VTK_INCLUDE_DIRS)
+--
+2.30.1
+
diff --git a/sci-libs/opencascade/opencascade-7.4.0-r4.ebuild b/sci-libs/opencascade/opencascade-7.4.0-r4.ebuild
index d46a66fe600..4b7371a287c 100644
--- a/sci-libs/opencascade/opencascade-7.4.0-r4.ebuild
+++ b/sci-libs/opencascade/opencascade-7.4.0-r4.ebuild
@@ -75,6 +75,7 @@ PATCHES=(
"${FILESDIR}/${P}-fix-install.patch"
"${FILESDIR}/${P}-fix-issue-with-cmake-path-variables.patch"
"${FILESDIR}/${P}-Gentoo-specific-avoid-pre-stripping-files.patch"
+ "${FILESDIR}/${P}-fix-flow-control-nesting.patch"
)
pkg_setup() {
^ permalink raw reply related [flat|nested] 17+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sci-libs/opencascade/, sci-libs/opencascade/files/
@ 2021-05-04 22:02 Sam James
0 siblings, 0 replies; 17+ messages in thread
From: Sam James @ 2021-05-04 22:02 UTC (permalink / raw
To: gentoo-commits
commit: 2ff6f73b2c6c62702952b3e712f878c32a1597da
Author: Bernd Waibel <waebbl <AT> gmail <DOT> com>
AuthorDate: Sat Feb 6 09:31:51 2021 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Tue May 4 22:02:02 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2ff6f73b
sci-libs/opencascade: bump to 7.5.1
Closes: https://bugs.gentoo.org/762775
Package-Manager: Portage-3.0.14, Repoman-3.0.2
Signed-off-by: Bernd Waibel <waebbl-gentoo <AT> posteo.net>
Closes: https://github.com/gentoo/gentoo/pull/20443
Signed-off-by: Sam James <sam <AT> gentoo.org>
sci-libs/opencascade/Manifest | 1 +
.../opencascade/files/opencascade-7.4.0.env.in | 6 +-
....1-0001-allow-default-search-path-for-Qt5.patch | 26 ++++
...e-7.5.1-0002-remove-unnecessary-Qt5-check.patch | 28 ++++
...-7.5.1-0003-add-Gentoo-configuration-type.patch | 26 ++++
...04-fix-installation-of-cmake-config-files.patch | 40 +++++
...5.1-0005-fix-write-permissions-on-scripts.patch | 43 ++++++
...5.1-0006-fix-creation-of-custom.sh-script.patch | 34 +++++
...cascade-7.4.0.env.in => opencascade-7.5.env.in} | 35 +++--
sci-libs/opencascade/metadata.xml | 10 +-
sci-libs/opencascade/opencascade-7.5.1.ebuild | 167 +++++++++++++++++++++
11 files changed, 392 insertions(+), 24 deletions(-)
diff --git a/sci-libs/opencascade/Manifest b/sci-libs/opencascade/Manifest
index 3c6a4c44796..77c4e42f391 100644
--- a/sci-libs/opencascade/Manifest
+++ b/sci-libs/opencascade/Manifest
@@ -1 +1,2 @@
DIST opencascade-7.4.0.tar.gz 49210449 BLAKE2B c92afe7551e9a066ad0940dcf49278b556a726f0534131706b3a11cb0986ba32818e162df3982283f6815eb9d67d7e91f909485d78f2b8d638da1934ffbc2f7f SHA512 eb0d47848d48f42a159ae5d7a4144483ba1f59f634844bd2053e48e04af30a30ba7056112cd38a1730d193a8d736b898f9608dd574cbe6829dbe7257a002772a
+DIST opencascade-7.5.1.tar.gz 47807222 BLAKE2B b5ef30ea7c373250db3e0863f3c7fde84256b37957a482f10a462a4c4ed1a21cffbbeb10e9fc140325022d7582efbd292ed6d1016d14cb67ccf5c84d14060d5a SHA512 ebb937254ac165041ef7e1a80df8f9d2ac1d518f01b3d4b0fd6d203fe0d80bd474b85a462cccc1c74a513bd257c0b0ab7002632573f38bf72170363c7e42ed2f
diff --git a/sci-libs/opencascade/files/opencascade-7.4.0.env.in b/sci-libs/opencascade/files/opencascade-7.4.0.env.in
index 2eefe188c1a..cf7cc6a724d 100644
--- a/sci-libs/opencascade/files/opencascade-7.4.0.env.in
+++ b/sci-libs/opencascade/files/opencascade-7.4.0.env.in
@@ -76,7 +76,7 @@ LDPATH=VAR_CASROOT/lib
# CSF_EXCEPTION_PROMPT (default: 1) optional
# not documented upstream (maybe a flag indicating whether the user shall
# be prompted in the case of exceptions)
-CSF_EXCEPTION_PROMPT=1
+#CSF_EXCEPTION_PROMPT=1
# The following CSF_* variables define various directories and files where
# OCCT is looking for resources.
@@ -93,8 +93,8 @@ CSF_IGESDefaults=VAR_CASROOT/share/opencascade/resources/XSTEPResource
CSF_ShadersDirectory=VAR_CASROOT/share/opencascade/resources/Shaders
CSF_SHMessage=VAR_CASROOT/share/opencascade/resources/SHMessage
CSF_STEPDefaults=VAR_CASROOT/share/opencascade/resources/XSTEPResource
-CSF_UnitsDefinition=/usr/lib64/opencascade-7.3.0/ros/share/opencascade/resources/UnitsAPI/Units.dat
-CSF_XSMessage=/usr/lib64/opencascade-7.3.0/ros/share/opencascade/resources/XSMessage
+CSF_UnitsDefinition=VAR_CASROOT/share/opencascade/resources/UnitsAPI/Units.dat
+CSF_XSMessage=VAR_CASROOT/share/opencascade/resources/XSMessage
# TODO: check those
# they were defined in the original ebuild but the directories and files
diff --git a/sci-libs/opencascade/files/opencascade-7.5.1-0001-allow-default-search-path-for-Qt5.patch b/sci-libs/opencascade/files/opencascade-7.5.1-0001-allow-default-search-path-for-Qt5.patch
new file mode 100644
index 00000000000..68be3e1c880
--- /dev/null
+++ b/sci-libs/opencascade/files/opencascade-7.5.1-0001-allow-default-search-path-for-Qt5.patch
@@ -0,0 +1,26 @@
+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
+
diff --git a/sci-libs/opencascade/files/opencascade-7.5.1-0002-remove-unnecessary-Qt5-check.patch b/sci-libs/opencascade/files/opencascade-7.5.1-0002-remove-unnecessary-Qt5-check.patch
new file mode 100644
index 00000000000..91d5c66c761
--- /dev/null
+++ b/sci-libs/opencascade/files/opencascade-7.5.1-0002-remove-unnecessary-Qt5-check.patch
@@ -0,0 +1,28 @@
+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
+
diff --git a/sci-libs/opencascade/files/opencascade-7.5.1-0003-add-Gentoo-configuration-type.patch b/sci-libs/opencascade/files/opencascade-7.5.1-0003-add-Gentoo-configuration-type.patch
new file mode 100644
index 00000000000..0665790d20a
--- /dev/null
+++ b/sci-libs/opencascade/files/opencascade-7.5.1-0003-add-Gentoo-configuration-type.patch
@@ -0,0 +1,26 @@
+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
+
diff --git a/sci-libs/opencascade/files/opencascade-7.5.1-0004-fix-installation-of-cmake-config-files.patch b/sci-libs/opencascade/files/opencascade-7.5.1-0004-fix-installation-of-cmake-config-files.patch
new file mode 100644
index 00000000000..caace23fc2d
--- /dev/null
+++ b/sci-libs/opencascade/files/opencascade-7.5.1-0004-fix-installation-of-cmake-config-files.patch
@@ -0,0 +1,40 @@
+From 8469f927963fe4bece05297c514fb2b9f9ad9b1a Mon Sep 17 00:00:00 2001
+From: Bernd Waibel <waebbl@gmail.com>
+Date: Fri, 5 Feb 2021 13:44:15 +0100
+Subject: [PATCH] fix installation of cmake config files
+
+Signed-off-by: Bernd Waibel <waebbl@gmail.com>
+---
+ CMakeLists.txt | 2 +-
+ adm/cmake/occt_macros.cmake | 2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 100d6133..bc8cdb92 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -1156,7 +1156,7 @@ foreach (OCCT_CONFIGURATION ${CMAKE_CONFIGURATION_TYPES})
+ endforeach()
+ # install OpenCASCADE config file with compile definitions and C/C++ flags ONLY for current configuration
+ install (CODE "string (TOLOWER \"\${CMAKE_INSTALL_CONFIG_NAME}\" CMAKE_INSTALL_CONFIG_NAME_LOWER)")
+-install (CODE "configure_file(\"${CMAKE_BINARY_DIR}/OpenCASCADECompileDefinitionsAndFlags-\${CMAKE_INSTALL_CONFIG_NAME_LOWER}.cmake\" \"${INSTALL_DIR}/${INSTALL_DIR_CMAKE}/OpenCASCADECompileDefinitionsAndFlags-\${CMAKE_INSTALL_CONFIG_NAME_LOWER}.cmake\" COPYONLY)")
++install (CODE "configure_file(\"${CMAKE_BINARY_DIR}/OpenCASCADECompileDefinitionsAndFlags-\${CMAKE_INSTALL_CONFIG_NAME_LOWER}.cmake\" \"${INSTALL_DIR_CMAKE}/OpenCASCADECompileDefinitionsAndFlags-\${CMAKE_INSTALL_CONFIG_NAME_LOWER}.cmake\" COPYONLY)")
+
+ foreach (OCCT_MODULE ${OCCT_MODULES})
+ if (BUILD_MODULE_${OCCT_MODULE})
+diff --git a/adm/cmake/occt_macros.cmake b/adm/cmake/occt_macros.cmake
+index 0a387945..f10fe5e3 100644
+--- a/adm/cmake/occt_macros.cmake
++++ b/adm/cmake/occt_macros.cmake
+@@ -592,7 +592,7 @@ macro (OCCT_UPDATE_TARGET_FILE)
+ "cmake_policy(PUSH)
+ cmake_policy(SET CMP0007 NEW)
+ string (TOLOWER \"\${CMAKE_INSTALL_CONFIG_NAME}\" CMAKE_INSTALL_CONFIG_NAME_LOWERCASE)
+- file (GLOB ALL_OCCT_TARGET_FILES \"${INSTALL_DIR}/${INSTALL_DIR_CMAKE}/OpenCASCADE*Targets-\${CMAKE_INSTALL_CONFIG_NAME_LOWERCASE}.cmake\")
++ file (GLOB ALL_OCCT_TARGET_FILES \"${INSTALL_DIR_CMAKE}/OpenCASCADE*Targets-\${CMAKE_INSTALL_CONFIG_NAME_LOWERCASE}.cmake\")
+ foreach(TARGET_FILENAME \${ALL_OCCT_TARGET_FILES})
+ file (STRINGS \"\${TARGET_FILENAME}\" TARGET_FILE_CONTENT)
+ file (REMOVE \"\${TARGET_FILENAME}\")
+--
+2.30.0
+
diff --git a/sci-libs/opencascade/files/opencascade-7.5.1-0005-fix-write-permissions-on-scripts.patch b/sci-libs/opencascade/files/opencascade-7.5.1-0005-fix-write-permissions-on-scripts.patch
new file mode 100644
index 00000000000..1cb397e0a97
--- /dev/null
+++ b/sci-libs/opencascade/files/opencascade-7.5.1-0005-fix-write-permissions-on-scripts.patch
@@ -0,0 +1,43 @@
+From 5f7db00bfc56d497a1897102a5ddd5bdddd72942 Mon Sep 17 00:00:00 2001
+From: Bernd Waibel <waebbl-gentoo@posteo.net>
+Date: Fri, 16 Apr 2021 01:04:24 +0200
+Subject: [PATCH] fix write permissions on scripts
+
+Signed-off-by: Bernd Waibel <waebbl-gentoo@posteo.net>
+---
+ CMakeLists.txt | 8 ++++----
+ 1 file changed, 4 insertions(+), 4 deletions(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 100d6133..e9e8fb29 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -890,10 +890,10 @@ if (${DRAWEXE_INDEX} GREATER -1)
+ # copy draw script to install script folder
+ if (BUILD_PATCH AND EXISTS "${BUILD_PATCH}/adm/templates/draw.${SCRIPT_EXT}")
+ install (FILES "${BUILD_PATCH}/adm/templates/draw.${SCRIPT_EXT}" DESTINATION "${INSTALL_DIR_SCRIPT}"
+- PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ GROUP_WRITE GROUP_EXECUTE WORLD_READ WORLD_WRITE WORLD_EXECUTE)
++ PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE)
+ else()
+ install (FILES "${CMAKE_SOURCE_DIR}/adm/templates/draw.${SCRIPT_EXT}" DESTINATION "${INSTALL_DIR_SCRIPT}"
+- PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ GROUP_WRITE GROUP_EXECUTE WORLD_READ WORLD_WRITE WORLD_EXECUTE)
++ PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE)
+ endif()
+
+ # copy draw script to CMake binary folder
+@@ -1101,10 +1101,10 @@ if (BUILD_TOOL_TOOLKITS)
+ # copy tinspector script to install script folder
+ if (BUILD_PATCH AND EXISTS "${BUILD_PATCH}/adm/templates/inspector.${SCRIPT_EXT}")
+ install (FILES "${BUILD_PATCH}/adm/templates/inspector.${SCRIPT_EXT}" DESTINATION "${INSTALL_DIR_SCRIPT}"
+- PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ GROUP_WRITE GROUP_EXECUTE WORLD_READ WORLD_WRITE WORLD_EXECUTE)
++ PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE)
+ else()
+ install (FILES "${CMAKE_SOURCE_DIR}/adm/templates/inspector.${SCRIPT_EXT}" DESTINATION "${INSTALL_DIR_SCRIPT}"
+- PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ GROUP_WRITE GROUP_EXECUTE WORLD_READ WORLD_WRITE WORLD_EXECUTE)
++ PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE)
+ endif()
+
+ set (OpenCASCADE_BINARY_DIR "${INSTALL_DIR}/${INSTALL_DIR_BIN}")
+--
+2.31.1
+
diff --git a/sci-libs/opencascade/files/opencascade-7.5.1-0006-fix-creation-of-custom.sh-script.patch b/sci-libs/opencascade/files/opencascade-7.5.1-0006-fix-creation-of-custom.sh-script.patch
new file mode 100644
index 00000000000..0ab023693e6
--- /dev/null
+++ b/sci-libs/opencascade/files/opencascade-7.5.1-0006-fix-creation-of-custom.sh-script.patch
@@ -0,0 +1,34 @@
+From 0df9b2c485da92c6e9fdd6d4b5ea1ec6588bd66f Mon Sep 17 00:00:00 2001
+From: Bernd Waibel <waebbl-gentoo@posteo.net>
+Date: Fri, 16 Apr 2021 14:32:24 +0200
+Subject: [PATCH] fix creation of custom.sh script
+
+Signed-off-by: Bernd Waibel <waebbl-gentoo@posteo.net>
+---
+ CMakeLists.txt | 10 +---------
+ 1 file changed, 1 insertion(+), 9 deletions(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 100d6133..7799b73a 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -909,15 +909,7 @@ else()
+ endif()
+
+ # change custom.bat/sh
+-if (EXISTS "${INSTALL_DIR}/${INSTALL_DIR_SCRIPT}/custom.${SCRIPT_EXT}")
+- file (READ "${INSTALL_DIR}/${INSTALL_DIR_SCRIPT}/custom.${SCRIPT_EXT}" CUSTOM_CONTENT)
+-
+- set (CUSTOM_CONTENT "${CUSTOM_CONTENT} ${ADDITIONAL_CUSTOM_CONTENT}")
+-
+- file (WRITE "${INSTALL_DIR}/${INSTALL_DIR_SCRIPT}/custom.${SCRIPT_EXT}" "${CUSTOM_CONTENT}")
+-else()
+- OCCT_CONFIGURE_AND_INSTALL ("adm/templates/custom.${SCRIPT_EXT}.main" "custom.${SCRIPT_EXT}" "custom.${SCRIPT_EXT}" "${INSTALL_DIR_SCRIPT}")
+-endif()
++OCCT_CONFIGURE_AND_INSTALL ("adm/templates/custom.${SCRIPT_EXT}.main" "custom.${SCRIPT_EXT}" "custom.${SCRIPT_EXT}" "${INSTALL_DIR_SCRIPT}")
+
+ if (WIN32)
+ set (THIRDPARTY_DIR_REPLACE "%THIRDPARTY_DIR%")
+--
+2.31.1
+
diff --git a/sci-libs/opencascade/files/opencascade-7.4.0.env.in b/sci-libs/opencascade/files/opencascade-7.5.env.in
similarity index 73%
copy from sci-libs/opencascade/files/opencascade-7.4.0.env.in
copy to sci-libs/opencascade/files/opencascade-7.5.env.in
index 2eefe188c1a..50766cbb6bb 100644
--- a/sci-libs/opencascade/files/opencascade-7.4.0.env.in
+++ b/sci-libs/opencascade/files/opencascade-7.5.env.in
@@ -10,9 +10,8 @@
# define the root directory of Open CASCADE Technology (needed)
CASROOT=VAR_CASROOT
-# PATH and LDPATH are used to find the binaries and libraries of OCCT (needed)
-PATH=VAR_CASROOT/bin
-LDPATH=VAR_CASROOT/lib
+PATH=VAR_CASROOT/lib/opencascade-VAR_PV/bin
+LDPATH=VAR_CASROOT/lib/opencascade-VAR_PV
#############################################################################
# The MMGT_* variables are used to determine how memory management will work
@@ -76,25 +75,25 @@ LDPATH=VAR_CASROOT/lib
# CSF_EXCEPTION_PROMPT (default: 1) optional
# not documented upstream (maybe a flag indicating whether the user shall
# be prompted in the case of exceptions)
-CSF_EXCEPTION_PROMPT=1
+#CSF_EXCEPTION_PROMPT=1
# The following CSF_* variables define various directories and files where
# OCCT is looking for resources.
-CSF_GraphicShr=VAR_CASROOT/lib/libTKOpenGl.so
-CSF_MIGRATION_TYPES=VAR_CASROOT/share/opencascade/resources/StdResource/MigrationSheet.txt
-CSF_MDTVTexturesDirectory=VAR_CASROOT/share/opencascade/resources/Textures
-CSF_PluginDefaults=VAR_CASROOT/share/opencascade/resources/StdResource
-CSF_StandardDefaults=VAR_CASROOT/share/opencascade/resources/StdResource
-CSF_StandardLiteDefaults=VAR_CASROOT/share/opencascade/resources/StdResource
-CSF_XCAFDefaults=VAR_CASROOT/share/opencascade/resources/StdResource
-CSF_XmlOcafResource=VAR_CASROOT/share/opencascade/resources/XmlOcafResource
+CSF_GraphicShr=VAR_CASROOT/lib/opencascade-VAR_PV/libTKOpenGl.so
+CSF_MIGRATION_TYPES=VAR_CASROOT/share/opencascade-VAR_PV/resources/StdResource/MigrationSheet.txt
+CSF_MDTVTexturesDirectory=VAR_CASROOT/share/opencascade-VAR_PV/resources/Textures
+CSF_PluginDefaults=VAR_CASROOT/share/opencascade-VAR_PV/resources/StdResource
+CSF_StandardDefaults=VAR_CASROOT/share/opencascade-VAR_PV/resources/StdResource
+CSF_StandardLiteDefaults=VAR_CASROOT/share/opencascade-VAR_PV/resources/StdResource
+CSF_XCAFDefaults=VAR_CASROOT/share/opencascade-VAR_PV/resources/StdResource
+CSF_XmlOcafResource=VAR_CASROOT/share/opencascade-VAR_PV/resources/XmlOcafResource
# The below values might be optional.
-CSF_IGESDefaults=VAR_CASROOT/share/opencascade/resources/XSTEPResource
-CSF_ShadersDirectory=VAR_CASROOT/share/opencascade/resources/Shaders
-CSF_SHMessage=VAR_CASROOT/share/opencascade/resources/SHMessage
-CSF_STEPDefaults=VAR_CASROOT/share/opencascade/resources/XSTEPResource
-CSF_UnitsDefinition=/usr/lib64/opencascade-7.3.0/ros/share/opencascade/resources/UnitsAPI/Units.dat
-CSF_XSMessage=/usr/lib64/opencascade-7.3.0/ros/share/opencascade/resources/XSMessage
+CSF_IGESDefaults=VAR_CASROOT/share/opencascade-VAR_PV/resources/XSTEPResource
+CSF_ShadersDirectory=VAR_CASROOT/share/opencascade-VAR_PV/resources/Shaders
+CSF_SHMessage=VAR_CASROOT/share/opencascade-VAR_PV/resources/SHMessage
+CSF_STEPDefaults=VAR_CASROOT/share/opencascade-VAR_PV/resources/XSTEPResource
+CSF_UnitsDefinition=VAR_CASROOT/share/opencascade-VAR_PV/resources/UnitsAPI/Units.dat
+CSF_XSMessage=VAR_CASROOT/share/opencascade-VAR_PV/resources/XSMessage
# TODO: check those
# they were defined in the original ebuild but the directories and files
diff --git a/sci-libs/opencascade/metadata.xml b/sci-libs/opencascade/metadata.xml
index aa017491b60..9477ecff134 100644
--- a/sci-libs/opencascade/metadata.xml
+++ b/sci-libs/opencascade/metadata.xml
@@ -11,7 +11,7 @@
</maintainer>
<use>
<flag name="freeimage">
- Enable support for image i/o via media-libs/freeimage
+ Enable support for image i/o via <pkg>media-libs/freeimage</pkg>
</flag>
<flag name="gles2">
Use OpenGL ES 2.0
@@ -19,15 +19,19 @@
<flag name="inspector">
Build the OCCT inspector tool for low-level data inspection
</flag>
+ <flag name="json">
+ Enable JSON support through <pkg>dev-libs/rapidjson</pkg>
+ </flag>
<flag name="optimize">
Don't clear allocated memory. Use optimized memory manager unless
tbb USE flag is set.
</flag>
<flag name="tbb">
- Enable multithreading with the Intel Threads Building Block dev-cpp/tbb
+ Enable multithreading with the Intel Threads Building Block
+ <pkg>dev-cpp/tbb</pkg>
</flag>
<flag name="vtk">
- Enable Visualization Toolkit
+ Enable Visualization Toolkit support via <pkg>sci-libs/vtk</pkg>
</flag>
</use>
</pkgmetadata>
diff --git a/sci-libs/opencascade/opencascade-7.5.1.ebuild b/sci-libs/opencascade/opencascade-7.5.1.ebuild
new file mode 100644
index 00000000000..474b381f556
--- /dev/null
+++ b/sci-libs/opencascade/opencascade-7.5.1.ebuild
@@ -0,0 +1,167 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+# TODO:
+# check the src files referenced in 51opencascade, i.e. resources and the like
+
+EAPI=7
+
+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="${PV_MAJ}"
+KEYWORDS="~amd64 ~arm64 ~x86"
+IUSE="debug doc examples ffmpeg freeimage gles2 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"
+
+RDEPEND="
+ app-eselect/eselect-opencascade
+ dev-cpp/eigen
+ dev-lang/tcl:0=
+ dev-lang/tk:0=
+ dev-libs/rapidjson
+ 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 )
+ json? ( dev-libs/rapidjson )
+ tbb? ( dev-cpp/tbb )
+ vtk? ( >=sci-libs/vtk-8.1.0[rendering] )
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+ doc? ( app-doc/doxygen )
+ examples? ( dev-qt/linguist-tools:5 )
+"
+
+PATCHES=(
+ "${FILESDIR}"/${P}-0001-allow-default-search-path-for-Qt5.patch
+ "${FILESDIR}"/${P}-0002-remove-unnecessary-Qt5-check.patch
+ "${FILESDIR}"/${P}-0003-add-Gentoo-configuration-type.patch
+ "${FILESDIR}"/${P}-0004-fix-installation-of-cmake-config-files.patch
+ "${FILESDIR}"/${P}-0005-fix-write-permissions-on-scripts.patch
+ "${FILESDIR}"/${P}-0006-fix-creation-of-custom.sh-script.patch
+)
+
+src_prepare() {
+ cmake_src_prepare
+
+ if use debug; then
+ append-cppflags -DDEBUG
+ append-flags -g
+ fi
+
+ sed -e 's/\/lib\$/\/'$(get_libdir)'\$/' \
+ -i adm/templates/OpenCASCADEConfig.cmake.in || die
+}
+
+src_configure() {
+ local mycmakeargs=(
+ -DBUILD_DOC_Overview=$(usex doc)
+ -DBUILD_Inspector=$(usex examples)
+ -DBUILD_WITH_DEBUG=$(usex debug)
+ -DCMAKE_INSTALL_PREFIX="/usr"
+ -DINSTALL_DIR_BIN="$(get_libdir)/${P}/bin"
+ -DINSTALL_DIR_CMAKE="$(get_libdir)/cmake/${P}"
+ -DINSTALL_DIR_DOC="share/doc/${PF}"
+ -DINSTALL_DIR_LIB="$(get_libdir)/${P}"
+ -DINSTALL_DIR_SCRIPT="$(get_libdir)/${P}/bin"
+ -DINSTALL_DIR_WITH_VERSION=ON
+ -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)
+ -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.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_env_file() {
+ # prepare /etc/env.d file
+ sed -e 's|VAR_CASROOT|'${ESYSROOT}'/usr|g' < "${FILESDIR}/${PN}-${PV_MAJ}.env.in" >> "${T}/${PV_MAJ}" || die
+ sed -e 's|lib/|'$(get_libdir)'/|g' -i "${T}/${PV_MAJ}" || die
+ sed -e 's|VAR_PV|'${PV}'|g' -i "${T}/${PV_MAJ}" || die
+
+ # use TBB for memory allocation optimizations?
+ use tbb && (sed -e 's|^#MMGT_OPT=0$|MMGT_OPT=2|' -i "${T}/${PV_MAJ}" || die)
+
+ if use optimize ; then
+ # use internal optimized memory manager?
+ sed -e 's|^#MMGT_OPT=0$|MMGT_OPT=1|' -i "${T}/${PV_MAJ}" || die
+ # don't clear memory ?
+ sed -e 's|^#MMGT_CLEAR=1$|MMGT_CLEAR=0|' -i "${T}/${PV_MAJ}" || die
+ fi
+ }
+
+ prepare_env_file
+}
+
+src_install() {
+ use doc && docompress -x /usr/share/doc/${PF}/overview/html
+ cmake_src_install
+
+ # respect slotting
+ insinto "/etc/env.d/${PN}"
+ doins "${T}/${PV_MAJ}"
+
+ # remove examples
+ if use !examples; then
+ rm -r "${ED}/usr/share/${P}/samples" || die
+ fi
+}
+
+pkg_postinst() {
+ eselect ${PN} set ${PV_MAJ} || die "failed to switch to updated implementation"
+ einfo "You can switch between available ${PN} implementations using eselect ${PN}"
+}
^ permalink raw reply related [flat|nested] 17+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sci-libs/opencascade/, sci-libs/opencascade/files/
@ 2021-10-31 2:23 Sam James
0 siblings, 0 replies; 17+ messages in thread
From: Sam James @ 2021-10-31 2:23 UTC (permalink / raw
To: gentoo-commits
commit: 82fb77334931d62d9811a1c361d2a3756dc10c86
Author: Bernd Waibel <waebbl-gentoo <AT> posteo <DOT> net>
AuthorDate: Wed Oct 27 17:31:03 2021 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sun Oct 31 02:22:48 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=82fb7733
sci-libs/opencascade: drop 7.4.0
Bugs: https://github.com/gentoo/sci/issues/1119
Package-Manager: Portage-3.0.28, Repoman-3.0.3
Signed-off-by: Bernd Waibel <waebbl-gentoo <AT> posteo.net>
Closes: https://github.com/gentoo/gentoo/pull/22729
Signed-off-by: Sam James <sam <AT> gentoo.org>
sci-libs/opencascade/Manifest | 1 -
...Gentoo-specific-avoid-pre-stripping-files.patch | 30 -----
.../files/opencascade-7.4.0-find-qt.patch | 85 ------------
...pencascade-7.4.0-fix-flow-control-nesting.patch | 31 -----
.../files/opencascade-7.4.0-fix-install.patch | 133 -------------------
...7.4.0-fix-issue-with-cmake-path-variables.patch | 41 ------
.../opencascade/files/opencascade-7.4.0.env.in | 103 ---------------
sci-libs/opencascade/metadata.xml | 3 -
sci-libs/opencascade/opencascade-7.4.0-r5.ebuild | 147 ---------------------
9 files changed, 574 deletions(-)
diff --git a/sci-libs/opencascade/Manifest b/sci-libs/opencascade/Manifest
index a6e46ffdc98..aa5f02d0bfc 100644
--- a/sci-libs/opencascade/Manifest
+++ b/sci-libs/opencascade/Manifest
@@ -1,4 +1,3 @@
-DIST opencascade-7.4.0.tar.gz 49210449 BLAKE2B c92afe7551e9a066ad0940dcf49278b556a726f0534131706b3a11cb0986ba32818e162df3982283f6815eb9d67d7e91f909485d78f2b8d638da1934ffbc2f7f SHA512 eb0d47848d48f42a159ae5d7a4144483ba1f59f634844bd2053e48e04af30a30ba7056112cd38a1730d193a8d736b898f9608dd574cbe6829dbe7257a002772a
DIST opencascade-7.5.1.tar.gz 47807222 BLAKE2B b5ef30ea7c373250db3e0863f3c7fde84256b37957a482f10a462a4c4ed1a21cffbbeb10e9fc140325022d7582efbd292ed6d1016d14cb67ccf5c84d14060d5a SHA512 ebb937254ac165041ef7e1a80df8f9d2ac1d518f01b3d4b0fd6d203fe0d80bd474b85a462cccc1c74a513bd257c0b0ab7002632573f38bf72170363c7e42ed2f
DIST opencascade-7.5.2.tar.gz 47812603 BLAKE2B 86995ea60e24329f91a2cbede26112a70794fb091b34d33614bef412b05b8cc9f1e770aecf78272b54a241c2524422c86f8ff722b3f27b54bf10fa5eda626288 SHA512 f951a941043a56f381cfd25e4d78bb9ae08e5cc29a894e6c0c35daf30aeabf1e44ee09af65bb6b7d62d9325be67741ddcf52266b7186b4c336c70ed8bcfa1676
DIST opencascade-7.5.3.tar.gz 47817862 BLAKE2B be438a08997c18c3cb2c08c520fff2f439cc8a406cc3f471be3b24f874ac3bd892c4afe6fa37f742ffb5da21b5a29f9c8f737e3160dcbda35a217286218eb5e1 SHA512 2d7cf284a1b3ce8d05151085b41579cc2f4e29489b7920769cd04f86a6d76e49f533b570226d3cf041c75582894ed8a6aff889312c7c507fffae47d3e57c5c47
diff --git a/sci-libs/opencascade/files/opencascade-7.4.0-Gentoo-specific-avoid-pre-stripping-files.patch b/sci-libs/opencascade/files/opencascade-7.4.0-Gentoo-specific-avoid-pre-stripping-files.patch
deleted file mode 100644
index 0d4015cabd7..00000000000
--- a/sci-libs/opencascade/files/opencascade-7.4.0-Gentoo-specific-avoid-pre-stripping-files.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-From 2ddba09ea491ae5d18b074a2d1126d44c0a2b1f6 Mon Sep 17 00:00:00 2001
-From: Bernd Waibel <waebbl-gentoo@posteo.net>
-Date: Tue, 9 Feb 2021 22:26:14 +0100
-Subject: [PATCH] [Gentoo-specific] avoid pre-stripping files
-
-Signed-off-by: Bernd Waibel <waebbl-gentoo@posteo.net>
----
- adm/cmake/occt_defs_flags.cmake | 6 ------
- 1 file changed, 6 deletions(-)
-
-diff --git a/adm/cmake/occt_defs_flags.cmake b/adm/cmake/occt_defs_flags.cmake
-index 5484c675..4e513ab5 100644
---- a/adm/cmake/occt_defs_flags.cmake
-+++ b/adm/cmake/occt_defs_flags.cmake
-@@ -137,12 +137,6 @@ elseif (DEFINED CMAKE_COMPILER_IS_GNUCXX)
- set (CMAKE_CXX_FLAGS "-std=c++0x ${CMAKE_CXX_FLAGS}")
- endif()
-
--# Optimize size of binaries
--if (CMAKE_COMPILER_IS_GNUCC OR CMAKE_COMPILER_IS_GNUCXX OR MINGW)
-- set (CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} -s")
-- set (CMAKE_C_FLAGS_RELEASE "${CMAKE_C_FLAGS_RELEASE} -s")
--endif()
--
- if (BUILD_RELEASE_DISABLE_EXCEPTIONS)
- set (CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} -DNo_Exception")
- set (CMAKE_C_FLAGS_RELEASE "${CMAKE_C_FLAGS_RELEASE} -DNo_Exception")
---
-2.30.0
-
diff --git a/sci-libs/opencascade/files/opencascade-7.4.0-find-qt.patch b/sci-libs/opencascade/files/opencascade-7.4.0-find-qt.patch
deleted file mode 100644
index 1ebc1106a31..00000000000
--- a/sci-libs/opencascade/files/opencascade-7.4.0-find-qt.patch
+++ /dev/null
@@ -1,85 +0,0 @@
-From 7304c888e57a581e9dc8ef2005e960ec579d58f4 Mon Sep 17 00:00:00 2001
-From: Bernd Waibel <waebbl@gmail.com>
-Date: Sat, 9 Nov 2019 17:15:27 +0100
-Subject: [PATCH] Gentoo-specific: disable internal 3RDPARTY_QT_DIR
-
-The patch disables searching for internal 3rd-party Qt. Instead
-system installed Qt is used. The call to find_package uses REQUIRED
-flag for this.
-
-Signed-off-by: Bernd Waibel <waebbl@gmail.com>
----
- adm/cmake/qt.cmake | 24 ++++++++++++------------
- adm/cmake/qt_macro.cmake | 6 +++---
- 2 files changed, 15 insertions(+), 15 deletions(-)
-
-diff --git a/adm/cmake/qt.cmake b/adm/cmake/qt.cmake
-index 6958bab5..b6a9b794 100644
---- a/adm/cmake/qt.cmake
-+++ b/adm/cmake/qt.cmake
-@@ -3,27 +3,27 @@
- # Qt is searched manually first (just determine root)
- message (STATUS "Processing Qt 3-rd party")
-
--if (NOT DEFINED ${3RDPARTY_QT_DIR} AND ${3RDPARTY_QT_DIR} STREQUAL "")
-- FIND_PRODUCT_DIR ("${3RDPARTY_DIR}" Qt 3RDPARTY_QT_DIR_NAME)
-+#if (NOT DEFINED ${3RDPARTY_QT_DIR} AND ${3RDPARTY_QT_DIR} STREQUAL "")
-+# FIND_PRODUCT_DIR ("${3RDPARTY_DIR}" Qt 3RDPARTY_QT_DIR_NAME)
-
-- if (NOT DEFINED ${3RDPARTY_QT_DIR_NAME} AND ${3RDPARTY_QT_DIR_NAME} STREQUAL "")
-- message (FATAL_ERROR "... Qt root directory was not found")
-- endif()
-+# if (NOT DEFINED ${3RDPARTY_QT_DIR_NAME} AND ${3RDPARTY_QT_DIR_NAME} STREQUAL "")
-+# message (FATAL_ERROR "... Qt root directory was not found")
-+# endif()
-
- # Combine directory name with absolute path and show in GUI
-- set (3RDPARTY_QT_DIR "${3RDPARTY_DIR}/${3RDPARTY_QT_DIR_NAME}" CACHE PATH "The directory containing Qt" FORCE)
-- message (STATUS "Info: Qt is used from folder: ${3RDPARTY_QT_DIR}")
--endif()
-+# set (3RDPARTY_QT_DIR "${3RDPARTY_DIR}/${3RDPARTY_QT_DIR_NAME}" CACHE PATH "The directory containing Qt" FORCE)
-+# message (STATUS "Info: Qt is used from folder: ${3RDPARTY_QT_DIR}")
-+#endif()
-
--set (USED_3RDPARTY_QT_DIR "${3RDPARTY_QT_DIR}")
-+#set (USED_3RDPARTY_QT_DIR "${3RDPARTY_QT_DIR}")
-
- # Now set CMAKE_PREFIX_PATH to point to local Qt installation.
- # Without this setting find_package() will not work
--set(CMAKE_PREFIX_PATH ${3RDPARTY_QT_DIR})
-+#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
-@@ -31,4 +31,4 @@ if (NOT ${Qt5_FOUND})
- #message (STATUS "Qt4 cmake configuration")
- else()
- #message (STATUS "Qt5 cmake configuration")
--endif()
-\ No newline at end of file
-+endif()
-diff --git a/adm/cmake/qt_macro.cmake b/adm/cmake/qt_macro.cmake
-index ec897384..8bd314a4 100644
---- a/adm/cmake/qt_macro.cmake
-+++ b/adm/cmake/qt_macro.cmake
-@@ -2,9 +2,9 @@
-
- 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 ("${3RDPARTY_QT_DIR}" STREQUAL "")
-+# message (FATAL_ERROR "Empty Qt dir")
-+# endif()
-
- if (${Qt5_FOUND})
- #message (STATUS "Qt5 cmake configuration")
---
-2.23.0
-
diff --git a/sci-libs/opencascade/files/opencascade-7.4.0-fix-flow-control-nesting.patch b/sci-libs/opencascade/files/opencascade-7.4.0-fix-flow-control-nesting.patch
deleted file mode 100644
index 7e2bb1d7b2a..00000000000
--- a/sci-libs/opencascade/files/opencascade-7.4.0-fix-flow-control-nesting.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-From e69c42386239bcc08143607df12b8bb3f1ff14ba Mon Sep 17 00:00:00 2001
-From: Bernd Waibel <waebbl-gentoo@posteo.net>
-Date: Wed, 24 Feb 2021 20:06:02 +0100
-Subject: [PATCH] adm/cmake/vtk.cmake: fix flow control nesting
-
-Fix an unbalanced nesting of flow control statements
-for >=cmake-3.20.0
-
-Signed-off-by: Bernd Waibel <waebbl-gentoo@posteo.net>
----
- adm/cmake/vtk.cmake | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/adm/cmake/vtk.cmake b/adm/cmake/vtk.cmake
-index c5692fd6..00b7ff4a 100644
---- a/adm/cmake/vtk.cmake
-+++ b/adm/cmake/vtk.cmake
-@@ -156,8 +156,8 @@ if (VTK_FOUND)
- endif()
- endif()
- endif()
-- endif()
-- endforeach()
-+ endforeach()
-+ endif()
- endif()
-
- if (3RDPARTY_VTK_INCLUDE_DIRS)
---
-2.30.1
-
diff --git a/sci-libs/opencascade/files/opencascade-7.4.0-fix-install.patch b/sci-libs/opencascade/files/opencascade-7.4.0-fix-install.patch
deleted file mode 100644
index edf3545a74b..00000000000
--- a/sci-libs/opencascade/files/opencascade-7.4.0-fix-install.patch
+++ /dev/null
@@ -1,133 +0,0 @@
-From 95c7c85f776d6e4764f2146c8385d6e29762043d Mon Sep 17 00:00:00 2001
-From: Bernd Waibel <waebbl@gmail.com>
-Date: Sat, 16 Nov 2019 18:28:11 +0100
-Subject: [PATCH] Gentoo-specific: patch installation paths
-
-Patch parts of cmake to install into proper locations and handle slotting.
-
-Signed-off-by: Bernd Waibel <waebbl@gmail.com>
----
- CMakeLists.txt | 28 +++++++++++++++-------------
- adm/cmake/occt_macros.cmake | 2 +-
- 2 files changed, 16 insertions(+), 14 deletions(-)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 0b445de9..1fd5779e 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -15,6 +15,8 @@ macro (OCCT_INCLUDE_CMAKE_FILE BEING_INCLUDED_FILE)
- endif()
- endmacro()
-
-+SET(CMAKE_INSTALL_DO_STRIP OFF)
-+
- # include variable description
- OCCT_INCLUDE_CMAKE_FILE ("adm/cmake/vardescr")
-
-@@ -231,7 +233,7 @@ endif()
- # place the libraries to <prefix>/lib folder for unix and leave old structure for windows
- if (NOT DEFINED INSTALL_DIR_LIB)
- if ("${INSTALL_DIR_LAYOUT}" STREQUAL "Unix")
-- set (INSTALL_DIR_LIB "lib" CACHE PATH "${INSTALL_DIR_LIB_DESCR}")
-+ set (INSTALL_DIR_LIB "lib${LIB_SUFFIX}" CACHE PATH "${INSTALL_DIR_LIB_DESCR}")
- else()
- set (INSTALL_DIR_LIB "${OS_WITH_BIT}/${COMPILER}/lib" CACHE PATH "${INSTALL_DIR_LIB_DESCR}")
- endif()
-@@ -315,9 +317,9 @@ endif()
- if (NOT DEFINED INSTALL_DIR_CMAKE)
- if ("${INSTALL_DIR_LAYOUT}" STREQUAL "Unix")
- if (INSTALL_DIR_WITH_VERSION)
-- set (INSTALL_DIR_CMAKE "lib/cmake/opencascade-${OCC_VERSION_STRING_EXT}" CACHE PATH "${INSTALL_DIR_CMAKE_DESCR}")
-+ set (INSTALL_DIR_CMAKE "lib${LIB_SUFFIX}/cmake/opencascade-${OCC_VERSION_STRING_EXT}" CACHE PATH "${INSTALL_DIR_CMAKE_DESCR}")
- else()
-- set (INSTALL_DIR_CMAKE "lib/cmake/opencascade" CACHE PATH "${INSTALL_DIR_CMAKE_DESCR}")
-+ set (INSTALL_DIR_CMAKE "lib${LIB_SUFFIX}/cmake/opencascade-${OCC_VERSION_STRING_EXT}" CACHE PATH "${INSTALL_DIR_CMAKE_DESCR}")
- endif()
- else()
- set (INSTALL_DIR_CMAKE "cmake" CACHE PATH "${INSTALL_DIR_CMAKE_DESCR}")
-@@ -868,10 +870,10 @@ if (${DRAWEXE_INDEX} GREATER -1)
- # copy draw script to install script folder
- if (BUILD_PATCH AND EXISTS "${BUILD_PATCH}/adm/templates/draw.${SCRIPT_EXT}")
- install (FILES "${BUILD_PATCH}/adm/templates/draw.${SCRIPT_EXT}" DESTINATION "${INSTALL_DIR_SCRIPT}"
-- PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ GROUP_WRITE GROUP_EXECUTE WORLD_READ WORLD_WRITE WORLD_EXECUTE)
-+ PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE)
- else()
- install (FILES "${CMAKE_SOURCE_DIR}/adm/templates/draw.${SCRIPT_EXT}" DESTINATION "${INSTALL_DIR_SCRIPT}"
-- PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ GROUP_WRITE GROUP_EXECUTE WORLD_READ WORLD_WRITE WORLD_EXECUTE)
-+ PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE)
- endif()
-
- # copy draw script to CMake binary folder
-@@ -892,9 +894,9 @@ if (EXISTS "${INSTALL_DIR}/${INSTALL_DIR_SCRIPT}/custom.${SCRIPT_EXT}")
-
- set (CUSTOM_CONTENT "${CUSTOM_CONTENT} ${ADDITIONAL_CUSTOM_CONTENT}")
-
-- file (WRITE "${INSTALL_DIR}/${INSTALL_DIR_SCRIPT}/custom.${SCRIPT_EXT}" "${CUSTOM_CONTENT}")
-+ file (WRITE "${CMAKE_BINARY_DIR}/custom.${SCRIPT_EXT}" "${CUSTOM_CONTENT}")
- else()
-- OCCT_CONFIGURE_AND_INSTALL ("adm/templates/custom.${SCRIPT_EXT}.main" "custom.${SCRIPT_EXT}" "custom.${SCRIPT_EXT}" "${INSTALL_DIR_SCRIPT}")
-+ OCCT_CONFIGURE_AND_INSTALL ("adm/templates/custom.${SCRIPT_EXT}.main" "custom.${SCRIPT_EXT}" "custom.${SCRIPT_EXT}" "$ENV{DESTDIR}${INSTALL_DIR}/${INSTALL_DIR_SCRIPT}")
- endif()
-
- if (WIN32)
-@@ -1067,10 +1069,10 @@ if (BUILD_TOOL_TOOLKITS)
- # copy tinspector script to install script folder
- if (BUILD_PATCH AND EXISTS "${BUILD_PATCH}/adm/templates/inspector.${SCRIPT_EXT}")
- install (FILES "${BUILD_PATCH}/adm/templates/inspector.${SCRIPT_EXT}" DESTINATION "${INSTALL_DIR_SCRIPT}"
-- PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ GROUP_WRITE GROUP_EXECUTE WORLD_READ WORLD_WRITE WORLD_EXECUTE)
-+ PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE)
- else()
- install (FILES "${CMAKE_SOURCE_DIR}/adm/templates/inspector.${SCRIPT_EXT}" DESTINATION "${INSTALL_DIR_SCRIPT}"
-- PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ GROUP_WRITE GROUP_EXECUTE WORLD_READ WORLD_WRITE WORLD_EXECUTE)
-+ PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE)
- endif()
-
- set (OpenCASCADE_BINARY_DIR "${INSTALL_DIR}/${INSTALL_DIR_BIN}")
-@@ -1122,7 +1124,7 @@ foreach (OCCT_CONFIGURATION ${CMAKE_CONFIGURATION_TYPES})
- endforeach()
- # install OpenCASCADE config file with compile definitions and C/C++ flags ONLY for current configuration
- install (CODE "string (TOLOWER \"\${CMAKE_INSTALL_CONFIG_NAME}\" CMAKE_INSTALL_CONFIG_NAME_LOWER)")
--install (CODE "configure_file(\"${CMAKE_BINARY_DIR}/OpenCASCADECompileDefinitionsAndFlags-\${CMAKE_INSTALL_CONFIG_NAME_LOWER}.cmake\" \"${INSTALL_DIR}/${INSTALL_DIR_CMAKE}/OpenCASCADECompileDefinitionsAndFlags-\${CMAKE_INSTALL_CONFIG_NAME_LOWER}.cmake\" COPYONLY)")
-+install (CODE "configure_file(\"${CMAKE_BINARY_DIR}/OpenCASCADECompileDefinitionsAndFlags-\${CMAKE_INSTALL_CONFIG_NAME_LOWER}.cmake\" \"\$ENV{DESTDIR}${INSTALL_DIR_CMAKE}/opencascade-${OCC_VERSION_STRING_EXT}/OpenCASCADECompileDefinitionsAndFlags-\${CMAKE_INSTALL_CONFIG_NAME_LOWER}.cmake\" COPYONLY)")
-
- foreach (OCCT_MODULE ${OCCT_MODULES})
- if (BUILD_MODULE_${OCCT_MODULE})
-@@ -1163,7 +1165,7 @@ endif()
-
- # Configure and install cmake config file
- configure_file("${CMAKE_SOURCE_DIR}/adm/templates/OpenCASCADEConfig.cmake.in" "OpenCASCADEConfig.cmake" @ONLY)
--install(FILES "${CMAKE_BINARY_DIR}/OpenCASCADEConfig.cmake" DESTINATION "${INSTALL_DIR_CMAKE}")
-+install(FILES "${CMAKE_BINARY_DIR}/OpenCASCADEConfig.cmake" DESTINATION "${INSTALL_DIR_CMAKE}/opencascade-${OCC_VERSION_STRING_EXT}")
-
- # Configure cmake version file
- include(CMakePackageConfigHelpers)
-@@ -1172,11 +1174,11 @@ write_basic_package_version_file( ${CMAKE_BINARY_DIR}/OpenCASCADEConfigVersion.c
- COMPATIBILITY ExactVersion )
-
- # Install cmake version file
--install (FILES "${CMAKE_BINARY_DIR}/OpenCASCADEConfigVersion.cmake" DESTINATION "${INSTALL_DIR_CMAKE}")
-+install (FILES "${CMAKE_BINARY_DIR}/OpenCASCADEConfigVersion.cmake" DESTINATION "${INSTALL_DIR_CMAKE}/opencascade-${OCC_VERSION_STRING_EXT}")
-
- # Install the export set for use with the install-tree for each configuration
- foreach (OCCT_MODULE ${OCCT_MODULES_ENABLED})
-- install(EXPORT OpenCASCADE${OCCT_MODULE}Targets DESTINATION "${INSTALL_DIR_CMAKE}")
-+ install(EXPORT OpenCASCADE${OCCT_MODULE}Targets DESTINATION "${INSTALL_DIR_CMAKE}/opencascade-${OCC_VERSION_STRING_EXT}")
- endforeach()
-
- # Update generated OpenCASCADETargets-*.cmake files
-diff --git a/adm/cmake/occt_macros.cmake b/adm/cmake/occt_macros.cmake
-index 8220ecd5..228d801b 100644
---- a/adm/cmake/occt_macros.cmake
-+++ b/adm/cmake/occt_macros.cmake
-@@ -598,7 +598,7 @@ macro (OCCT_UPDATE_TARGET_FILE)
- "cmake_policy(PUSH)
- cmake_policy(SET CMP0007 NEW)
- string (TOLOWER \"\${CMAKE_INSTALL_CONFIG_NAME}\" CMAKE_INSTALL_CONFIG_NAME_LOWERCASE)
-- file (GLOB ALL_OCCT_TARGET_FILES \"${INSTALL_DIR}/${INSTALL_DIR_CMAKE}/OpenCASCADE*Targets-\${CMAKE_INSTALL_CONFIG_NAME_LOWERCASE}.cmake\")
-+ file (GLOB ALL_OCCT_TARGET_FILES \"\$ENV{DESTDIR}${INSTALL_DIR_CMAKE}/opencascade-${OCC_VERSION_STRING_EXT}/OpenCASCADE*Targets-\${CMAKE_INSTALL_CONFIG_NAME_LOWERCASE}.cmake\")
- foreach(TARGET_FILENAME \${ALL_OCCT_TARGET_FILES})
- file (STRINGS \"\${TARGET_FILENAME}\" TARGET_FILE_CONTENT)
- file (REMOVE \"\${TARGET_FILENAME}\")
---
-2.23.0
-
diff --git a/sci-libs/opencascade/files/opencascade-7.4.0-fix-issue-with-cmake-path-variables.patch b/sci-libs/opencascade/files/opencascade-7.4.0-fix-issue-with-cmake-path-variables.patch
deleted file mode 100644
index aacb642019f..00000000000
--- a/sci-libs/opencascade/files/opencascade-7.4.0-fix-issue-with-cmake-path-variables.patch
+++ /dev/null
@@ -1,41 +0,0 @@
-From cefaa5bddedcb90a06d6ef8f0837a11619e5d87e Mon Sep 17 00:00:00 2001
-From: Bernd Waibel <waebbl-gentoo@posteo.net>
-Date: Tue, 9 Feb 2021 20:58:43 +0100
-Subject: [PATCH] fix issue with cmake path variables
-
-Thanks to Fabio Rossi for reporting the issue.
-Upstream bug: https://tracker.dev.opencascade.org/view.php?id=32035
-
-Signed-off-by: Bernd Waibel <waebbl-gentoo@posteo.net>
----
- adm/templates/OpenCASCADEConfig.cmake.in | 14 +-------------
- 1 file changed, 1 insertion(+), 13 deletions(-)
-
-diff --git a/adm/templates/OpenCASCADEConfig.cmake.in b/adm/templates/OpenCASCADEConfig.cmake.in
-index 4937103b..db99a8d1 100644
---- a/adm/templates/OpenCASCADEConfig.cmake.in
-+++ b/adm/templates/OpenCASCADEConfig.cmake.in
-@@ -16,19 +16,7 @@ set (OpenCASCADE_MINOR_VERSION "@OCC_VERSION_MINOR@")
- set (OpenCASCADE_MAINTENANCE_VERSION "@OCC_VERSION_MAINTENANCE@")
- set (OpenCASCADE_DEVELOPMENT_VERSION "@OCC_VERSION_DEVELOPMENT@")
-
--# Compute the installation prefix from this OpenCASCADEConfig.cmake file
--# location, by going up one level + one level if "cmake" + one level if "lib".
--# This is made to support different locations of CMake files:
--# - in UNIX style: $INSTALL_DIR/lib/cmake/opencascade-<version>
--# - in Windows style: $INSTALL_DIR/cmake
--get_filename_component (OpenCASCADE_INSTALL_PREFIX "${CMAKE_CURRENT_LIST_FILE}" PATH)
--get_filename_component (OpenCASCADE_INSTALL_PREFIX "${OpenCASCADE_INSTALL_PREFIX}" PATH)
--if (OpenCASCADE_INSTALL_PREFIX MATCHES "/cmake$")
-- get_filename_component (OpenCASCADE_INSTALL_PREFIX "${OpenCASCADE_INSTALL_PREFIX}" PATH)
--endif()
--if (OpenCASCADE_INSTALL_PREFIX MATCHES "/lib$")
-- get_filename_component (OpenCASCADE_INSTALL_PREFIX "${OpenCASCADE_INSTALL_PREFIX}" PATH)
--endif()
-+set (OpenCASCADE_INSTALL_PREFIX "$ENV{CASROOT}")
-
- # Set OpenCASCADE paths to headers, binaries, libraries, resources, tests, samples, data
- set (OpenCASCADE_BINARY_DIR "${OpenCASCADE_INSTALL_PREFIX}/@INSTALL_DIR_BIN@")
---
-2.30.0
-
diff --git a/sci-libs/opencascade/files/opencascade-7.4.0.env.in b/sci-libs/opencascade/files/opencascade-7.4.0.env.in
deleted file mode 100644
index cf7cc6a724d..00000000000
--- a/sci-libs/opencascade/files/opencascade-7.4.0.env.in
+++ /dev/null
@@ -1,103 +0,0 @@
-#
-# This file sets needed and optional environment variables for
-# Open CASCADE Technology
-#
-# See: https://dev.opencascade.org/doc/overview/html/index.html#OCCT_OVW_SECTION_4_2
-# for further documentation.
-#
-# Some of the values are set at compile time depending on what USE flags
-# were enabled. Those values are marked as such.
-
-# define the root directory of Open CASCADE Technology (needed)
-CASROOT=VAR_CASROOT
-# PATH and LDPATH are used to find the binaries and libraries of OCCT (needed)
-PATH=VAR_CASROOT/bin
-LDPATH=VAR_CASROOT/lib
-
-#############################################################################
-# The MMGT_* variables are used to determine how memory management will work
-# in OCCT. All of those are optional. If they are not set here, their default
-# values will be used.
-#
-# Uncomment or change the ones you need to adapt from its default.
-#############################################################################
-# MMGT_OPT = {0,1,2} (default: 0) set at compile time
-# if set to 0 (the default), every memory block is allocated in C
-# memory heap directly (via malloc() and free()). Will be set, if
-# neither the the 'optimize' nor the 'tbb' USE flags are set.
-# if set to 1, the memory manager performs it's own internal optimization.
-# Will be set, if the 'optimize' USE flag is set.
-# if set to 2, Intel(R) TBB optimized memory manager is used. Will be set,
-# if the 'tbb' USE flag is set.
-#MMGT_OPT=0
-
-# MMGT_CLEAR = {0,1} (default: 1)
-# if set to 0, memory block is returned as it is. Will be set, if the
-# 'optimize' USE flag is set
-# if set to 1, every allocated memory block is cleared by zeros
-#MMGT_CLEAR=1
-
-# MMGT_CELLSIZE (default: 200)
-# defines the maximal size of blocks allocated in large pools of memory.
-#MMGT_CELLSIZE=200
-
-# MMGT_NBPAGES (default: 10000)
-# defines the size of memory chunks allocated for small blocks in pages
-# (OS dependant)
-#MMGT_NBPAGES=10000
-
-# MMGT_THRESHOLD (default: 40000)
-# defines the maximal size of blocks that are recycled internally instead
-# of being returned to the heap.
-#MMGT_THRESHOLD=40000
-
-# MMGT_MMAP = {0,1} (default: 1)
-# if set to 0, large memory blocks will be allocated in the C heap by
-# malloc()
-# if set to 1, large memory blocks are allocated using memory mapping
-# functions of the operating system.
-#MMGT_MMAP=1
-
-# CSF_LANGUAGE (default: us) optional
-# defines the default language of messages indicated by a two-letter
-# country code. Currently it's not verified if this work with other
-# than the default languages, so we keep it commented.
-#CSF_LANGUAGE=us
-
-# CSF_DEBUG_BOP (default: undefined) optional
-# if defined then it should specify the directory where diagnostic data
-# on problems occured in Boolean operations will be saved. Not defined by
-# default.
-#
-# NOTE: Only enable for debugging purposes. If set, this variable has a
-# large impact on the performance of boolean operations.
-#CSF_DEBUG_BOP=/var/tmp
-
-# CSF_EXCEPTION_PROMPT (default: 1) optional
-# not documented upstream (maybe a flag indicating whether the user shall
-# be prompted in the case of exceptions)
-#CSF_EXCEPTION_PROMPT=1
-
-# The following CSF_* variables define various directories and files where
-# OCCT is looking for resources.
-CSF_GraphicShr=VAR_CASROOT/lib/libTKOpenGl.so
-CSF_MIGRATION_TYPES=VAR_CASROOT/share/opencascade/resources/StdResource/MigrationSheet.txt
-CSF_MDTVTexturesDirectory=VAR_CASROOT/share/opencascade/resources/Textures
-CSF_PluginDefaults=VAR_CASROOT/share/opencascade/resources/StdResource
-CSF_StandardDefaults=VAR_CASROOT/share/opencascade/resources/StdResource
-CSF_StandardLiteDefaults=VAR_CASROOT/share/opencascade/resources/StdResource
-CSF_XCAFDefaults=VAR_CASROOT/share/opencascade/resources/StdResource
-CSF_XmlOcafResource=VAR_CASROOT/share/opencascade/resources/XmlOcafResource
-# The below values might be optional.
-CSF_IGESDefaults=VAR_CASROOT/share/opencascade/resources/XSTEPResource
-CSF_ShadersDirectory=VAR_CASROOT/share/opencascade/resources/Shaders
-CSF_SHMessage=VAR_CASROOT/share/opencascade/resources/SHMessage
-CSF_STEPDefaults=VAR_CASROOT/share/opencascade/resources/XSTEPResource
-CSF_UnitsDefinition=VAR_CASROOT/share/opencascade/resources/UnitsAPI/Units.dat
-CSF_XSMessage=VAR_CASROOT/share/opencascade/resources/XSMessage
-
-# TODO: check those
-# they were defined in the original ebuild but the directories and files
-# are not present in the current installation.
-#CSF_MDTVFontDirectory=VAR_CASROOT/src/FontMFT
-#CSF_UnitsLexicon=VAR_CASROOT/src/UnitsAPI/Lexi_Expr.dat
diff --git a/sci-libs/opencascade/metadata.xml b/sci-libs/opencascade/metadata.xml
index b0acd7390fe..fe7ad33b952 100644
--- a/sci-libs/opencascade/metadata.xml
+++ b/sci-libs/opencascade/metadata.xml
@@ -16,9 +16,6 @@
<flag name="gles2">
Use OpenGL ES 2.0
</flag>
- <flag name="inspector">
- Build the OCCT inspector tool for low-level data inspection
- </flag>
<flag name="json">
Enable JSON support through <pkg>dev-libs/rapidjson</pkg>
</flag>
diff --git a/sci-libs/opencascade/opencascade-7.4.0-r5.ebuild b/sci-libs/opencascade/opencascade-7.4.0-r5.ebuild
deleted file mode 100644
index b6dbf4121d0..00000000000
--- a/sci-libs/opencascade/opencascade-7.4.0-r5.ebuild
+++ /dev/null
@@ -1,147 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-# TODO:
-# check the src files referenced in 51opencascade, i.e. resources and the like
-# check where cmake gets it's '-s' linker flag to avoid pre-stripping (QA)
-
-EAPI=7
-
-inherit check-reqs cmake flag-o-matic java-pkg-opt-2
-
-MY_PV="$(ver_rs 1- '_')"
-
-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="${PV}"
-KEYWORDS="~amd64 ~arm64 ~x86"
-IUSE="debug doc +examples ffmpeg freeimage gles2 inspector java optimize qt5 tbb +vtk"
-
-REQUIRED_USE="
- inspector? ( qt5 )
- qt5? ( examples )
- ?? ( optimize tbb )
-"
-
-RDEPEND="
- app-eselect/eselect-opencascade
- dev-cpp/eigen
- dev-lang/tcl:0=
- dev-lang/tk:0=
- dev-tcltk/itcl
- dev-tcltk/itk
- dev-tcltk/tix
- media-libs/freetype:2
- media-libs/ftgl
- virtual/glu
- virtual/opengl
- x11-libs/libXmu
- ffmpeg? ( media-video/ffmpeg )
- freeimage? ( media-libs/freeimage )
- java? ( virtual/jdk:1.8 )
- qt5? (
- dev-qt/qtcore:5
- dev-qt/qtgui:5
- dev-qt/qtquickcontrols2:5
- dev-qt/qtwidgets:5
- dev-qt/qtxml:5
- )
- tbb? ( dev-cpp/tbb:= )
- vtk? (
- >=sci-libs/vtk-8.1.0[rendering]
- <sci-libs/vtk-9
- )
-"
-DEPEND="${RDEPEND}"
-BDEPEND="
- doc? ( app-doc/doxygen )
- qt5? ( dev-qt/linguist-tools:5 )
-"
-
-# There's no easy way to test. Testing needs a rather big environment
-# properly set up.
-RESTRICT="test"
-
-CHECKREQS_MEMORY="256M"
-CHECKREQS_DISK_BUILD="3584M"
-
-CMAKE_BUILD_TYPE=Release
-
-PATCHES=(
- "${FILESDIR}/${P}-find-qt.patch"
- "${FILESDIR}/${P}-fix-install.patch"
- "${FILESDIR}/${P}-fix-issue-with-cmake-path-variables.patch"
- "${FILESDIR}/${P}-Gentoo-specific-avoid-pre-stripping-files.patch"
- "${FILESDIR}/${P}-fix-flow-control-nesting.patch"
-)
-
-pkg_setup() {
- check-reqs_pkg_setup
- use java && java-pkg-opt-2_pkg_setup
-}
-
-src_prepare() {
- cmake_src_prepare
- use java && java-pkg-opt-2_src_prepare
-}
-
-src_configure() {
- local mycmakeargs=(
- -DBUILD_DOC_Overview=$(usex doc)
- -DBUILD_Inspector=$(usex inspector)
- -DBUILD_WITH_DEBUG=$(usex debug)
- -DCMAKE_CONFIGURATION_TYPES="Gentoo"
- -DCMAKE_INSTALL_PREFIX="/usr/$(get_libdir)/${P}/ros"
- -DINSTALL_DIR_DOC="/usr/share/doc/${PF}"
- -DINSTALL_DIR_CMAKE="/usr/$(get_libdir)/cmake"
- -DINSTALL_SAMPLES=$(usex examples)
- -DINSTALL_TEST_CASES=NO
- -DUSE_D3D=no
- -DUSE_FFMPEG=$(usex ffmpeg)
- -DUSE_FREEIMAGE=$(usex freeimage)
- -DUSE_GLES2=$(usex gles2)
- -DUSE_TBB=$(usex tbb)
- -DUSE_VTK=$(usex vtk)
- )
-
- use doc && mycmakeargs+=( -DINSTALL_DOC_Overview=ON )
- use examples && mycmakeargs+=( -DBUILD_SAMPLES_QT=$(usex qt5) )
-
- cmake_src_configure
-
- # prepare /etc/env.d file
- sed -e 's|VAR_CASROOT|'${ESYSROOT}'/usr/'$(get_libdir)'/'${P}'/ros|g' < "${FILESDIR}/${P}.env.in" >> "${T}/${PV}" || die
- sed -i -e 's|ros/lib|ros/'$(get_libdir)'|' "${T}/${PV}" || die
-
- # use TBB for memory allocation optimizations?
- use tbb && (sed -i -e 's|^#MMGT_OPT=0$|MMGT_OPT=2|' "${T}/${PV}" || die)
-
- if use optimize ; then
- # use internal optimized memory manager?
- sed -i -e 's|^#MMGT_OPT=0$|MMGT_OPT=1|' "${T}/${PV}" || die
- # don't clear memory ?
- sed -i -e 's|^#MMGT_CLEAR=1$|MMGT_CLEAR=0|' "${T}/${PV}" || die
- fi
-}
-
-src_install() {
- cmake_src_install
-
- # respect slotting
- insinto "/etc/env.d/${PN}"
- doins "${T}/${PV}"
-
- # remove examples
- use examples || (rm -rf "${ED}/usr/$(get_libdir)/${P}/ros/share/${PN}/samples" || die)
- use java || (rm -rf "${ED}/usr/$(get_libdir)/${P}/ros/share/${PN}/samples/java" || die)
- use qt5 || (rm -rf "${ED}/usr/$(get_libdir)/${P}/ros/share/${PN}/samples/qt" || die)
-}
-
-pkg_postinst() {
- eselect ${PN} set ${PV} || die "failed to switch to updated implementation"
- einfo "You can switch between available ${PN} implementations using eselect ${PN}"
-}
^ permalink raw reply related [flat|nested] 17+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sci-libs/opencascade/, sci-libs/opencascade/files/
@ 2022-01-13 1:25 Sam James
0 siblings, 0 replies; 17+ messages in thread
From: Sam James @ 2022-01-13 1:25 UTC (permalink / raw
To: gentoo-commits
commit: 4db0fd6113765ff6f6865e47bdbe8f4f2495e4f4
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Thu Jan 13 01:07:53 2022 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Thu Jan 13 01:25:32 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4db0fd61
sci-libs/opencascade: fix installed environment file for non-slotted
We're no longer using slotted OCC but I don't think we fully
completed the version. I was initially going to wait but
upon reflection, I think this is the only way forward
that makes sense (updating the env.in to reflect
the earlier changes).
The old/outdated env file results in build failures
in e.g. kicad.
(Also, change ESYSROOT -> EPREFIX for the env file
as the env file is for the end result system.)
Bug: https://bugs.gentoo.org/831069
Bug: https://bugs.gentoo.org/831054
Signed-off-by: Sam James <sam <AT> gentoo.org>
sci-libs/opencascade/files/opencascade.env.in | 32 +++++++++++-----------
...7.5.2-r3.ebuild => opencascade-7.5.2-r4.ebuild} | 5 ++--
...7.5.3-r4.ebuild => opencascade-7.5.3-r5.ebuild} | 5 ++--
...de-7.6.0.ebuild => opencascade-7.6.0-r1.ebuild} | 5 ++--
4 files changed, 22 insertions(+), 25 deletions(-)
diff --git a/sci-libs/opencascade/files/opencascade.env.in b/sci-libs/opencascade/files/opencascade.env.in
index d7148c241f11..28006d724806 100644
--- a/sci-libs/opencascade/files/opencascade.env.in
+++ b/sci-libs/opencascade/files/opencascade.env.in
@@ -10,8 +10,8 @@
# define the root directory of Open CASCADE Technology (needed)
CASROOT="VAR_CASROOT"
-PATH="VAR_CASROOT/lib/opencascade-VAR_PV/bin"
-LDPATH="VAR_CASROOT/lib/opencascade-VAR_PV"
+PATH="VAR_CASROOT/lib/opencascade/bin"
+LDPATH="VAR_CASROOT/lib/opencascade"
#############################################################################
# The MMGT_* variables are used to determine how memory management will work
@@ -79,21 +79,21 @@ LDPATH="VAR_CASROOT/lib/opencascade-VAR_PV"
# The following CSF_* variables define various directories and files where
# OCCT is looking for resources.
-CSF_GraphicShr="VAR_CASROOT/lib/opencascade-VAR_PV/libTKOpenGl.so"
-CSF_MIGRATION_TYPES="VAR_CASROOT/share/opencascade-VAR_PV/resources/StdResource/MigrationSheet.txt"
-CSF_MDTVTexturesDirectory="VAR_CASROOT/share/opencascade-VAR_PV/resources/Textures"
-CSF_PluginDefaults="VAR_CASROOT/share/opencascade-VAR_PV/resources/StdResource"
-CSF_StandardDefaults="VAR_CASROOT/share/opencascade-VAR_PV/resources/StdResource"
-CSF_StandardLiteDefaults="VAR_CASROOT/share/opencascade-VAR_PV/resources/StdResource"
-CSF_XCAFDefaults="VAR_CASROOT/share/opencascade-VAR_PV/resources/StdResource"
-CSF_XmlOcafResource="VAR_CASROOT/share/opencascade-VAR_PV/resources/XmlOcafResource"
+CSF_GraphicShr="VAR_CASROOT/lib/opencascade/libTKOpenGl.so"
+CSF_MIGRATION_TYPES="VAR_CASROOT/share/opencascade/resources/StdResource/MigrationSheet.txt"
+CSF_MDTVTexturesDirectory="VAR_CASROOT/share/opencascade/resources/Textures"
+CSF_PluginDefaults="VAR_CASROOT/share/opencascade/resources/StdResource"
+CSF_StandardDefaults="VAR_CASROOT/share/opencascade/resources/StdResource"
+CSF_StandardLiteDefaults="VAR_CASROOT/share/opencascade/resources/StdResource"
+CSF_XCAFDefaults="VAR_CASROOT/share/opencascade/resources/StdResource"
+CSF_XmlOcafResource="VAR_CASROOT/share/opencascade/resources/XmlOcafResource"
# The below values might be optional.
-CSF_IGESDefaults="VAR_CASROOT/share/opencascade-VAR_PV/resources/XSTEPResource"
-CSF_ShadersDirectory="VAR_CASROOT/share/opencascade-VAR_PV/resources/Shaders"
-CSF_SHMessage="VAR_CASROOT/share/opencascade-VAR_PV/resources/SHMessage"
-CSF_STEPDefaults="VAR_CASROOT/share/opencascade-VAR_PV/resources/XSTEPResource"
-CSF_UnitsDefinition="VAR_CASROOT/share/opencascade-VAR_PV/resources/UnitsAPI/Units.dat"
-CSF_XSMessage="VAR_CASROOT/share/opencascade-VAR_PV/resources/XSMessage"
+CSF_IGESDefaults="VAR_CASROOT/share/opencascade/resources/XSTEPResource"
+CSF_ShadersDirectory="VAR_CASROOT/share/opencascade/resources/Shaders"
+CSF_SHMessage="VAR_CASROOT/share/opencascade/resources/SHMessage"
+CSF_STEPDefaults="VAR_CASROOT/share/opencascade/resources/XSTEPResource"
+CSF_UnitsDefinition="VAR_CASROOT/share/opencascade/resources/UnitsAPI/Units.dat"
+CSF_XSMessage="VAR_CASROOT/share/opencascade/resources/XSMessage"
# TODO: check those
# they were defined in the original ebuild but the directories and files
diff --git a/sci-libs/opencascade/opencascade-7.5.2-r3.ebuild b/sci-libs/opencascade/opencascade-7.5.2-r4.ebuild
similarity index 97%
rename from sci-libs/opencascade/opencascade-7.5.2-r3.ebuild
rename to sci-libs/opencascade/opencascade-7.5.2-r4.ebuild
index 080f7888f0bd..7f662a01ff3a 100644
--- a/sci-libs/opencascade/opencascade-7.5.2-r3.ebuild
+++ b/sci-libs/opencascade/opencascade-7.5.2-r4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -135,8 +135,7 @@ src_configure() {
# prepare /etc/env.d file
sed -e "s|lib/|$(get_libdir)/|" \
- -e "s|VAR_PV|${PV}|" \
- -e "s|VAR_CASROOT|${ESYSROOT}/usr|" \
+ -e "s|VAR_CASROOT|${EPREFIX}/usr|" \
< "${FILESDIR}"/${PN}.env.in > "${T}"/99${PN} || die
# use TBB for memory allocation optimizations
diff --git a/sci-libs/opencascade/opencascade-7.5.3-r4.ebuild b/sci-libs/opencascade/opencascade-7.5.3-r5.ebuild
similarity index 97%
rename from sci-libs/opencascade/opencascade-7.5.3-r4.ebuild
rename to sci-libs/opencascade/opencascade-7.5.3-r5.ebuild
index 2fd61839b59b..6c9825a5afde 100644
--- a/sci-libs/opencascade/opencascade-7.5.3-r4.ebuild
+++ b/sci-libs/opencascade/opencascade-7.5.3-r5.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
@@ -135,8 +135,7 @@ src_configure() {
# prepare /etc/env.d file
sed -e "s|lib/|$(get_libdir)/|" \
- -e "s|VAR_PV|${PV}|" \
- -e "s|VAR_CASROOT|${ESYSROOT}/usr|" \
+ -e "s|VAR_CASROOT|${EPREFIX}/usr|" \
< "${FILESDIR}"/${PN}.env.in > "${T}"/99${PN} || die
# use TBB for memory allocation optimizations
diff --git a/sci-libs/opencascade/opencascade-7.6.0.ebuild b/sci-libs/opencascade/opencascade-7.6.0-r1.ebuild
similarity index 97%
rename from sci-libs/opencascade/opencascade-7.6.0.ebuild
rename to sci-libs/opencascade/opencascade-7.6.0-r1.ebuild
index e9eafc6f8515..4791baa0fb60 100644
--- a/sci-libs/opencascade/opencascade-7.6.0.ebuild
+++ b/sci-libs/opencascade/opencascade-7.6.0-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
@@ -141,8 +141,7 @@ src_configure() {
cmake_src_configure
sed -e "s|lib/|$(get_libdir)/|" \
- -e "s|VAR_PV|${PV}|" \
- -e "s|VAR_CASROOT|${ESYSROOT}/usr|" \
+ -e "s|VAR_CASROOT|${EPREFIX}/usr|" \
< "${FILESDIR}"/${PN}.env.in > "${T}"/99${PN} || die
# use TBB for memory allocation optimizations
^ permalink raw reply related [flat|nested] 17+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sci-libs/opencascade/, sci-libs/opencascade/files/
@ 2022-06-14 16:01 Joonas Niilola
0 siblings, 0 replies; 17+ messages in thread
From: Joonas Niilola @ 2022-06-14 16:01 UTC (permalink / raw
To: gentoo-commits
commit: b62d48ddf7302a3db272a0ffc494fb0f8defe8f5
Author: Bernd Waibel <waebbl-gentoo <AT> posteo <DOT> net>
AuthorDate: Sun Jun 5 09:05:43 2022 +0000
Commit: Joonas Niilola <juippis <AT> gentoo <DOT> org>
CommitDate: Tue Jun 14 16:01:44 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b62d48dd
sci-libs/opencascade: avoid pre-stripping binaries
Remove cmake settings for gcc and clang to not strip the binaries
during linking stage.
Closes: https://bugs.gentoo.org/831800
Bug: https://dev.opencascade.org/content/dont-pre-strip-binaries
Signed-off-by: Bernd Waibel <waebbl-gentoo <AT> posteo.net>
Closes: https://github.com/gentoo/gentoo/pull/25764
Signed-off-by: Joonas Niilola <juippis <AT> gentoo.org>
...ascade-7.6.2-avoid-pre-stripping-binaries.patch | 33 ++++++++++++++++++++++
sci-libs/opencascade/opencascade-7.5.2-r6.ebuild | 1 +
sci-libs/opencascade/opencascade-7.5.3-r7.ebuild | 1 +
sci-libs/opencascade/opencascade-7.6.0-r4.ebuild | 1 +
sci-libs/opencascade/opencascade-7.6.1-r1.ebuild | 1 +
sci-libs/opencascade/opencascade-7.6.2.ebuild | 1 +
6 files changed, 38 insertions(+)
diff --git a/sci-libs/opencascade/files/opencascade-7.6.2-avoid-pre-stripping-binaries.patch b/sci-libs/opencascade/files/opencascade-7.6.2-avoid-pre-stripping-binaries.patch
new file mode 100644
index 000000000000..144047fba163
--- /dev/null
+++ b/sci-libs/opencascade/files/opencascade-7.6.2-avoid-pre-stripping-binaries.patch
@@ -0,0 +1,33 @@
+https://bugs.gentoo.org/831800
+https://dev.opencascade.org/content/dont-pre-strip-binaries
+
+From 88e59e0199daaf66184833e366e9deb1299078a9 Mon Sep 17 00:00:00 2001
+From: Bernd Waibel <waebbl-gentoo@posteo.net>
+Date: Sun, 5 Jun 2022 09:48:09 +0200
+Subject: [PATCH] avoid pre-stripping binaries
+
+Signed-off-by: Bernd Waibel <waebbl-gentoo@posteo.net>
+--- a/adm/cmake/occt_defs_flags.cmake
++++ b/adm/cmake/occt_defs_flags.cmake
+@@ -133,8 +133,6 @@ if ("x${CMAKE_CXX_COMPILER_ID}" STREQUAL "xClang")
+ # does not support option "-std=c++0x"
+ set (CMAKE_CXX_FLAGS "-std=c++0x ${CMAKE_CXX_FLAGS}")
+ endif()
+- # Optimize size of binaries
+- set (CMAKE_SHARED_LINKER_FLAGS "-Wl,-s ${CMAKE_SHARED_LINKER_FLAGS}")
+ elseif(MINGW)
+ add_definitions(-D_WIN32_WINNT=0x0601)
+ # _WIN32_WINNT=0x0601 (use Windows 7 SDK)
+@@ -150,9 +148,6 @@ elseif(MINGW)
+ elseif (DEFINED CMAKE_COMPILER_IS_GNUCXX)
+ # Require C++11
+ set (CMAKE_CXX_FLAGS "-std=c++0x ${CMAKE_CXX_FLAGS}")
+- # Optimize size of binaries
+- set (CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} -s")
+- set (CMAKE_C_FLAGS_RELEASE "${CMAKE_C_FLAGS_RELEASE} -s")
+ endif()
+
+ if (BUILD_RELEASE_DISABLE_EXCEPTIONS)
+--
+2.35.1
+
diff --git a/sci-libs/opencascade/opencascade-7.5.2-r6.ebuild b/sci-libs/opencascade/opencascade-7.5.2-r6.ebuild
index 4ba6a2ccee23..d4500132ab1f 100644
--- a/sci-libs/opencascade/opencascade-7.5.2-r6.ebuild
+++ b/sci-libs/opencascade/opencascade-7.5.2-r6.ebuild
@@ -67,6 +67,7 @@ PATCHES=(
"${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
)
src_prepare() {
diff --git a/sci-libs/opencascade/opencascade-7.5.3-r7.ebuild b/sci-libs/opencascade/opencascade-7.5.3-r7.ebuild
index 7dc58dcd6393..8287de53da6b 100644
--- a/sci-libs/opencascade/opencascade-7.5.3-r7.ebuild
+++ b/sci-libs/opencascade/opencascade-7.5.3-r7.ebuild
@@ -67,6 +67,7 @@ PATCHES=(
"${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
)
src_prepare() {
diff --git a/sci-libs/opencascade/opencascade-7.6.0-r4.ebuild b/sci-libs/opencascade/opencascade-7.6.0-r4.ebuild
index cd8196d34d06..41e15cf2bd76 100644
--- a/sci-libs/opencascade/opencascade-7.6.0-r4.ebuild
+++ b/sci-libs/opencascade/opencascade-7.6.0-r4.ebuild
@@ -64,6 +64,7 @@ PATCHES=(
"${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.6.2-avoid-pre-stripping-binaries.patch
)
src_prepare() {
diff --git a/sci-libs/opencascade/opencascade-7.6.1-r1.ebuild b/sci-libs/opencascade/opencascade-7.6.1-r1.ebuild
index cd8196d34d06..41e15cf2bd76 100644
--- a/sci-libs/opencascade/opencascade-7.6.1-r1.ebuild
+++ b/sci-libs/opencascade/opencascade-7.6.1-r1.ebuild
@@ -64,6 +64,7 @@ PATCHES=(
"${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.6.2-avoid-pre-stripping-binaries.patch
)
src_prepare() {
diff --git a/sci-libs/opencascade/opencascade-7.6.2.ebuild b/sci-libs/opencascade/opencascade-7.6.2.ebuild
index cd8196d34d06..1a0ee2adda8e 100644
--- a/sci-libs/opencascade/opencascade-7.6.2.ebuild
+++ b/sci-libs/opencascade/opencascade-7.6.2.ebuild
@@ -64,6 +64,7 @@ PATCHES=(
"${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}"/${P}-avoid-pre-stripping-binaries.patch
)
src_prepare() {
^ permalink raw reply related [flat|nested] 17+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sci-libs/opencascade/, sci-libs/opencascade/files/
@ 2022-06-25 23:33 Sam James
0 siblings, 0 replies; 17+ messages in thread
From: Sam James @ 2022-06-25 23:33 UTC (permalink / raw
To: gentoo-commits
commit: d7f8763ca52ef8a17cf9271997fc8e4a4c83e75d
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Sat Jun 25 23:06:26 2022 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sat Jun 25 23:33:23 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d7f8763c
sci-libs/opencascade: allow newer TBB
Bug: https://bugs.gentoo.org/851783
Signed-off-by: Sam James <sam <AT> gentoo.org>
.../files/opencascade-7.5.3-tbb-2021.patch | 51 ++++++++++++++++++++++
...7.5.3-r7.ebuild => opencascade-7.5.3-r8.ebuild} | 3 +-
...7.6.1-r1.ebuild => opencascade-7.6.1-r2.ebuild} | 3 +-
...de-7.6.2.ebuild => opencascade-7.6.2-r1.ebuild} | 3 +-
4 files changed, 57 insertions(+), 3 deletions(-)
diff --git a/sci-libs/opencascade/files/opencascade-7.5.3-tbb-2021.patch b/sci-libs/opencascade/files/opencascade-7.5.3-tbb-2021.patch
new file mode 100644
index 000000000000..38770ac9a541
--- /dev/null
+++ b/sci-libs/opencascade/files/opencascade-7.5.3-tbb-2021.patch
@@ -0,0 +1,51 @@
+https://github.com/Open-Cascade-SAS/OCCT/commit/740833a6a88e481f474783c426b6f6311ed586d3
+
+From 740833a6a88e481f474783c426b6f6311ed586d3 Mon Sep 17 00:00:00 2001
+From: kgv <kgv@opencascade.com>
+Date: Mon, 29 Nov 2021 21:26:45 +0300
+Subject: [PATCH] 0032697: Configuration - fix compilation errors with oneTBB
+ 2021
+
+Removed usage of no more existing tbb::task_scheduler_init and tbb::captured_exception.
+--- a/src/OSD/OSD_Parallel_TBB.cxx
++++ b/src/OSD/OSD_Parallel_TBB.cxx
+@@ -25,7 +25,9 @@ Standard_DISABLE_DEPRECATION_WARNINGS
+ #include <tbb/parallel_for.h>
+ #include <tbb/parallel_for_each.h>
+ #include <tbb/blocked_range.h>
+-#include <tbb/task_scheduler_init.h>
++#if TBB_VERSION_MAJOR < 2021
++ #include <tbb/task_scheduler_init.h>
++#endif
+ Standard_ENABLE_DEPRECATION_WARNINGS
+
+ //=======================================================================
+@@ -38,12 +40,16 @@ void OSD_Parallel::forEachExternal (UniversalIterator& theBegin,
+ const FunctorInterface& theFunctor,
+ Standard_Integer theNbItems)
+ {
++#if TBB_VERSION_MAJOR >= 2021
++ // task_scheduler_init is removed,
++ // exceptions are captured without proxy tbb::captured_exception object
++ (void )theNbItems;
++ tbb::parallel_for_each (theBegin, theEnd, theFunctor);
++#else
+ try
+ {
+ const Handle(OSD_ThreadPool)& aThreadPool = OSD_ThreadPool::DefaultPool();
+- const Standard_Integer aNbThreads = theNbItems > 0 ?
+- aThreadPool->NbDefaultThreadsToLaunch() : -1;
+-
++ const Standard_Integer aNbThreads = theNbItems > 0 ? aThreadPool->NbDefaultThreadsToLaunch() : -1;
+ tbb::task_scheduler_init aScheduler (aNbThreads);
+ tbb::parallel_for_each (theBegin, theEnd, theFunctor);
+ }
+@@ -51,6 +57,7 @@ void OSD_Parallel::forEachExternal (UniversalIterator& theBegin,
+ {
+ throw Standard_ProgramError (anException.what());
+ }
++#endif
+ }
+
+ #endif /* HAVE_TBB */
+
diff --git a/sci-libs/opencascade/opencascade-7.5.3-r7.ebuild b/sci-libs/opencascade/opencascade-7.5.3-r8.ebuild
similarity index 98%
rename from sci-libs/opencascade/opencascade-7.5.3-r7.ebuild
rename to sci-libs/opencascade/opencascade-7.5.3-r8.ebuild
index 8287de53da6b..87b782fa5e6a 100644
--- a/sci-libs/opencascade/opencascade-7.5.3-r7.ebuild
+++ b/sci-libs/opencascade/opencascade-7.5.3-r8.ebuild
@@ -47,7 +47,7 @@ RDEPEND="
)
ffmpeg? ( media-video/ffmpeg:= )
freeimage? ( media-libs/freeimage )
- tbb? ( <dev-cpp/tbb-2021.4.0 )
+ tbb? ( dev-cpp/tbb:= )
vtk? ( sci-libs/vtk:=[rendering] )
"
DEPEND="${RDEPEND}"
@@ -68,6 +68,7 @@ PATCHES=(
"${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() {
diff --git a/sci-libs/opencascade/opencascade-7.6.1-r1.ebuild b/sci-libs/opencascade/opencascade-7.6.1-r2.ebuild
similarity index 98%
rename from sci-libs/opencascade/opencascade-7.6.1-r1.ebuild
rename to sci-libs/opencascade/opencascade-7.6.1-r2.ebuild
index 41e15cf2bd76..e11b24187775 100644
--- a/sci-libs/opencascade/opencascade-7.6.1-r1.ebuild
+++ b/sci-libs/opencascade/opencascade-7.6.1-r2.ebuild
@@ -47,7 +47,7 @@ RDEPEND="
)
ffmpeg? ( <media-video/ffmpeg-5:= )
freeimage? ( media-libs/freeimage )
- tbb? ( <dev-cpp/tbb-2021.4 )
+ tbb? ( dev-cpp/tbb:= )
vtk? ( sci-libs/vtk:=[rendering] )
"
DEPEND="
@@ -65,6 +65,7 @@ PATCHES=(
"${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.6.2-avoid-pre-stripping-binaries.patch
+ "${FILESDIR}"/${PN}-7.5.3-tbb-2021.patch
)
src_prepare() {
diff --git a/sci-libs/opencascade/opencascade-7.6.2.ebuild b/sci-libs/opencascade/opencascade-7.6.2-r1.ebuild
similarity index 98%
rename from sci-libs/opencascade/opencascade-7.6.2.ebuild
rename to sci-libs/opencascade/opencascade-7.6.2-r1.ebuild
index 7914fe259a7e..7773a90fb9f2 100644
--- a/sci-libs/opencascade/opencascade-7.6.2.ebuild
+++ b/sci-libs/opencascade/opencascade-7.6.2-r1.ebuild
@@ -47,7 +47,7 @@ RDEPEND="
)
ffmpeg? ( <media-video/ffmpeg-5:= )
freeimage? ( media-libs/freeimage )
- tbb? ( <dev-cpp/tbb-2021.4 )
+ tbb? ( dev-cpp/tbb:= )
vtk? ( sci-libs/vtk:=[rendering] )
"
DEPEND="
@@ -66,6 +66,7 @@ PATCHES=(
"${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}"/${P}-avoid-pre-stripping-binaries.patch
+ "${FILESDIR}"/${PN}-7.5.3-tbb-2021.patch
)
src_prepare() {
^ permalink raw reply related [flat|nested] 17+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sci-libs/opencascade/, sci-libs/opencascade/files/
@ 2022-12-31 15:36 Sam James
0 siblings, 0 replies; 17+ messages in thread
From: Sam James @ 2022-12-31 15:36 UTC (permalink / raw
To: gentoo-commits
commit: bdaa85f652b25c81c889d9a1bcff53a819b0afc2
Author: Bernd Waibel <waebbl-gentoo <AT> posteo <DOT> net>
AuthorDate: Sun Dec 18 15:37:34 2022 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sat Dec 31 15:36:06 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bdaa85f6
sci-libs/opencascade: build 7.7.0 against vtk-9.2
cleanup some X related libraries
Closes: https://bugs.gentoo.org/886343
Signed-off-by: Bernd Waibel <waebbl-gentoo <AT> posteo.net>
Signed-off-by: Sam James <sam <AT> gentoo.org>
.../opencascade-7.7.0-build-against-vtk-9.2.patch | 36 ++++++++++++++++++++++
...de-7.7.0.ebuild => opencascade-7.7.0-r1.ebuild} | 25 ++++++---------
2 files changed, 45 insertions(+), 16 deletions(-)
diff --git a/sci-libs/opencascade/files/opencascade-7.7.0-build-against-vtk-9.2.patch b/sci-libs/opencascade/files/opencascade-7.7.0-build-against-vtk-9.2.patch
new file mode 100644
index 000000000000..7e744189a8d2
--- /dev/null
+++ b/sci-libs/opencascade/files/opencascade-7.7.0-build-against-vtk-9.2.patch
@@ -0,0 +1,36 @@
+From: http://git.dev.opencascade.org/gitweb/?p=occt.git;a=commitdiff_plain;h=7f523af8e8a63ee17d8fc26f107c191cd51dcd44;hp=0b4962a7f04caef12d090d087b7196cefde0703c
+
+From: Aiden Grossman <agrossman154@yahoo.com>
+Date: Mon, 10 Oct 2022 18:25:13 +0000 (-0700)
+Subject: Fix naming conflict between X11 headers and VTK 9.2.2+
+X-Git-Url: http://git.dev.opencascade.org/gitweb/?p=occt.git;a=commitdiff_plain;h=7f523af8e8a63ee17d8fc26f107c191cd51dcd44;hp=0b4962a7f04caef12d090d087b7196cefde0703c
+
+Fix naming conflict between X11 headers and VTK 9.2.2+
+
+Currently, the GLX headers include the X11 headers which use a
+preprocessor define to make Status an int. However, VTK has a class
+called Status, and this define replaces this class name with int which
+results in compilation errors. This patch undefs Status and Success,
+which are both defined in the X11 headers if they exist so that there
+are no conflicts within the VTK headers for newer versions.
+---
+
+--- a/src/IVtkDraw/IVtkDraw_Interactor.cxx
++++ b/src/IVtkDraw/IVtkDraw_Interactor.cxx
+@@ -27,6 +27,16 @@
+ #undef AllValues
+ #endif
+
++// Prevent naming collisions between X11
++// and VTK versions 9.2.0 and above.
++// X11 is included through glx
++#ifdef Status
++#undef Status
++#endif
++#ifdef Success
++#undef Success
++#endif
++
+ #include <vtkXRenderWindowInteractor.h>
+ #include <vtkXOpenGLRenderWindow.h>
+ #endif
diff --git a/sci-libs/opencascade/opencascade-7.7.0.ebuild b/sci-libs/opencascade/opencascade-7.7.0-r1.ebuild
similarity index 88%
rename from sci-libs/opencascade/opencascade-7.7.0.ebuild
rename to sci-libs/opencascade/opencascade-7.7.0-r1.ebuild
index c2f7e7dbf7a4..efd245f9b465 100644
--- a/sci-libs/opencascade/opencascade-7.7.0.ebuild
+++ b/sci-libs/opencascade/opencascade-7.7.0-r1.ebuild
@@ -34,7 +34,7 @@ RDEPEND="
media-libs/fontconfig
media-libs/freetype:2
virtual/opengl
- x11-libs/libXmu
+ x11-libs/libX11
examples? (
dev-qt/qtcore:5
dev-qt/qtgui:5
@@ -63,6 +63,7 @@ PATCHES=(
"${FILESDIR}"/${PN}-7.7.0-add-missing-include-limits.patch
"${FILESDIR}"/${PN}-7.7.0-fix-installation-of-cmake-config-files.patch
"${FILESDIR}"/${PN}-7.7.0-avoid-pre-stripping-binaries.patch
+ "${FILESDIR}"/${PN}-7.7.0-build-against-vtk-9.2.patch
)
src_prepare() {
@@ -132,24 +133,16 @@ src_configure() {
fi
if use vtk; then
+ mycmakeargs+=(
+ -D3RDPARTY_VTK_DIR="${ESYSROOT}"/usr
+ -D3RDPARTY_VTK_LIBRARY_DIR="${ESYSROOT}"/usr/$(get_libdir)
+ )
if has_version ">=sci-libs/vtk-9.2.0"; then
- mycmakeargs+=(
- -D3RDPARTY_VTK_DIR="${ESYSROOT}"/usr
- -D3RDPARTY_VTK_INCLUDE_DIR="${ESYSROOT}"/usr/include/vtk-9.2
- -D3RDPARTY_VTK_LIBRARY_DIR="${ESYSROOT}"/usr/$(get_libdir)
- )
+ mycmakeargs+=( -D3RDPARTY_VTK_INCLUDE_DIR="${ESYSROOT}"/usr/include/vtk-9.2 )
elif 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)
- )
+ mycmakeargs+=( -D3RDPARTY_VTK_INCLUDE_DIR="${ESYSROOT}"/usr/include/vtk-9.1 )
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)
- )
+ mycmakeargs+=( -D3RDPARTY_VTK_INCLUDE_DIR="${ESYSROOT}"/usr/include/vtk-9.0 )
fi
fi
^ permalink raw reply related [flat|nested] 17+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sci-libs/opencascade/, sci-libs/opencascade/files/
@ 2023-01-28 22:48 Andreas Sturmlechner
0 siblings, 0 replies; 17+ messages in thread
From: Andreas Sturmlechner @ 2023-01-28 22:48 UTC (permalink / raw
To: gentoo-commits
commit: ff9032e688571dde15e9d36cebedf5a247ded1b8
Author: Bernd Waibel <waebbl-gentoo <AT> posteo <DOT> net>
AuthorDate: Fri Jan 27 11:32:35 2023 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sat Jan 28 22:32:27 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ff9032e6
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 <AT> posteo.net>
Closes: https://github.com/gentoo/gentoo/pull/29296
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
sci-libs/opencascade/Manifest | 1 -
....1-0001-allow-default-search-path-for-Qt5.patch | 26 ---
...e-7.5.1-0002-remove-unnecessary-Qt5-check.patch | 28 ----
...-7.5.1-0003-add-Gentoo-configuration-type.patch | 26 ---
...fix-AllValues-name-collision-with-vtk-9.0.patch | 172 --------------------
sci-libs/opencascade/opencascade-7.5.3-r8.ebuild | 176 ---------------------
6 files changed, 429 deletions(-)
diff --git a/sci-libs/opencascade/Manifest b/sci-libs/opencascade/Manifest
index b0510b20df5f..af71bb8b4462 100644
--- a/sci-libs/opencascade/Manifest
+++ b/sci-libs/opencascade/Manifest
@@ -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
diff --git a/sci-libs/opencascade/files/opencascade-7.5.1-0001-allow-default-search-path-for-Qt5.patch b/sci-libs/opencascade/files/opencascade-7.5.1-0001-allow-default-search-path-for-Qt5.patch
deleted file mode 100644
index 68be3e1c8803..000000000000
--- a/sci-libs/opencascade/files/opencascade-7.5.1-0001-allow-default-search-path-for-Qt5.patch
+++ /dev/null
@@ -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
-
diff --git a/sci-libs/opencascade/files/opencascade-7.5.1-0002-remove-unnecessary-Qt5-check.patch b/sci-libs/opencascade/files/opencascade-7.5.1-0002-remove-unnecessary-Qt5-check.patch
deleted file mode 100644
index 91d5c66c7614..000000000000
--- a/sci-libs/opencascade/files/opencascade-7.5.1-0002-remove-unnecessary-Qt5-check.patch
+++ /dev/null
@@ -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
-
diff --git a/sci-libs/opencascade/files/opencascade-7.5.1-0003-add-Gentoo-configuration-type.patch b/sci-libs/opencascade/files/opencascade-7.5.1-0003-add-Gentoo-configuration-type.patch
deleted file mode 100644
index 0665790d20a1..000000000000
--- a/sci-libs/opencascade/files/opencascade-7.5.1-0003-add-Gentoo-configuration-type.patch
+++ /dev/null
@@ -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
-
diff --git a/sci-libs/opencascade/files/opencascade-7.5.1-fix-AllValues-name-collision-with-vtk-9.0.patch b/sci-libs/opencascade/files/opencascade-7.5.1-fix-AllValues-name-collision-with-vtk-9.0.patch
deleted file mode 100644
index e2725ebb2c64..000000000000
--- a/sci-libs/opencascade/files/opencascade-7.5.1-fix-AllValues-name-collision-with-vtk-9.0.patch
+++ /dev/null
@@ -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
-
diff --git a/sci-libs/opencascade/opencascade-7.5.3-r8.ebuild b/sci-libs/opencascade/opencascade-7.5.3-r8.ebuild
deleted file mode 100644
index bdd9b918a69a..000000000000
--- a/sci-libs/opencascade/opencascade-7.5.3-r8.ebuild
+++ /dev/null
@@ -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
-}
^ permalink raw reply related [flat|nested] 17+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sci-libs/opencascade/, sci-libs/opencascade/files/
@ 2023-07-31 8:43 Joonas Niilola
0 siblings, 0 replies; 17+ messages in thread
From: Joonas Niilola @ 2023-07-31 8:43 UTC (permalink / raw
To: gentoo-commits
commit: 5e2d9cb1e3a5ae5e530bef03d12b6b44d7a8c252
Author: Violet Purcell <vimproved <AT> inventati <DOT> org>
AuthorDate: Tue Jul 11 20:24:57 2023 +0000
Commit: Joonas Niilola <juippis <AT> gentoo <DOT> org>
CommitDate: Mon Jul 31 08:43:08 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5e2d9cb1
sci-libs/opencascade: Fix build on musl
Signed-off-by: Violet Purcell <vimproved <AT> inventati.org>
Closes: https://github.com/gentoo/gentoo/pull/31496
Signed-off-by: Joonas Niilola <juippis <AT> gentoo.org>
.../opencascade/files/opencascade-7.7.0-musl.patch | 97 ++++++++++++++++++++++
...7.6.3-r1.ebuild => opencascade-7.6.3-r2.ebuild} | 3 +-
...7.7.0-r1.ebuild => opencascade-7.7.0-r2.ebuild} | 1 +
3 files changed, 100 insertions(+), 1 deletion(-)
diff --git a/sci-libs/opencascade/files/opencascade-7.7.0-musl.patch b/sci-libs/opencascade/files/opencascade-7.7.0-musl.patch
new file mode 100644
index 000000000000..45aeb449ac73
--- /dev/null
+++ b/sci-libs/opencascade/files/opencascade-7.7.0-musl.patch
@@ -0,0 +1,97 @@
+From 4351ac37b19bf43ff9a8f21e5126deb7f43f751e Mon Sep 17 00:00:00 2001
+From: Violet Purcell <vimproved@inventati.org>
+Date: Tue, 11 Jul 2023 16:13:32 -0400
+Subject: [PATCH] Fix building with musl
+
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -554,6 +554,10 @@ OCCT_IS_PRODUCT_REQUIRED (CSF_EIGEN CAN_USE_EIGEN)
+ # define CSF variable
+ OCCT_INCLUDE_CMAKE_FILE ("adm/cmake/occt_csf")
+
++# Check for execinfo.h
++include(CheckIncludeFile)
++CHECK_INCLUDE_FILE("execinfo.h" HAS_EXECINFO_H)
++
+ # Tcl (mandatory for Draw Harness)
+ if (USE_TCL)
+ message (STATUS "Info: TCL is used by OCCT")
+--- a/src/OSD/OSD_MemInfo.cxx
++++ b/src/OSD/OSD_MemInfo.cxx
+@@ -184,12 +184,16 @@ void OSD_MemInfo::Update()
+ #endif
+ #endif
+
++ #if defined(__GLIBC__)
+ #ifdef HAS_MALLINFO2
+ const struct mallinfo2 aMI = mallinfo2();
+ #else
+ const struct mallinfo aMI = mallinfo();
+ #endif
+ myCounters[MemHeapUsage] = aMI.uordblks;
++ #else
++ myCounters[MemHeapUsage] = 0;
++ #endif
+ }
+
+ if (!IsActive (MemVirtual)
+--- a/src/OSD/OSD_signal.cxx
++++ b/src/OSD/OSD_signal.cxx
+@@ -758,7 +758,7 @@ typedef void (* SIG_PFV) (int);
+
+ #include <signal.h>
+
+-#if !defined(__ANDROID__) && !defined(__QNX__) && !defined(__EMSCRIPTEN__)
++#if !defined(__ANDROID__) && !defined(__QNX__) && !defined(__EMSCRIPTEN__) && defined(__GLIBC__)
+ #include <sys/signal.h>
+ #endif
+
+@@ -974,7 +974,7 @@ static void SegvHandler(const int theSignal,
+ //=======================================================================
+ void OSD::SetFloatingSignal (Standard_Boolean theFloatingSignal)
+ {
+-#if defined (__linux__)
++#if defined (__linux__) && defined(__GLIBC__)
+ feclearexcept (FE_ALL_EXCEPT);
+ if (theFloatingSignal)
+ {
+@@ -1007,7 +1007,7 @@ void OSD::SetFloatingSignal (Standard_Boolean theFloatingSignal)
+ //=======================================================================
+ Standard_Boolean OSD::ToCatchFloatingSignals()
+ {
+-#if defined (__linux__)
++#if defined (__linux__) && defined(__GLIBC__)
+ return (fegetexcept() & _OSD_FPX) != 0;
+ #else
+ return Standard_False;
+--- a/src/Standard/Standard_StackTrace.cxx
++++ b/src/Standard/Standard_StackTrace.cxx
+@@ -29,7 +29,7 @@
+ //#include <unwind.h>
+ #elif defined(__QNX__)
+ //#include <backtrace.h> // requires linking to libbacktrace
+-#elif !defined(_WIN32) && !(defined(TARGET_OS_IPHONE) && TARGET_OS_IPHONE)
++#elif defined (HAS_EXECINFO_H)
+ #include <execinfo.h>
+ #elif defined(_WIN32) && !defined(OCCT_UWP)
+
+@@ -313,7 +313,7 @@ Standard_Boolean Standard::StackTrace (char* theBuffer,
+ Message::SendTrace ("Standard::StackTrace() is not implemented for this CPU architecture");
+ return false;
+ #endif
+-#else
++#elif defined (HAS_EXECINFO_H)
+ const int aTopSkip = theNbTopSkip + 1; // skip this function call and specified extra number
+ int aNbTraces = theNbTraces + aTopSkip;
+ void** aStackArr = (void** )alloca (sizeof(void*) * aNbTraces);
+@@ -360,5 +360,7 @@ Standard_Boolean Standard::StackTrace (char* theBuffer,
+ strcat (theBuffer, "\n=============");
+ }
+ return true;
++#else
++ return false;
+ #endif
+ }
+--
+2.41.0
+
diff --git a/sci-libs/opencascade/opencascade-7.6.3-r1.ebuild b/sci-libs/opencascade/opencascade-7.6.3-r2.ebuild
similarity index 98%
rename from sci-libs/opencascade/opencascade-7.6.3-r1.ebuild
rename to sci-libs/opencascade/opencascade-7.6.3-r2.ebuild
index 82352ba3e3a2..0ea3c5736c42 100644
--- a/sci-libs/opencascade/opencascade-7.6.3-r1.ebuild
+++ b/sci-libs/opencascade/opencascade-7.6.3-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
@@ -69,6 +69,7 @@ PATCHES=(
"${FILESDIR}"/${PN}-7.6.2-avoid-pre-stripping-binaries.patch
"${FILESDIR}"/${PN}-7.5.3-tbb-2021.patch
"${FILESDIR}"/${PN}-7.7.0-build-against-vtk-9.2.patch
+ "${FILESDIR}"/${PN}-7.7.0-musl.patch
)
src_prepare() {
diff --git a/sci-libs/opencascade/opencascade-7.7.0-r1.ebuild b/sci-libs/opencascade/opencascade-7.7.0-r2.ebuild
similarity index 99%
rename from sci-libs/opencascade/opencascade-7.7.0-r1.ebuild
rename to sci-libs/opencascade/opencascade-7.7.0-r2.ebuild
index c22348558869..076a308ee9ba 100644
--- a/sci-libs/opencascade/opencascade-7.7.0-r1.ebuild
+++ b/sci-libs/opencascade/opencascade-7.7.0-r2.ebuild
@@ -64,6 +64,7 @@ PATCHES=(
"${FILESDIR}"/${PN}-7.7.0-fix-installation-of-cmake-config-files.patch
"${FILESDIR}"/${PN}-7.7.0-avoid-pre-stripping-binaries.patch
"${FILESDIR}"/${PN}-7.7.0-build-against-vtk-9.2.patch
+ "${FILESDIR}"/${PN}-7.7.0-musl.patch
)
src_prepare() {
^ permalink raw reply related [flat|nested] 17+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sci-libs/opencascade/, sci-libs/opencascade/files/
@ 2024-04-14 14:28 Andrew Ammerlaan
0 siblings, 0 replies; 17+ messages in thread
From: Andrew Ammerlaan @ 2024-04-14 14:28 UTC (permalink / raw
To: gentoo-commits
commit: 74af42387178d837aa7831d4724522ab6d9743f0
Author: Paul Zander <negril.nx+gentoo <AT> gmail <DOT> com>
AuthorDate: Thu Apr 11 14:22:40 2024 +0000
Commit: Andrew Ammerlaan <andrewammerlaan <AT> gentoo <DOT> org>
CommitDate: Sun Apr 14 14:15:07 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=74af4238
sci-libs/opencascade: move 7.8.0 -> 7.8.1
7.8.1 addresses a critical issue regarding backward binary
compatibility with version 7.8.0.
Closes: https://bugs.gentoo.org/927788
Closes: https://bugs.gentoo.org/927890
Signed-off-by: Paul Zander <negril.nx+gentoo <AT> gmail.com>
Signed-off-by: Andrew Ammerlaan <andrewammerlaan <AT> gentoo.org>
sci-libs/opencascade/Manifest | 3 +-
.../opencascade-7.8.0-jemalloc-noexcept.patch | 13 ++++++
.../files/opencascade-7.8.1-vtk_components.patch | 24 +++++++++++
sci-libs/opencascade/metadata.xml | 1 +
sci-libs/opencascade/opencascade-7.7.2-r1.ebuild | 18 ++++++---
...scade-7.8.0.ebuild => opencascade-7.8.1.ebuild} | 20 +++++++---
sci-libs/opencascade/opencascade-9999.ebuild | 46 ++++++++++++----------
7 files changed, 91 insertions(+), 34 deletions(-)
diff --git a/sci-libs/opencascade/Manifest b/sci-libs/opencascade/Manifest
index ac0e7aa5db19..fa54d19c63f2 100644
--- a/sci-libs/opencascade/Manifest
+++ b/sci-libs/opencascade/Manifest
@@ -1,7 +1,6 @@
DIST opencascade-7.6.3.tar.gz 48216090 BLAKE2B ff0b63250e77b0240bd99bba38cd0e6b0a8c88bf39e495f5d51d7913f097e2cad83a5ad121e9d56de11c74008249c99a41f4615269a085b7cf97c3d7f0477d6d SHA512 c708f76edb707ba18bdfe7442ed8fa500894ee6c1cd8d0313eb906b3aa7dfa40a575f04dbccd70e84395d670f2b93fb8529f3d59726449234e627b9f35b9dded
DIST opencascade-7.7.0.tar.gz 48393806 BLAKE2B b41da7bdd07aa6ef52f7833bef3e8a9fc2ca16cbf754773cb7adcc059c11c2a7937d279a2b6cf3096e7af6fbb42c6fdc2a5c98340d6b084d2ba100ba2c538f2a SHA512 6c90e2761f752241417ae6f18d819f51e66b32f3a50a97384f29ed73fa07f4cded84c71a6f6ba302d5e35c57e2fc13001619521eaf45757e4e5ff670d94bbf5c
-DIST opencascade-7.7.1.tar.gz 48408076 BLAKE2B 46e14a47a0ce555ac17a3fca520c1f21d7ca05c67b54259e3d2d8560618db096313d5be3d5e4a24acad1912534c17293ad203f48dd7464690aec86e287d9f230 SHA512 f095848d212afbe7e71614d46f57222e347246aec7c92aafae59e6f07798f5371c7a125042c149393ee7d361f28eb89b5196de17a7cc37233f1586ba919c0839
DIST opencascade-7.7.2.tar.gz 48404428 BLAKE2B 28d637e75eca570e38401a0a59127ffdbcb06838a91cc3899fe905834bb47e0e9a92d16cde52027d94e78b0fbddc2043340a35dcb0f4a472c4f2bdac2713216c SHA512 d9e882d44bb65616f8cfce68ebdcd5765669b84e3d82cfb2d1bc22b71b0e878442c079bacc37e9d54f28ce98a7c23bf81f2a3e3e7bbeeec38927ca739f423dee
-DIST opencascade-7.8.0.tar.gz 48428565 BLAKE2B 91253101072af27c94b82b82beed5c1f1d7460f4154600fba805c5b2d27976a4841b9a9dfab9e67706d02463b2c630c5b63d1f056e84c69c9c8eeaca7e7caebf SHA512 af176cbd105c49949282c16bb6e30f69167bc6c00a50e0ae69aea555815d47ac3c4540c233e596c5add7cb846c2b33d7be267d8e02472286e758b662b4a652ab
+DIST opencascade-7.8.1.tar.gz 48432051 BLAKE2B de7a40b8e6612642a1567d2cf3e6b471c9edeadbc7f686bc8648502165c8d824b3574259874ecb1775c856703fd8df7481c9bc07a66a3a321a83e699e6802052 SHA512 807c1f8732926cfdabcfbdf8d6a0e76b8dba1a1e614afe084a467ffb4cfd80623f5e3afa7e9905b1ac96667c93e01b5f98ceaa8948a576a1093d98df98cc8f81
DIST opencascade-dataset-7.7.0.tar.gz 128392200 BLAKE2B ebfbe6f24520144ca4a82e4ddd0486890552c2de1b62bf5c0d4990d777d4a1458dea54f8a6f08d8a0999582fb4325eda0002fc8a0137b9e66d024a47145d1279 SHA512 71d7e807b1d629fe7371b9d1d503024d00b7c1ae1775e62803eeffd127bd1c768e5240fdd1f949a237737089d528b5d4e43d26db025bbe14a4e0e4616ebdc5d8
DIST opencascade-dataset-7.8.0.tar.xz 97049756 BLAKE2B aae5f076d9fc8a0d8a05028b0d9ffb527978e7acfdf5ecbc7e71c5ee3d6060cd7db9e56dba5b94a445bf5cf208126711cda70306607bdc5cd5e8b68df8fc150c SHA512 9b4c91d7b4743c47f2cf8d9a3b6ded73409a13133013424150ee9bdb61fd771c0b8799c7f31b459a7d2ba140399b9c0c972e2d0476188006361b4fb04042d990
diff --git a/sci-libs/opencascade/files/opencascade-7.8.0-jemalloc-noexcept.patch b/sci-libs/opencascade/files/opencascade-7.8.0-jemalloc-noexcept.patch
new file mode 100644
index 000000000000..2c4a98f5a1fd
--- /dev/null
+++ b/sci-libs/opencascade/files/opencascade-7.8.0-jemalloc-noexcept.patch
@@ -0,0 +1,13 @@
+diff --git a/src/Standard/Standard.cxx b/src/Standard/Standard.cxx
+index bb06de7..f73164f 100644
+--- a/src/Standard/Standard.cxx
++++ b/src/Standard/Standard.cxx
+@@ -28,7 +28,7 @@
+ #elif (defined(__GNUC__) && (__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 1)) && (defined(__i386) || defined(__x86_64)))
+ #include <mm_malloc.h>
+ #else
+-extern "C" int posix_memalign(void** thePtr, size_t theAlign, size_t theSize);
++extern "C" int posix_memalign(void** thePtr, size_t theAlign, size_t theSize) throw ();
+ #endif
+
+ namespace
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
new file mode 100644
index 000000000000..224becfdec1f
--- /dev/null
+++ b/sci-libs/opencascade/files/opencascade-7.8.1-vtk_components.patch
@@ -0,0 +1,24 @@
+diff --git a/adm/cmake/vtk.cmake b/adm/cmake/vtk.cmake
+index 7d25a37..79257d1 100644
+--- a/adm/cmake/vtk.cmake
++++ b/adm/cmake/vtk.cmake
+@@ -60,7 +60,18 @@ if (3RDPARTY_VTK_DIR AND EXISTS "${3RDPARTY_VTK_DIR}")
+ set (ENV{VTK_DIR} "${3RDPARTY_VTK_DIR}")
+ endif()
+
+-find_package(VTK)
++find_package(VTK
++ COMPONENTS
++ CommonCore
++ FiltersGeneral
++ IOImage
++ ImagingCore
++ InteractionStyle
++ RenderingCore
++ RenderingFreeType
++ RenderingGL2PSOpenGL2
++ RenderingOpenGL2
++)
+
+ if (3RDPARTY_VTK_DIR AND EXISTS "${3RDPARTY_VTK_DIR}")
+ set (ENV{VTK_DIR} ${CACHED_VTK_DIR})
diff --git a/sci-libs/opencascade/metadata.xml b/sci-libs/opencascade/metadata.xml
index f3b6e96ad889..cf700b6db37e 100644
--- a/sci-libs/opencascade/metadata.xml
+++ b/sci-libs/opencascade/metadata.xml
@@ -13,6 +13,7 @@
<flag name="eigen">Enable support for eigenvalues through the header-only <pkg>dev-cpp/eigen</pkg> package.</flag>
<flag name="freeimage">Enable support for image i/o via <pkg>media-libs/freeimage</pkg></flag>
<flag name="freetype">Enable <pkg>media-libs/freetype</pkg> support</flag>
+ <flag name="inspector">Build Inspector tool</flag>
<flag name="jemalloc">Enable jemalloc allocator support via <pkg>dev-libs/jemalloc</pkg></flag>
<flag name="json">Enable JSON support through <pkg>dev-libs/rapidjson</pkg></flag>
<flag name="optimize">Don't clear allocated memory. Use optimized memory manager unlesstbb USE flag is set.</flag>
diff --git a/sci-libs/opencascade/opencascade-7.7.2-r1.ebuild b/sci-libs/opencascade/opencascade-7.7.2-r1.ebuild
index ce92fcc889e0..f3c88aa3ab89 100644
--- a/sci-libs/opencascade/opencascade-7.7.2-r1.ebuild
+++ b/sci-libs/opencascade/opencascade-7.7.2-r1.ebuild
@@ -32,12 +32,11 @@ 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 gui json +opengl optimize tbb test testprograms tk vtk"
+IUSE="X debug doc examples ffmpeg freeimage freetype gles2-only inspector json +opengl optimize tbb test testprograms tk vtk"
REQUIRED_USE="
?? ( optimize tbb )
?? ( opengl gles2-only )
- examples? ( gui )
test? ( freeimage json opengl )
"
@@ -59,7 +58,7 @@ RDEPEND="
X? (
x11-libs/libX11
)
- gui? (
+ examples? (
dev-qt/qtcore:5
dev-qt/qtgui:5
dev-qt/qtquickcontrols2:5
@@ -68,6 +67,13 @@ RDEPEND="
)
ffmpeg? ( <media-video/ffmpeg-5:= )
freeimage? ( media-libs/freeimage )
+ inspector? (
+ dev-qt/qtcore:5
+ dev-qt/qtgui:5
+ dev-qt/qtquickcontrols2:5
+ dev-qt/qtwidgets:5
+ dev-qt/qtxml:5
+ )
tbb? ( dev-cpp/tbb:= )
vtk? (
dev-lang/tk:=
@@ -84,7 +90,7 @@ DEPEND="
"
BDEPEND="
doc? ( app-text/doxygen[dot] )
- gui? (
+ inspector? (
dev-qt/linguist-tools:5
)
test? ( dev-tcltk/thread )
@@ -145,7 +151,7 @@ src_configure() {
-DBUILD_SOVERSION_NUMBERS=2
-DBUILD_DOC_Overview="$(usex doc)"
- -DBUILD_Inspector="$(usex gui)"
+ -DBUILD_Inspector="$(usex inspector)"
-DBUILD_ENABLE_FPE_SIGNAL_HANDLER="$(usex debug)"
-DBUILD_USE_PCH="no"
@@ -195,7 +201,7 @@ src_configure() {
)
fi
- if use examples || use gui; then
+ if use examples || use inspector; then
mycmakeargs+=(
-D3RDPARTY_QT_DIR="${ESYSROOT}/usr"
-DBUILD_SAMPLES_QT="$(usex examples)"
diff --git a/sci-libs/opencascade/opencascade-7.8.0.ebuild b/sci-libs/opencascade/opencascade-7.8.1.ebuild
similarity index 95%
rename from sci-libs/opencascade/opencascade-7.8.0.ebuild
rename to sci-libs/opencascade/opencascade-7.8.1.ebuild
index fb390401a82b..94a2d018ce23 100644
--- a/sci-libs/opencascade/opencascade-7.8.0.ebuild
+++ b/sci-libs/opencascade/opencascade-7.8.1.ebuild
@@ -31,12 +31,11 @@ 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 gui jemalloc json +opengl optimize tbb test testprograms tk vtk"
+IUSE="X debug doc examples ffmpeg freeimage freetype gles2-only inspector jemalloc json +opengl optimize tbb test testprograms tk vtk"
REQUIRED_USE="
?? ( optimize tbb )
?? ( opengl gles2-only )
- examples? ( gui )
test? ( freeimage json opengl )
"
@@ -58,7 +57,7 @@ RDEPEND="
X? (
x11-libs/libX11
)
- gui? (
+ examples? (
dev-qt/qtcore:5
dev-qt/qtgui:5
dev-qt/qtquickcontrols2:5
@@ -67,6 +66,13 @@ RDEPEND="
)
ffmpeg? ( <media-video/ffmpeg-5:= )
freeimage? ( media-libs/freeimage )
+ inspector? (
+ dev-qt/qtcore:5
+ dev-qt/qtgui:5
+ dev-qt/qtquickcontrols2:5
+ dev-qt/qtwidgets:5
+ dev-qt/qtxml:5
+ )
jemalloc? ( dev-libs/jemalloc )
tbb? ( dev-cpp/tbb:= )
vtk? (
@@ -84,7 +90,7 @@ DEPEND="
"
BDEPEND="
doc? ( app-text/doxygen[dot] )
- gui? (
+ inspector? (
dev-qt/linguist-tools:5
)
test? ( dev-tcltk/thread )
@@ -101,6 +107,8 @@ PATCHES=(
"${FILESDIR}/${PN}-7.7.0-jemalloc-lib-type.patch"
"${FILESDIR}/${PN}-7.8.0-cmake-min-version.patch"
"${FILESDIR}/${PN}-7.8.0-tests.patch"
+ "${FILESDIR}/${PN}-7.8.0-jemalloc-noexcept.patch"
+ "${FILESDIR}/${PN}-7.8.1-vtk_components.patch"
)
src_unpack() {
@@ -146,7 +154,7 @@ src_configure() {
-DBUILD_SOVERSION_NUMBERS=2
-DBUILD_DOC_Overview="$(usex doc)"
- -DBUILD_Inspector="$(usex gui)"
+ -DBUILD_Inspector="$(usex inspector)"
-DBUILD_ENABLE_FPE_SIGNAL_HANDLER="$(usex debug)"
-DBUILD_USE_PCH="no"
@@ -210,7 +218,7 @@ src_configure() {
)
fi
- if use examples || use gui; then
+ if use examples || use inspector; then
mycmakeargs+=(
-D3RDPARTY_QT_DIR="${ESYSROOT}/usr"
-DBUILD_SAMPLES_QT="$(usex examples)"
diff --git a/sci-libs/opencascade/opencascade-9999.ebuild b/sci-libs/opencascade/opencascade-9999.ebuild
index e3da366e699f..94a2d018ce23 100644
--- a/sci-libs/opencascade/opencascade-9999.ebuild
+++ b/sci-libs/opencascade/opencascade-9999.ebuild
@@ -31,7 +31,7 @@ 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 +gui jemalloc json +opengl optimize tbb test testprograms tk vtk"
+IUSE="X debug doc examples ffmpeg freeimage freetype gles2-only inspector jemalloc json +opengl optimize tbb test testprograms tk vtk"
REQUIRED_USE="
?? ( optimize tbb )
@@ -57,20 +57,26 @@ RDEPEND="
X? (
x11-libs/libX11
)
- gui? (
- examples? (
- dev-qt/qtcore:5
- dev-qt/qtgui:5
- dev-qt/qtquickcontrols2:5
- dev-qt/qtwidgets:5
- dev-qt/qtxml:5
- )
+ 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-5:= )
freeimage? ( media-libs/freeimage )
+ inspector? (
+ dev-qt/qtcore:5
+ dev-qt/qtgui:5
+ dev-qt/qtquickcontrols2:5
+ dev-qt/qtwidgets:5
+ dev-qt/qtxml:5
+ )
jemalloc? ( dev-libs/jemalloc )
tbb? ( dev-cpp/tbb:= )
vtk? (
+ dev-lang/tk:=
sci-libs/vtk:=[rendering]
tbb? (
sci-libs/vtk:=[tbb,-cuda]
@@ -84,8 +90,8 @@ DEPEND="
"
BDEPEND="
doc? ( app-text/doxygen[dot] )
- gui? (
- examples? ( dev-qt/linguist-tools:5 )
+ inspector? (
+ dev-qt/linguist-tools:5
)
test? ( dev-tcltk/thread )
"
@@ -97,9 +103,12 @@ PATCHES=(
"${FILESDIR}/${PN}-7.7.0-avoid-pre-stripping-binaries.patch"
"${FILESDIR}/${PN}-7.7.0-build-against-vtk-9.2.patch"
"${FILESDIR}/${PN}-7.7.0-musl.patch"
+ "${FILESDIR}/${PN}-7.7.0-tbb-detection.patch"
"${FILESDIR}/${PN}-7.7.0-jemalloc-lib-type.patch"
"${FILESDIR}/${PN}-7.8.0-cmake-min-version.patch"
"${FILESDIR}/${PN}-7.8.0-tests.patch"
+ "${FILESDIR}/${PN}-7.8.0-jemalloc-noexcept.patch"
+ "${FILESDIR}/${PN}-7.8.1-vtk_components.patch"
)
src_unpack() {
@@ -145,7 +154,7 @@ src_configure() {
-DBUILD_SOVERSION_NUMBERS=2
-DBUILD_DOC_Overview="$(usex doc)"
- -DBUILD_Inspector="$(usex gui)"
+ -DBUILD_Inspector="$(usex inspector)"
-DBUILD_ENABLE_FPE_SIGNAL_HANDLER="$(usex debug)"
-DBUILD_USE_PCH="no"
@@ -192,7 +201,10 @@ src_configure() {
if ! use jemalloc && ! use tbb; then
mycmakeargs+=( -DUSE_MMGR_TYPE=NATIVE )
elif use jemalloc && ! use tbb; then
- mycmakeargs+=( -DUSE_MMGR_TYPE=JEMALLOC )
+ mycmakeargs+=(
+ -DUSE_MMGR_TYPE=JEMALLOC
+ -D3RDPARTY_JEMALLOC_INCLUDE_DIR="${ESYSROOT}/usr/include/jemalloc"
+ )
elif ! use jemalloc && use tbb; then
mycmakeargs+=( -DUSE_MMGR_TYPE=TBB )
elif use jemalloc && use tbb; then
@@ -206,19 +218,13 @@ src_configure() {
)
fi
- if use gui; then
+ if use examples || use inspector; then
mycmakeargs+=(
-D3RDPARTY_QT_DIR="${ESYSROOT}/usr"
-DBUILD_SAMPLES_QT="$(usex examples)"
)
fi
- if use jemalloc; then
- mycmakeargs+=(
- -D3RDPARTY_JEMALLOC_INCLUDE_DIR="${ESYSROOT}/usr/include/jemalloc"
- )
- fi
-
if use tbb; then
mycmakeargs+=(
-D3RDPARTY_TBB_DIR="${ESYSROOT}/usr"
^ permalink raw reply related [flat|nested] 17+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sci-libs/opencascade/, sci-libs/opencascade/files/
@ 2024-11-25 15:32 Andreas Sturmlechner
0 siblings, 0 replies; 17+ messages in thread
From: Andreas Sturmlechner @ 2024-11-25 15:32 UTC (permalink / raw
To: gentoo-commits
commit: 21e88e724a6b8182f7800d68db945fecb75a9d44
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sat Nov 23 19:52:05 2024 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Mon Nov 25 15:29:58 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=21e88e72
sci-libs/opencascade: drop 7.6.3-r2, 7.7.0-r2, 7.7.2-r1
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
sci-libs/opencascade/Manifest | 4 -
...04-fix-installation-of-cmake-config-files.patch | 40 ---
.../files/opencascade-7.5.3-tbb-2021.patch | 51 ---
...ascade-7.6.2-avoid-pre-stripping-binaries.patch | 33 --
...ncascade-7.7.0-add-missing-include-limits.patch | 19 --
sci-libs/opencascade/metadata.xml | 1 -
sci-libs/opencascade/opencascade-7.6.3-r2.ebuild | 171 ----------
sci-libs/opencascade/opencascade-7.7.0-r2.ebuild | 178 ----------
sci-libs/opencascade/opencascade-7.7.2-r1.ebuild | 365 ---------------------
9 files changed, 862 deletions(-)
diff --git a/sci-libs/opencascade/Manifest b/sci-libs/opencascade/Manifest
index fa54d19c63f2..db7dd2e4cdad 100644
--- a/sci-libs/opencascade/Manifest
+++ b/sci-libs/opencascade/Manifest
@@ -1,6 +1,2 @@
-DIST opencascade-7.6.3.tar.gz 48216090 BLAKE2B ff0b63250e77b0240bd99bba38cd0e6b0a8c88bf39e495f5d51d7913f097e2cad83a5ad121e9d56de11c74008249c99a41f4615269a085b7cf97c3d7f0477d6d SHA512 c708f76edb707ba18bdfe7442ed8fa500894ee6c1cd8d0313eb906b3aa7dfa40a575f04dbccd70e84395d670f2b93fb8529f3d59726449234e627b9f35b9dded
-DIST opencascade-7.7.0.tar.gz 48393806 BLAKE2B b41da7bdd07aa6ef52f7833bef3e8a9fc2ca16cbf754773cb7adcc059c11c2a7937d279a2b6cf3096e7af6fbb42c6fdc2a5c98340d6b084d2ba100ba2c538f2a SHA512 6c90e2761f752241417ae6f18d819f51e66b32f3a50a97384f29ed73fa07f4cded84c71a6f6ba302d5e35c57e2fc13001619521eaf45757e4e5ff670d94bbf5c
-DIST opencascade-7.7.2.tar.gz 48404428 BLAKE2B 28d637e75eca570e38401a0a59127ffdbcb06838a91cc3899fe905834bb47e0e9a92d16cde52027d94e78b0fbddc2043340a35dcb0f4a472c4f2bdac2713216c SHA512 d9e882d44bb65616f8cfce68ebdcd5765669b84e3d82cfb2d1bc22b71b0e878442c079bacc37e9d54f28ce98a7c23bf81f2a3e3e7bbeeec38927ca739f423dee
DIST opencascade-7.8.1.tar.gz 48432051 BLAKE2B de7a40b8e6612642a1567d2cf3e6b471c9edeadbc7f686bc8648502165c8d824b3574259874ecb1775c856703fd8df7481c9bc07a66a3a321a83e699e6802052 SHA512 807c1f8732926cfdabcfbdf8d6a0e76b8dba1a1e614afe084a467ffb4cfd80623f5e3afa7e9905b1ac96667c93e01b5f98ceaa8948a576a1093d98df98cc8f81
-DIST opencascade-dataset-7.7.0.tar.gz 128392200 BLAKE2B ebfbe6f24520144ca4a82e4ddd0486890552c2de1b62bf5c0d4990d777d4a1458dea54f8a6f08d8a0999582fb4325eda0002fc8a0137b9e66d024a47145d1279 SHA512 71d7e807b1d629fe7371b9d1d503024d00b7c1ae1775e62803eeffd127bd1c768e5240fdd1f949a237737089d528b5d4e43d26db025bbe14a4e0e4616ebdc5d8
DIST opencascade-dataset-7.8.0.tar.xz 97049756 BLAKE2B aae5f076d9fc8a0d8a05028b0d9ffb527978e7acfdf5ecbc7e71c5ee3d6060cd7db9e56dba5b94a445bf5cf208126711cda70306607bdc5cd5e8b68df8fc150c SHA512 9b4c91d7b4743c47f2cf8d9a3b6ded73409a13133013424150ee9bdb61fd771c0b8799c7f31b459a7d2ba140399b9c0c972e2d0476188006361b4fb04042d990
diff --git a/sci-libs/opencascade/files/opencascade-7.5.1-0004-fix-installation-of-cmake-config-files.patch b/sci-libs/opencascade/files/opencascade-7.5.1-0004-fix-installation-of-cmake-config-files.patch
deleted file mode 100644
index caace23fc2d8..000000000000
--- a/sci-libs/opencascade/files/opencascade-7.5.1-0004-fix-installation-of-cmake-config-files.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-From 8469f927963fe4bece05297c514fb2b9f9ad9b1a Mon Sep 17 00:00:00 2001
-From: Bernd Waibel <waebbl@gmail.com>
-Date: Fri, 5 Feb 2021 13:44:15 +0100
-Subject: [PATCH] fix installation of cmake config files
-
-Signed-off-by: Bernd Waibel <waebbl@gmail.com>
----
- CMakeLists.txt | 2 +-
- adm/cmake/occt_macros.cmake | 2 +-
- 2 files changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 100d6133..bc8cdb92 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -1156,7 +1156,7 @@ foreach (OCCT_CONFIGURATION ${CMAKE_CONFIGURATION_TYPES})
- endforeach()
- # install OpenCASCADE config file with compile definitions and C/C++ flags ONLY for current configuration
- install (CODE "string (TOLOWER \"\${CMAKE_INSTALL_CONFIG_NAME}\" CMAKE_INSTALL_CONFIG_NAME_LOWER)")
--install (CODE "configure_file(\"${CMAKE_BINARY_DIR}/OpenCASCADECompileDefinitionsAndFlags-\${CMAKE_INSTALL_CONFIG_NAME_LOWER}.cmake\" \"${INSTALL_DIR}/${INSTALL_DIR_CMAKE}/OpenCASCADECompileDefinitionsAndFlags-\${CMAKE_INSTALL_CONFIG_NAME_LOWER}.cmake\" COPYONLY)")
-+install (CODE "configure_file(\"${CMAKE_BINARY_DIR}/OpenCASCADECompileDefinitionsAndFlags-\${CMAKE_INSTALL_CONFIG_NAME_LOWER}.cmake\" \"${INSTALL_DIR_CMAKE}/OpenCASCADECompileDefinitionsAndFlags-\${CMAKE_INSTALL_CONFIG_NAME_LOWER}.cmake\" COPYONLY)")
-
- foreach (OCCT_MODULE ${OCCT_MODULES})
- if (BUILD_MODULE_${OCCT_MODULE})
-diff --git a/adm/cmake/occt_macros.cmake b/adm/cmake/occt_macros.cmake
-index 0a387945..f10fe5e3 100644
---- a/adm/cmake/occt_macros.cmake
-+++ b/adm/cmake/occt_macros.cmake
-@@ -592,7 +592,7 @@ macro (OCCT_UPDATE_TARGET_FILE)
- "cmake_policy(PUSH)
- cmake_policy(SET CMP0007 NEW)
- string (TOLOWER \"\${CMAKE_INSTALL_CONFIG_NAME}\" CMAKE_INSTALL_CONFIG_NAME_LOWERCASE)
-- file (GLOB ALL_OCCT_TARGET_FILES \"${INSTALL_DIR}/${INSTALL_DIR_CMAKE}/OpenCASCADE*Targets-\${CMAKE_INSTALL_CONFIG_NAME_LOWERCASE}.cmake\")
-+ file (GLOB ALL_OCCT_TARGET_FILES \"${INSTALL_DIR_CMAKE}/OpenCASCADE*Targets-\${CMAKE_INSTALL_CONFIG_NAME_LOWERCASE}.cmake\")
- foreach(TARGET_FILENAME \${ALL_OCCT_TARGET_FILES})
- file (STRINGS \"\${TARGET_FILENAME}\" TARGET_FILE_CONTENT)
- file (REMOVE \"\${TARGET_FILENAME}\")
---
-2.30.0
-
diff --git a/sci-libs/opencascade/files/opencascade-7.5.3-tbb-2021.patch b/sci-libs/opencascade/files/opencascade-7.5.3-tbb-2021.patch
deleted file mode 100644
index 38770ac9a541..000000000000
--- a/sci-libs/opencascade/files/opencascade-7.5.3-tbb-2021.patch
+++ /dev/null
@@ -1,51 +0,0 @@
-https://github.com/Open-Cascade-SAS/OCCT/commit/740833a6a88e481f474783c426b6f6311ed586d3
-
-From 740833a6a88e481f474783c426b6f6311ed586d3 Mon Sep 17 00:00:00 2001
-From: kgv <kgv@opencascade.com>
-Date: Mon, 29 Nov 2021 21:26:45 +0300
-Subject: [PATCH] 0032697: Configuration - fix compilation errors with oneTBB
- 2021
-
-Removed usage of no more existing tbb::task_scheduler_init and tbb::captured_exception.
---- a/src/OSD/OSD_Parallel_TBB.cxx
-+++ b/src/OSD/OSD_Parallel_TBB.cxx
-@@ -25,7 +25,9 @@ Standard_DISABLE_DEPRECATION_WARNINGS
- #include <tbb/parallel_for.h>
- #include <tbb/parallel_for_each.h>
- #include <tbb/blocked_range.h>
--#include <tbb/task_scheduler_init.h>
-+#if TBB_VERSION_MAJOR < 2021
-+ #include <tbb/task_scheduler_init.h>
-+#endif
- Standard_ENABLE_DEPRECATION_WARNINGS
-
- //=======================================================================
-@@ -38,12 +40,16 @@ void OSD_Parallel::forEachExternal (UniversalIterator& theBegin,
- const FunctorInterface& theFunctor,
- Standard_Integer theNbItems)
- {
-+#if TBB_VERSION_MAJOR >= 2021
-+ // task_scheduler_init is removed,
-+ // exceptions are captured without proxy tbb::captured_exception object
-+ (void )theNbItems;
-+ tbb::parallel_for_each (theBegin, theEnd, theFunctor);
-+#else
- try
- {
- const Handle(OSD_ThreadPool)& aThreadPool = OSD_ThreadPool::DefaultPool();
-- const Standard_Integer aNbThreads = theNbItems > 0 ?
-- aThreadPool->NbDefaultThreadsToLaunch() : -1;
--
-+ const Standard_Integer aNbThreads = theNbItems > 0 ? aThreadPool->NbDefaultThreadsToLaunch() : -1;
- tbb::task_scheduler_init aScheduler (aNbThreads);
- tbb::parallel_for_each (theBegin, theEnd, theFunctor);
- }
-@@ -51,6 +57,7 @@ void OSD_Parallel::forEachExternal (UniversalIterator& theBegin,
- {
- throw Standard_ProgramError (anException.what());
- }
-+#endif
- }
-
- #endif /* HAVE_TBB */
-
diff --git a/sci-libs/opencascade/files/opencascade-7.6.2-avoid-pre-stripping-binaries.patch b/sci-libs/opencascade/files/opencascade-7.6.2-avoid-pre-stripping-binaries.patch
deleted file mode 100644
index 144047fba163..000000000000
--- a/sci-libs/opencascade/files/opencascade-7.6.2-avoid-pre-stripping-binaries.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-https://bugs.gentoo.org/831800
-https://dev.opencascade.org/content/dont-pre-strip-binaries
-
-From 88e59e0199daaf66184833e366e9deb1299078a9 Mon Sep 17 00:00:00 2001
-From: Bernd Waibel <waebbl-gentoo@posteo.net>
-Date: Sun, 5 Jun 2022 09:48:09 +0200
-Subject: [PATCH] avoid pre-stripping binaries
-
-Signed-off-by: Bernd Waibel <waebbl-gentoo@posteo.net>
---- a/adm/cmake/occt_defs_flags.cmake
-+++ b/adm/cmake/occt_defs_flags.cmake
-@@ -133,8 +133,6 @@ if ("x${CMAKE_CXX_COMPILER_ID}" STREQUAL "xClang")
- # does not support option "-std=c++0x"
- set (CMAKE_CXX_FLAGS "-std=c++0x ${CMAKE_CXX_FLAGS}")
- endif()
-- # Optimize size of binaries
-- set (CMAKE_SHARED_LINKER_FLAGS "-Wl,-s ${CMAKE_SHARED_LINKER_FLAGS}")
- elseif(MINGW)
- add_definitions(-D_WIN32_WINNT=0x0601)
- # _WIN32_WINNT=0x0601 (use Windows 7 SDK)
-@@ -150,9 +148,6 @@ elseif(MINGW)
- elseif (DEFINED CMAKE_COMPILER_IS_GNUCXX)
- # Require C++11
- set (CMAKE_CXX_FLAGS "-std=c++0x ${CMAKE_CXX_FLAGS}")
-- # Optimize size of binaries
-- set (CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} -s")
-- set (CMAKE_C_FLAGS_RELEASE "${CMAKE_C_FLAGS_RELEASE} -s")
- endif()
-
- if (BUILD_RELEASE_DISABLE_EXCEPTIONS)
---
-2.35.1
-
diff --git a/sci-libs/opencascade/files/opencascade-7.7.0-add-missing-include-limits.patch b/sci-libs/opencascade/files/opencascade-7.7.0-add-missing-include-limits.patch
deleted file mode 100644
index 2bc59319864a..000000000000
--- a/sci-libs/opencascade/files/opencascade-7.7.0-add-missing-include-limits.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-From 44a30819131496bf41f2e1dcfd362b23173db6fb Mon Sep 17 00:00:00 2001
-From: Bernd Waibel <waebbl-gentoo@posteo.net>
-Date: Wed, 5 Oct 2022 21:55:06 +0200
-Subject: [PATCH] add missing #include <limits>
-
-Signed-off-by: Bernd Waibel <waebbl-gentoo@posteo.net>
---- a/src/ViewerTest/ViewerTest_CmdParser.cxx
-+++ b/src/ViewerTest/ViewerTest_CmdParser.cxx
-@@ -21,6 +21,7 @@
-
- #include <algorithm>
- #include <iostream>
-+#include <limits>
-
- namespace
- {
---
-2.38.0
-
diff --git a/sci-libs/opencascade/metadata.xml b/sci-libs/opencascade/metadata.xml
index 5f2d813e1af6..38b85e513a1f 100644
--- a/sci-libs/opencascade/metadata.xml
+++ b/sci-libs/opencascade/metadata.xml
@@ -10,7 +10,6 @@
<name>Proxy Maintainers</name>
</maintainer>
<use>
- <flag name="eigen">Enable support for eigenvalues through the header-only <pkg>dev-cpp/eigen</pkg> package.</flag>
<flag name="freeimage">Enable support for image i/o via <pkg>media-libs/freeimage</pkg></flag>
<flag name="freetype">Enable <pkg>media-libs/freetype</pkg> support</flag>
<flag name="inspector">Build Inspector tool</flag>
diff --git a/sci-libs/opencascade/opencascade-7.6.3-r2.ebuild b/sci-libs/opencascade/opencascade-7.6.3-r2.ebuild
deleted file mode 100644
index 2e561ce32b79..000000000000
--- a/sci-libs/opencascade/opencascade-7.6.3-r2.ebuild
+++ /dev/null
@@ -1,171 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit cmake
-
-MY_SLOT="$(ver_cut 1-2)"
-COMMIT="b079fb9877ef64d4a8158a60fa157f59b096debb"
-COMMIT_SHORT="${COMMIT:0:7}"
-
-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=${COMMIT};sf=tgz -> ${P}.tar.gz"
-S="${WORKDIR}/occt-${COMMIT_SHORT}"
-
-LICENSE="|| ( Open-CASCADE-LGPL-2.1-Exception-1.0 LGPL-2.1 )"
-SLOT="0/${MY_SLOT}"
-KEYWORDS="amd64 ~arm64 ~riscv ~x86"
-IUSE="doc eigen examples ffmpeg freeimage gles2 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="
- 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/libX11
- 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-5:= )
- freeimage? ( media-libs/freeimage )
- tbb? ( dev-cpp/tbb:= )
- vtk? ( <sci-libs/vtk-9.3.0:=[rendering] )
-"
-DEPEND="
- ${RDEPEND}
- eigen? ( dev-cpp/eigen )
- json? ( dev-libs/rapidjson )
- vtk? ( dev-libs/utfcpp )
-"
-BDEPEND="
- doc? ( app-text/doxygen[dot] )
- examples? ( dev-qt/linguist-tools:5 )
-"
-
-PATCHES=(
- "${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.6.2-avoid-pre-stripping-binaries.patch
- "${FILESDIR}"/${PN}-7.5.3-tbb-2021.patch
- "${FILESDIR}"/${PN}-7.7.0-build-against-vtk-9.2.patch
- "${FILESDIR}"/${PN}-7.7.0-musl.patch
-)
-
-src_prepare() {
- cmake_src_prepare
-
- 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
- # no package yet in tree
- -DUSE_DRACO=OFF
- -DUSE_EIGEN=$(usex eigen)
- -DUSE_FFMPEG=$(usex ffmpeg)
- -DUSE_FREEIMAGE=$(usex freeimage)
- -DUSE_FREETYPE=ON
- -DUSE_GLES2=$(usex gles2)
- # no package in tree
- -DUSE_OPENVR=OFF
- -DUSE_RAPIDJSON=$(usex json)
- -DUSE_TBB=$(usex tbb)
- -DUSE_VTK=$(usex vtk)
- -DUSE_XLIB=ON
- # suppress CMake dev warnings
- -Wno-dev
- )
-
- 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
- local vtk_ver=$(best_version "sci-libs/vtk")
- vtk_ver=${vtk_ver#sci-libs/vtk-}
- vtk_ver=$(ver_cut 1-2 ${vtk_ver})
- mycmakeargs+=(
- -D3RDPARTY_VTK_DIR="${ESYSROOT}"/usr
- -D3RDPARTY_VTK_INCLUDE_DIR="${ESYSROOT}"/usr/include/vtk-${vtk_ver}
- -D3RDPARTY_VTK_LIBRARY_DIR="${ESYSROOT}"/usr/$(get_libdir)
- )
- fi
-
- cmake_src_configure
-
- 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}"
-
- docompress -x /usr/share/doc/${PF}/overview/html
-}
diff --git a/sci-libs/opencascade/opencascade-7.7.0-r2.ebuild b/sci-libs/opencascade/opencascade-7.7.0-r2.ebuild
deleted file mode 100644
index 9db1978c27a0..000000000000
--- a/sci-libs/opencascade/opencascade-7.7.0-r2.ebuild
+++ /dev/null
@@ -1,178 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-# USE_{DRACO,FFMPEG,FREEIMAGE,FREETYPE,GLES2,OPENGL,OPENVR,RAPIDJSON,TBB,TK,VTK,XLIB}
-
-EAPI=8
-
-inherit cmake flag-o-matic
-
-MY_SLOT="$(ver_cut 1-2)"
-MY_PV="$(ver_rs 3 '-')"
-
-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=185d29b92f6764ffa9fc195b7dbe7bba3c4ac855;sf=tgz -> ${P}.tar.gz"
-S="${WORKDIR}/occt-185d29b"
-
-LICENSE="|| ( Open-CASCADE-LGPL-2.1-Exception-1.0 LGPL-2.1 )"
-SLOT="0/${MY_SLOT}"
-KEYWORDS="amd64 ~arm ~arm64 ~riscv ~x86"
-IUSE="doc examples ffmpeg freeimage gles2 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://tracker.dev.opencascade.org/view.php?id=32871
-RDEPEND="
- dev-lang/tcl:=
- dev-lang/tk:=
- media-libs/fontconfig
- media-libs/freetype:2
- virtual/opengl
- x11-libs/libX11
- 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-5:= )
- freeimage? ( media-libs/freeimage )
- tbb? ( dev-cpp/tbb:= )
- vtk? ( <sci-libs/vtk-9.3.0:=[rendering] )
-"
-DEPEND="
- ${RDEPEND}
- x11-base/xorg-proto
- json? ( dev-libs/rapidjson )
- vtk? ( dev-libs/utfcpp )
-"
-BDEPEND="
- doc? ( app-text/doxygen )
- examples? ( dev-qt/linguist-tools:5 )
-"
-
-PATCHES=(
- "${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.7.0-add-missing-include-limits.patch
- "${FILESDIR}"/${PN}-7.7.0-fix-installation-of-cmake-config-files.patch
- "${FILESDIR}"/${PN}-7.7.0-avoid-pre-stripping-binaries.patch
- "${FILESDIR}"/${PN}-7.7.0-build-against-vtk-9.2.patch
- "${FILESDIR}"/${PN}-7.7.0-musl.patch
-)
-
-src_prepare() {
- cmake_src_prepare
-
- 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() {
- # -Werror=odr
- # https://bugs.gentoo.org/862912
- # https://tracker.dev.opencascade.org/view.php?id=33091
- filter-lto
-
- 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
- # no package yet in tree
- -DUSE_DRACO=OFF
- # has no function in 7.7.0_beta
- # see https://dev.opencascade.org/content/occt-770-beta-version-available#comment-23733
- -DUSE_EIGEN=OFF
- -DUSE_FFMPEG=$(usex ffmpeg)
- -DUSE_FREEIMAGE=$(usex freeimage)
- -DUSE_FREETYPE=ON
- -DUSE_GLES2=$(usex gles2)
- # no package in tree
- -DUSE_OPENVR=OFF
- -DUSE_RAPIDJSON=$(usex json)
- -DUSE_TBB=$(usex tbb)
- -DUSE_VTK=$(usex vtk)
- -DUSE_XLIB=ON
- # suppress CMake dev warnings
- -Wno-dev
- )
-
- use doc && mycmakeargs+=( -DINSTALL_DOC_Overview=ON )
-
- if use examples; then
- mycmakeargs+=(
- -D3RDPARTY_QT_DIR="${ESYSROOT}"/usr
- -DBUILD_SAMPLES_QT=ON
- )
- fi
-
- if use tbb; then
- mycmakeargs+=( -D3RDPARTY_TBB_DIR="${ESYSROOT}"/usr )
- fi
-
- if use vtk; then
- local vtk_ver=$(best_version "sci-libs/vtk")
- vtk_ver=${vtk_ver#sci-libs/vtk-}
- vtk_ver=$(ver_cut 1-2 ${vtk_ver})
- mycmakeargs+=(
- -D3RDPARTY_VTK_DIR="${ESYSROOT}"/usr
- -D3RDPARTY_VTK_INCLUDE_DIR="${ESYSROOT}"/usr/include/vtk-${vtk_ver}
- -D3RDPARTY_VTK_LIBRARY_DIR="${ESYSROOT}"/usr/$(get_libdir)
- )
- fi
-
- cmake_src_configure
-
- 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}"
-
- docompress -x /usr/share/doc/${PF}/overview/html
-}
diff --git a/sci-libs/opencascade/opencascade-7.7.2-r1.ebuild b/sci-libs/opencascade/opencascade-7.7.2-r1.ebuild
deleted file mode 100644
index ebb48f6acc7e..000000000000
--- a/sci-libs/opencascade/opencascade-7.7.2-r1.ebuild
+++ /dev/null
@@ -1,365 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit cmake flag-o-matic virtualx
-
-DESCRIPTION="Development platform for CAD/CAE, 3D surface/solid modeling and data exchange"
-HOMEPAGE="https://www.opencascade.com"
-
-MY_PN="OCCT"
-
-MY_TEST_PV="7.7.0"
-MY_TEST_PV2="${MY_TEST_PV//./_}"
-
-SRC_URI="
- test? ( https://github.com/Open-Cascade-SAS/${MY_PN}/releases/download/V${MY_TEST_PV2}/${PN}-dataset-${MY_TEST_PV}.tgz
- -> ${PN}-dataset-${MY_TEST_PV}.tar.gz )
-"
-
-if [[ ${PV} = *9999* ]] ; then
- inherit git-r3
- EGIT_REPO_URI="https://github.com/Open-Cascade-SAS/${MY_PN}.git"
-else
- MY_PV="${PV//./_}"
- SRC_URI+="
- https://github.com/Open-Cascade-SAS/${MY_PN}/archive/refs/tags/V${MY_PV}.tar.gz -> ${P}.tar.gz
- "
- S="${WORKDIR}/${MY_PN}-${MY_PV}"
- KEYWORDS="~amd64 ~arm ~arm64 ~riscv ~x86"
-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 json +opengl optimize tbb test testprograms tk 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? (
- media-libs/libglvnd
- )
- opengl? (
- media-libs/libglvnd[X]
- )
- X? (
- x11-libs/libX11
- )
- 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-5:= )
- freeimage? ( media-libs/freeimage )
- inspector? (
- dev-qt/qtcore:5
- dev-qt/qtgui:5
- dev-qt/qtquickcontrols2:5
- dev-qt/qtwidgets:5
- dev-qt/qtxml:5
- )
- tbb? ( dev-cpp/tbb:= )
- vtk? (
- dev-lang/tk:=
- sci-libs/vtk:=[rendering]
- tbb? (
- sci-libs/vtk:=[tbb,-cuda]
- )
- )
-"
-DEPEND="
- ${RDEPEND}
- X? ( x11-base/xorg-proto )
- json? ( dev-libs/rapidjson )
-"
-BDEPEND="
- doc? ( app-text/doxygen[dot] )
- inspector? (
- dev-qt/linguist-tools:5
- )
- test? ( dev-tcltk/thread )
-"
-
-PATCHES=(
- "${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.7.0-fix-installation-of-cmake-config-files.patch"
- "${FILESDIR}/${PN}-7.7.0-avoid-pre-stripping-binaries.patch"
- "${FILESDIR}/${PN}-7.7.0-build-against-vtk-9.2.patch"
- "${FILESDIR}/${PN}-7.7.0-musl.patch"
- "${FILESDIR}/${PN}-7.7.0-tbb-detection.patch"
- "${FILESDIR}/${PN}-7.8.0-cmake-min-version.patch"
- "${FILESDIR}/${PN}-7.8.0-tests.patch"
-)
-
-src_unpack() {
- if [[ ${PV} = *9999* ]] ; then
- git-r3_src_unpack
- else
- unpack "${P}.tar.gz"
- fi
-
- if use test; then
- mkdir "${WORKDIR}/data"
- pushd "${WORKDIR}/data" > /dev/null || die
- # should be in paths indicated by CSF_TestDataPath environment variable,
- # or in subfolder data in the script directory
- unpack "${PN}-dataset-${MY_TEST_PV}.tar.gz"
- popd > /dev/null || die
- fi
-}
-
-src_prepare() {
- cmake_src_prepare
-
- 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() {
- # -Werror=odr
- # https://bugs.gentoo.org/862912
- # https://tracker.dev.opencascade.org/view.php?id=33091
- filter-lto
-
- local mycmakeargs=(
- -D3RDPARTY_DIR="${ESYSROOT}/usr"
- -DBUILD_CPP_STANDARD="C++17"
- -DBUILD_SOVERSION_NUMBERS=2
-
- -DBUILD_DOC_Overview="$(usex doc)"
- -DBUILD_Inspector="$(usex inspector)"
-
- -DBUILD_ENABLE_FPE_SIGNAL_HANDLER="$(usex debug)"
- -DBUILD_USE_PCH="no"
- # -DBUILD_OPT_PROFILE="Default" # Production
- # -DBUILD_RESOURCES="yes"
- # -DBUILD_YACCLEX="yes"
-
- -DBUILD_RELEASE_DISABLE_EXCEPTIONS="no" # bug #847916
- -DINSTALL_DIR="${EPREFIX}/usr"
- -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_TESTS="share/${PN}/tests"
- -DINSTALL_DIR_WITH_VERSION="no"
- -DINSTALL_SAMPLES="$(usex examples)"
-
- -DINSTALL_TEST_CASES="$(usex testprograms)"
-
- # no package yet in tree
- -DUSE_DRACO="no"
- -DUSE_FFMPEG="$(usex ffmpeg)"
- -DUSE_FREEIMAGE="$(usex freeimage)"
- -DUSE_FREETYPE="$(usex freetype)"
- # Indicates whether OpenGL ES 2.0 should be used in OCCT visualization module
- -DUSE_GLES2="$(usex gles2-only)"
- # Indicates whether OpenGL desktop should be used in OCCT visualization module
- -DUSE_OPENGL="$(usex opengl)"
- # no package in tree
- -DUSE_OPENVR="no"
- -DUSE_RAPIDJSON="$(usex json)"
- -DUSE_TBB="$(usex tbb)"
- -DUSE_TK="$(usex tk)"
- -DUSE_VTK="$(usex vtk)"
- -DUSE_XLIB="$(usex X)"
- )
-
- if use doc; then
- mycmakeargs+=(
- -DINSTALL_DOC_Overview="yes"
- -D3RDPARTY_SKIP_DOT_EXECUTABLE="no"
- )
- fi
-
- if use examples || use inspector; then
- mycmakeargs+=(
- -D3RDPARTY_QT_DIR="${ESYSROOT}/usr"
- -DBUILD_SAMPLES_QT="$(usex examples)"
- )
- fi
-
- if use tbb; then
- mycmakeargs+=(
- -D3RDPARTY_TBB_DIR="${ESYSROOT}/usr"
- )
- fi
-
- if use vtk; then
- local vtk_ver
- vtk_ver="$(best_version "sci-libs/vtk")"
- vtk_ver=$(ver_cut 1-2 "${vtk_ver#sci-libs/vtk-}")
- mycmakeargs+=(
- -D3RDPARTY_VTK_INCLUDE_DIR="${ESYSROOT}/usr/include/vtk-${vtk_ver}"
- -D3RDPARTY_VTK_LIBRARY_DIR="${ESYSROOT}/usr/$(get_libdir)"
- )
- fi
-
- cmake_src_configure
-
- 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_test() {
- echo "export CSF_OCCTDataPath=${WORKDIR}/data" >> "${BUILD_DIR}/custom.sh" || die
-
- if has_version media-fonts/dejavu; then
- cp "${ESYSROOT}/usr/share/fonts/dejavu/DejaVuSans.ttf" "${WORKDIR}/data/" # no die here as this isn't fatal
- fi
-
- local test_file=${T}/testscript.tcl
-
- local draw_opts=(
- i # see ${BUILD_DIR}/custom*.sh
- # -b # batch mode (no GUI, no viewers)
- -v # no GUI, use virtual (off-screen) windows for viewers
- )
-
- local test_names=(
- "demo draw bug30430" # prone to dying due to cpu limit
- )
- local test_opts=( # run single tests
- -overwrite
- )
- for test_name in "${test_names[@]}"; do
- cat >> "${test_file}" <<- _EOF_ || die
- test ${test_name} -outfile "${BUILD_DIR}/test_results/${test_name// /\/}.html" ${test_opts[@]}
- _EOF_
- done
-
- local testgrid_opts=()
-
- local SKIP_TESTS=()
-
- if [[ "${OCCT_OPTIONAL_TESTS}" != "true" ]]; then
- SKIP_TESTS+=(
- 'blend complex F4'
- 'bugs'
- 'geometry circ2d3Tan '{CircleCircleLin_11,CircleLinPoint_11}
- 'heal checkshape bug32448_1'
- 'hlr exact_hlr bug25813_2'
-
- 'hlr poly_hlr '{bug25813_2,bug25813_3,bug25813_4,Plate}
- 'lowalgos intss bug'{565,567_1,25950,27431,29807_i1003,29807_i2006,29807_i3003,29807_i5002,30703}
- 'lowalgos proximity '{A4,A5}
- 'opengl background bug27836'
- 'opengl drivers opengles'
- 'opengles3'
-
- 'offset wire_closed_inside_0_005 D1'
- 'offset wire_unclosed_outside_0_025 A1'
-
- 'demo draw bug30430'
- )
-
- local DEL_TESTS=(
- 'opengl/data/background/bug27836'
- 'perf/mesh/bug26965'
- 'v3d/trsf/bug26029'
- )
-
- for test in "${DEL_TESTS[@]}"; do
- rm "${CMAKE_USE_DIR}/tests/${test}" || die
- done
- fi
-
- if ! use vtk; then
- SKIP_TESTS+=(
- 'vtk'
- )
- echo "IGNORE /Could not open: libTKIVtkDraw/skip VTK" >> "${CMAKE_USE_DIR}/tests/opengl/parse.rules"
- fi
-
- if [[ -n "${SKIP_TESTS[*]}" ]]; then
- testgrid_opts+=( -exclude "$(IFS=',' ; echo "${SKIP_TESTS[*]}")" )
- fi
-
- testgrid_opts+=(
- # -refresh 5
- -overwrite
- )
- cat >> "${test_file}" <<- _EOF_ || die
- testgrid -outdir "${BUILD_DIR}/test_results" ${testgrid_opts[@]}
- _EOF_
-
- # # regenerate summary in case we have to
- # cat >> "${test_file}" <<- _EOF_ || die
- # testsummarize "${BUILD_DIR}/test_results"
- # _EOF_
-
- # Work around zink warnings
- export LIBGL_ALWAYS_SOFTWARE="true"
-
- export CASROOT="${BUILD_DIR}"
-
- virtx \
- "${BUILD_DIR}/draw.sh" \
- "${draw_opts[@]}" \
- -f "${test_file}"
-
- if [[ ! -f "${BUILD_DIR}/test_results/tests.log" ]]; then
- eerror "tests never ran!"
- die
- fi
- failed_tests="$(grep ": FAILED" "${BUILD_DIR}/test_results/tests.log")"
- if [[ -n ${failed_tests} ]]; then
- eerror "Failed tests:"
- eerror "${failed_tests}"
- die
- fi
-}
-
-src_install() {
- cmake_src_install
-
- doenvd "${T}/99${PN}"
-
- docompress -x "/usr/share/doc/${PF}/overview/html"
-}
^ permalink raw reply related [flat|nested] 17+ messages in thread
end of thread, other threads:[~2024-11-25 15:32 UTC | newest]
Thread overview: 17+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2022-06-25 23:33 [gentoo-commits] repo/gentoo:master commit in: sci-libs/opencascade/, sci-libs/opencascade/files/ Sam James
-- strict thread matches above, loose matches on Subject: below --
2024-11-25 15:32 Andreas Sturmlechner
2024-04-14 14:28 Andrew Ammerlaan
2023-07-31 8:43 Joonas Niilola
2023-01-28 22:48 Andreas Sturmlechner
2022-12-31 15:36 Sam James
2022-06-14 16:01 Joonas Niilola
2022-01-13 1:25 Sam James
2021-10-31 2:23 Sam James
2021-05-04 22:02 Sam James
2021-03-01 8:26 Joonas Niilola
2020-04-01 14:38 Joonas Niilola
2019-11-17 7:46 Joonas Niilola
2018-11-29 20:19 Andreas Sturmlechner
2018-11-29 20:19 Andreas Sturmlechner
2018-04-05 12:31 Andreas Sturmlechner
2017-06-07 7:09 Michael Weber
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox