[geogram] update to 1.7.5 (#12562)

* [geogram] update geogram version

* [geogram] fix diff patch

* [geogram] remove port-Version

3 files changed, 35 insertions, 37 deletions

diff --git a/ports/geogram/CONTROL b/ports/geogram/CONTROL
index 8125ce280..8661aa1e4 100644
--- a/ports/geogram/CONTROL
+++ b/ports/geogram/CONTROL
@@ -1,6 +1,5 @@
 Source: geogram
-Version: 1.6.9
-Port-Version: 8
+Version: 1.7.5
 Homepage: https://gforge.inria.fr/projects/geogram/
 Description: Geogram is a programming library of geometric algorithms.
 Build-Depends: openblas (!osx), lapack
diff --git a/ports/geogram/fix-cmake-config-and-install.patch b/ports/geogram/fix-cmake-config-and-install.patch
index 2c7790923..8eb16c364 100644
--- a/ports/geogram/fix-cmake-config-and-install.patch
+++ b/ports/geogram/fix-cmake-config-and-install.patch
@@ -1,9 +1,9 @@
 diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 17dc02e..e489d75 100644
+index 2e54997..169e33c 100644
 --- a/CMakeLists.txt
 +++ b/CMakeLists.txt
-@@ -42,7 +42,7 @@ set(VORPALINE_VERSION_MINOR 6)
- set(VORPALINE_VERSION_PATCH 9)
+@@ -51,7 +51,7 @@ set(VORPALINE_VERSION_MINOR 7)
+ set(VORPALINE_VERSION_PATCH 5)
  set(VORPALINE_VERSION ${VORPALINE_VERSION_MAJOR}.${VORPALINE_VERSION_MINOR}.${VORPALINE_VERSION_PATCH})
  
 -set(VORPALINE_INCLUDE_SUBPATH geogram${VORPALINE_VERSION_MAJOR})
@@ -11,7 +11,7 @@ index 17dc02e..e489d75 100644
  
  # Determine the current Build-OS (Build-platform without the compiler info)
  string(REGEX REPLACE "-[^-]+$" "" VORPALINE_OS ${VORPALINE_PLATFORM})
-@@ -106,6 +106,11 @@ if(GEOGRAM_WITH_VORPALINE)
+@@ -113,6 +113,11 @@ if(GEOGRAM_WITH_VORPALINE)
     add_subdirectory(src/lib/vorpalib)
  endif()
  
@@ -23,7 +23,7 @@ index 17dc02e..e489d75 100644
  add_subdirectory(src/lib/third_party)
  
  if(GEOGRAM_WITH_GRAPHICS)
-@@ -138,8 +143,44 @@ file(REMOVE ${CMAKE_BINARY_DIR}/doc/LICENSE.txt)
+@@ -145,8 +150,44 @@ file(REMOVE ${CMAKE_BINARY_DIR}/doc/LICENSE.txt)
  
  
  # FindGeogram.cmake
@@ -70,10 +70,10 @@ index 17dc02e..e489d75 100644
  # Configure CPack
  
 diff --git a/src/lib/geogram/CMakeLists.txt b/src/lib/geogram/CMakeLists.txt
-index d90bc48..927f857 100644
+index 49cb2ba..82c2f39 100755
 --- a/src/lib/geogram/CMakeLists.txt
 +++ b/src/lib/geogram/CMakeLists.txt
-@@ -47,7 +47,14 @@ if(WIN32)
+@@ -62,7 +62,14 @@ if(WIN32)
  endif()
  
  # Install the library
@@ -90,10 +90,10 @@ index d90bc48..927f857 100644
  # Install include files for the standard devkit
  install(
 diff --git a/src/lib/geogram_gfx/CMakeLists.txt b/src/lib/geogram_gfx/CMakeLists.txt
-index f319b93..e24039d 100644
+index b155975..ad66440 100755
 --- a/src/lib/geogram_gfx/CMakeLists.txt
 +++ b/src/lib/geogram_gfx/CMakeLists.txt
-@@ -33,14 +33,21 @@ if(VORPALINE_BUILD_DYNAMIC)
+@@ -47,14 +47,21 @@ if(VORPALINE_BUILD_DYNAMIC)
  endif()
  
  # Install the library
@@ -117,7 +117,7 @@ index f319b93..e24039d 100644
  )
  
  # Install include files for the full devkit
-@@ -48,7 +55,7 @@ install(
+@@ -62,7 +69,7 @@ install(
      DIRECTORY .
      DESTINATION include/${VORPALINE_INCLUDE_SUBPATH}/geogram_gfx
      COMPONENT devkit-full
@@ -127,7 +127,7 @@ index f319b93..e24039d 100644
  
  install(
 diff --git a/src/lib/third_party/numerics/CMakeLists.txt b/src/lib/third_party/numerics/CMakeLists.txt
-index 5789cd2..e4262e3 100644
+index c9c3a6e..f16d7ec 100644
 --- a/src/lib/third_party/numerics/CMakeLists.txt
 +++ b/src/lib/third_party/numerics/CMakeLists.txt
 @@ -10,16 +10,19 @@ endif()
@@ -154,7 +154,7 @@ index 5789cd2..e4262e3 100644
      target_link_libraries(geogram_num_3rdparty m)
  endif()
 diff --git a/src/lib/third_party/numerics/LIBF2C/getarg_.c b/src/lib/third_party/numerics/LIBF2C/getarg_.c
-index 2b69a1e..a504538 100644
+index 2b69a1e..1cde8b6 100755
 --- a/src/lib/third_party/numerics/LIBF2C/getarg_.c
 +++ b/src/lib/third_party/numerics/LIBF2C/getarg_.c
 @@ -17,20 +17,20 @@ VOID getarg_(n, s, ls) ftnint *n; char *s; ftnlen ls;
@@ -193,7 +193,7 @@ index 2b69a1e..a504538 100644
  }
  #endif
 diff --git a/src/lib/third_party/numerics/LIBF2C/iargc_.c b/src/lib/third_party/numerics/LIBF2C/iargc_.c
-index 2f29da0..50b00de 100644
+index 2f29da0..50b00de 100755
 --- a/src/lib/third_party/numerics/LIBF2C/iargc_.c
 +++ b/src/lib/third_party/numerics/LIBF2C/iargc_.c
 @@ -9,8 +9,9 @@ ftnint iargc_()
diff --git a/ports/geogram/portfile.cmake b/ports/geogram/portfile.cmake
index 3bf583d51..9aee74e6f 100644
--- a/ports/geogram/portfile.cmake
+++ b/ports/geogram/portfile.cmake
@@ -1,11 +1,9 @@
-include(vcpkg_common_functions)
-
-set(GEOGRAM_VERSION 1.6.9)
+set(GEOGRAM_VERSION 1.7.5)
 
 vcpkg_download_distfile(ARCHIVE
-    URLS "https://gforge.inria.fr/frs/download.php/file/37779/geogram_${GEOGRAM_VERSION}.tar.gz"
+    URLS "https://gforge.inria.fr/frs/download.php/file/38314/geogram_${GEOGRAM_VERSION}.tar.gz"
     FILENAME "geogram_${GEOGRAM_VERSION}.tar.gz"
-    SHA512 1b5c7540bef734c1908f213f26780aba63b4911a8022d5eb3f7c90eabe2cb69efd1f298b30cdc8e2c636a5b37c8c25832dd4aad0b7c2ff5f0a5b5caa17970136
+    SHA512 47dcbb8a5c4e5f791feb8d9b209b04b575b0757e8b89de09c82ef2324a36d4056a1f3001537038c8a752045b0e6b6eedf5421ad49132214c0f60163ff095c36f
 )
 
 vcpkg_extract_source_archive_ex(
@@ -18,35 +16,36 @@ vcpkg_extract_source_archive_ex(
 
 file(COPY ${CURRENT_PORT_DIR}/Config.cmake.in DESTINATION ${SOURCE_PATH}/cmake)
 
-set(GEOGRAM_WITH_GRAPHICS OFF)
-if("graphics" IN_LIST FEATURES)
-    set(GEOGRAM_WITH_GRAPHICS ON)
-endif()
+
+vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS
+    FEATURES
+    "graphics" GEOGRAM_WITH_GRAPHICS
+)
 
 if (VCPKG_LIBRARY_LINKAGE STREQUAL "static")
     set(VORPALINE_BUILD_DYNAMIC FALSE)
-    if (NOT VCPKG_CMAKE_SYSTEM_NAME OR VCPKG_CMAKE_SYSTEM_NAME MATCHES "WindowsStore")
+    if (VCPKG_TARGET_IS_WINDOWS)
         set(VORPALINE_PLATFORM Win-vs-generic)
     endif()
-    if (VCPKG_CMAKE_SYSTEM_NAME MATCHES "Linux")
+    if (VCPKG_TARGET_IS_LINUX)
         message("geogram on Linux only supports dynamic library linkage. Building dynamic.")
         set(VCPKG_LIBRARY_LINKAGE dynamic)
         set(VORPALINE_PLATFORM Linux64-gcc-dynamic )
     endif()
-    if (VCPKG_CMAKE_SYSTEM_NAME MATCHES "Darwin")
+    if (VCPKG_TARGET_IS_OSX)
         message("geogram on Darwin only supports dynamic library linkage. Building dynamic.")
         set(VCPKG_LIBRARY_LINKAGE dynamic)
         set(VORPALINE_PLATFORM Darwin-clang-dynamic)
     endif()
 else()
     set(VORPALINE_BUILD_DYNAMIC TRUE)
-    if (NOT VCPKG_CMAKE_SYSTEM_NAME OR VCPKG_CMAKE_SYSTEM_NAME MATCHES "WindowsStore")
+    if (VCPKG_TARGET_IS_WINDOWS)
         set(VORPALINE_PLATFORM Win-vs-generic)
     endif()
-    if (VCPKG_CMAKE_SYSTEM_NAME MATCHES "Linux")
+    if (VCPKG_TARGET_IS_LINUX)
         set(VORPALINE_PLATFORM Linux64-gcc-dynamic )
     endif()
-    if (VCPKG_CMAKE_SYSTEM_NAME MATCHES "Darwin")
+    if (VCPKG_TARGET_IS_OSX)
         set(VORPALINE_PLATFORM Darwin-clang-dynamic)
     endif()
 endif()
@@ -57,11 +56,11 @@ vcpkg_configure_cmake(
     #PREFER_NINJA # Disable this option if project cannot be built with Ninja
     OPTIONS
         -DVORPALINE_BUILD_DYNAMIC=${VORPALINE_BUILD_DYNAMIC}
-        -DGEOGRAM_WITH_GRAPHICS=${GEOGRAM_WITH_GRAPHICS}
         -DGEOGRAM_LIB_ONLY=ON
         -DGEOGRAM_USE_SYSTEM_GLFW3=ON
         -DVORPALINE_PLATFORM=${VORPALINE_PLATFORM}
         -DGEOGRAM_WITH_VORPALINE=OFF
+        ${FEATURE_OPTIONS}
 )
 
 vcpkg_install_cmake()
@@ -73,11 +72,11 @@ file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/doc)
 file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/doc)
 file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include)
 
-file(READ ${CURRENT_PACKAGES_DIR}/share/geogram/GeogramTargets.cmake TARGET_CONFIG)
-string(REPLACE [[INTERFACE_INCLUDE_DIRECTORIES "/src/lib;${_IMPORT_PREFIX}/include"]]
-               [[INTERFACE_INCLUDE_DIRECTORIES "${_IMPORT_PREFIX}/include"]] TARGET_CONFIG "${TARGET_CONFIG}")
-file(WRITE ${CURRENT_PACKAGES_DIR}/share/geogram/GeogramTargets.cmake "${TARGET_CONFIG}")
+vcpkg_replace_string(
+    ${CURRENT_PACKAGES_DIR}/share/geogram/GeogramTargets.cmake
+    [[INTERFACE_INCLUDE_DIRECTORIES "/src/lib;${_IMPORT_PREFIX}/include"]]
+    [[INTERFACE_INCLUDE_DIRECTORIES "${_IMPORT_PREFIX}/include"]]
+    )
 
 # Handle copyright
-file(COPY ${SOURCE_PATH}/doc/devkit/license.dox DESTINATION ${CURRENT_PACKAGES_DIR}/share/geogram)
-file(RENAME ${CURRENT_PACKAGES_DIR}/share/geogram/license.dox ${CURRENT_PACKAGES_DIR}/share/geogram/copyright)
+file(INSTALL ${SOURCE_PATH}/doc/devkit/license.dox DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright)