gentoo Easter resync : 12.04.2020

3 files changed, 0 insertions, 82 deletions

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 fc572a4f5bca..000000000000
--- 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 c0a6363e19fd..000000000000
--- 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 71700a57f1dc..000000000000
--- 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)
- 
- //================================================================