[opencascade] update to 7.9.1 (#45671)

ports/opencascade/csf-redifinition.patch

@@ -0,0 +1,24 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 17bc7f1638..c4283c3c4d 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -473,6 +473,9 @@ OCCT_IS_PRODUCT_REQUIRED (CSF_EIGEN CAN_USE_EIGEN)
+ 
+ set (OCCT_3RDPARTY_CMAKE_LIST)
+ 
++# define CSF variable
++OCCT_INCLUDE_CMAKE_FILE ("adm/cmake/occt_csf")
++
+ # Tcl (mandatory for Draw Harness)
+ if (USE_TCL)
+   message (STATUS "Info: TCL is used by OCCT")
+@@ -769,9 +772,6 @@ file(COPY ${CMAKE_SOURCE_DIR}/.clang-format DESTINATION ${CMAKE_SOURCE_DIR})
+ OCCT_MAKE_OS_WITH_BITNESS()
+ OCCT_MAKE_COMPILER_SHORT_NAME()
+ 
+-# define CSF variable
+-OCCT_INCLUDE_CMAKE_FILE ("adm/cmake/occt_csf")
+-
+ # do not define INSTALL_DIR_BIN for win.
+ # Leave library structure for win: <prefix>/win64/vc10/bin(d)
+ if (NOT DEFINED INSTALL_DIR_BIN)

ports/opencascade/dependencies.patch

@@ -1,8 +1,8 @@
 diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 91517a5936..715adb7c2e 100644
+index 34300d41ad..263b4bcbd3 100644
 --- a/CMakeLists.txt
 +++ b/CMakeLists.txt
-@@ -524,8 +524,8 @@ endif()
+@@ -518,8 +518,8 @@ endif()
  if (CAN_USE_FREETYPE AND USE_FREETYPE)
    message (STATUS "Info: FreeType is used by OCCT")
    add_definitions (-DHAVE_FREETYPE)
@@ -13,7 +13,7 @@ index 91517a5936..715adb7c2e 100644
  else()
    if (NOT CAN_USE_FREETYPE)
      OCCT_CHECK_AND_UNSET ("USE_FREETYPE")
-@@ -540,9 +540,10 @@ endif()
+@@ -534,9 +534,10 @@ endif()
  # VTK
  if (USE_VTK)
    add_definitions (-DHAVE_VTK)
@@ -26,7 +26,7 @@ index 91517a5936..715adb7c2e 100644
  else()
    OCCT_CHECK_AND_UNSET_GROUP ("3RDPARTY_VTK")
    OCCT_UNSET_VCPKG_FEATURE ("vtk")
-@@ -557,8 +558,8 @@ endif()
+@@ -551,8 +552,8 @@ endif()
  # FREEIMAGE
  if (CAN_USE_FREEIMAGE AND USE_FREEIMAGE)
    add_definitions (-DHAVE_FREEIMAGE)
@@ -37,7 +37,7 @@ index 91517a5936..715adb7c2e 100644
  elseif (NOT CAN_USE_FREEIMAGE)
    OCCT_CHECK_AND_UNSET ("USE_FREEIMAGE")
    OCCT_UNSET_VCPKG_FEATURE ("freeimage")
-@@ -653,8 +654,8 @@ endif()
+@@ -647,8 +648,8 @@ endif()
  # TBB
  if (CAN_USE_TBB AND USE_TBB)
    add_definitions (-DHAVE_TBB)
@@ -48,7 +48,7 @@ index 91517a5936..715adb7c2e 100644
  elseif (NOT CAN_USE_TBB)
    OCCT_CHECK_AND_UNSET ("USE_TBB")
    OCCT_UNSET_VCPKG_FEATURE ("tbb")
-@@ -670,8 +671,8 @@ endif()
+@@ -664,8 +665,8 @@ endif()
  OCCT_IS_PRODUCT_REQUIRED (CSF_RapidJSON CAN_USE_RAPIDJSON)
  if (CAN_USE_RAPIDJSON AND USE_RAPIDJSON)
    add_definitions (-DHAVE_RAPIDJSON)
@@ -59,29 +59,8 @@ index 91517a5936..715adb7c2e 100644
  elseif (NOT CAN_USE_RAPIDJSON)
    OCCT_CHECK_AND_UNSET ("USE_RAPIDJSON")
    OCCT_UNSET_VCPKG_FEATURE ("rapidjson")
-diff --git a/adm/cmake/occt_toolkit.cmake b/adm/cmake/occt_toolkit.cmake
-index 36accf907f..5ef87f9bf0 100644
---- a/adm/cmake/occt_toolkit.cmake
-+++ b/adm/cmake/occt_toolkit.cmake
-@@ -281,12 +281,11 @@ else()
-   endif()
- endif()
- 
--if (BUILD_SHARED_LIBS OR EXECUTABLE_PROJECT)
--  if(IS_VTK_9XX)
--    string (REGEX REPLACE "vtk" "VTK::" USED_TOOLKITS_BY_CURRENT_PROJECT "${USED_TOOLKITS_BY_CURRENT_PROJECT}")
--  endif()
-+if(IS_VTK_9XX)
-+  string (REGEX REPLACE "vtk" "VTK::" USED_TOOLKITS_BY_CURRENT_PROJECT "${USED_TOOLKITS_BY_CURRENT_PROJECT}")
- endif()
--target_link_libraries (${PROJECT_NAME} ${USED_TOOLKITS_BY_CURRENT_PROJECT} ${USED_EXTERNAL_LIBS_BY_CURRENT_PROJECT})
-+
-+target_link_libraries (${PROJECT_NAME} PRIVATE ${USED_TOOLKITS_BY_CURRENT_PROJECT} ${USED_EXTERNAL_LIBS_BY_CURRENT_PROJECT})
- 
- if (USE_QT)
-   foreach (PROJECT_LIBRARY_DEBUG ${PROJECT_LIBRARIES_DEBUG})
 diff --git a/adm/templates/OpenCASCADEConfig.cmake.in b/adm/templates/OpenCASCADEConfig.cmake.in
-index c926c499ac..a7ad99990c 100644
+index add6a678c7..312930343e 100644
 --- a/adm/templates/OpenCASCADEConfig.cmake.in
 +++ b/adm/templates/OpenCASCADEConfig.cmake.in
 @@ -71,6 +71,23 @@ set (OpenCASCADE_WITH_GLES2     @USE_GLES2@)

ports/opencascade/file-filter-regex.patch

@@ -1,45 +0,0 @@
-diff --git a/adm/cmake/occt_macros.cmake b/adm/cmake/occt_macros.cmake
-index 3d4c95b584..bf3e7c8d81 100644
---- a/adm/cmake/occt_macros.cmake
-+++ b/adm/cmake/occt_macros.cmake
-@@ -437,7 +437,7 @@ function (COLLECT_AND_INSTALL_OCCT_HEADER_FILES THE_ROOT_TARGET_OCCT_DIR THE_OCC
-     foreach(OCCT_PACKAGE ${USED_PACKAGES})
-       EXTRACT_PACKAGE_FILES (${THE_RELATIVE_PATH} ${OCCT_PACKAGE} ALL_FILES _)
-       set (HEADER_FILES_FILTERING ${ALL_FILES})
--      list (FILTER HEADER_FILES_FILTERING INCLUDE REGEX ".+[.](h|g|p|lxx)")
-+      list (FILTER HEADER_FILES_FILTERING INCLUDE REGEX ".+[.](h|g|p|lxx|hxx|pxx|hpp|gxx)$")
-       list (APPEND OCCT_HEADER_FILES_COMPLETE ${HEADER_FILES_FILTERING})
-     endforeach()
-   endforeach()
-@@ -477,7 +477,7 @@ function (COLLECT_AND_INSTALL_OCCT_HEADER_FILES THE_ROOT_TARGET_OCCT_DIR THE_OCC
-   endforeach()
- 
-   set (OCCT_HEADER_FILES_INSTALLATION ${OCCT_HEADER_FILES_COMPLETE})
--  list (FILTER OCCT_HEADER_FILES_INSTALLATION INCLUDE REGEX ".*[.](h|lxx)")
-+  list (FILTER OCCT_HEADER_FILES_INSTALLATION INCLUDE REGEX ".*[.](h|hxx|lxx)$")
-   install (FILES ${OCCT_HEADER_FILES_INSTALLATION} DESTINATION "${INSTALL_DIR}/${THE_OCCT_INSTALL_DIR_PREFIX}")
- endfunction()
- 
-diff --git a/adm/cmake/occt_toolkit.cmake b/adm/cmake/occt_toolkit.cmake
-index a2009e65b9..41bc03fc9a 100644
---- a/adm/cmake/occt_toolkit.cmake
-+++ b/adm/cmake/occt_toolkit.cmake
-@@ -63,13 +63,13 @@ foreach (OCCT_PACKAGE ${USED_PACKAGES})
- 
-   set (HEADER_FILES_FILTERING ${ALL_FILES})
-   set (SOURCE_FILES_FILTERING ${ALL_FILES})
--  
--  list (FILTER HEADER_FILES_FILTERING INCLUDE REGEX ".+[.](h|p|g|lxx)")
--  
-+
-+  list (FILTER HEADER_FILES_FILTERING INCLUDE REGEX ".+[.](h|p|g|lxx|hxx|pxx|hpp|gxx)$")
-+    
-   if(APPLE)
--    list (FILTER SOURCE_FILES_FILTERING INCLUDE REGEX ".+[.](c|mm)")
-+    list (FILTER SOURCE_FILES_FILTERING INCLUDE REGEX ".+[.](c|cxx|cpp|mm)$")
-   else()
--    list (FILTER SOURCE_FILES_FILTERING INCLUDE REGEX ".+[.](c)")
-+    list (FILTER SOURCE_FILES_FILTERING INCLUDE REGEX ".+[.](c|cpp|cxx)$")
-   endif()
- 
-   list (APPEND HEADER_FILES ${HEADER_FILES_FILTERING})

ports/opencascade/fix-pdb-find.patch

@@ -1,13 +0,0 @@
-diff --git a/adm/cmake/occt_toolkit.cmake b/adm/cmake/occt_toolkit.cmake
-index 1a7eb59b5c..36accf907f 100644
---- a/adm/cmake/occt_toolkit.cmake
-+++ b/adm/cmake/occt_toolkit.cmake
-@@ -134,7 +134,7 @@ if (EXECUTABLE_PROJECT)
- else()
-   add_library (${PROJECT_NAME} ${USED_SRCFILES} ${USED_INCFILES} ${USED_RCFILE} ${RESOURCE_FILES} ${${PROJECT_NAME}_MOC_FILES})
- 
--  if (MSVC)
-+  if (MSVC AND BUILD_SHARED_LIBS)
-     if (BUILD_FORCE_RelWithDebInfo)
-       set (aReleasePdbConf "Release")
-     else()

ports/opencascade/portfile.cmake

@@ -3,16 +3,15 @@ vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO Open-Cascade-SAS/OCCT
     REF "${VERSION_STR}"
-    SHA512 42ceb7ad4ba6848c334ca850c5caffefd262b82dd4432f069d7a986f796dc22f038f3af902c0f3fc4ce8c9dd4592c444674a271d31f744c1084bc5bfd775eadf
+    SHA512 4ec271ec8db5f0d6f77ea5c0633b40334c796421806a344c568fb8d9ed942fec63f8dfcc65ab9f65e0446d5cd7a49beede5ac693421971b350e828ab1a19d773
     HEAD_REF master
     PATCHES
         fix-install-prefix-path.patch
-        fix-pdb-find.patch
         drop-bin-letter-d.patch
         dependencies.patch
         install-include-dir.patch
         remove-vcpkg-enabling.patch
-        file-filter-regex.patch
+        csf-redifinition.patch
 )
 
 if (VCPKG_LIBRARY_LINKAGE STREQUAL "dynamic")

ports/opencascade/vcpkg.json

@@ -1,6 +1,6 @@
 {
   "name": "opencascade",
-  "version": "7.9.0",
+  "version": "7.9.1",
   "description": "Open CASCADE Technology (OCCT) is an open-source software development platform for 3D CAD, CAM, CAE.",
   "homepage": "https://github.com/Open-Cascade-SAS/OCCT",
   "license": "LGPL-2.1-only",

scripts/ci.feature.baseline.txt

@@ -1504,12 +1504,7 @@ open62541[mbedtls]:arm64-uwp = cascade
 open62541[mbedtls]:x64-uwp = cascade
 openal-soft[pipewire](!linux) = cascade
 openal-soft[pulseaudio](!linux) = cascade
-opencascade:x86-windows = cascade
-opencascade[samples,tbb]:x64-linux = cascade
-opencascade[tbb]:x64-windows = cascade
-opencascade[tbb]:x64-windows-static = cascade
-opencascade[tbb]:x64-windows-static-md = cascade
-opencascade[tbb,vtk,freeimage](uwp) = cascade
+opencascade[vtk,freeimage](uwp) = cascade
 opencv[cuda,cudnn](osx) = cascade
 opencv[cuda,cudnn,dc1394,dnn-cuda,freetype,gdcm,gstreamer,gtk,halide,openexr,opengl,ovis,python,qt,sfm,tbb,vtk]:arm64-uwp = cascade
 opencv[cuda,cudnn,dc1394,dnn-cuda,freetype,gdcm,gstreamer,gtk,openexr,opengl,ovis,qt,sfm,tbb,vtk]:x64-uwp = cascade

versions/baseline.json

@@ -6865,7 +6865,7 @@
       "port-version": 0
     },
     "opencascade": {
-      "baseline": "7.9.0",
+      "baseline": "7.9.1",
       "port-version": 0
     },
     "opencc": {

versions/o-/opencascade.json

@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "5698eb483bbce42fd662a7682d880c5e24d24a68",
+      "version": "7.9.1",
+      "port-version": 0
+    },
     {
       "git-tree": "3234bf9b80704cbb6d401fa42a2f5555e4f9e69b",
       "version": "7.9.0",