pkgsrc-WIP-changes archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

opencascade: Merge in changes from cad/occt.



Module Name:	pkgsrc-wip
Committed By:	Paul Ripke <stix%stix.id.au@localhost>
Pushed By:	stix
Date:		Sun Dec 10 12:43:46 2023 +1100
Changeset:	8ba246671008328f887ea15e638559dd6bce2962

Modified Files:
	opencascade-git/Makefile
	opencascade-git/PLIST
	opencascade-git/buildlink3.mk
	opencascade-git/distinfo
	opencascade-git/patches/patch-CMakeLists.txt
	opencascade-git/patches/patch-adm_cmake_occt__macros.cmake
	opencascade-git/patches/patch-src_Standard_Standard__CString.cxx
Added Files:
	opencascade-git/options.mk
	opencascade-git/patches/patch-src_MeshVS_MeshVS__MeshPrsBuilder.cxx
	opencascade-git/patches/patch-src_OSD_OSD__MemInfo.cxx
	opencascade-git/patches/patch-src_OSD_OSD__signal.cxx
	opencascade-git/patches/patch-src_OpenGl_OpenGl__ShaderObject.cxx
	opencascade-git/patches/patch-src_OpenGl_OpenGl__ShaderProgram.cxx
	opencascade-git/patches/patch-src_Standard_Standard__Failure.cxx
	opencascade-git/patches/patch-src_Standard_Standard__PrimitiveTypes.hxx
	opencascade-git/patches/patch-src_Standard_Standard__StackTrace.cxx
	opencascade-git/patches/patch-src_ViewerTest_ViewerTest__CmdParser.cxx

Log Message:
opencascade: Merge in changes from cad/occt.

To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=8ba246671008328f887ea15e638559dd6bce2962

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

diffstat:
 opencascade-git/Makefile                           |  56 ++--
 opencascade-git/PLIST                              | 300 ++++++++++++++-------
 opencascade-git/buildlink3.mk                      |  24 +-
 opencascade-git/distinfo                           |  21 +-
 opencascade-git/options.mk                         |  47 ++++
 opencascade-git/patches/patch-CMakeLists.txt       |  13 +-
 .../patches/patch-adm_cmake_occt__macros.cmake     |  10 +-
 .../patch-src_MeshVS_MeshVS__MeshPrsBuilder.cxx    |  17 ++
 .../patches/patch-src_OSD_OSD__MemInfo.cxx         |  18 ++
 .../patches/patch-src_OSD_OSD__signal.cxx          |  62 +++++
 .../patch-src_OpenGl_OpenGl__ShaderObject.cxx      |  17 ++
 .../patch-src_OpenGl_OpenGl__ShaderProgram.cxx     |  17 ++
 .../patch-src_Standard_Standard__CString.cxx       |   4 +-
 .../patch-src_Standard_Standard__Failure.cxx       |  17 ++
 ...patch-src_Standard_Standard__PrimitiveTypes.hxx |  38 +++
 .../patch-src_Standard_Standard__StackTrace.cxx    |  27 ++
 .../patch-src_ViewerTest_ViewerTest__CmdParser.cxx |  19 ++
 17 files changed, 572 insertions(+), 135 deletions(-)

diffs:
diff --git a/opencascade-git/Makefile b/opencascade-git/Makefile
index 85b9c1c302..2b10f87800 100644
--- a/opencascade-git/Makefile
+++ b/opencascade-git/Makefile
@@ -1,8 +1,6 @@
-# $NetBSD: Makefile,v 1.3 2012/10/03 21:32:46 asau Exp $
-#
+# $NetBSD$
 
-DISTNAME=	opencascade-7.6.3
-PKGREVISION=	1
+DISTNAME=	opencascade-7.7.0
 CATEGORIES=	cad
 MASTER_SITES=	-http://git.dev.opencascade.org/gitweb/?p=occt.git;a=snapshot;h=refs/tags/V${PKGVERSION_NOREV:S/./_/g};sf=tgz
 
@@ -10,26 +8,27 @@ MAINTAINER=	stix%stix.id.au@localhost
 HOMEPAGE=	http://www.opencascade.org/
 COMMENT=	Software development platform for 3D CAD CAM CAE
 LICENSE=	gnu-lgpl-v2.1
-WRKSRC=		${WRKDIR}/occt-V${PKGVERSION_NOREV:S/./_/g}
 
-USE_CMAKE=	yes
-USE_TOOLS+=	bash
 USE_LANGUAGES=	c c++
+USE_CMAKE=	yes
+USE_TOOLS+=	bash:run
+WRKSRC=		${WRKDIR}/occt-V${PKGVERSION_NOREV:S/./_/g}
+
+.include "../../mk/bsd.prefs.mk"
+.include "options.mk"
 
-REPLACE_BASH+=	adm/templates/*
-REPLACE_BASH+=	*
+CMAKE_ARGS+=	-DUSE_FREETYPE=ON
+CMAKE_ARGS+=	-DUSE_EIGEN=ON
+CMAKE_ARGS+=	-DUSE_RAPIDJSON=ON
+CMAKE_ARGS+=	-DBUILD_DOC_Overview=OFF
 
-CHECK_PORTABILITY_SKIP+=	samples/qt/*
+REPLACE_BASH+=	adm/templates/draw.sh
 
+CXXFLAGS.SunOS+=		-DSOLARIS=1
+LDFLAGS.SunOS+=			-lnsl
 BUILDLINK_TRANSFORM.NetBSD+=	rm:-ldl
-# Required for proper alloca(3) support on NetBSD
-BUILDLINK_TRANSFORM+=		opt:-std=c++0x:-std=gnu++11
-LDFLAGS+=			-lexecinfo
-CMAKE_ARGS=			-DINSTALL_DIR_SCRIPT=${DISTNAME}.script
 
-# HACK
 post-install:
-	${RUN} chmod go-w ${DESTDIR}${PREFIX}/bin/*
 	${RUN} rm -f ${DESTDIR}${PREFIX}/share/opencascade/resources/DrawResources/InitEnvironment.tcl.orig
 
 SUBST_CLASSES+=			cmakebinletter
@@ -38,6 +37,27 @@ SUBST_MESSAGE.cmakebinletter=	Fixing $$OCCT_INSTALL_BIN_LETTER in cmake files
 SUBST_FILES.cmakebinletter=	${DESTDIR}${PREFIX}/lib/cmake/opencascade/*.cmake
 SUBST_SED.cmakebinletter=	-e 's/\\$${OCCT_INSTALL_BIN_LETTER}//g'
 
-.include "../../lang/tcl/buildlink3.mk"
-.include "../../x11/tk/buildlink3.mk"
+.include "../../mk/compiler.mk"
+
+.if !empty(LP64PLATFORMS:@.PLAT.@${MACHINE_PLATFORM:M${.PLAT.}}@) || \
+	(defined(ABI) && ${ABI} == "64")
+.  if !empty(PKGSRC_COMPILER:Mclang)
+OCCT_CUSTOM_COMPILER_DRIVER=	custom_clang_64.sh
+.  else
+OCCT_CUSTOM_COMPILER_DRIVER=	custom_gcc_64.sh
+.  endif
+.else
+.  if !empty(PKGSRC_COMPILER:Mclang)
+OCCT_CUSTOM_COMPILER_DRIVER=	custom_clang_32.sh
+.  else
+OCCT_CUSTOM_COMPILER_DRIVER=	custom_gcc_32.sh
+.  endif
+.endif
+
+PLIST_SUBST=	OCCT_CUSTOM_COMPILER_DRIVER=${OCCT_CUSTOM_COMPILER_DRIVER:Q}
+
+.include "../../fonts/fontconfig/buildlink3.mk"
+.include "../../graphics/freetype2/buildlink3.mk"
+.include "../../math/eigen3/buildlink3.mk"
+.include "../../textproc/rapidjson/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/opencascade-git/PLIST b/opencascade-git/PLIST
index cd5a1cff7a..1a946c96f9 100644
--- a/opencascade-git/PLIST
+++ b/opencascade-git/PLIST
@@ -1,6 +1,12 @@
 @comment $NetBSD$
 bin/DRAWEXE
 bin/DRAWEXE-${PKGVERSION}
+bin/ExpToCasExe
+bin/ExpToCasExe-${PKGVERSION}
+bin/custom.sh
+bin/${OCCT_CUSTOM_COMPILER_DRIVER}
+bin/draw.sh
+bin/env.sh
 include/opencascade/AIS.hxx
 include/opencascade/AIS_AngleDimension.hxx
 include/opencascade/AIS_Animation.hxx
@@ -15,20 +21,14 @@ include/opencascade/AIS_CameraFrustum.hxx
 include/opencascade/AIS_Chamf2dDimension.hxx
 include/opencascade/AIS_Chamf3dDimension.hxx
 include/opencascade/AIS_Circle.hxx
-include/opencascade/AIS_ClearMode.hxx
 include/opencascade/AIS_ColorScale.hxx
 include/opencascade/AIS_ColoredDrawer.hxx
 include/opencascade/AIS_ColoredShape.hxx
 include/opencascade/AIS_ConcentricRelation.hxx
-include/opencascade/AIS_ConnectStatus.hxx
 include/opencascade/AIS_ConnectedInteractive.hxx
 include/opencascade/AIS_DataMapIteratorOfDataMapOfIOStatus.hxx
-include/opencascade/AIS_DataMapIteratorOfDataMapOfSelStat.hxx
-include/opencascade/AIS_DataMapIteratorOfDataMapofIntegerListOfinteractive.hxx
 include/opencascade/AIS_DataMapOfIOStatus.hxx
-include/opencascade/AIS_DataMapOfSelStat.hxx
 include/opencascade/AIS_DataMapOfShapeDrawer.hxx
-include/opencascade/AIS_DataMapofIntegerListOfinteractive.hxx
 include/opencascade/AIS_DiameterDimension.hxx
 include/opencascade/AIS_Dimension.hxx
 include/opencascade/AIS_DimensionOwner.hxx
@@ -43,7 +43,6 @@ include/opencascade/AIS_FixRelation.hxx
 include/opencascade/AIS_GlobalStatus.hxx
 include/opencascade/AIS_GraphicTool.hxx
 include/opencascade/AIS_IdenticRelation.hxx
-include/opencascade/AIS_IndexedDataMapOfOwnerPrs.hxx
 include/opencascade/AIS_InteractiveContext.hxx
 include/opencascade/AIS_InteractiveObject.hxx
 include/opencascade/AIS_KindOfInteractive.hxx
@@ -55,8 +54,6 @@ include/opencascade/AIS_ListOfInteractive.hxx
 include/opencascade/AIS_Manipulator.hxx
 include/opencascade/AIS_ManipulatorMode.hxx
 include/opencascade/AIS_ManipulatorOwner.hxx
-include/opencascade/AIS_MapIteratorOfMapOfInteractive.hxx
-include/opencascade/AIS_MapOfInteractive.hxx
 include/opencascade/AIS_MaxRadiusDimension.hxx
 include/opencascade/AIS_MediaPlayer.hxx
 include/opencascade/AIS_MidPointRelation.hxx
@@ -81,7 +78,6 @@ include/opencascade/AIS_SelectStatus.hxx
 include/opencascade/AIS_Selection.hxx
 include/opencascade/AIS_SelectionModesConcurrency.hxx
 include/opencascade/AIS_SelectionScheme.hxx
-include/opencascade/AIS_SequenceOfInteractive.hxx
 include/opencascade/AIS_Shape.hxx
 include/opencascade/AIS_SignatureFilter.hxx
 include/opencascade/AIS_StatusOfDetection.hxx
@@ -273,6 +269,7 @@ include/opencascade/Aspect_RectangularGrid.hxx
 include/opencascade/Aspect_RenderingContext.hxx
 include/opencascade/Aspect_ScrollDelta.hxx
 include/opencascade/Aspect_SequenceOfColor.hxx
+include/opencascade/Aspect_SkydomeBackground.hxx
 include/opencascade/Aspect_Touch.hxx
 include/opencascade/Aspect_TouchMap.hxx
 include/opencascade/Aspect_TrackedDevicePose.hxx
@@ -549,6 +546,7 @@ include/opencascade/BRepBuilderAPI_MakeEdge2d.hxx
 include/opencascade/BRepBuilderAPI_MakeFace.hxx
 include/opencascade/BRepBuilderAPI_MakePolygon.hxx
 include/opencascade/BRepBuilderAPI_MakeShape.hxx
+include/opencascade/BRepBuilderAPI_MakeShapeOnMesh.hxx
 include/opencascade/BRepBuilderAPI_MakeShell.hxx
 include/opencascade/BRepBuilderAPI_MakeSolid.hxx
 include/opencascade/BRepBuilderAPI_MakeVertex.hxx
@@ -608,6 +606,8 @@ include/opencascade/BRepExtrema_ExtPF.hxx
 include/opencascade/BRepExtrema_MapOfIntegerPackedMapOfInteger.hxx
 include/opencascade/BRepExtrema_OverlapTool.hxx
 include/opencascade/BRepExtrema_Poly.hxx
+include/opencascade/BRepExtrema_ProximityDistTool.hxx
+include/opencascade/BRepExtrema_ProximityValueTool.hxx
 include/opencascade/BRepExtrema_SelfIntersection.hxx
 include/opencascade/BRepExtrema_SeqOfSolution.hxx
 include/opencascade/BRepExtrema_ShapeProximity.hxx
@@ -741,8 +741,10 @@ include/opencascade/BRepLib_MakeShell.hxx
 include/opencascade/BRepLib_MakeSolid.hxx
 include/opencascade/BRepLib_MakeVertex.hxx
 include/opencascade/BRepLib_MakeWire.hxx
+include/opencascade/BRepLib_PointCloudShape.hxx
 include/opencascade/BRepLib_ShapeModification.hxx
 include/opencascade/BRepLib_ShellError.hxx
+include/opencascade/BRepLib_ToolTriangulatedShape.hxx
 include/opencascade/BRepLib_ValidateEdge.hxx
 include/opencascade/BRepLib_WireError.hxx
 include/opencascade/BRepMAT2d_BisectingLocus.hxx
@@ -787,6 +789,7 @@ include/opencascade/BRepMesh_Edge.hxx
 include/opencascade/BRepMesh_EdgeDiscret.hxx
 include/opencascade/BRepMesh_EdgeParameterProvider.hxx
 include/opencascade/BRepMesh_EdgeTessellationExtractor.hxx
+include/opencascade/BRepMesh_ExtrusionRangeSplitter.hxx
 include/opencascade/BRepMesh_FaceChecker.hxx
 include/opencascade/BRepMesh_FaceDiscret.hxx
 include/opencascade/BRepMesh_FactoryError.hxx
@@ -813,6 +816,7 @@ include/opencascade/BRepMesh_TorusRangeSplitter.hxx
 include/opencascade/BRepMesh_Triangle.hxx
 include/opencascade/BRepMesh_Triangulator.hxx
 include/opencascade/BRepMesh_UVParamRangeSplitter.hxx
+include/opencascade/BRepMesh_UndefinedRangeSplitter.hxx
 include/opencascade/BRepMesh_Vertex.hxx
 include/opencascade/BRepMesh_VertexInspector.hxx
 include/opencascade/BRepMesh_VertexTool.hxx
@@ -903,6 +907,7 @@ include/opencascade/BRepToIGES_BRShell.hxx
 include/opencascade/BRepToIGES_BRSolid.hxx
 include/opencascade/BRepToIGES_BRWire.hxx
 include/opencascade/BRepTools.hxx
+include/opencascade/BRepTools_CopyModification.hxx
 include/opencascade/BRepTools_DataMapIteratorOfMapOfVertexPnt2d.hxx
 include/opencascade/BRepTools_GTrsfModification.hxx
 include/opencascade/BRepTools_History.hxx
@@ -1200,7 +1205,6 @@ include/opencascade/Bnd_B3f.hxx
 include/opencascade/Bnd_B3x.gxx
 include/opencascade/Bnd_B3x.lxx
 include/opencascade/Bnd_BoundSortBox.hxx
-include/opencascade/Bnd_BoundSortBox2d.hxx
 include/opencascade/Bnd_Box.hxx
 include/opencascade/Bnd_Box2d.hxx
 include/opencascade/Bnd_HArray1OfBox.hxx
@@ -1208,7 +1212,6 @@ include/opencascade/Bnd_HArray1OfBox2d.hxx
 include/opencascade/Bnd_HArray1OfSphere.hxx
 include/opencascade/Bnd_OBB.hxx
 include/opencascade/Bnd_Range.hxx
-include/opencascade/Bnd_SeqOfBox.hxx
 include/opencascade/Bnd_Sphere.hxx
 include/opencascade/Bnd_Sphere.lxx
 include/opencascade/Bnd_Tools.hxx
@@ -1400,6 +1403,14 @@ include/opencascade/DDataStd_DrawPresentation.hxx
 include/opencascade/DDataStd_TreeBrowser.hxx
 include/opencascade/DDocStd.hxx
 include/opencascade/DDocStd_DrawDocument.hxx
+include/opencascade/DEBRepCascade_ConfigurationNode.hxx
+include/opencascade/DEBRepCascade_Provider.hxx
+include/opencascade/DEXCAFCascade_ConfigurationNode.hxx
+include/opencascade/DEXCAFCascade_Provider.hxx
+include/opencascade/DE_ConfigurationContext.hxx
+include/opencascade/DE_ConfigurationNode.hxx
+include/opencascade/DE_Provider.hxx
+include/opencascade/DE_Wrapper.hxx
 include/opencascade/DNaming.hxx
 include/opencascade/DNaming_BooleanOperationDriver.hxx
 include/opencascade/DNaming_BoxDriver.hxx
@@ -1606,6 +1617,36 @@ include/opencascade/Expr_UnaryExpression.lxx
 include/opencascade/Expr_UnaryFunction.hxx
 include/opencascade/Expr_UnaryMinus.hxx
 include/opencascade/Expr_UnknownIterator.hxx
+include/opencascade/Express.hxx
+include/opencascade/Express_Alias.hxx
+include/opencascade/Express_Array.hxx
+include/opencascade/Express_Bag.hxx
+include/opencascade/Express_Boolean.hxx
+include/opencascade/Express_ComplexType.hxx
+include/opencascade/Express_DataMapOfAsciiStringItem.hxx
+include/opencascade/Express_Entity.hxx
+include/opencascade/Express_Enum.hxx
+include/opencascade/Express_Field.hxx
+include/opencascade/Express_HSequenceOfEntity.hxx
+include/opencascade/Express_HSequenceOfField.hxx
+include/opencascade/Express_HSequenceOfItem.hxx
+include/opencascade/Express_Integer.hxx
+include/opencascade/Express_Item.hxx
+include/opencascade/Express_List.hxx
+include/opencascade/Express_Logical.hxx
+include/opencascade/Express_NamedType.hxx
+include/opencascade/Express_Number.hxx
+include/opencascade/Express_PredefinedType.hxx
+include/opencascade/Express_Real.hxx
+include/opencascade/Express_Reference.hxx
+include/opencascade/Express_Schema.hxx
+include/opencascade/Express_Select.hxx
+include/opencascade/Express_SequenceOfEntity.hxx
+include/opencascade/Express_SequenceOfField.hxx
+include/opencascade/Express_SequenceOfItem.hxx
+include/opencascade/Express_Set.hxx
+include/opencascade/Express_String.hxx
+include/opencascade/Express_Type.hxx
 include/opencascade/Extrema_Array1OfPOnCurv.hxx
 include/opencascade/Extrema_Array1OfPOnCurv2d.hxx
 include/opencascade/Extrema_Array1OfPOnSurf.hxx
@@ -1861,10 +1902,13 @@ include/opencascade/Geom2dAPI_ProjectPointOnCurve.lxx
 include/opencascade/Geom2dAdaptor.hxx
 include/opencascade/Geom2dAdaptor_Curve.hxx
 include/opencascade/Geom2dConvert.hxx
+include/opencascade/Geom2dConvert_ApproxArcsSegments.hxx
 include/opencascade/Geom2dConvert_ApproxCurve.hxx
 include/opencascade/Geom2dConvert_BSplineCurveKnotSplitting.hxx
 include/opencascade/Geom2dConvert_BSplineCurveToBezierCurve.hxx
 include/opencascade/Geom2dConvert_CompCurveToBSplineCurve.hxx
+include/opencascade/Geom2dConvert_PPoint.hxx
+include/opencascade/Geom2dConvert_SequenceOfPPoint.hxx
 include/opencascade/Geom2dEvaluator.hxx
 include/opencascade/Geom2dEvaluator_Curve.hxx
 include/opencascade/Geom2dEvaluator_OffsetCurve.hxx
@@ -1995,6 +2039,12 @@ include/opencascade/GeomConvert_BSplineSurfaceToBezierSurface.hxx
 include/opencascade/GeomConvert_CompBezierSurfacesToBSplineSurface.hxx
 include/opencascade/GeomConvert_CompBezierSurfacesToBSplineSurface.lxx
 include/opencascade/GeomConvert_CompCurveToBSplineCurve.hxx
+include/opencascade/GeomConvert_ConvType.hxx
+include/opencascade/GeomConvert_CurveToAnaCurve.hxx
+include/opencascade/GeomConvert_FuncConeLSDist.hxx
+include/opencascade/GeomConvert_FuncCylinderLSDist.hxx
+include/opencascade/GeomConvert_FuncSphereLSDist.hxx
+include/opencascade/GeomConvert_SurfToAnaSurf.hxx
 include/opencascade/GeomConvert_Units.hxx
 include/opencascade/GeomEvaluator_Curve.hxx
 include/opencascade/GeomEvaluator_OffsetCurve.hxx
@@ -2281,6 +2331,7 @@ include/opencascade/Graphic3d_CubeMapSide.hxx
 include/opencascade/Graphic3d_CullingTool.hxx
 include/opencascade/Graphic3d_DataStructureManager.hxx
 include/opencascade/Graphic3d_DiagnosticInfo.hxx
+include/opencascade/Graphic3d_DisplayPriority.hxx
 include/opencascade/Graphic3d_FrameStats.hxx
 include/opencascade/Graphic3d_FrameStatsCounter.hxx
 include/opencascade/Graphic3d_FrameStatsData.hxx
@@ -2344,6 +2395,7 @@ include/opencascade/Graphic3d_Texture1Dsegment.hxx
 include/opencascade/Graphic3d_Texture2D.hxx
 include/opencascade/Graphic3d_Texture2Dmanual.hxx
 include/opencascade/Graphic3d_Texture2Dplane.hxx
+include/opencascade/Graphic3d_Texture3D.hxx
 include/opencascade/Graphic3d_TextureEnv.hxx
 include/opencascade/Graphic3d_TextureMap.hxx
 include/opencascade/Graphic3d_TextureParams.hxx
@@ -2747,6 +2799,8 @@ include/opencascade/IGESBasic_ToolSingleParent.hxx
 include/opencascade/IGESBasic_ToolSingularSubfigure.hxx
 include/opencascade/IGESBasic_ToolSubfigureDef.hxx
 include/opencascade/IGESCAFControl.hxx
+include/opencascade/IGESCAFControl_ConfigurationNode.hxx
+include/opencascade/IGESCAFControl_Provider.hxx
 include/opencascade/IGESCAFControl_Reader.hxx
 include/opencascade/IGESCAFControl_Writer.hxx
 include/opencascade/IGESControl_ActorWrite.hxx
@@ -3255,7 +3309,6 @@ include/opencascade/IntCurve_UserIntConicCurveGen.gxx
 include/opencascade/IntCurvesFace_Intersector.hxx
 include/opencascade/IntCurvesFace_Intersector.lxx
 include/opencascade/IntCurvesFace_ShapeIntersector.hxx
-include/opencascade/IntCurvesFace_ShapeIntersector.lxx
 include/opencascade/IntImpParGen.hxx
 include/opencascade/IntImpParGen_ImpParTool.gxx
 include/opencascade/IntImpParGen_ImpTool.hxx
@@ -3315,7 +3368,6 @@ include/opencascade/IntPatch_PolyhedronTool.lxx
 include/opencascade/IntPatch_PrmPrmIntersection.hxx
 include/opencascade/IntPatch_PrmPrmIntersection.lxx
 include/opencascade/IntPatch_PrmPrmIntersection_T3Bits.hxx
-include/opencascade/IntPatch_PrmPrmIntersection_T3Bits.lxx
 include/opencascade/IntPatch_RLine.hxx
 include/opencascade/IntPatch_RLine.lxx
 include/opencascade/IntPatch_RstInt.hxx
@@ -3954,15 +4006,7 @@ include/opencascade/OSD_Exception.hxx
 include/opencascade/OSD_Exception_ACCESS_VIOLATION.hxx
 include/opencascade/OSD_Exception_ARRAY_BOUNDS_EXCEEDED.hxx
 include/opencascade/OSD_Exception_CTRL_BREAK.hxx
-include/opencascade/OSD_Exception_FLT_DENORMAL_OPERAND.hxx
-include/opencascade/OSD_Exception_FLT_DIVIDE_BY_ZERO.hxx
-include/opencascade/OSD_Exception_FLT_INEXACT_RESULT.hxx
-include/opencascade/OSD_Exception_FLT_INVALID_OPERATION.hxx
-include/opencascade/OSD_Exception_FLT_OVERFLOW.hxx
-include/opencascade/OSD_Exception_FLT_STACK_CHECK.hxx
-include/opencascade/OSD_Exception_FLT_UNDERFLOW.hxx
 include/opencascade/OSD_Exception_ILLEGAL_INSTRUCTION.hxx
-include/opencascade/OSD_Exception_INT_DIVIDE_BY_ZERO.hxx
 include/opencascade/OSD_Exception_INT_OVERFLOW.hxx
 include/opencascade/OSD_Exception_INVALID_DISPOSITION.hxx
 include/opencascade/OSD_Exception_IN_PAGE_ERROR.hxx
@@ -4064,6 +4108,8 @@ include/opencascade/OpenGl_GlCore44.hxx
 include/opencascade/OpenGl_GlCore45.hxx
 include/opencascade/OpenGl_GlCore46.hxx
 include/opencascade/OpenGl_GlFunctions.hxx
+include/opencascade/OpenGl_GlNative.hxx
+include/opencascade/OpenGl_GlTypes.hxx
 include/opencascade/OpenGl_GraduatedTrihedron.hxx
 include/opencascade/OpenGl_GraphicDriver.hxx
 include/opencascade/OpenGl_GraphicDriverFactory.hxx
@@ -4112,6 +4158,7 @@ include/opencascade/OpenGl_VertexBufferEditor.hxx
 include/opencascade/OpenGl_View.hxx
 include/opencascade/OpenGl_Window.hxx
 include/opencascade/OpenGl_Workspace.hxx
+include/opencascade/OpenGl_glext.h
 include/opencascade/OpenGl_khrplatform.h
 include/opencascade/PCDM.hxx
 include/opencascade/PCDM_BaseDriverPointer.hxx
@@ -4313,7 +4360,6 @@ include/opencascade/QANCollection_IndexedDataMapOfRealPnt.hxx
 include/opencascade/QANCollection_ListIteratorOfListOfPnt.hxx
 include/opencascade/QANCollection_ListOfPnt.hxx
 include/opencascade/Quantity_Array1OfColor.hxx
-include/opencascade/Quantity_Array2OfColor.hxx
 include/opencascade/Quantity_Color.hxx
 include/opencascade/Quantity_ColorHasher.hxx
 include/opencascade/Quantity_ColorRGBA.hxx
@@ -4324,10 +4370,11 @@ include/opencascade/Quantity_HArray1OfColor.hxx
 include/opencascade/Quantity_NameOfColor.hxx
 include/opencascade/Quantity_Period.hxx
 include/opencascade/Quantity_PeriodDefinitionError.hxx
-include/opencascade/Quantity_PhysicalQuantity.hxx
 include/opencascade/Quantity_TypeOfColor.hxx
 include/opencascade/RWGltf_CafReader.hxx
 include/opencascade/RWGltf_CafWriter.hxx
+include/opencascade/RWGltf_ConfigurationNode.hxx
+include/opencascade/RWGltf_DracoParameters.hxx
 include/opencascade/RWGltf_GltfAccessor.hxx
 include/opencascade/RWGltf_GltfAccessorCompType.hxx
 include/opencascade/RWGltf_GltfAccessorLayout.hxx
@@ -4346,6 +4393,7 @@ include/opencascade/RWGltf_GltfRootElement.hxx
 include/opencascade/RWGltf_GltfSceneNodeMap.hxx
 include/opencascade/RWGltf_MaterialCommon.hxx
 include/opencascade/RWGltf_MaterialMetallicRoughness.hxx
+include/opencascade/RWGltf_Provider.hxx
 include/opencascade/RWGltf_TriangulationReader.hxx
 include/opencascade/RWGltf_WriterTrsfFormat.hxx
 include/opencascade/RWHeaderSection.hxx
@@ -4367,15 +4415,21 @@ include/opencascade/RWMesh_TriangulationSource.hxx
 include/opencascade/RWObj.hxx
 include/opencascade/RWObj_CafReader.hxx
 include/opencascade/RWObj_CafWriter.hxx
+include/opencascade/RWObj_ConfigurationNode.hxx
 include/opencascade/RWObj_Material.hxx
 include/opencascade/RWObj_MtlReader.hxx
 include/opencascade/RWObj_ObjMaterialMap.hxx
 include/opencascade/RWObj_ObjWriterContext.hxx
+include/opencascade/RWObj_Provider.hxx
 include/opencascade/RWObj_Reader.hxx
 include/opencascade/RWObj_SubMesh.hxx
 include/opencascade/RWObj_SubMeshReason.hxx
 include/opencascade/RWObj_Tools.hxx
 include/opencascade/RWObj_TriangulationReader.hxx
+include/opencascade/RWPly_CafWriter.hxx
+include/opencascade/RWPly_ConfigurationNode.hxx
+include/opencascade/RWPly_PlyWriterContext.hxx
+include/opencascade/RWPly_Provider.hxx
 include/opencascade/RWStepAP203_RWCcDesignApproval.hxx
 include/opencascade/RWStepAP203_RWCcDesignCertification.hxx
 include/opencascade/RWStepAP203_RWCcDesignContract.hxx
@@ -4988,11 +5042,15 @@ include/opencascade/RWStepVisual_RWCharacterizedObjAndRepresentationAndDraughtin
 include/opencascade/RWStepVisual_RWColour.hxx
 include/opencascade/RWStepVisual_RWColourRgb.hxx
 include/opencascade/RWStepVisual_RWColourSpecification.hxx
+include/opencascade/RWStepVisual_RWComplexTriangulatedFace.hxx
+include/opencascade/RWStepVisual_RWComplexTriangulatedSurfaceSet.hxx
 include/opencascade/RWStepVisual_RWCompositeText.hxx
 include/opencascade/RWStepVisual_RWCompositeTextWithExtent.hxx
 include/opencascade/RWStepVisual_RWContextDependentInvisibility.hxx
 include/opencascade/RWStepVisual_RWContextDependentOverRidingStyledItem.hxx
 include/opencascade/RWStepVisual_RWCoordinatesList.hxx
+include/opencascade/RWStepVisual_RWCubicBezierTessellatedEdge.hxx
+include/opencascade/RWStepVisual_RWCubicBezierTriangulatedFace.hxx
 include/opencascade/RWStepVisual_RWCurveStyle.hxx
 include/opencascade/RWStepVisual_RWCurveStyleFont.hxx
 include/opencascade/RWStepVisual_RWCurveStyleFontPattern.hxx
@@ -5023,6 +5081,8 @@ include/opencascade/RWStepVisual_RWPresentationStyleAssignment.hxx
 include/opencascade/RWStepVisual_RWPresentationStyleByContext.hxx
 include/opencascade/RWStepVisual_RWPresentationView.hxx
 include/opencascade/RWStepVisual_RWPresentedItemRepresentation.hxx
+include/opencascade/RWStepVisual_RWRepositionedTessellatedGeometricSet.hxx
+include/opencascade/RWStepVisual_RWRepositionedTessellatedItem.hxx
 include/opencascade/RWStepVisual_RWStyledItem.hxx
 include/opencascade/RWStepVisual_RWSurfaceSideStyle.hxx
 include/opencascade/RWStepVisual_RWSurfaceStyleBoundary.hxx
@@ -5039,15 +5099,28 @@ include/opencascade/RWStepVisual_RWSurfaceStyleUsage.hxx
 include/opencascade/RWStepVisual_RWTemplate.hxx
 include/opencascade/RWStepVisual_RWTemplateInstance.hxx
 include/opencascade/RWStepVisual_RWTessellatedAnnotationOccurrence.hxx
+include/opencascade/RWStepVisual_RWTessellatedConnectingEdge.hxx
 include/opencascade/RWStepVisual_RWTessellatedCurveSet.hxx
+include/opencascade/RWStepVisual_RWTessellatedEdge.hxx
 include/opencascade/RWStepVisual_RWTessellatedGeometricSet.hxx
 include/opencascade/RWStepVisual_RWTessellatedItem.hxx
+include/opencascade/RWStepVisual_RWTessellatedPointSet.hxx
+include/opencascade/RWStepVisual_RWTessellatedShapeRepresentation.hxx
+include/opencascade/RWStepVisual_RWTessellatedShapeRepresentationWithAccuracyParameters.hxx
+include/opencascade/RWStepVisual_RWTessellatedShell.hxx
+include/opencascade/RWStepVisual_RWTessellatedSolid.hxx
+include/opencascade/RWStepVisual_RWTessellatedStructuredItem.hxx
+include/opencascade/RWStepVisual_RWTessellatedVertex.hxx
+include/opencascade/RWStepVisual_RWTessellatedWire.hxx
 include/opencascade/RWStepVisual_RWTextLiteral.hxx
 include/opencascade/RWStepVisual_RWTextStyle.hxx
 include/opencascade/RWStepVisual_RWTextStyleForDefinedFont.hxx
 include/opencascade/RWStepVisual_RWTextStyleWithBoxCharacteristics.hxx
+include/opencascade/RWStepVisual_RWTriangulatedFace.hxx
 include/opencascade/RWStepVisual_RWViewVolume.hxx
 include/opencascade/RWStl.hxx
+include/opencascade/RWStl_ConfigurationNode.hxx
+include/opencascade/RWStl_Provider.hxx
 include/opencascade/RWStl_Reader.hxx
 include/opencascade/Resource_ConvertUnicode.hxx
 include/opencascade/Resource_DataMapOfAsciiStringAsciiString.hxx
@@ -5058,6 +5131,7 @@ include/opencascade/Resource_Manager.hxx
 include/opencascade/Resource_NoSuchResource.hxx
 include/opencascade/Resource_Unicode.hxx
 include/opencascade/STEPCAFControl_ActorWrite.hxx
+include/opencascade/STEPCAFControl_ConfigurationNode.hxx
 include/opencascade/STEPCAFControl_Controller.hxx
 include/opencascade/STEPCAFControl_DataMapIteratorOfDataMapOfLabelExternFile.hxx
 include/opencascade/STEPCAFControl_DataMapIteratorOfDataMapOfLabelShape.hxx
@@ -5074,6 +5148,7 @@ include/opencascade/STEPCAFControl_DataMapOfShapeSDR.hxx
 include/opencascade/STEPCAFControl_ExternFile.hxx
 include/opencascade/STEPCAFControl_ExternFile.lxx
 include/opencascade/STEPCAFControl_GDTProperty.hxx
+include/opencascade/STEPCAFControl_Provider.hxx
 include/opencascade/STEPCAFControl_Reader.hxx
 include/opencascade/STEPCAFControl_Writer.hxx
 include/opencascade/STEPConstruct.hxx
@@ -5208,6 +5283,7 @@ include/opencascade/ShapeAlgo_AlgoContainer.lxx
 include/opencascade/ShapeAlgo_ToolContainer.hxx
 include/opencascade/ShapeAnalysis.hxx
 include/opencascade/ShapeAnalysis_BoxBndTree.hxx
+include/opencascade/ShapeAnalysis_CanonicalRecognition.hxx
 include/opencascade/ShapeAnalysis_CheckSmallFace.hxx
 include/opencascade/ShapeAnalysis_CheckSmallFace.lxx
 include/opencascade/ShapeAnalysis_Curve.hxx
@@ -5439,7 +5515,6 @@ include/opencascade/Standard_Std.hxx
 include/opencascade/Standard_Stream.hxx
 include/opencascade/Standard_ThreadId.hxx
 include/opencascade/Standard_Time.hxx
-include/opencascade/Standard_TooManyUsers.hxx
 include/opencascade/Standard_Transient.hxx
 include/opencascade/Standard_Type.hxx
 include/opencascade/Standard_TypeDef.hxx
@@ -6581,6 +6656,8 @@ include/opencascade/StepToTopoDS_TranslatePolyLoop.hxx
 include/opencascade/StepToTopoDS_TranslatePolyLoopError.hxx
 include/opencascade/StepToTopoDS_TranslateShell.hxx
 include/opencascade/StepToTopoDS_TranslateShellError.hxx
+include/opencascade/StepToTopoDS_TranslateSolid.hxx
+include/opencascade/StepToTopoDS_TranslateSolidError.hxx
 include/opencascade/StepToTopoDS_TranslateVertex.hxx
 include/opencascade/StepToTopoDS_TranslateVertexError.hxx
 include/opencascade/StepToTopoDS_TranslateVertexLoop.hxx
@@ -6611,6 +6688,8 @@ include/opencascade/StepVisual_Array1OfPresentationStyleSelect.hxx
 include/opencascade/StepVisual_Array1OfRenderingPropertiesSelect.hxx
 include/opencascade/StepVisual_Array1OfStyleContextSelect.hxx
 include/opencascade/StepVisual_Array1OfSurfaceStyleElementSelect.hxx
+include/opencascade/StepVisual_Array1OfTessellatedEdgeOrVertex.hxx
+include/opencascade/StepVisual_Array1OfTessellatedStructuredItem.hxx
 include/opencascade/StepVisual_Array1OfTextOrCharacter.hxx
 include/opencascade/StepVisual_BackgroundColour.hxx
 include/opencascade/StepVisual_BoxCharacteristicSelect.hxx
@@ -6631,11 +6710,15 @@ include/opencascade/StepVisual_CharacterizedObjAndRepresentationAndDraughtingMod
 include/opencascade/StepVisual_Colour.hxx
 include/opencascade/StepVisual_ColourRgb.hxx
 include/opencascade/StepVisual_ColourSpecification.hxx
+include/opencascade/StepVisual_ComplexTriangulatedFace.hxx
+include/opencascade/StepVisual_ComplexTriangulatedSurfaceSet.hxx
 include/opencascade/StepVisual_CompositeText.hxx
 include/opencascade/StepVisual_CompositeTextWithExtent.hxx
 include/opencascade/StepVisual_ContextDependentInvisibility.hxx
 include/opencascade/StepVisual_ContextDependentOverRidingStyledItem.hxx
 include/opencascade/StepVisual_CoordinatesList.hxx
+include/opencascade/StepVisual_CubicBezierTessellatedEdge.hxx
+include/opencascade/StepVisual_CubicBezierTriangulatedFace.hxx
 include/opencascade/StepVisual_CurveStyle.hxx
 include/opencascade/StepVisual_CurveStyleFont.hxx
 include/opencascade/StepVisual_CurveStyleFontPattern.hxx
@@ -6647,8 +6730,10 @@ include/opencascade/StepVisual_DraughtingCalloutElement.hxx
 include/opencascade/StepVisual_DraughtingModel.hxx
 include/opencascade/StepVisual_DraughtingPreDefinedColour.hxx
 include/opencascade/StepVisual_DraughtingPreDefinedCurveFont.hxx
+include/opencascade/StepVisual_EdgeOrCurve.hxx
 include/opencascade/StepVisual_ExternallyDefinedCurveFont.hxx
 include/opencascade/StepVisual_ExternallyDefinedTextFont.hxx
+include/opencascade/StepVisual_FaceOrSurface.hxx
 include/opencascade/StepVisual_FillAreaStyle.hxx
 include/opencascade/StepVisual_FillAreaStyleColour.hxx
 include/opencascade/StepVisual_FillStyleSelect.hxx
@@ -6668,6 +6753,8 @@ include/opencascade/StepVisual_HArray1OfPresentationStyleSelect.hxx
 include/opencascade/StepVisual_HArray1OfRenderingPropertiesSelect.hxx
 include/opencascade/StepVisual_HArray1OfStyleContextSelect.hxx
 include/opencascade/StepVisual_HArray1OfSurfaceStyleElementSelect.hxx
+include/opencascade/StepVisual_HArray1OfTessellatedEdgeOrVertex.hxx
+include/opencascade/StepVisual_HArray1OfTessellatedStructuredItem.hxx
 include/opencascade/StepVisual_HArray1OfTextOrCharacter.hxx
 include/opencascade/StepVisual_Invisibility.hxx
 include/opencascade/StepVisual_InvisibilityContext.hxx
@@ -6681,6 +6768,7 @@ include/opencascade/StepVisual_MechanicalDesignGeometricPresentationRepresentati
 include/opencascade/StepVisual_NullStyle.hxx
 include/opencascade/StepVisual_NullStyleMember.hxx
 include/opencascade/StepVisual_OverRidingStyledItem.hxx
+include/opencascade/StepVisual_PathOrCompositeCurve.hxx
 include/opencascade/StepVisual_PlanarBox.hxx
 include/opencascade/StepVisual_PlanarExtent.hxx
 include/opencascade/StepVisual_PointStyle.hxx
@@ -6703,6 +6791,8 @@ include/opencascade/StepVisual_PresentationView.hxx
 include/opencascade/StepVisual_PresentedItem.hxx
 include/opencascade/StepVisual_PresentedItemRepresentation.hxx
 include/opencascade/StepVisual_RenderingPropertiesSelect.hxx
+include/opencascade/StepVisual_RepositionedTessellatedGeometricSet.hxx
+include/opencascade/StepVisual_RepositionedTessellatedItem.hxx
 include/opencascade/StepVisual_ShadingSurfaceMethod.hxx
 include/opencascade/StepVisual_StyleContextSelect.hxx
 include/opencascade/StepVisual_StyledItem.hxx
@@ -6724,15 +6814,29 @@ include/opencascade/StepVisual_SurfaceStyleUsage.hxx
 include/opencascade/StepVisual_Template.hxx
 include/opencascade/StepVisual_TemplateInstance.hxx
 include/opencascade/StepVisual_TessellatedAnnotationOccurrence.hxx
+include/opencascade/StepVisual_TessellatedConnectingEdge.hxx
 include/opencascade/StepVisual_TessellatedCurveSet.hxx
+include/opencascade/StepVisual_TessellatedEdge.hxx
+include/opencascade/StepVisual_TessellatedEdgeOrVertex.hxx
+include/opencascade/StepVisual_TessellatedFace.hxx
 include/opencascade/StepVisual_TessellatedGeometricSet.hxx
 include/opencascade/StepVisual_TessellatedItem.hxx
+include/opencascade/StepVisual_TessellatedPointSet.hxx
+include/opencascade/StepVisual_TessellatedShapeRepresentation.hxx
+include/opencascade/StepVisual_TessellatedShapeRepresentationWithAccuracyParameters.hxx
+include/opencascade/StepVisual_TessellatedShell.hxx
+include/opencascade/StepVisual_TessellatedSolid.hxx
+include/opencascade/StepVisual_TessellatedStructuredItem.hxx
+include/opencascade/StepVisual_TessellatedSurfaceSet.hxx
+include/opencascade/StepVisual_TessellatedVertex.hxx
+include/opencascade/StepVisual_TessellatedWire.hxx
 include/opencascade/StepVisual_TextLiteral.hxx
 include/opencascade/StepVisual_TextOrCharacter.hxx
 include/opencascade/StepVisual_TextPath.hxx
 include/opencascade/StepVisual_TextStyle.hxx
 include/opencascade/StepVisual_TextStyleForDefinedFont.hxx
 include/opencascade/StepVisual_TextStyleWithBoxCharacteristics.hxx
+include/opencascade/StepVisual_TriangulatedFace.hxx
 include/opencascade/StepVisual_ViewVolume.hxx
 include/opencascade/StlAPI.hxx
 include/opencascade/StlAPI_Reader.hxx
@@ -7610,6 +7714,7 @@ include/opencascade/TopoDSToStep_MakeStepEdge.hxx
 include/opencascade/TopoDSToStep_MakeStepFace.hxx
 include/opencascade/TopoDSToStep_MakeStepVertex.hxx
 include/opencascade/TopoDSToStep_MakeStepWire.hxx
+include/opencascade/TopoDSToStep_MakeTessellatedItem.hxx
 include/opencascade/TopoDSToStep_MakeVertexError.hxx
 include/opencascade/TopoDSToStep_MakeWireError.hxx
 include/opencascade/TopoDSToStep_Root.hxx
@@ -7792,6 +7897,7 @@ include/opencascade/ViewerTest_EventManager.hxx
 include/opencascade/ViewerTest_V3dView.hxx
 include/opencascade/Vrml.hxx
 include/opencascade/VrmlAPI.hxx
+include/opencascade/VrmlAPI_CafReader.hxx
 include/opencascade/VrmlAPI_RepresentationOfShape.hxx
 include/opencascade/VrmlAPI_Writer.hxx
 include/opencascade/VrmlConverter_Curve.hxx
@@ -7844,6 +7950,7 @@ include/opencascade/Vrml_AsciiText.hxx
 include/opencascade/Vrml_AsciiTextJustification.hxx
 include/opencascade/Vrml_Cone.hxx
 include/opencascade/Vrml_ConeParts.hxx
+include/opencascade/Vrml_ConfigurationNode.hxx
 include/opencascade/Vrml_Coordinate3.hxx
 include/opencascade/Vrml_Cube.hxx
 include/opencascade/Vrml_Cylinder.hxx
@@ -7869,6 +7976,7 @@ include/opencascade/Vrml_OrthographicCamera.hxx
 include/opencascade/Vrml_PerspectiveCamera.hxx
 include/opencascade/Vrml_PointLight.hxx
 include/opencascade/Vrml_PointSet.hxx
+include/opencascade/Vrml_Provider.hxx
 include/opencascade/Vrml_Rotation.hxx
 include/opencascade/Vrml_SFImage.hxx
 include/opencascade/Vrml_SFImageNumber.hxx
@@ -7902,6 +8010,7 @@ include/opencascade/WNT_WindowPtr.hxx
 include/opencascade/Wasm_Window.hxx
 include/opencascade/XBRepMesh.hxx
 include/opencascade/XCAFApp_Application.hxx
+include/opencascade/XCAFDimTolObjects_AngularQualifier.hxx
 include/opencascade/XCAFDimTolObjects_DataMapOfToleranceDatum.hxx
 include/opencascade/XCAFDimTolObjects_DatumModifWithValue.hxx
 include/opencascade/XCAFDimTolObjects_DatumModifiersSequence.hxx
@@ -7929,8 +8038,11 @@ include/opencascade/XCAFDimTolObjects_ToleranceZoneAffectedPlane.hxx
 include/opencascade/XCAFDimTolObjects_Tool.hxx
 include/opencascade/XCAFDoc.hxx
 include/opencascade/XCAFDoc_Area.hxx
+include/opencascade/XCAFDoc_AssemblyGraph.hxx
 include/opencascade/XCAFDoc_AssemblyItemId.hxx
 include/opencascade/XCAFDoc_AssemblyItemRef.hxx
+include/opencascade/XCAFDoc_AssemblyIterator.hxx
+include/opencascade/XCAFDoc_AssemblyTool.hxx
 include/opencascade/XCAFDoc_Centroid.hxx
 include/opencascade/XCAFDoc_ClippingPlaneTool.hxx
 include/opencascade/XCAFDoc_Color.hxx
@@ -8149,7 +8261,6 @@ include/opencascade/gce_MakeTranslation.hxx
 include/opencascade/gce_MakeTranslation2d.hxx
 include/opencascade/gce_Root.hxx
 include/opencascade/gce_Root.lxx
-include/opencascade/glext.h
 include/opencascade/gp.hxx
 include/opencascade/gp_Ax1.hxx
 include/opencascade/gp_Ax2.hxx
@@ -8229,7 +8340,6 @@ include/opencascade/math_FunctionRoots.lxx
 include/opencascade/math_FunctionSample.hxx
 include/opencascade/math_FunctionSet.hxx
 include/opencascade/math_FunctionSetRoot.hxx
-include/opencascade/math_FunctionSetRoot.lxx
 include/opencascade/math_FunctionSetWithDerivatives.hxx
 include/opencascade/math_FunctionWithDerivative.hxx
 include/opencascade/math_Gauss.hxx
@@ -8296,183 +8406,188 @@ lib/cmake/opencascade/OpenCASCADEModelingDataTargets.cmake
 lib/cmake/opencascade/OpenCASCADEVisualizationTargets-release.cmake
 lib/cmake/opencascade/OpenCASCADEVisualizationTargets.cmake
 lib/libTKBO.so
-lib/libTKBO.so.7
+lib/libTKBO.so.7.7
 lib/libTKBO.so.${PKGVERSION}
 lib/libTKBRep.so
-lib/libTKBRep.so.7
+lib/libTKBRep.so.7.7
 lib/libTKBRep.so.${PKGVERSION}
 lib/libTKBin.so
-lib/libTKBin.so.7
+lib/libTKBin.so.7.7
 lib/libTKBin.so.${PKGVERSION}
 lib/libTKBinL.so
-lib/libTKBinL.so.7
+lib/libTKBinL.so.7.7
 lib/libTKBinL.so.${PKGVERSION}
 lib/libTKBinTObj.so
-lib/libTKBinTObj.so.7
+lib/libTKBinTObj.so.7.7
 lib/libTKBinTObj.so.${PKGVERSION}
 lib/libTKBinXCAF.so
-lib/libTKBinXCAF.so.7
+lib/libTKBinXCAF.so.7.7
 lib/libTKBinXCAF.so.${PKGVERSION}
 lib/libTKBool.so
-lib/libTKBool.so.7
+lib/libTKBool.so.7.7
 lib/libTKBool.so.${PKGVERSION}
 lib/libTKCAF.so
-lib/libTKCAF.so.7
+lib/libTKCAF.so.7.7
 lib/libTKCAF.so.${PKGVERSION}
 lib/libTKCDF.so
-lib/libTKCDF.so.7
+lib/libTKCDF.so.7.7
 lib/libTKCDF.so.${PKGVERSION}
 lib/libTKDCAF.so
-lib/libTKDCAF.so.7
+lib/libTKDCAF.so.7.7
 lib/libTKDCAF.so.${PKGVERSION}
 lib/libTKDraw.so
-lib/libTKDraw.so.7
+lib/libTKDraw.so.7.7
 lib/libTKDraw.so.${PKGVERSION}
+lib/libTKExpress.so
+lib/libTKExpress.so.7.7
+lib/libTKExpress.so.${PKGVERSION}
 lib/libTKFeat.so
-lib/libTKFeat.so.7
+lib/libTKFeat.so.7.7
 lib/libTKFeat.so.${PKGVERSION}
 lib/libTKFillet.so
-lib/libTKFillet.so.7
+lib/libTKFillet.so.7.7
 lib/libTKFillet.so.${PKGVERSION}
 lib/libTKG2d.so
-lib/libTKG2d.so.7
+lib/libTKG2d.so.7.7
 lib/libTKG2d.so.${PKGVERSION}
 lib/libTKG3d.so
-lib/libTKG3d.so.7
+lib/libTKG3d.so.7.7
 lib/libTKG3d.so.${PKGVERSION}
 lib/libTKGeomAlgo.so
-lib/libTKGeomAlgo.so.7
+lib/libTKGeomAlgo.so.7.7
 lib/libTKGeomAlgo.so.${PKGVERSION}
 lib/libTKGeomBase.so
-lib/libTKGeomBase.so.7
+lib/libTKGeomBase.so.7.7
 lib/libTKGeomBase.so.${PKGVERSION}
 lib/libTKHLR.so
-lib/libTKHLR.so.7
+lib/libTKHLR.so.7.7
 lib/libTKHLR.so.${PKGVERSION}
 lib/libTKIGES.so
-lib/libTKIGES.so.7
+lib/libTKIGES.so.7.7
 lib/libTKIGES.so.${PKGVERSION}
 lib/libTKLCAF.so
-lib/libTKLCAF.so.7
+lib/libTKLCAF.so.7.7
 lib/libTKLCAF.so.${PKGVERSION}
 lib/libTKMath.so
-lib/libTKMath.so.7
+lib/libTKMath.so.7.7
 lib/libTKMath.so.${PKGVERSION}
 lib/libTKMesh.so
-lib/libTKMesh.so.7
+lib/libTKMesh.so.7.7
 lib/libTKMesh.so.${PKGVERSION}
 lib/libTKMeshVS.so
-lib/libTKMeshVS.so.7
+lib/libTKMeshVS.so.7.7
 lib/libTKMeshVS.so.${PKGVERSION}
 lib/libTKOffset.so
-lib/libTKOffset.so.7
+lib/libTKOffset.so.7.7
 lib/libTKOffset.so.${PKGVERSION}
 lib/libTKOpenGl.so
-lib/libTKOpenGl.so.7
+lib/libTKOpenGl.so.7.7
 lib/libTKOpenGl.so.${PKGVERSION}
 lib/libTKOpenGlTest.so
-lib/libTKOpenGlTest.so.7
+lib/libTKOpenGlTest.so.7.7
 lib/libTKOpenGlTest.so.${PKGVERSION}
 lib/libTKPrim.so
-lib/libTKPrim.so.7
+lib/libTKPrim.so.7.7
 lib/libTKPrim.so.${PKGVERSION}
 lib/libTKQADraw.so
-lib/libTKQADraw.so.7
+lib/libTKQADraw.so.7.7
 lib/libTKQADraw.so.${PKGVERSION}
 lib/libTKRWMesh.so
-lib/libTKRWMesh.so.7
+lib/libTKRWMesh.so.7.7
 lib/libTKRWMesh.so.${PKGVERSION}
 lib/libTKSTEP.so
-lib/libTKSTEP.so.7
+lib/libTKSTEP.so.7.7
 lib/libTKSTEP.so.${PKGVERSION}
 lib/libTKSTEP209.so
-lib/libTKSTEP209.so.7
+lib/libTKSTEP209.so.7.7
 lib/libTKSTEP209.so.${PKGVERSION}
 lib/libTKSTEPAttr.so
-lib/libTKSTEPAttr.so.7
+lib/libTKSTEPAttr.so.7.7
 lib/libTKSTEPAttr.so.${PKGVERSION}
 lib/libTKSTEPBase.so
-lib/libTKSTEPBase.so.7
+lib/libTKSTEPBase.so.7.7
 lib/libTKSTEPBase.so.${PKGVERSION}
 lib/libTKSTL.so
-lib/libTKSTL.so.7
+lib/libTKSTL.so.7.7
 lib/libTKSTL.so.${PKGVERSION}
 lib/libTKService.so
-lib/libTKService.so.7
+lib/libTKService.so.7.7
 lib/libTKService.so.${PKGVERSION}
 lib/libTKShHealing.so
-lib/libTKShHealing.so.7
+lib/libTKShHealing.so.7.7
 lib/libTKShHealing.so.${PKGVERSION}
 lib/libTKStd.so
-lib/libTKStd.so.7
+lib/libTKStd.so.7.7
 lib/libTKStd.so.${PKGVERSION}
 lib/libTKStdL.so
-lib/libTKStdL.so.7
+lib/libTKStdL.so.7.7
 lib/libTKStdL.so.${PKGVERSION}
 lib/libTKTObj.so
-lib/libTKTObj.so.7
+lib/libTKTObj.so.7.7
 lib/libTKTObj.so.${PKGVERSION}
 lib/libTKTObjDRAW.so
-lib/libTKTObjDRAW.so.7
+lib/libTKTObjDRAW.so.7.7
 lib/libTKTObjDRAW.so.${PKGVERSION}
 lib/libTKTopAlgo.so
-lib/libTKTopAlgo.so.7
+lib/libTKTopAlgo.so.7.7
 lib/libTKTopAlgo.so.${PKGVERSION}
 lib/libTKTopTest.so
-lib/libTKTopTest.so.7
+lib/libTKTopTest.so.7.7
 lib/libTKTopTest.so.${PKGVERSION}
 lib/libTKV3d.so
-lib/libTKV3d.so.7
+lib/libTKV3d.so.7.7
 lib/libTKV3d.so.${PKGVERSION}
 lib/libTKVCAF.so
-lib/libTKVCAF.so.7
+lib/libTKVCAF.so.7.7
 lib/libTKVCAF.so.${PKGVERSION}
 lib/libTKVRML.so
-lib/libTKVRML.so.7
+lib/libTKVRML.so.7.7
 lib/libTKVRML.so.${PKGVERSION}
 lib/libTKViewerTest.so
-lib/libTKViewerTest.so.7
+lib/libTKViewerTest.so.7.7
 lib/libTKViewerTest.so.${PKGVERSION}
 lib/libTKXCAF.so
-lib/libTKXCAF.so.7
+lib/libTKXCAF.so.7.7
 lib/libTKXCAF.so.${PKGVERSION}
+lib/libTKXDE.so
+lib/libTKXDE.so.7.7
+lib/libTKXDE.so.${PKGVERSION}
+lib/libTKXDECascade.so
+lib/libTKXDECascade.so.7.7
+lib/libTKXDECascade.so.${PKGVERSION}
 lib/libTKXDEDRAW.so
-lib/libTKXDEDRAW.so.7
+lib/libTKXDEDRAW.so.7.7
 lib/libTKXDEDRAW.so.${PKGVERSION}
 lib/libTKXDEIGES.so
-lib/libTKXDEIGES.so.7
+lib/libTKXDEIGES.so.7.7
 lib/libTKXDEIGES.so.${PKGVERSION}
 lib/libTKXDESTEP.so
-lib/libTKXDESTEP.so.7
+lib/libTKXDESTEP.so.7.7
 lib/libTKXDESTEP.so.${PKGVERSION}
 lib/libTKXMesh.so
-lib/libTKXMesh.so.7
+lib/libTKXMesh.so.7.7
 lib/libTKXMesh.so.${PKGVERSION}
 lib/libTKXSBase.so
-lib/libTKXSBase.so.7
+lib/libTKXSBase.so.7.7
 lib/libTKXSBase.so.${PKGVERSION}
 lib/libTKXSDRAW.so
-lib/libTKXSDRAW.so.7
+lib/libTKXSDRAW.so.7.7
 lib/libTKXSDRAW.so.${PKGVERSION}
 lib/libTKXml.so
-lib/libTKXml.so.7
+lib/libTKXml.so.7.7
 lib/libTKXml.so.${PKGVERSION}
 lib/libTKXmlL.so
-lib/libTKXmlL.so.7
+lib/libTKXmlL.so.7.7
 lib/libTKXmlL.so.${PKGVERSION}
 lib/libTKXmlTObj.so
-lib/libTKXmlTObj.so.7
+lib/libTKXmlTObj.so.7.7
 lib/libTKXmlTObj.so.${PKGVERSION}
 lib/libTKXmlXCAF.so
-lib/libTKXmlXCAF.so.7
+lib/libTKXmlXCAF.so.7.7
 lib/libTKXmlXCAF.so.${PKGVERSION}
 lib/libTKernel.so
-lib/libTKernel.so.7
+lib/libTKernel.so.7.7
 lib/libTKernel.so.${PKGVERSION}
-${PKGNAME}.script/custom.sh
-${PKGNAME}.script/custom_gcc_64.sh
-${PKGNAME}.script/draw.sh
-${PKGNAME}.script/env.sh
 share/doc/opencascade/LICENSE_LGPL_21.txt
 share/doc/opencascade/OCCT_LGPL_EXCEPTION.txt
 share/opencascade/data/iges/bearing.iges
@@ -8582,9 +8697,9 @@ share/opencascade/resources/SHMessage/SHAPE.us
 share/opencascade/resources/SHMessage/SHMessage_SHAPE_us.pxx
 share/opencascade/resources/Shaders/Declarations.glsl
 share/opencascade/resources/Shaders/DeclarationsImpl.glsl
-share/opencascade/resources/Shaders/DirectionalLightShadow.glsl
 share/opencascade/resources/Shaders/Display.fs
 share/opencascade/resources/Shaders/FILES
+share/opencascade/resources/Shaders/LightShadow.glsl
 share/opencascade/resources/Shaders/PBRCookTorrance.glsl
 share/opencascade/resources/Shaders/PBRDirectionalLight.glsl
 share/opencascade/resources/Shaders/PBRDistribution.glsl
@@ -8608,8 +8723,8 @@ share/opencascade/resources/Shaders/RaytraceRender.fs
 share/opencascade/resources/Shaders/RaytraceSmooth.fs
 share/opencascade/resources/Shaders/Shaders_DeclarationsImpl_glsl.pxx
 share/opencascade/resources/Shaders/Shaders_Declarations_glsl.pxx
-share/opencascade/resources/Shaders/Shaders_DirectionalLightShadow_glsl.pxx
 share/opencascade/resources/Shaders/Shaders_Display_fs.pxx
+share/opencascade/resources/Shaders/Shaders_LightShadow_glsl.pxx
 share/opencascade/resources/Shaders/Shaders_PBRCookTorrance_glsl.pxx
 share/opencascade/resources/Shaders/Shaders_PBRDirectionalLight_glsl.pxx
 share/opencascade/resources/Shaders/Shaders_PBRDistribution_glsl.pxx
@@ -8629,7 +8744,9 @@ share/opencascade/resources/Shaders/Shaders_RaytraceBase_fs.pxx
 share/opencascade/resources/Shaders/Shaders_RaytraceBase_vs.pxx
 share/opencascade/resources/Shaders/Shaders_RaytraceRender_fs.pxx
 share/opencascade/resources/Shaders/Shaders_RaytraceSmooth_fs.pxx
+share/opencascade/resources/Shaders/Shaders_SkydomBackground_fs.pxx
 share/opencascade/resources/Shaders/Shaders_TangentSpaceNormal_glsl.pxx
+share/opencascade/resources/Shaders/SkydomBackground.fs
 share/opencascade/resources/Shaders/TangentSpaceNormal.glsl
 share/opencascade/resources/StdResource/FILES
 share/opencascade/resources/StdResource/MigrationSheet.txt
@@ -8679,6 +8796,7 @@ share/opencascade/resources/XRResources/occtvr_bindings_generic.json
 share/opencascade/resources/XRResources/occtvr_bindings_holographic_hmd.json
 share/opencascade/resources/XRResources/occtvr_bindings_index_hmd.json
 share/opencascade/resources/XRResources/occtvr_bindings_rift.json
+share/opencascade/resources/XRResources/occtvr_bindings_touch.json
 share/opencascade/resources/XRResources/occtvr_bindings_vive.json
 share/opencascade/resources/XRResources/occtvr_bindings_vive_controller.json
 share/opencascade/resources/XRResources/occtvr_bindings_vive_cosmos.json
diff --git a/opencascade-git/buildlink3.mk b/opencascade-git/buildlink3.mk
index db875b2b5b..75d178ca1e 100644
--- a/opencascade-git/buildlink3.mk
+++ b/opencascade-git/buildlink3.mk
@@ -8,8 +8,28 @@ OPENCASCADE_BUILDLINK3_MK:=
 BUILDLINK_API_DEPENDS.opencascade+=	opencascade>=7.0.0
 BUILDLINK_PKGSRCDIR.opencascade?=	../../wip/opencascade-git
 
-.include "../../lang/tcl/buildlink3.mk"
-.include "../../x11/tk/buildlink3.mk"
+BUILDLINK_INCDIRS.opencascade+=		include/opencascade
+CMAKE_ARGS+=				-DOCC_INCLUDE_DIR=${BUILDLINK_PREFIX.opencascade}/include/opencascade
+
+pkgbase:=	opencascade
+
+.include "../../mk/pkg-build-options.mk"
+
+.if ${PKG_BUILD_OPTIONS.opencascade:Mx11}
+.  include "../../graphics/freeimage/buildlink3.mk"
+.  include "../../graphics/MesaLib/buildlink3.mk"
+.  include "../../x11/libX11/buildlink3.mk"
+.endif
+
+.if ${PKG_BUILD_OPTIONS.opencascade:Mocct-draw}
+.  include "../../lang/tcl/buildlink3.mk"
+.  include "../../x11/tk/buildlink3.mk"
+.endif
+
+.include "../../fonts/fontconfig/buildlink3.mk"
+.include "../../graphics/freetype2/buildlink3.mk"
+.include "../../math/eigen3/buildlink3.mk"
+.include "../../textproc/rapidjson/buildlink3.mk"
 .endif	# OPENCASCADE_BUILDLINK3_MK
 
 BUILDLINK_TREE+=	-opencascade
diff --git a/opencascade-git/distinfo b/opencascade-git/distinfo
index d7c4d51cdc..782d63452d 100644
--- a/opencascade-git/distinfo
+++ b/opencascade-git/distinfo
@@ -1,13 +1,22 @@
 $NetBSD$
 
-BLAKE2s (opencascade-7.6.3.tar.gz) = 2d456a342d1016b46aafd4aaab7725aa63137c9dea758a1aba5fca734fc9fcad
-SHA512 (opencascade-7.6.3.tar.gz) = 0709ea71b7a9c0010a6f1fd988f3a8cdba74ef400dad1b74323c1b0785c60346a48d47ec8be7df7b72682686a3843b3e28c11eef7fec2a3a7b593629a8857eda
-Size (opencascade-7.6.3.tar.gz) = 48214346 bytes
-SHA1 (patch-CMakeLists.txt) = 0aed9c33580f915de7ff0c2800a78d00d655edc4
-SHA1 (patch-adm_cmake_occt__macros.cmake) = 132c73f4208796af25f7363e3792e825887ac3aa
+BLAKE2s (opencascade-7.7.0.tar.gz) = 3ac0f49a8d50e3c5eb86192f3d9d7bb1c52ae58e7f4816d32a9971665bbd0c0b
+SHA512 (opencascade-7.7.0.tar.gz) = 27ed889bbe95fa40fbb1840788ce0f2c58af67a6fec799f5705f6cad2567fcfeddbe461ba1854b65672392a604f8b41fed1f77b2cc0704f83746a58957d830c7
+Size (opencascade-7.7.0.tar.gz) = 48391263 bytes
+SHA1 (patch-CMakeLists.txt) = e09a83be7708806a0f09798fad011947ebc0e88d
+SHA1 (patch-adm_cmake_occt__macros.cmake) = 60de48fed68d10f3d885d6a9a7b370e733483124
 SHA1 (patch-src_DrawResources_InitEnvironment.tcl) = 436803f7b8f3e72b0c62a8df7a3b76babf9aecaf
+SHA1 (patch-src_MeshVS_MeshVS__MeshPrsBuilder.cxx) = ba177be057941b7077a4525348d0563cb1378213
 SHA1 (patch-src_OSD_OSD__Chronometer.cxx) = 8df82aefe0fe738534c4ee2c93aa0d542cd75443
 SHA1 (patch-src_OSD_OSD__Host.cxx) = 6f56c0a582c0880e01b8923ef9356acf0a3bf55c
+SHA1 (patch-src_OSD_OSD__MemInfo.cxx) = 6cd4e1095abcadeb3c2df27b2669853764aa5a32
 SHA1 (patch-src_OSD_OSD__Path.cxx) = c6972cbd91658923b75a6e343adacfb217da87fc
-SHA1 (patch-src_Standard_Standard__CString.cxx) = 9e2a8235326bf144dd674269dc6fedf2f0fdd45c
+SHA1 (patch-src_OSD_OSD__signal.cxx) = 5a6a6d914340368d089a7bcaadf1aacfeef9bed8
+SHA1 (patch-src_OpenGl_OpenGl__ShaderObject.cxx) = 804cbd76d7377ca003442374b5fcfad951984f37
+SHA1 (patch-src_OpenGl_OpenGl__ShaderProgram.cxx) = a6b7d8e8f15f2c72134fd99f7015e7458d6086d8
+SHA1 (patch-src_Standard_Standard__CString.cxx) = 30de1afeea9952b40fc614df93b1d3a653cc5315
+SHA1 (patch-src_Standard_Standard__Failure.cxx) = a10c3dcb43837fbb82f16fce8232ebdf5ba9d8f1
 SHA1 (patch-src_Standard_Standard__MMgrOpt.cxx) = ed4f05ca2b24563ecffe22bae6000b652ec18ab6
+SHA1 (patch-src_Standard_Standard__PrimitiveTypes.hxx) = 868c062a76fd1f77b272ac734f3b0c06eea0be51
+SHA1 (patch-src_Standard_Standard__StackTrace.cxx) = 166ab4d7b79a4fc7361c01196e6aca702f6e15f2
+SHA1 (patch-src_ViewerTest_ViewerTest__CmdParser.cxx) = d92c768377484a64731940cee387d9054114adab
diff --git a/opencascade-git/options.mk b/opencascade-git/options.mk
new file mode 100644
index 0000000000..d693cefca8
--- /dev/null
+++ b/opencascade-git/options.mk
@@ -0,0 +1,47 @@
+# $NetBSD$
+
+PKG_OPTIONS_VAR=	PKG_OPTIONS.opencascade
+PKG_SUPPORTED_OPTIONS=	x11 occt-draw
+PKG_SUGGESTED_OPTIONS=	occt-draw
+
+.if ${OPSYS} != "Darwin"
+PKG_SUGGESTED_OPTIONS+=	x11
+.endif
+
+.include "../../mk/bsd.options.mk"
+
+.if !empty(PKG_OPTIONS:Mx11)
+.include "../../graphics/freeimage/buildlink3.mk"
+.include "../../graphics/MesaLib/buildlink3.mk"
+.include "../../x11/libX11/buildlink3.mk"
+CMAKE_ARGS+=	-DUSE_XLIB=ON
+CMAKE_ARGS+=	-DUSE_FREEIMAGE=ON
+.else
+CMAKE_ARGS+=	-DUSE_XLIB=OFF
+CMAKE_ARGS+=	-DUSE_FREEIMAGE=OFF
+.endif
+
+.if !empty(PKG_OPTIONS:Mocct-draw)
+.include "../../lang/tcl/buildlink3.mk"
+.include "../../x11/tk/buildlink3.mk"
+CMAKE_ARGS+=	-DUSE_TCL=ON
+CMAKE_ARGS+=	-DUSE_TK=ON
+CMAKE_ARGS+=	-D3RDPARTY_TCL_INCLUDE_DIR=${BUILDLINK_PREFIX.tcl}/include
+CMAKE_ARGS+=	-D3RDPARTY_TCL_LIBRARY_DIR=${BUILDLINK_PREFIX.tcl}/lib
+CMAKE_ARGS+=	-D3RDPARTY_TK_INCLUDE_DIR=${BUILDLINK_PREFIX.tk}/include
+CMAKE_ARGS+=	-D3RDPARTY_TK_LIBRARY_DIR=${BUILDLINK_PREFIX.tk}/lib
+.  if ${OPSYS} == "Darwin"
+CMAKE_ARGS+=	-D3RDPARTY_TCL_LIBRARY=${BUILDLINK_PREFIX.tcl}/lib/libtcl86.dylib
+CMAKE_ARGS+=	-D3RDPARTY_TK_LIBRARY=${BUILDLINK_PREFIX.tk}/lib/libtk86.dylib
+.  elif ${OPSYS} == "SunOS"
+CMAKE_ARGS+=	-D3RDPARTY_TCL_LIBRARY=${BUILDLINK_PREFIX.tcl}/lib/libtcl86.so
+CMAKE_ARGS+=	-D3RDPARTY_TK_LIBRARY=${BUILDLINK_PREFIX.tk}/lib/libtk86.so
+.  endif
+.else
+CMAKE_ARGS+=	-DUSE_TCL=OFF
+CMAKE_ARGS+=	-DUSE_TK=OFF
+.endif
+
+# TODO
+CMAKE_ARGS+=	-DUSE_VTK=OFF
+CMAKE_ARGS+=	-DUSE_FFMPEG=OFF
diff --git a/opencascade-git/patches/patch-CMakeLists.txt b/opencascade-git/patches/patch-CMakeLists.txt
index 90d247ee3a..8d08e6653e 100644
--- a/opencascade-git/patches/patch-CMakeLists.txt
+++ b/opencascade-git/patches/patch-CMakeLists.txt
@@ -3,9 +3,9 @@ $NetBSD$
 Install configure_file under prefix. Patch from upstream:
 https://git.dev.opencascade.org/gitweb/?p=occt.git;a=commitdiff;h=b9184c271493f25ae444304a62f35d9c236c6f12
 
---- CMakeLists.txt.orig	2022-08-24 07:55:40.493878115 +0000
+--- CMakeLists.txt.orig	2022-11-11 22:19:44.000000000 +0000
 +++ CMakeLists.txt
-@@ -981,7 +981,7 @@ else()
+@@ -1021,7 +1021,7 @@ else()
  endif()
  
   # change custom.bat/sh
@@ -14,12 +14,3 @@ https://git.dev.opencascade.org/gitweb/?p=occt.git;a=commitdiff;h=b9184c271493f2
    file (READ "${INSTALL_DIR}/${INSTALL_DIR_SCRIPT}/custom.${SCRIPT_EXT}" CUSTOM_CONTENT)
  
    set (CUSTOM_CONTENT "${CUSTOM_CONTENT} ${ADDITIONAL_CUSTOM_CONTENT}")
-@@ -1231,7 +1231,7 @@ foreach (OCCT_CONFIGURATION ${CMAKE_CONF
- 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 "file(INSTALL FILES \"${CMAKE_BINARY_DIR}/OpenCASCADECompileDefinitionsAndFlags-\${CMAKE_INSTALL_CONFIG_NAME_LOWER}.cmake\" DESTINATION \"${INSTALL_DIR}/${INSTALL_DIR_CMAKE}/\" TYPE FILE)")
- 
- foreach (OCCT_MODULE ${OCCT_MODULES})
-   if (BUILD_MODULE_${OCCT_MODULE})
diff --git a/opencascade-git/patches/patch-adm_cmake_occt__macros.cmake b/opencascade-git/patches/patch-adm_cmake_occt__macros.cmake
index cddd79a2b0..2dd09de79f 100644
--- a/opencascade-git/patches/patch-adm_cmake_occt__macros.cmake
+++ b/opencascade-git/patches/patch-adm_cmake_occt__macros.cmake
@@ -3,14 +3,14 @@ $NetBSD$
 Fix escaping so substitutions occur in the right pass, and we don't try to
 modify files in the final installation directory.
 
---- adm/cmake/occt_macros.cmake.orig	2022-11-08 12:10:11.124051833 +0000
+--- adm/cmake/occt_macros.cmake.orig	2022-11-11 22:19:44.000000000 +0000
 +++ 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)
+ 
+   install (CODE
+   "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}/\${INSTALL_DIR_CMAKE}/OpenCASCADE*Targets-\${CMAKE_INSTALL_CONFIG_NAME_LOWERCASE}.cmake\")
++  file (GLOB ALL_OCCT_TARGET_FILES \"\${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/opencascade-git/patches/patch-src_MeshVS_MeshVS__MeshPrsBuilder.cxx b/opencascade-git/patches/patch-src_MeshVS_MeshVS__MeshPrsBuilder.cxx
new file mode 100644
index 0000000000..834ed56b45
--- /dev/null
+++ b/opencascade-git/patches/patch-src_MeshVS_MeshVS__MeshPrsBuilder.cxx
@@ -0,0 +1,17 @@
+$NetBSD$
+
+Needs alloca.h on SunOS.
+
+--- src/MeshVS/MeshVS_MeshPrsBuilder.cxx.orig	2022-11-11 22:19:44.000000000 +0000
++++ src/MeshVS/MeshVS_MeshPrsBuilder.cxx
+@@ -48,6 +48,10 @@
+   #include <malloc.h> // for alloca()
+ #endif
+ 
++#ifdef __sun
++#include <alloca.h>
++#endif
++
+ IMPLEMENT_STANDARD_RTTIEXT(MeshVS_MeshPrsBuilder,MeshVS_PrsBuilder)
+ 
+ //================================================================
diff --git a/opencascade-git/patches/patch-src_OSD_OSD__MemInfo.cxx b/opencascade-git/patches/patch-src_OSD_OSD__MemInfo.cxx
new file mode 100644
index 0000000000..052d4188a4
--- /dev/null
+++ b/opencascade-git/patches/patch-src_OSD_OSD__MemInfo.cxx
@@ -0,0 +1,18 @@
+$NetBSD$
+
+From cad/oce 1.1 2017/01/20 11:00:50 fhajny:
+Use stdlib.h instead of malloc.h
+
+--- src/OSD/OSD_MemInfo.cxx.orig	2022-11-11 22:19:44.000000000 +0000
++++ src/OSD/OSD_MemInfo.cxx
+@@ -28,7 +28,10 @@
+   #include <malloc/malloc.h>
+ #else
+   #include <unistd.h>
++  #if defined(__linux__)
+   #include <malloc.h>
++  #endif
++  #include <stdlib.h>
+ #endif
+ 
+ #include <OSD_MemInfo.hxx>
diff --git a/opencascade-git/patches/patch-src_OSD_OSD__signal.cxx b/opencascade-git/patches/patch-src_OSD_OSD__signal.cxx
new file mode 100644
index 0000000000..f9c658933b
--- /dev/null
+++ b/opencascade-git/patches/patch-src_OSD_OSD__signal.cxx
@@ -0,0 +1,62 @@
+$NetBSD$
+
+From cad/oce:
+Define SIGFPE macros on SunOS.
+Avoid overlapping reference in case statements.
+Respect the reality as CMake found it, there might not be libsunmath.
+1.1 2017/01/20 11:00:50 fhajny
+
+--- src/OSD/OSD_signal.cxx.orig	2022-11-11 22:19:44.000000000 +0000
++++ src/OSD/OSD_signal.cxx
+@@ -20,6 +20,18 @@
+ 
+ #include <Standard_WarningDisableFunctionCast.hxx>
+ 
++#if defined(__sun)
++# include <alloca.h>
++# include <sys/siginfo.h>
++# define FPE_FLTDIV_TRAP FPE_FLTDIV
++# define FPE_INTDIV_TRAP FPE_INTDIV
++# define FPE_FLTOVF_TRAP FPE_FLTOVF
++# define FPE_INTOVF_TRAP FPE_INTOVF
++# define FPE_FLTUND_TRAP FPE_FLTUND
++# define FPE_FLTRES_TRAP FPE_FLTRES
++# define FPE_FLTINV_TRAP FPE_FLTINV
++#endif
++
+ static OSD_SignalMode OSD_WasSetSignal = OSD_SignalMode_AsIs;
+ static Standard_Integer OSD_SignalStackTraceLength = 0;
+ 
+@@ -846,6 +858,7 @@ static void Handler (const int theSignal
+     break;
+ #endif
+   case SIGFPE:
++  {
+     sigaddset(&set, SIGFPE);
+     sigprocmask(SIG_UNBLOCK, &set, NULL) ;
+ #ifdef __linux__
+@@ -856,6 +869,7 @@ static void Handler (const int theSignal
+     break;
+ #else
+     // Reste SOLARIS
++    siginfo_t * aSigInfo = NULL;
+     if (aSigInfo) {
+       switch(aSigInfo->si_code) {
+       case FPE_FLTDIV_TRAP :
+@@ -888,6 +902,7 @@ static void Handler (const int theSignal
+     }
+ #endif
+     break;
++  }
+   default:
+ #ifdef OCCT_DEBUG
+     std::cout << "Unexpected signal " << theSignal << std::endl ;
+@@ -984,7 +999,7 @@ void OSD::SetFloatingSignal (Standard_Bo
+   {
+     fedisableexcept (_OSD_FPX);
+   }
+-#elif defined (__sun) || defined (SOLARIS)
++#elif (defined (__sun) || defined (SOLARIS)) && HAVE_SUNMATH
+   int aSunStat = 0;
+   sigfpe_handler_type anFpeHandler = (theFloatingSignal ? (sigfpe_handler_type)Handler : NULL);
+   aSunStat = ieee_handler ("set", "invalid",  anFpeHandler);
diff --git a/opencascade-git/patches/patch-src_OpenGl_OpenGl__ShaderObject.cxx b/opencascade-git/patches/patch-src_OpenGl_OpenGl__ShaderObject.cxx
new file mode 100644
index 0000000000..55e0bb919c
--- /dev/null
+++ b/opencascade-git/patches/patch-src_OpenGl_OpenGl__ShaderObject.cxx
@@ -0,0 +1,17 @@
+$NetBSD$
+
+Needs alloca.h on SunOS.
+
+--- src/OpenGl/OpenGl_ShaderObject.cxx.orig	2022-11-11 22:19:44.000000000 +0000
++++ src/OpenGl/OpenGl_ShaderObject.cxx
+@@ -26,6 +26,10 @@
+   #include <malloc.h> // for alloca()
+ #endif
+ 
++#ifdef __sun
++#include <alloca.h>
++#endif
++
+ IMPLEMENT_STANDARD_RTTIEXT(OpenGl_ShaderObject,OpenGl_Resource)
+ 
+ //! Puts line numbers to the output of GLSL program source code.
diff --git a/opencascade-git/patches/patch-src_OpenGl_OpenGl__ShaderProgram.cxx b/opencascade-git/patches/patch-src_OpenGl_OpenGl__ShaderProgram.cxx
new file mode 100644
index 0000000000..0a50c8f2ba
--- /dev/null
+++ b/opencascade-git/patches/patch-src_OpenGl_OpenGl__ShaderProgram.cxx
@@ -0,0 +1,17 @@
+$NetBSD$
+
+Needs alloca.h on SunOS.
+
+--- src/OpenGl/OpenGl_ShaderProgram.cxx.orig	2022-11-11 22:19:44.000000000 +0000
++++ src/OpenGl/OpenGl_ShaderProgram.cxx
+@@ -30,6 +30,10 @@
+   #include <malloc.h> // for alloca()
+ #endif
+ 
++#ifdef __sun
++#include <alloca.h>
++#endif
++
+ IMPLEMENT_STANDARD_RTTIEXT(OpenGl_ShaderProgram, OpenGl_NamedResource)
+ 
+ OpenGl_VariableSetterSelector OpenGl_ShaderProgram::mySetterSelector = OpenGl_VariableSetterSelector();
diff --git a/opencascade-git/patches/patch-src_Standard_Standard__CString.cxx b/opencascade-git/patches/patch-src_Standard_Standard__CString.cxx
index 4a1df2128f..565313e00d 100644
--- a/opencascade-git/patches/patch-src_Standard_Standard__CString.cxx
+++ b/opencascade-git/patches/patch-src_Standard_Standard__CString.cxx
@@ -1,6 +1,6 @@
 $NetBSD$
 
-Add NetBSD support.
+Work around xlocale build error.
 
 --- src/Standard/Standard_CString.cxx.orig	2016-04-04 14:58:18.000000000 +0000
 +++ src/Standard/Standard_CString.cxx
@@ -9,7 +9,7 @@ Add NetBSD support.
      // strtod, strtol, strtoll functions. For other system with locale-depended
      // implementations problems may appear if "C" locale is not set explicitly.
 -    #if !defined(__ANDROID__) && !defined(__QNX__) && !defined(__MINGW32__)
-+    #if !defined(__ANDROID__) && !defined(__QNX__) && !defined(__MINGW32__) && !defined(__NetBSD__)
++    #if !defined(__ANDROID__) && !defined(__QNX__) && !defined(__MINGW32__) && !defined(__NetBSD__) && !defined(__sun)
        #error System does not support xlocale. Import/export could be broken if C locale did not specified by application.
      #endif
      #define strtod_l(thePtr, theNextPtr, theLocale)              strtod(thePtr, theNextPtr)
diff --git a/opencascade-git/patches/patch-src_Standard_Standard__Failure.cxx b/opencascade-git/patches/patch-src_Standard_Standard__Failure.cxx
new file mode 100644
index 0000000000..d9adbcb9a5
--- /dev/null
+++ b/opencascade-git/patches/patch-src_Standard_Standard__Failure.cxx
@@ -0,0 +1,17 @@
+$NetBSD$
+
+Needs alloca.h on SunOS.
+
+--- src/Standard/Standard_Failure.cxx.orig	2022-11-11 22:19:44.000000000 +0000
++++ src/Standard/Standard_Failure.cxx
+@@ -23,6 +23,10 @@
+ 
+ #include <string.h>
+ 
++#ifdef __sun
++#include <alloca.h>
++#endif
++
+ IMPLEMENT_STANDARD_RTTIEXT(Standard_Failure,Standard_Transient)
+ 
+ namespace
diff --git a/opencascade-git/patches/patch-src_Standard_Standard__PrimitiveTypes.hxx b/opencascade-git/patches/patch-src_Standard_Standard__PrimitiveTypes.hxx
new file mode 100644
index 0000000000..d5df573488
--- /dev/null
+++ b/opencascade-git/patches/patch-src_Standard_Standard__PrimitiveTypes.hxx
@@ -0,0 +1,38 @@
+$NetBSD$
+
+From cad/oce:
+Undefine SunOS registers that are forcibly pulled in by headers,
+and clash with some OpenCASCADE variables.
+v 1.1 2017/01/20 11:00:50 fhajny
+
+--- src/Standard/Standard_PrimitiveTypes.hxx.orig	2022-11-11 22:19:44.000000000 +0000
++++ src/Standard/Standard_PrimitiveTypes.hxx
+@@ -18,6 +18,28 @@
+ #include <stddef.h>
+ #include <stdlib.h>
+ 
++#if defined(__sun)
++#undef CS
++#undef DS
++#undef ES
++#undef FS
++#undef GS
++#undef SS
++#undef EAX
++#undef EBP
++#undef EBX
++#undef ECX
++#undef EDI
++#undef EEDX
++#undef EFL
++#undef EIP
++#undef ERR
++#undef ESI
++#undef ESP
++#undef TRAPNO
++#undef UESP
++#endif
++
+ #include <Standard_Macro.hxx>
+ 
+ #include <Standard_Boolean.hxx>
diff --git a/opencascade-git/patches/patch-src_Standard_Standard__StackTrace.cxx b/opencascade-git/patches/patch-src_Standard_Standard__StackTrace.cxx
new file mode 100644
index 0000000000..6857cce93e
--- /dev/null
+++ b/opencascade-git/patches/patch-src_Standard_Standard__StackTrace.cxx
@@ -0,0 +1,27 @@
+$NetBSD$
+
+Needs alloca.h on SunOS.
+Fix build on NetBSD.
+
+--- src/Standard/Standard_StackTrace.cxx.orig	2022-11-11 22:19:44.000000000 +0000
++++ src/Standard/Standard_StackTrace.cxx
+@@ -19,6 +19,10 @@
+ 
+ #include <Standard_WarningDisableFunctionCast.hxx>
+ 
++#if defined(__sun)
++#include <alloca.h>
++#endif
++
+ #if defined(__APPLE__)
+   #import <TargetConditionals.h>
+ #endif
+@@ -200,7 +204,7 @@ Standard_Boolean Standard::StackTrace (c
+   // theNbTraces is ignored
+   // EM_LOG_JS_STACK?
+   return emscripten_get_callstack (EM_LOG_C_STACK | EM_LOG_DEMANGLE | EM_LOG_NO_PATHS | EM_LOG_FUNC_PARAMS, theBuffer, theBufferSize) > 0;
+-#elif defined(__ANDROID__)
++#elif defined(__ANDROID__) || defined(__NetBSD__)
+   Message::SendTrace ("Standard::StackTrace() is not implemented for this platform");
+   return false;
+ #elif defined(__QNX__)
diff --git a/opencascade-git/patches/patch-src_ViewerTest_ViewerTest__CmdParser.cxx b/opencascade-git/patches/patch-src_ViewerTest_ViewerTest__CmdParser.cxx
new file mode 100644
index 0000000000..08dabe0fe5
--- /dev/null
+++ b/opencascade-git/patches/patch-src_ViewerTest_ViewerTest__CmdParser.cxx
@@ -0,0 +1,19 @@
+$NetBSD$
+
+Just use SIZE_MAX instead of C++20 std::numeric_limits to help
+with older compilers.
+
+--- src/ViewerTest/ViewerTest_CmdParser.cxx.orig	2022-11-11 22:19:44.000000000 +0000
++++ src/ViewerTest/ViewerTest_CmdParser.cxx
+@@ -50,7 +50,11 @@ namespace
+ 
+ } // namespace
+ 
++#ifdef SIZE_MAX
++const std::size_t ViewerTest_CmdParser::THE_UNNAMED_COMMAND_OPTION_KEY = SIZE_MAX;
++#else
+ const std::size_t ViewerTest_CmdParser::THE_UNNAMED_COMMAND_OPTION_KEY = (std::numeric_limits<std::size_t>::max)();
++#endif
+ 
+ const std::size_t ViewerTest_CmdParser::THE_HELP_COMMAND_OPTION_KEY = 0;
+ 


Home | Main Index | Thread Index | Old Index