diff options
Diffstat (limited to 'sci-libs/opencascade/files')
5 files changed, 38 insertions, 178 deletions
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 1f37eace7602..000000000000 --- 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 8e1d3361dde6..000000000000 --- 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 d1f560320c6c..000000000000 --- 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 3c2711d3813e..000000000000 --- 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/files/opencascade-7.3.0-ffmpeg4.patch b/sci-libs/opencascade/files/opencascade-7.3.0-ffmpeg4.patch new file mode 100644 index 000000000000..fc572a4f5bca --- /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; |