[opencascade] Update to 7.5.0 (#15997)

* [opencascade] Update to 7.5.0

* update version

9 files changed, 44 insertions, 133 deletions

diff --git a/ports/opencascade/CONTROL b/ports/opencascade/CONTROL
index d16b19ff8..998252a3f 100644
--- a/ports/opencascade/CONTROL
+++ b/ports/opencascade/CONTROL
@@ -1,6 +1,5 @@
 Source: opencascade
-Version: 7.4.0
-Port-Version: 3
+Version: 7.5.0
 Build-Depends: freetype
 Description: Open CASCADE Technology (OCCT) is an open-source software development platform for 3D CAD, CAM, CAE.
 Supports: !(uwp|osx|linux|arm)
diff --git a/ports/opencascade/fix-build-with-vs2017.patch b/ports/opencascade/fix-build-with-vs2017.patch
deleted file mode 100644
index 53b0ab0ea..000000000
--- a/ports/opencascade/fix-build-with-vs2017.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/adm/cmake/occt_defs_flags.cmake b/adm/cmake/occt_defs_flags.cmake
-index 203ca6b..4ff433a 100644
---- a/adm/cmake/occt_defs_flags.cmake
-+++ b/adm/cmake/occt_defs_flags.cmake
-@@ -18,7 +18,7 @@ endif()
- 
- # Turn off the "improved inline analyzer" that stalls on x86 release builds using MSVC 16.7 for 32-bit
- if (NOT CMAKE_SIZEOF_VOID_P EQUAL 8)
--  if (MSVC)
-+  if (MSVC AND MSVC_VERSION GREATER 1919)
-     set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /d2DeepThoughtInliner-")
-     set (CMAKE_C_FLAGS   "${CMAKE_C_FLAGS} /d2DeepThoughtInliner-")
-   endif()
diff --git a/ports/opencascade/fix-install-prefix-path.patch b/ports/opencascade/fix-install-prefix-path.patch
deleted file mode 100644
index 38c07c21d..000000000
--- a/ports/opencascade/fix-install-prefix-path.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff --git a/adm/templates/OpenCASCADEConfig.cmake.in b/adm/templates/OpenCASCADEConfig.cmake.in
-index 4937103b..cd35e07d 100644
---- a/adm/templates/OpenCASCADEConfig.cmake.in
-+++ b/adm/templates/OpenCASCADEConfig.cmake.in
-@@ -23,6 +23,7 @@ set (OpenCASCADE_DEVELOPMENT_VERSION "@OCC_VERSION_DEVELOPMENT@")
- # - in Windows style: $INSTALL_DIR/cmake
- 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)
- if (OpenCASCADE_INSTALL_PREFIX MATCHES "/cmake$")
-   get_filename_component (OpenCASCADE_INSTALL_PREFIX "${OpenCASCADE_INSTALL_PREFIX}" PATH)
- endif()
diff --git a/ports/opencascade/fix-msvc-32bit-builds.patch b/ports/opencascade/fix-msvc-32bit-builds.patch
deleted file mode 100644
index 2fa76ffb0..000000000
--- a/ports/opencascade/fix-msvc-32bit-builds.patch
+++ /dev/null
@@ -1,22 +0,0 @@
- adm/cmake/occt_defs_flags.cmake | 8 ++++++++

- 1 file changed, 8 insertions(+)

-

-diff --git a/adm/cmake/occt_defs_flags.cmake b/adm/cmake/occt_defs_flags.cmake

-index 5484c67..203ca6b 100644

---- a/adm/cmake/occt_defs_flags.cmake

-+++ b/adm/cmake/occt_defs_flags.cmake

-@@ -16,6 +16,14 @@ if (MSVC)

-   set (CMAKE_C_FLAGS   "${CMAKE_C_FLAGS}   /fp:precise")

- endif()

- 

-+# Turn off the "improved inline analyzer" that stalls on x86 release builds using MSVC 16.7 for 32-bit

-+if (NOT CMAKE_SIZEOF_VOID_P EQUAL 8)

-+  if (MSVC)

-+    set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /d2DeepThoughtInliner-")

-+    set (CMAKE_C_FLAGS   "${CMAKE_C_FLAGS} /d2DeepThoughtInliner-")

-+  endif()

-+endif()

-+

- # add SSE2 option for old MSVC compilers (VS 2005 - 2010, 32 bit only)

- if (NOT CMAKE_SIZEOF_VOID_P EQUAL 8)

-   if (MSVC AND ((MSVC_VERSION EQUAL 1400) OR (MSVC_VERSION EQUAL 1500) OR (MSVC_VERSION EQUAL 1600)))

diff --git a/ports/opencascade/fix-pdb-find.patch b/ports/opencascade/fix-pdb-find.patch
new file mode 100644
index 000000000..dd9b10863
--- /dev/null
+++ b/ports/opencascade/fix-pdb-find.patch
@@ -0,0 +1,33 @@
+diff --git a/adm/cmake/cotire.cmake b/adm/cmake/cotire.cmake

+index 6cf0cb66..2a9b1793 100644

+--- a/adm/cmake/cotire.cmake

++++ b/adm/cmake/cotire.cmake

+@@ -3114,6 +3114,7 @@ function (cotire_setup_unity_build_target _languages _configurations _target)

+ 		OSX_ARCHITECTURES OSX_ARCHITECTURES_<CONFIG> PRIVATE_HEADER PUBLIC_HEADER RESOURCE XCTEST

+ 		IOS_INSTALL_COMBINED)

+ 	# copy Windows platform specific stuff

++    if (BUILD_SHARED_LIBS)

+ 	cotire_copy_set_properites("${_configurations}" TARGET ${_target} ${_unityTargetName}

+ 		GNUtoMS

+ 		COMPILE_PDB_NAME COMPILE_PDB_NAME_<CONFIG>

+@@ -3129,6 +3130,7 @@ function (cotire_setup_unity_build_target _languages _configurations _target)

+ 		WIN32_EXECUTABLE WINDOWS_EXPORT_ALL_SYMBOLS

+ 		DEPLOYMENT_REMOTE_DIRECTORY VS_CONFIGURATION_TYPE

+ 		VS_SDK_REFERENCES)

++    endif()

+ 	# copy Android platform specific stuff

+ 	cotire_copy_set_properites("${_configurations}" TARGET ${_target} ${_unityTargetName}

+ 		ANDROID_API ANDROID_API_MIN ANDROID_GUI

+diff --git a/adm/cmake/occt_toolkit.cmake b/adm/cmake/occt_toolkit.cmake

+index 79605059..630a978e 100644

+--- a/adm/cmake/occt_toolkit.cmake

++++ b/adm/cmake/occt_toolkit.cmake

+@@ -231,7 +231,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)

+     install (FILES  ${CMAKE_BINARY_DIR}/${OS_WITH_BIT}/${COMPILER}/bin\${OCCT_INSTALL_BIN_LETTER}/${PROJECT_NAME}.pdb

+              CONFIGURATIONS Debug RelWithDebInfo

+              DESTINATION "${INSTALL_DIR_BIN}\${OCCT_INSTALL_BIN_LETTER}")

diff --git a/ports/opencascade/fix-static-build.patch b/ports/opencascade/fix-static-build.patch
deleted file mode 100644
index 05c105f58..000000000
--- a/ports/opencascade/fix-static-build.patch
+++ /dev/null
@@ -1,76 +0,0 @@
-diff --git a/adm/cmake/freetype.cmake b/adm/cmake/freetype.cmake
-index 7f6f950..ca0c525 100644
---- a/adm/cmake/freetype.cmake
-+++ b/adm/cmake/freetype.cmake
-@@ -111,6 +111,8 @@ if (IS_BUILTIN_SEARCH_REQUIRED)
-   endif()
- 
-   find_package(Freetype)
-+  find_package(freetype CONFIG REQUIRED)
-+  set(FREETYPE_LIBRARY freetype)
- 
-   # restore ENV{FREETYPE_DIR}
-   if (3RDPARTY_FREETYPE_DIR AND EXISTS "${3RDPARTY_FREETYPE_DIR}")
-@@ -230,6 +232,22 @@ endif()
-     # set 3RDPARTY_FREETYPE_LIBRARY as notfound, otherwise find_library can't assign a new value to 3RDPARTY_FREETYPE_LIBRARY
-     set (3RDPARTY_FREETYPE_LIBRARY "3RDPARTY_FREETYPE_LIBRARY-NOTFOUND" CACHE FILEPATH "The path to freetype library" FORCE)
- 
-+    if (BUILD_SHARED_LIBS)
-+        if (CMAKE_BUILD_TYPE STREQUAL "Debug")
-+            get_target_property(3RDPARTY_FREETYPE_LIBRARY freetype IMPORTED_IMPLIB_DEBUG)
-+        else()
-+            get_target_property(3RDPARTY_FREETYPE_LIBRARY freetype IMPORTED_IMPLIB_RELEASE)
-+        endif()
-+    else()
-+        if (CMAKE_BUILD_TYPE STREQUAL "Debug")
-+            get_target_property(3RDPARTY_FREETYPE_LIBRARY freetype IMPORTED_LOCATION_DEBUG)
-+        else()
-+            get_target_property(3RDPARTY_FREETYPE_LIBRARY freetype IMPORTED_LOCATION_RELEASE)
-+        endif()
-+    endif()
-+    get_filename_component(3RDPARTY_FREETYPE_LIBRARY_DIR ${3RDPARTY_FREETYPE_LIBRARY} DIRECTORY)
-+    
-+    if(0)
-     if (3RDPARTY_FREETYPE_DIR AND EXISTS "${3RDPARTY_FREETYPE_DIR}")
-       find_library (3RDPARTY_FREETYPE_LIBRARY ${CSF_FREETYPE}
-                                               PATHS "${3RDPARTY_FREETYPE_LIBRARY_DIR}" "${3RDPARTY_FREETYPE_DIR}"
-@@ -257,9 +275,10 @@ endif()
- 
-     set (3RDPARTY_FREETYPE_LIBRARY "" CACHE FILEPATH "The path to freetype library" FORCE)
-   endif()
-+  endif()
- 
-   # freetype shared library
--  if (WIN32)
-+  if (0)
-     if (NOT 3RDPARTY_FREETYPE_DLL OR NOT EXISTS "${3RDPARTY_FREETYPE_DLL}")
- 
-       set (CMAKE_FIND_LIBRARY_SUFFIXES .dll)
-diff --git a/adm/cmake/occt_toolkit.cmake b/adm/cmake/occt_toolkit.cmake
-index f59b163..92175e4 100644
---- a/adm/cmake/occt_toolkit.cmake
-+++ b/adm/cmake/occt_toolkit.cmake
-@@ -208,7 +208,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)
-     install (FILES  ${CMAKE_BINARY_DIR}/${OS_WITH_BIT}/${COMPILER}/bin\${OCCT_INSTALL_BIN_LETTER}/${PROJECT_NAME}.pdb
-              CONFIGURATIONS Debug RelWithDebInfo
-              DESTINATION "${INSTALL_DIR_BIN}\${OCCT_INSTALL_BIN_LETTER}")
-diff --git a/src/Font/Font_FontMgr.cxx b/src/Font/Font_FontMgr.cxx
-index 4fad2f6..ba64b51 100644
---- a/src/Font/Font_FontMgr.cxx
-+++ b/src/Font/Font_FontMgr.cxx
-@@ -36,10 +36,6 @@ IMPLEMENT_STANDARD_RTTIEXT(Font_FontMgr,Standard_Transient)
-   #include <windows.h>
-   #include <stdlib.h>
- 
--  #ifdef _MSC_VER
--    #pragma comment (lib, "freetype.lib")
--  #endif
--
-   namespace
-   {
- 
diff --git a/ports/opencascade/portfile.cmake b/ports/opencascade/portfile.cmake
index 90676ada2..68bb56397 100644
--- a/ports/opencascade/portfile.cmake
+++ b/ports/opencascade/portfile.cmake
@@ -3,14 +3,11 @@ vcpkg_fail_port_install(ON_ARCH "arm" "arm64" ON_TARGET "UWP" "OSX" "Linux")
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO Open-Cascade-SAS/OCCT
-    REF V7_4_0
-    SHA512 595ad7226b9365c1a7670b77001f71787a5d8aaa4a93a4a4d8eb938564670d79ae5a247ae7cc770b5da53c9a9f2e4166ba6e5ae104c1f2debad19ec2187f4a56
+    REF 628c0211d53c7fe1036a85e7a7b2b067c9c50f7a #V7.5.0
+    SHA512 8d946e971417642264b318353fb34ebabf214bff5c705c60818da9e56e9cd658ed15b76b73d7207edffa398c23ad9982f4e9656b218b5edada325ca05c1283bb
     HEAD_REF master
     PATCHES
-        fix-msvc-32bit-builds.patch
-        fix-build-with-vs2017.patch
-        fix-static-build.patch
-        fix-install-prefix-path.patch
+        fix-pdb-find.patch
 )
 
 if (VCPKG_LIBRARY_LINKAGE STREQUAL dynamic)
diff --git a/versions/baseline.json b/versions/baseline.json
index 3e75ab8a9..3bd5b395e 100644
--- a/versions/baseline.json
+++ b/versions/baseline.json
@@ -4209,8 +4209,8 @@
       "port-version": 0
     },
     "opencascade": {
-      "baseline": "7.4.0",
-      "port-version": 3
+      "baseline": "7.5.0",
+      "port-version": 0
     },
     "opencc": {
       "baseline": "2020-04-26",
diff --git a/versions/o-/opencascade.json b/versions/o-/opencascade.json
index 8abba0291..cf3e61041 100644
--- a/versions/o-/opencascade.json
+++ b/versions/o-/opencascade.json
@@ -1,6 +1,11 @@
 {
   "versions": [
     {
+      "git-tree": "0d003408ab69f77a4ca2c02de115087c87a46b27",
+      "version-string": "7.5.0",
+      "port-version": 0
+    },
+    {
       "git-tree": "dc198546c1a39fc3a26f7fae34f1ca97afa94f32",
       "version-string": "7.4.0",
       "port-version": 3