[opencascade] update git-tree for 8.0.0 (#51657)

Co-authored-by: Billy O'Neal <bion@microsoft.com>

ports/opencascade/0001-cmake-keep-build-use-vcpkg-explicit.patch

@@ -1,8 +1,8 @@
 diff --git a/CMakeLists.txt b/CMakeLists.txt
-index a06f8a8c88..de45605c62 100644
+index 9b21fedd66..25f31712c7 100644
 --- a/CMakeLists.txt
 +++ b/CMakeLists.txt
-@@ -2,9 +2,6 @@ cmake_minimum_required (VERSION 3.10 FATAL_ERROR)
+@@ -5,9 +5,6 @@ set(OCCT_ROOT_DIR ${CMAKE_CURRENT_SOURCE_DIR} CACHE PATH "Root directory of OCCT
  
  if (NOT DEFINED BUILD_USE_VCPKG)
    set (BUILD_USE_VCPKG OFF CACHE BOOL "Use vcpkg for 3rdparty libraries.")

ports/opencascade/0002-cmake-load-exported-package-dependencies.patch

@@ -1,8 +1,8 @@
 diff --git a/CMakeLists.txt b/CMakeLists.txt
-index f8d62e06..1cf4a902 100644
+index 25f31712c7..f002521b30 100644
 --- a/CMakeLists.txt
 +++ b/CMakeLists.txt
-@@ -521,8 +521,8 @@ endif()
+@@ -580,8 +580,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 f8d62e06..1cf4a902 100644
  else()
    if (NOT CAN_USE_FREETYPE)
      OCCT_CHECK_AND_UNSET ("USE_FREETYPE")
-@@ -537,9 +537,10 @@ endif()
+@@ -596,9 +596,10 @@ endif()
  # VTK
  if (USE_VTK)
    add_definitions (-DHAVE_VTK)
@@ -26,7 +26,7 @@ index f8d62e06..1cf4a902 100644
  else()
    OCCT_CHECK_AND_UNSET_GROUP ("3RDPARTY_VTK")
    OCCT_UNSET_VCPKG_FEATURE ("vtk")
-@@ -554,8 +555,8 @@ endif()
+@@ -613,8 +614,8 @@ endif()
  # FREEIMAGE
  if (CAN_USE_FREEIMAGE AND USE_FREEIMAGE)
    add_definitions (-DHAVE_FREEIMAGE)
@@ -37,7 +37,7 @@ index f8d62e06..1cf4a902 100644
  elseif (NOT CAN_USE_FREEIMAGE)
    OCCT_CHECK_AND_UNSET ("USE_FREEIMAGE")
    OCCT_UNSET_VCPKG_FEATURE ("freeimage")
-@@ -650,8 +651,8 @@ endif()
+@@ -707,8 +708,8 @@ endif()
  # TBB
  if (CAN_USE_TBB AND USE_TBB)
    add_definitions (-DHAVE_TBB)
@@ -48,7 +48,7 @@ index f8d62e06..1cf4a902 100644
  elseif (NOT CAN_USE_TBB)
    OCCT_CHECK_AND_UNSET ("USE_TBB")
    OCCT_UNSET_VCPKG_FEATURE ("tbb")
-@@ -667,8 +668,8 @@ endif()
+@@ -724,8 +725,8 @@ endif()
  OCCT_IS_PRODUCT_REQUIRED (CSF_RapidJSON CAN_USE_RAPIDJSON)
  if (CAN_USE_RAPIDJSON AND USE_RAPIDJSON)
    add_definitions (-DHAVE_RAPIDJSON)
@@ -60,14 +60,14 @@ index f8d62e06..1cf4a902 100644
    OCCT_CHECK_AND_UNSET ("USE_RAPIDJSON")
    OCCT_UNSET_VCPKG_FEATURE ("rapidjson")
 diff --git a/adm/cmake/occt_csf.cmake b/adm/cmake/occt_csf.cmake
-index 49e35d44..124eb4d6 100644
+index 0795158ae7..a5a118e0ea 100644
 --- a/adm/cmake/occt_csf.cmake
 +++ b/adm/cmake/occt_csf.cmake
-@@ -163,7 +163,9 @@ else()
+@@ -134,7 +134,9 @@ else()
      set (CSF_OpenGlesLibs "EGL GLESv2")
      set (CSF_dl          "dl")
      if (USE_FREETYPE)
--      set (CSF_fontconfig "fontconfig")
+-      set (CSF_fontconfig "fontconfig expat")
 +      find_package(Fontconfig REQUIRED)
 +      set(USE_FONTCONFIG "ON" CACHE INTERNAL "")
 +      set (CSF_fontconfig "Fontconfig::Fontconfig")
@@ -75,10 +75,10 @@ index 49e35d44..124eb4d6 100644
    endif()
  endif()
 diff --git a/adm/templates/OpenCASCADEConfig.cmake.in b/adm/templates/OpenCASCADEConfig.cmake.in
-index 5079ba63..137206bb 100644
+index a4796b2dc1..fef12e3163 100644
 --- a/adm/templates/OpenCASCADEConfig.cmake.in
 +++ b/adm/templates/OpenCASCADEConfig.cmake.in
-@@ -70,6 +70,26 @@ set (OpenCASCADE_WITH_GLES2     @USE_GLES2@)
+@@ -74,6 +74,26 @@ set (OpenCASCADE_WITH_GLES2     @USE_GLES2@)
  @SET_OpenCASCADE_WITH_D3D@
  @SET_OpenCASCADE_WITH_GLX@
  
@@ -105,18 +105,3 @@ index 5079ba63..137206bb 100644
  # Import OpenCASCADE compile definitions, C and C++ flags for each installed configuration.
  file(GLOB CONFIG_FILES "${CMAKE_CURRENT_LIST_DIR}/OpenCASCADECompileDefinitionsAndFlags-*.cmake")
  foreach(f ${CONFIG_FILES})
-diff --git a/src/Image/Image_AlienPixMap.cxx b/src/Image/Image_AlienPixMap.cxx
-index 7e14e9e6..e6c23d78 100644
---- a/src/Image/Image_AlienPixMap.cxx
-+++ b/src/Image/Image_AlienPixMap.cxx
-@@ -19,10 +19,6 @@
- 
- #ifdef HAVE_FREEIMAGE
-   #include <FreeImage.h>
--
--  #ifdef _MSC_VER
--    #pragma comment(lib, "FreeImage.lib")
--  #endif
- #elif defined(HAVE_WINCODEC)
-   #include <wincodec.h>
-   // prevent warnings on MSVC10

ports/opencascade/0003-image-remove-freeimage-msvc-autolink.patch

@@ -0,0 +1,15 @@
+diff --git a/src/Visualization/TKService/Image/Image_AlienPixMap.cxx b/src/Visualization/TKService/Image/Image_AlienPixMap.cxx
+index 238efdcc42..94017e63aa 100644
+--- a/src/Visualization/TKService/Image/Image_AlienPixMap.cxx
++++ b/src/Visualization/TKService/Image/Image_AlienPixMap.cxx
+@@ -19,10 +19,6 @@
+ 
+ #ifdef HAVE_FREEIMAGE
+   #include <FreeImage.h>
+-
+-  #ifdef _MSC_VER
+-    #pragma comment(lib, "FreeImage.lib")
+-  #endif
+ #elif defined(HAVE_WINCODEC)
+   #include <wincodec.h>
+   // prevent warnings on MSVC10

ports/opencascade/0004-cmake-add-additional-path-extraction-for-OpenCASCADE.patch

@@ -1,9 +1,9 @@
 diff --git a/adm/templates/OpenCASCADEConfig.cmake.in b/adm/templates/OpenCASCADEConfig.cmake.in
-index e391ddfe8e..c926c499ac 100644
+index 678e44c7d1..b2fdc9dc27 100644
 --- a/adm/templates/OpenCASCADEConfig.cmake.in
 +++ b/adm/templates/OpenCASCADEConfig.cmake.in
-@@ -24,6 +24,7 @@ set (OpenCASCADE_DEVELOPMENT_VERSION "@OCC_VERSION_DEVELOPMENT@")
- # - in Android style: $INSTALL_DIR/libs/$CMAKE_ANDROID_ARCH_ABI/cmake/opencascade-<version>
+@@ -25,6 +25,7 @@ set (OpenCASCADE_DEVELOPMENT_VERSION "@OCC_VERSION_DEVELOPMENT@")
+ # - in Android style: $INSTALL_DIR/libs/$CMAKE_ANDROID_ARCH_ABI/cmake/@OCCT_PROJECT_NAME@-<version>
  get_filename_component (OpenCASCADE_INSTALL_PREFIX "${CMAKE_CURRENT_LIST_FILE}" PATH)
  get_filename_component (OpenCASCADE_INSTALL_PREFIX "${OpenCASCADE_INSTALL_PREFIX}" PATH)
 +get_filename_component (OpenCASCADE_INSTALL_PREFIX "${OpenCASCADE_INSTALL_PREFIX}" PATH)

ports/opencascade/0005-drop-bin-letter.patch

@@ -0,0 +1,49 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index e2264828be..5dc72e76f0 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -351,13 +351,6 @@ endif()
+ set (CMAKE_INSTALL_PREFIX "${INSTALL_DIR}" CACHE INTERNAL "" FORCE)
+ 
+ set (BIN_LETTER "")
+-if (NOT LAYOUT_IS_VCPKG)
+-  if ("${CMAKE_BUILD_TYPE}" STREQUAL "Debug")
+-    set (BIN_LETTER "d")
+-  elseif ("${CMAKE_BUILD_TYPE}" STREQUAL "RelWithDebInfo")
+-    set (BIN_LETTER "i")
+-  endif()
+-endif()
+ 
+ # the list of being built toolkits
+ set (BUILD_ADDITIONAL_TOOLKITS "" CACHE STRING "${BUILD_ADDITIONAL_TOOLKITS_DESCR}")
+@@ -1089,6 +1082,7 @@ else()
+     set (CMAKE_LIBRARY_OUTPUT_DIRECTORY_RELEASE        "${CMAKE_BINARY_DIR}/${OS_WITH_BIT}/${COMPILER}/bin")
+     set (CMAKE_LIBRARY_OUTPUT_DIRECTORY_RELWITHDEBINFO "${CMAKE_BINARY_DIR}/${OS_WITH_BIT}/${COMPILER}/bini")
+     set (CMAKE_LIBRARY_OUTPUT_DIRECTORY_DEBUG          "${CMAKE_BINARY_DIR}/${OS_WITH_BIT}/${COMPILER}/bind")
++    set (CMAKE_PDB_OUTPUT_DIRECTORY_DEBUG              "${CMAKE_BINARY_DIR}/${OS_WITH_BIT}/${COMPILER}/bin")
+   endif()
+ endif()
+ 
+diff --git a/adm/cmake/occt_macros.cmake b/adm/cmake/occt_macros.cmake
+index 11c686a1a4..b050d477de 100644
+--- a/adm/cmake/occt_macros.cmake
++++ b/adm/cmake/occt_macros.cmake
+@@ -696,17 +696,7 @@ macro (OCCT_UPDATE_TARGET_FILE)
+ endmacro()
+ 
+ macro (OCCT_INSERT_CODE_FOR_TARGET)
+-  if (LAYOUT_IS_VCPKG)
+-    install(CODE "set (OCCT_INSTALL_BIN_LETTER \"\")")
+-  else()
+-    install(CODE "if (\"\${CMAKE_INSTALL_CONFIG_NAME}\" MATCHES \"^([Rr][Ee][Ll][Ee][Aa][Ss][Ee])$\")
+-      set (OCCT_INSTALL_BIN_LETTER \"\")
+-    elseif (\"\${CMAKE_INSTALL_CONFIG_NAME}\" MATCHES \"^([Rr][Ee][Ll][Ww][Ii][Tt][Hh][Dd][Ee][Bb][Ii][Nn][Ff][Oo])$\")
+-      set (OCCT_INSTALL_BIN_LETTER \"i\")
+-    elseif (\"\${CMAKE_INSTALL_CONFIG_NAME}\" MATCHES \"^([Dd][Ee][Bb][Uu][Gg])$\")
+-      set (OCCT_INSTALL_BIN_LETTER \"d\")
+-    endif()")
+-  endif()
++  install(CODE "set (OCCT_INSTALL_BIN_LETTER \"\")")
+ endmacro()
+ 
+ macro (OCCT_UPDATE_DRAW_DEFAULT_FILE)

ports/opencascade/drop-bin-letter-d.patch

@@ -1,45 +0,0 @@
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index d051f5ccce..91517a5936 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -317,7 +317,6 @@ set (CMAKE_INSTALL_PREFIX "${INSTALL_DIR}" CACHE INTERNAL "" FORCE)
- 
- set (BIN_LETTER "")
- if ("${CMAKE_BUILD_TYPE}" STREQUAL "Debug")
--  set (BIN_LETTER "d")
- elseif ("${CMAKE_BUILD_TYPE}" STREQUAL "RelWithDebInfo")
-   set (BIN_LETTER "i")
- endif()
-@@ -1002,6 +1001,7 @@ if (WIN32)
-   set (CMAKE_LIBRARY_OUTPUT_DIRECTORY_RELEASE        "${CMAKE_BINARY_DIR}/${OS_WITH_BIT}/${COMPILER}/bin")
-   set (CMAKE_LIBRARY_OUTPUT_DIRECTORY_RELWITHDEBINFO "${CMAKE_BINARY_DIR}/${OS_WITH_BIT}/${COMPILER}/bini")
-   set (CMAKE_LIBRARY_OUTPUT_DIRECTORY_DEBUG          "${CMAKE_BINARY_DIR}/${OS_WITH_BIT}/${COMPILER}/bind")
-+  set (CMAKE_PDB_OUTPUT_DIRECTORY_DEBUG              "${CMAKE_BINARY_DIR}/${OS_WITH_BIT}/${COMPILER}/bin")
- endif()
- 
- string(TIMESTAMP CURRENT_TIME "%H:%M:%S")
-diff --git a/adm/cmake/occt_macros.cmake b/adm/cmake/occt_macros.cmake
-index 92a8db33dc..3d4c95b584 100644
---- a/adm/cmake/occt_macros.cmake
-+++ b/adm/cmake/occt_macros.cmake
-@@ -779,7 +779,7 @@ macro (OCCT_INSERT_CODE_FOR_TARGET)
-   elseif (\"\${CMAKE_INSTALL_CONFIG_NAME}\" MATCHES \"^([Rr][Ee][Ll][Ww][Ii][Tt][Hh][Dd][Ee][Bb][Ii][Nn][Ff][Oo])$\")
-     set (OCCT_INSTALL_BIN_LETTER \"i\")
-   elseif (\"\${CMAKE_INSTALL_CONFIG_NAME}\" MATCHES \"^([Dd][Ee][Bb][Uu][Gg])$\")
--    set (OCCT_INSTALL_BIN_LETTER \"d\")
-+    set (OCCT_INSTALL_BIN_LETTER \"\")
-   endif()")
- endmacro()
- 
-diff --git a/tools/CMakeLists.txt b/tools/CMakeLists.txt
-index beb934f7..95cec74a 100644
---- a/tools/CMakeLists.txt
-+++ b/tools/CMakeLists.txt
-@@ -172,7 +172,6 @@ set (CMAKE_INSTALL_PREFIX "${INSTALL_DIR}" CACHE INTERNAL "" FORCE)
- 
- set (BIN_LETTER "")
- if ("${CMAKE_BUILD_TYPE}" STREQUAL "Debug")
--  set (BIN_LETTER "d")
- elseif ("${CMAKE_BUILD_TYPE}" STREQUAL "RelWithDebInfo")
-   set (BIN_LETTER "i")
- endif()

ports/opencascade/install-include-dir.patch

@@ -1,16 +0,0 @@
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 715adb7c2e..a06f8a8c88 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -1375,6 +1375,11 @@ foreach (OCCT_MODULE ${OCCT_MODULES})
- endforeach()
- set (OCCT_MODULES_ENABLED ${OCCT_MODULES_ENABLED_SORTED})
- 
-+foreach (OCCT_LIBRARY IN LISTS OCCT_LIBRARIES)
-+  target_include_directories(${OCCT_LIBRARY} INTERFACE $<INSTALL_INTERFACE:include/opencascade>) # OpenCASCADE_INCLUDE_DIR
-+  target_include_directories(${OCCT_LIBRARY} INTERFACE $<INSTALL_INTERFACE:include>) # vcpkg lock-in
-+endforeach()
-+
- # Add all targets to the build-tree export set
- export (TARGETS ${OCCT_LIBRARIES} FILE "${CMAKE_BINARY_DIR}/OpenCASCADETargets.cmake")
- 

ports/opencascade/portfile.cmake

@@ -3,14 +3,14 @@ vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO Open-Cascade-SAS/OCCT
     REF "${VERSION_STR}"
-    SHA512 65935a2f46021e2b9a7dd2a218515c06925454855a8cc952fcbd1cccbfd5c8d605ed8f1d930d2aec87ef172ded551d0a237fad128319fb9cbcabdc755aa0aa67
+    SHA512 fc5a57a25677f73b1adff8e94a901a11ff62109f16f447f2c8e8effe490ba501a705d8149a42f6c05f8a1524a5e9071df0566b48497cd58b0898a7e69b2c676b
     HEAD_REF master
     PATCHES
-        fix-install-prefix-path.patch
-        drop-bin-letter-d.patch
-        dependencies.patch
-        install-include-dir.patch
-        remove-vcpkg-enabling.patch
+        0001-cmake-keep-build-use-vcpkg-explicit.patch
+        0002-cmake-load-exported-package-dependencies.patch
+        0003-image-remove-freeimage-msvc-autolink.patch
+        0004-cmake-add-additional-path-extraction-for-OpenCASCADE.patch
+        0005-drop-bin-letter.patch
 )
 
 if (VCPKG_LIBRARY_LINKAGE STREQUAL "dynamic")
@@ -24,7 +24,6 @@ vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS
         freeimage   USE_FREEIMAGE
         freetype    USE_FREETYPE
         rapidjson   USE_RAPIDJSON
-        samples     INSTALL_SAMPLES
         tbb         USE_TBB
         vtk         USE_VTK
 )
@@ -39,14 +38,11 @@ vcpkg_cmake_configure(
         -DBUILD_LIBRARY_TYPE=${BUILD_TYPE}
         -DBUILD_MODULE_Draw=OFF
         -DBUILD_DOC_Overview=OFF
-        -DBUILD_MODULE_DETools=OFF
         -DINSTALL_DIR_LAYOUT=Unix
         -DINSTALL_DIR_DOC=share/trash
         -DINSTALL_DIR_SCRIPT=share/trash # not relocatable
         -DINSTALL_TEST_CASES=OFF
         -DUSE_TK=OFF
-    OPTIONS_DEBUG
-        -DINSTALL_SAMPLES=OFF
 )
 
 vcpkg_cmake_install()

ports/opencascade/vcpkg.json

@@ -1,7 +1,6 @@
 {
   "name": "opencascade",
-  "version": "7.9.3",
-  "port-version": 1,
+  "version": "8.0.0",
   "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",
@@ -57,9 +56,6 @@
         "rapidjson"
       ]
     },
-    "samples": {
-      "description": "Enable optional samples"
-    },
     "tbb": {
       "description": "Enable optional usage of tbb",
       "dependencies": [

scripts/ci.baseline.txt

@@ -942,6 +942,18 @@ nana:x64-linux=fail
 nanodbc:x64-linux=skip
 netcdf-cxx4:arm64-windows-static-md=fail
 netcdf-cxx4:x64-windows-static-md=fail
+netgen:arm64-android=fail
+netgen:arm64-osx=fail
+netgen:arm64-windows-static-md=fail
+netgen:arm64-windows=fail
+netgen:x64-android=fail
+netgen:x64-linux=fail
+netgen:x64-windows-release=fail
+netgen:x64-windows-release=fail
+netgen:x64-windows-static-md=fail
+netgen:x64-windows-static=fail
+netgen:x64-windows-static=fail
+netgen:x64-windows=fail
 nethost:arm64-linux=fail
 ngspice:x64-android=fail
 ngspice:x64-windows-static=fail

versions/baseline.json

@@ -7313,8 +7313,8 @@
       "port-version": 0
     },
     "opencascade": {
-      "baseline": "7.9.3",
-      "port-version": 1
+      "baseline": "8.0.0",
+      "port-version": 0
     },
     "opencc": {
       "baseline": "1.1.9",

versions/o-/opencascade.json

@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "380113d2be95b9e41f2eb1740d809769edf41769",
+      "version": "8.0.0",
+      "port-version": 0
+    },
     {
       "git-tree": "9a763d6711b422dea8fd72603ef8f89ff2386983",
       "version": "7.9.3",