Date: Thursday, May 23, 2019 @ 05:47:36 Author: kkeen Revision: 469184
archrelease: copy trunk to community-x86_64 Added: opencascade/repos/community-x86_64/PKGBUILD (from rev 469182, opencascade/trunk/PKGBUILD) opencascade/repos/community-x86_64/cmake-fix-variable.patch (from rev 469182, opencascade/trunk/cmake-fix-variable.patch) opencascade/repos/community-x86_64/ffmpeg4.patch (from rev 469182, opencascade/trunk/ffmpeg4.patch) opencascade/repos/community-x86_64/fix-install-dir-references.patch (from rev 469182, opencascade/trunk/fix-install-dir-references.patch) opencascade/repos/community-x86_64/opencascade.sh (from rev 469182, opencascade/trunk/opencascade.sh) opencascade/repos/community-x86_64/vtk7.patch (from rev 469182, opencascade/trunk/vtk7.patch) Deleted: opencascade/repos/community-x86_64/PKGBUILD opencascade/repos/community-x86_64/cmake-fix-variable.patch opencascade/repos/community-x86_64/ffmpeg4.patch opencascade/repos/community-x86_64/fix-install-dir-references.patch opencascade/repos/community-x86_64/opencascade.sh opencascade/repos/community-x86_64/vtk7.patch ----------------------------------+ PKGBUILD | 135 ++++++++++++++++++------------------- cmake-fix-variable.patch | 24 +++--- ffmpeg4.patch | 44 ++++++------ fix-install-dir-references.patch | 48 ++++++------- opencascade.sh | 48 ++++++------- vtk7.patch | 96 +++++++++++++------------- 6 files changed, 198 insertions(+), 197 deletions(-) Deleted: PKGBUILD =================================================================== --- PKGBUILD 2019-05-23 05:47:33 UTC (rev 469183) +++ PKGBUILD 2019-05-23 05:47:36 UTC (rev 469184) @@ -1,67 +0,0 @@ -# Maintainer: Kyle Keen <keen...@gmail.com> -# Contributor: Gabriel Souza Franco <Z2FicmllbGZyYW5jb3NvdXphQGdtYWlsLmNvbQ==> -# Contributor: Florian Pritz <bluew...@xinu.at> -# Contributor: Giuseppe Borzi <gbo...@ieee.org> -# Contributor: Brice Méalier <mealier_br...@yahoo.fr> -# Contributor: Michele Mocciola <mickele> - -pkgname=opencascade -pkgver=7.3.0 -_pkgver=V${pkgver//./_} -pkgrel=4 -pkgdesc="Open CASCADE Technology, 3D modeling & numerical simulation" -arch=('x86_64') -url="http://www.opencascade.org" -license=('custom') -depends=('tk' 'vtk' 'gl2ps' 'ffmpeg' 'freeimage' 'intel-tbb') -makedepends=('cmake' 'qt5-base') # VTK requires Qt5 to build -source=("opencascade-${pkgver}.tgz::http://git.dev.opencascade.org/gitweb/?p=occt.git;a=snapshot;h=refs/tags/${_pkgver};sf=tgz" - 'opencascade.sh' 'fix-install-dir-references.patch' - 'vtk7.patch' 'ffmpeg4.patch' 'cmake-fix-variable.patch') -sha256sums=('7298c5eadc6dd0aeb6265ff2958e8e742d6e3aa65227acce8094f96f1bf6d2ac' - '2064536a85d46fee368a8f1a712b2c6c77ca79c5bffcc68cba79d70d36efa2f4' - 'afb584aa453993ae8d9e2b983594558531ede735a5892754b812be30650c9fb5' - 'bd230962173a80a971c8da9d3dc07238f249544bb67ee834be7d6466391d0315' - '461c44a1b635c09f23283c0b8f583a0d38079a1e20338c009776a621d0ed6efe' - 'c7427082400b2d1ac58c59549d4dd1ee5b27d06847b7907842e9e2f2b68980fa') - -prepare() { - cd "occt-${_pkgver}" - patch -Np1 -i "$srcdir/fix-install-dir-references.patch" - patch -Np1 -i "$srcdir/vtk7.patch" - patch -Np1 -i "$srcdir/ffmpeg4.patch" - patch -Np1 -i "$srcdir/cmake-fix-variable.patch" -} - -build() { - cd "occt-${_pkgver}" - mkdir -p build && cd build - - cmake .. \ - -DCMAKE_BUILD_TYPE=Release \ - -DCMAKE_INSTALL_PREFIX=/usr \ - -DUSE_GL2PS=ON \ - -DUSE_FREEIMAGE=ON \ - -DUSE_FFMPEG=ON \ - -DUSE_VTK=ON \ - -DUSE_TBB=ON - - make -} - -package() { - cd "occt-${_pkgver}/build" - - make DESTDIR="$pkgdir" install - - cd .. - - install -Dm755 "$srcdir/opencascade.sh" "$pkgdir/etc/profile.d/opencascade.sh" - install -dm755 "$pkgdir/usr/share/licenses/$pkgname/" - mv "$pkgdir/usr/share/doc/opencascade/"* "$pkgdir/usr/share/licenses/$pkgname" - rm -r "$pkgdir/usr/share/doc" - - rm "$pkgdir/usr/bin/"*.sh -} - -# vim:set ts=2 sw=2 et: Copied: opencascade/repos/community-x86_64/PKGBUILD (from rev 469182, opencascade/trunk/PKGBUILD) =================================================================== --- PKGBUILD (rev 0) +++ PKGBUILD 2019-05-23 05:47:36 UTC (rev 469184) @@ -0,0 +1,68 @@ +# Maintainer: Kyle Keen <keen...@gmail.com> +# Contributor: Gabriel Souza Franco <Z2FicmllbGZyYW5jb3NvdXphQGdtYWlsLmNvbQ==> +# Contributor: Florian Pritz <bluew...@xinu.at> +# Contributor: Giuseppe Borzi <gbo...@ieee.org> +# Contributor: Brice Méalier <mealier_br...@yahoo.fr> +# Contributor: Michele Mocciola <mickele> + +pkgname=opencascade +pkgver=7.3.0_p3 +_pkgver=${pkgver//_/} +_pkgver=V${_pkgver//./_} +pkgrel=1 +pkgdesc="Open CASCADE Technology, 3D modeling & numerical simulation" +arch=('x86_64') +url="http://www.opencascade.org" +license=('custom') +depends=('tk' 'vtk' 'gl2ps' 'ffmpeg' 'freeimage' 'intel-tbb') +makedepends=('cmake' 'qt5-base') # VTK requires Qt5 to build +source=("opencascade-${pkgver}.tgz::http://git.dev.opencascade.org/gitweb/?p=occt.git;a=snapshot;h=refs/tags/${_pkgver};sf=tgz" + 'opencascade.sh' 'fix-install-dir-references.patch' + 'vtk7.patch' 'ffmpeg4.patch' 'cmake-fix-variable.patch') +sha256sums=('fbd46db3e75313131b88a606024ea4d4496c3c7f6e68c23988e9d3e673d4f21b' + '2064536a85d46fee368a8f1a712b2c6c77ca79c5bffcc68cba79d70d36efa2f4' + 'afb584aa453993ae8d9e2b983594558531ede735a5892754b812be30650c9fb5' + 'bd230962173a80a971c8da9d3dc07238f249544bb67ee834be7d6466391d0315' + '461c44a1b635c09f23283c0b8f583a0d38079a1e20338c009776a621d0ed6efe' + 'c7427082400b2d1ac58c59549d4dd1ee5b27d06847b7907842e9e2f2b68980fa') + +prepare() { + cd "occt-${_pkgver}" + patch -Np1 -i "$srcdir/fix-install-dir-references.patch" + patch -Np1 -i "$srcdir/vtk7.patch" + patch -Np1 -i "$srcdir/ffmpeg4.patch" + patch -Np1 -i "$srcdir/cmake-fix-variable.patch" +} + +build() { + cd "occt-${_pkgver}" + mkdir -p build && cd build + + cmake .. \ + -DCMAKE_BUILD_TYPE=Release \ + -DCMAKE_INSTALL_PREFIX=/usr \ + -DUSE_GL2PS=ON \ + -DUSE_FREEIMAGE=ON \ + -DUSE_FFMPEG=ON \ + -DUSE_VTK=ON \ + -DUSE_TBB=ON + + make +} + +package() { + cd "occt-${_pkgver}/build" + + make DESTDIR="$pkgdir" install + + cd .. + + install -Dm755 "$srcdir/opencascade.sh" "$pkgdir/etc/profile.d/opencascade.sh" + install -dm755 "$pkgdir/usr/share/licenses/$pkgname/" + mv "$pkgdir/usr/share/doc/opencascade/"* "$pkgdir/usr/share/licenses/$pkgname" + rm -r "$pkgdir/usr/share/doc" + + rm "$pkgdir/usr/bin/"*.sh +} + +# vim:set ts=2 sw=2 et: Deleted: cmake-fix-variable.patch =================================================================== --- cmake-fix-variable.patch 2019-05-23 05:47:33 UTC (rev 469183) +++ cmake-fix-variable.patch 2019-05-23 05:47:36 UTC (rev 469184) @@ -1,12 +0,0 @@ -diff -Naur occt-V7_3_0/adm/templates/OpenCASCADEConfig.cmake.in occt-V7_3_0_new/adm/templates/OpenCASCADEConfig.cmake.in ---- occt-V7_3_0/adm/templates/OpenCASCADEConfig.cmake.in 2018-05-29 12:14:02.000000000 +0200 -+++ occt-V7_3_0.new/adm/templates/OpenCASCADEConfig.cmake.in 2018-05-29 12:14:02.000000000 +0200 -@@ -26,7 +26,7 @@ - if (OpenCASCADE_INSTALL_PREFIX MATCHES "/cmake$") - get_filename_component (OpenCASCADE_INSTALL_PREFIX "${OpenCASCADE_INSTALL_PREFIX}" PATH) - endif() --if (OpenCASCADE_INSTALL_PREFIX MATCHES "/lib$") -+if (OpenCASCADE_INSTALL_PREFIX MATCHES "/lib(64)?$") - get_filename_component (OpenCASCADE_INSTALL_PREFIX "${OpenCASCADE_INSTALL_PREFIX}" PATH) - endif() - Copied: opencascade/repos/community-x86_64/cmake-fix-variable.patch (from rev 469182, opencascade/trunk/cmake-fix-variable.patch) =================================================================== --- cmake-fix-variable.patch (rev 0) +++ cmake-fix-variable.patch 2019-05-23 05:47:36 UTC (rev 469184) @@ -0,0 +1,12 @@ +diff -Naur occt-V7_3_0/adm/templates/OpenCASCADEConfig.cmake.in occt-V7_3_0_new/adm/templates/OpenCASCADEConfig.cmake.in +--- occt-V7_3_0/adm/templates/OpenCASCADEConfig.cmake.in 2018-05-29 12:14:02.000000000 +0200 ++++ occt-V7_3_0.new/adm/templates/OpenCASCADEConfig.cmake.in 2018-05-29 12:14:02.000000000 +0200 +@@ -26,7 +26,7 @@ + if (OpenCASCADE_INSTALL_PREFIX MATCHES "/cmake$") + get_filename_component (OpenCASCADE_INSTALL_PREFIX "${OpenCASCADE_INSTALL_PREFIX}" PATH) + endif() +-if (OpenCASCADE_INSTALL_PREFIX MATCHES "/lib$") ++if (OpenCASCADE_INSTALL_PREFIX MATCHES "/lib(64)?$") + get_filename_component (OpenCASCADE_INSTALL_PREFIX "${OpenCASCADE_INSTALL_PREFIX}" PATH) + endif() + Deleted: ffmpeg4.patch =================================================================== --- ffmpeg4.patch 2019-05-23 05:47:33 UTC (rev 469183) +++ ffmpeg4.patch 2019-05-23 05:47:36 UTC (rev 469184) @@ -1,22 +0,0 @@ -diff -Naur a/src/Image/Image_VideoRecorder.cxx b/src/Image/Image_VideoRecorder.cxx ---- a/src/Image/Image_VideoRecorder.cxx 2017-10-04 14:26:07.000000000 +0200 -+++ b/src/Image/Image_VideoRecorder.cxx 2017-10-04 14:26:07.000000000 +0200 -@@ -276,7 +276,7 @@ - // 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,8 +449,7 @@ - AVPacket aPacket; - memset (&aPacket, 0, sizeof(aPacket)); - av_init_packet (&aPacket); -- if ((myAVContext->oformat->flags & AVFMT_RAWPICTURE) != 0 -- && !theToFlush) -+ if (0) - { - // raw video case - directly store the picture in the packet - aPacket.flags |= AV_PKT_FLAG_KEY; Copied: opencascade/repos/community-x86_64/ffmpeg4.patch (from rev 469182, opencascade/trunk/ffmpeg4.patch) =================================================================== --- ffmpeg4.patch (rev 0) +++ ffmpeg4.patch 2019-05-23 05:47:36 UTC (rev 469184) @@ -0,0 +1,22 @@ +diff -Naur a/src/Image/Image_VideoRecorder.cxx b/src/Image/Image_VideoRecorder.cxx +--- a/src/Image/Image_VideoRecorder.cxx 2017-10-04 14:26:07.000000000 +0200 ++++ b/src/Image/Image_VideoRecorder.cxx 2017-10-04 14:26:07.000000000 +0200 +@@ -276,7 +276,7 @@ + // 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,8 +449,7 @@ + AVPacket aPacket; + memset (&aPacket, 0, sizeof(aPacket)); + av_init_packet (&aPacket); +- if ((myAVContext->oformat->flags & AVFMT_RAWPICTURE) != 0 +- && !theToFlush) ++ if (0) + { + // raw video case - directly store the picture in the packet + aPacket.flags |= AV_PKT_FLAG_KEY; Deleted: fix-install-dir-references.patch =================================================================== --- fix-install-dir-references.patch 2019-05-23 05:47:33 UTC (rev 469183) +++ fix-install-dir-references.patch 2019-05-23 05:47:36 UTC (rev 469184) @@ -1,24 +0,0 @@ -diff -aur occt-V7_1_0/CMakeLists.txt occt-V7_1_0.new/CMakeLists.txt ---- occt-V7_1_0/CMakeLists.txt 2016-11-25 11:50:18.000000000 +0100 -+++ occt-V7_1_0.new/CMakeLists.txt 2017-03-18 08:44:10.406668714 +0100 -@@ -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}/${INSTALL_DIR_CMAKE}/OpenCASCADECompileDefinitionsAndFlags-\${CMAKE_INSTALL_CONFIG_NAME_LOWER}.cmake\" COPYONLY)") - - foreach (OCCT_MODULE ${OCCT_MODULES}) - if (BUILD_MODULE_${OCCT_MODULE}) -diff -aur occt-V7_1_0/adm/cmake/occt_macros.cmake occt-V7_1_0.new/adm/cmake/occt_macros.cmake ---- occt-V7_1_0/adm/cmake/occt_macros.cmake 2016-11-25 11:50:18.000000000 +0100 -+++ occt-V7_1_0.new/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}\") Copied: opencascade/repos/community-x86_64/fix-install-dir-references.patch (from rev 469182, opencascade/trunk/fix-install-dir-references.patch) =================================================================== --- fix-install-dir-references.patch (rev 0) +++ fix-install-dir-references.patch 2019-05-23 05:47:36 UTC (rev 469184) @@ -0,0 +1,24 @@ +diff -aur occt-V7_1_0/CMakeLists.txt occt-V7_1_0.new/CMakeLists.txt +--- occt-V7_1_0/CMakeLists.txt 2016-11-25 11:50:18.000000000 +0100 ++++ occt-V7_1_0.new/CMakeLists.txt 2017-03-18 08:44:10.406668714 +0100 +@@ -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}/${INSTALL_DIR_CMAKE}/OpenCASCADECompileDefinitionsAndFlags-\${CMAKE_INSTALL_CONFIG_NAME_LOWER}.cmake\" COPYONLY)") + + foreach (OCCT_MODULE ${OCCT_MODULES}) + if (BUILD_MODULE_${OCCT_MODULE}) +diff -aur occt-V7_1_0/adm/cmake/occt_macros.cmake occt-V7_1_0.new/adm/cmake/occt_macros.cmake +--- occt-V7_1_0/adm/cmake/occt_macros.cmake 2016-11-25 11:50:18.000000000 +0100 ++++ occt-V7_1_0.new/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}\") Deleted: opencascade.sh =================================================================== --- opencascade.sh 2019-05-23 05:47:33 UTC (rev 469183) +++ opencascade.sh 2019-05-23 05:47:36 UTC (rev 469184) @@ -1,24 +0,0 @@ -export CASROOT=/usr - -export CSF_LANGUAGE=us -export MMGT_CLEAR=1 -export CSF_EXCEPTION_PROMPT=1 - -export CSF_OCCTResourcePath=$CASROOT/share/opencascade/resources -export CSF_SHMessage=$CSF_OCCTResourcePath/SHMessage -export CSF_MDTVTexturesDirectory=$CSF_OCCTResourcePath/Textures -export CSF_ShadersDirectory=$CSF_OCCTResourcePath/Shaders -export CSF_XSMessage=$CSF_OCCTResourcePath/XSMessage -export CSF_TObjMessage=$CSF_OCCTResourcePath/TObj -export CSF_StandardDefaults=$CSF_OCCTResourcePath/StdResource -export CSF_PluginDefaults=$CSF_OCCTResourcePath/StdResource -export CSF_XCAFDefaults=$CSF_OCCTResourcePath/StdResource -export CSF_TObjDefaults=$CSF_OCCTResourcePath/StdResource -export CSF_StandardLiteDefaults=$CSF_OCCTResourcePath/StdResource -export CSF_IGESDefaults=$CSF_OCCTResourcePath/XSTEPResource -export CSF_STEPDefaults=$CSF_OCCTResourcePath/XSTEPResource -export CSF_XmlOcafResource=$CSF_OCCTResourcePath/XmlOcafResource -export CSF_MIGRATION_TYPES=$CSF_OCCTResourcePath/StdResource/MigrationSheet.txt -export CSF_DrawPluginDefaults=$CSF_OCCTResourcePath/DrawResources -export DRAWHOME=$CSF_OCCTResourcePath/DrawResources -export DRAWDEFAULT=$CSF_OCCTResourcePath/DrawResources/DrawDefault Copied: opencascade/repos/community-x86_64/opencascade.sh (from rev 469182, opencascade/trunk/opencascade.sh) =================================================================== --- opencascade.sh (rev 0) +++ opencascade.sh 2019-05-23 05:47:36 UTC (rev 469184) @@ -0,0 +1,24 @@ +export CASROOT=/usr + +export CSF_LANGUAGE=us +export MMGT_CLEAR=1 +export CSF_EXCEPTION_PROMPT=1 + +export CSF_OCCTResourcePath=$CASROOT/share/opencascade/resources +export CSF_SHMessage=$CSF_OCCTResourcePath/SHMessage +export CSF_MDTVTexturesDirectory=$CSF_OCCTResourcePath/Textures +export CSF_ShadersDirectory=$CSF_OCCTResourcePath/Shaders +export CSF_XSMessage=$CSF_OCCTResourcePath/XSMessage +export CSF_TObjMessage=$CSF_OCCTResourcePath/TObj +export CSF_StandardDefaults=$CSF_OCCTResourcePath/StdResource +export CSF_PluginDefaults=$CSF_OCCTResourcePath/StdResource +export CSF_XCAFDefaults=$CSF_OCCTResourcePath/StdResource +export CSF_TObjDefaults=$CSF_OCCTResourcePath/StdResource +export CSF_StandardLiteDefaults=$CSF_OCCTResourcePath/StdResource +export CSF_IGESDefaults=$CSF_OCCTResourcePath/XSTEPResource +export CSF_STEPDefaults=$CSF_OCCTResourcePath/XSTEPResource +export CSF_XmlOcafResource=$CSF_OCCTResourcePath/XmlOcafResource +export CSF_MIGRATION_TYPES=$CSF_OCCTResourcePath/StdResource/MigrationSheet.txt +export CSF_DrawPluginDefaults=$CSF_OCCTResourcePath/DrawResources +export DRAWHOME=$CSF_OCCTResourcePath/DrawResources +export DRAWDEFAULT=$CSF_OCCTResourcePath/DrawResources/DrawDefault Deleted: vtk7.patch =================================================================== --- vtk7.patch 2019-05-23 05:47:33 UTC (rev 469183) +++ vtk7.patch 2019-05-23 05:47:36 UTC (rev 469184) @@ -1,48 +0,0 @@ ---- a/src/IVtkVTK/IVtkVTK_ShapeData.cxx 2017-10-04 14:26:07.000000000 +0200 -+++ b/src/IVtkVTK/IVtkVTK_ShapeData.cxx 2018-04-07 14:43:32.920435032 +0200 -@@ -80,9 +80,9 @@ - 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 @@ - 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 @@ - - 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); - } - } - -@@ -143,7 +143,7 @@ - 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); - } Copied: opencascade/repos/community-x86_64/vtk7.patch (from rev 469182, opencascade/trunk/vtk7.patch) =================================================================== --- vtk7.patch (rev 0) +++ vtk7.patch 2019-05-23 05:47:36 UTC (rev 469184) @@ -0,0 +1,48 @@ +--- a/src/IVtkVTK/IVtkVTK_ShapeData.cxx 2017-10-04 14:26:07.000000000 +0200 ++++ b/src/IVtkVTK/IVtkVTK_ShapeData.cxx 2018-04-07 14:43:32.920435032 +0200 +@@ -80,9 +80,9 @@ + 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 @@ + 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 @@ + + 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); + } + } + +@@ -143,7 +143,7 @@ + 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); + }