[SuiteSparse] Update and split into sub-packages

ports/ceres/0003_fix_exported_ceres_config.patch

@@ -2,7 +2,24 @@ diff --git a/cmake/CeresConfig.cmake.in b/cmake/CeresConfig.cmake.in
 index 4745483..b55462d 100644
 --- a/cmake/CeresConfig.cmake.in
 +++ b/cmake/CeresConfig.cmake.in
-@@ -217,55 +217,14 @@ else (Eigen3_FOUND)
+@@ -179,8 +179,14 @@
+ find_dependency(Threads)
+
+ # Optional dependencies
+-@CXSparse_DEPENDENCY@
+-@SuiteSparse_DEPENDENCY@
++include (CMakeFindDependencyMacro)
++if (@CXSPARSE@)
++    find_dependency(CXSparse REQUIRED)
++endif()
++if (@SUITESPARSE@)
++    find_dependency(CHOLMOD REQUIRED)
++    find_dependency(SPQR REQUIRED)
++endif()
+
+ # As imported CMake targets are not re-exported when a dependent target is
+ # exported, we must invoke find_package(XXX) here to reload the definition
+@@ -217,55 +223,7 @@
  endif (Eigen3_FOUND)
 
  # glog (and maybe gflags).
@@ -35,15 +52,13 @@ index 4745483..b55462d 100644
 -    # Search quietly s/t we control the timing of the error message if not found.
 -    find_package(Glog QUIET)
 -  endif()
- 
+-
 -  if (GLOG_FOUND)
 -    ceres_message(STATUS "Found required Ceres dependency: glog")
 -  else()
 -    ceres_report_not_found("Missing required Ceres dependency: glog.")
 -  endif()
-+include (CMakeFindDependencyMacro)
-+find_dependency (glog NO_MODULE)
-
+-
 -  # gflags is only a public dependency of Ceres via glog, thus is not required
 -  # if Ceres was built with MINIGLOG.
 -  if (CERES_USES_GFLAGS)
@@ -57,10 +72,7 @@ index 4745483..b55462d 100644
 -    endif()
 -  endif()
 -endif(CERES_USES_MINIGLOG)
-+# SuiteSparse
-+if (@SUITESPARSE@)
-+    find_dependency(SuiteSparse CONFIG)
-+endif()
++find_dependency(glog CONFIG)
 
  # Import exported Ceres targets, if they have not already been imported.
  if (NOT TARGET ceres AND NOT Ceres_BINARY_DIR)

ports/ceres/0005_suitesparse_v7_compatibility.patch

@@ -0,0 +1,15 @@
+https://github.com/ceres-solver/ceres-solver/commit/9cca671273c2f205ca7350422f48b7b119c5dd78
+
+Enable compatibility with SuiteSparse 7.2.0
+
+--- a/internal/ceres/covariance_impl.cc
++++ b/internal/ceres/covariance_impl.cc
+@@ -630,7 +630,7 @@
+   // separately.
+   const SuiteSparse_long rank = SuiteSparseQR<double>(SPQR_ORDERING_BESTAMD,
+                                                       SPQR_DEFAULT_TOL,
+-                                                      cholmod_jacobian.ncol,
++                                                      static_cast<int64_t>(cholmod_jacobian.ncol),
+                                                       &cholmod_jacobian,
+                                                       &R,
+                                                       &permutation,

ports/ceres/find-package-required.patch

@@ -13,10 +13,11 @@ index 2d241fe..b79454d 100644
    else (LAPACK_FOUND)
 @@ -266,7 +266,8 @@ if (SUITESPARSE)
    # built with SuiteSparse support.
- 
+-
    # Check for SuiteSparse and dependencies.
 -  find_package(SuiteSparse 4.0 COMPONENTS CHOLMOD SPQR)
-+  find_package(suitesparse CONFIG REQUIRED)
++  find_package(CHOLMOD CONFIG REQUIRED)
++  find_package(SPQR CONFIG REQUIRED)
 +  set(SuiteSparse_FOUND 1)
    if (SuiteSparse_FOUND)
      set(SuiteSparse_DEPENDENCY "find_dependency(SuiteSparse ${SuiteSparse_VERSION})")
@@ -98,15 +99,15 @@ index 299b373..33d41d8 100644
    add_definitions(-DCERES_SUITESPARSE_VERSION="${SuiteSparse_VERSION}")
 -  list(APPEND CERES_LIBRARY_PRIVATE_DEPENDENCIES SuiteSparse::CHOLMOD
 -    SuiteSparse::SPQR)
-+  list(APPEND CERES_LIBRARY_PRIVATE_DEPENDENCIES SuiteSparse::cholmod
-+    SuiteSparse::spqr)
++  list(APPEND CERES_LIBRARY_PRIVATE_DEPENDENCIES SuiteSparse::CHOLMOD
++    SuiteSparse::SPQR)
  endif (SUITESPARSE AND SuiteSparse_FOUND)
 
  if (CXSPARSE AND CXSparse_FOUND)
    # Define version information for use in Solver::FullReport.
    add_definitions(-DCERES_CXSPARSE_VERSION="${CXSparse_VERSION}")
 -  list(APPEND CERES_LIBRARY_PRIVATE_DEPENDENCIES CXSparse::CXSparse)
-+  list(APPEND CERES_LIBRARY_PRIVATE_DEPENDENCIES ${CXSparse_LIBRARIES})
++  list(APPEND CERES_LIBRARY_PRIVATE_DEPENDENCIES SuiteSparse::CXSparse)
  endif (CXSPARSE AND CXSparse_FOUND)
 
  if (ACCELERATESPARSE AND AccelerateSparse_FOUND)

ports/ceres/portfile.cmake

@@ -17,6 +17,7 @@ vcpkg_from_github(
         0002_use_glog_target.patch
         0003_fix_exported_ceres_config.patch
         find-package-required.patch
+        0005_suitesparse_v7_compatibility.patch
 )
 
 file(REMOVE "${SOURCE_PATH}/cmake/FindCXSparse.cmake")

ports/ceres/vcpkg.json

@@ -1,7 +1,7 @@
 {
   "name": "ceres",
   "version": "2.1.0",
-  "port-version": 5,
+  "port-version": 6,
   "description": "non-linear optimization package",
   "homepage": "https://github.com/ceres-solver/ceres-solver",
   "license": "Apache-2.0",
@@ -36,7 +36,8 @@
           "features": [
             "suitesparse"
           ]
-        }
+        },
+        "suitesparse-cxsparse"
       ]
     },
     "eigensparse": {
@@ -61,9 +62,12 @@
           ]
         },
         {
-          "name": "suitesparse",
-          "default-features": false
-        }
+          "name": "suitesparse-cholmod",
+          "features": [
+            "matrixops"
+          ]
+        },
+        "suitesparse-spqr"
       ]
     },
     "tools": {

ports/colmap/vcpkg.json

@@ -1,6 +1,7 @@
 {
   "name": "colmap",
   "version": "3.10",
+  "port-version": 1,
   "description": "COLMAP is a general-purpose Structure-from-Motion (SfM) and Multi-View Stereo (MVS) pipeline with a graphical and command-line interface. It offers a wide range of features for reconstruction of ordered and unordered image collections. The software is licensed under the new BSD license.",
   "homepage": "https://colmap.github.io/",
   "license": "BSD-3-Clause",
@@ -25,6 +26,7 @@
     "gflags",
     "glew",
     "glog",
+    "metis",
     "qt5-base",
     "sqlite3",
     {

ports/g2o/portfile.cmake

@@ -17,6 +17,7 @@ vcpkg_cmake_configure(
         -DBUILD_LGPL_SHARED_LIBS=${BUILD_LGPL_SHARED_LIBS}
         -DG2O_BUILD_EXAMPLES=OFF
         -DG2O_BUILD_APPS=OFF
+        -DBUILD_CSPARSE=OFF
 )
 
 vcpkg_cmake_install()

ports/g2o/vcpkg.json

@@ -1,14 +1,15 @@
 {
   "name": "g2o",
   "version-date": "2020-02-07",
-  "port-version": 6,
+  "port-version": 7,
   "description": "g2o: A General Framework for Graph Optimization",
   "homepage": "https://openslam.org/g2o.html",
   "dependencies": [
     "ceres",
     "eigen3",
     "lapack",
-    "suitesparse",
+    "suitesparse-cholmod",
+    "suitesparse-cxsparse",
     {
       "name": "vcpkg-cmake",
       "host": true

ports/suitesparse-amd/portfile.cmake

@@ -0,0 +1,33 @@
+vcpkg_from_github(
+    OUT_SOURCE_PATH SOURCE_PATH
+    REPO DrTimothyAldenDavis/SuiteSparse
+    REF v7.8.1
+    SHA512 d07709ad8567e5fe954f04d0c38a95a5610394aaa5ff5c809518c378b937d20556114b95c9dc052b316c8e8fcbb2eca294b425b21e8bbfa5c04f72c6f15a5eb6
+    HEAD_REF dev
+)
+
+set(PACKAGE_NAME AMD)
+
+string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "static" BUILD_STATIC_LIBS)
+vcpkg_cmake_configure(
+    SOURCE_PATH "${SOURCE_PATH}/${PACKAGE_NAME}"
+    DISABLE_PARALLEL_CONFIGURE
+    OPTIONS
+        -DBUILD_STATIC_LIBS=${BUILD_STATIC_LIBS}
+        -DSUITESPARSE_USE_CUDA=OFF
+        -DSUITESPARSE_USE_STRICT=ON
+        -DSUITESPARSE_USE_FORTRAN=OFF
+        -DSUITESPARSE_DEMOS=OFF
+)
+
+vcpkg_cmake_install()
+
+vcpkg_cmake_config_fixup(
+    PACKAGE_NAME ${PACKAGE_NAME}
+    CONFIG_PATH lib/cmake/${PACKAGE_NAME}
+)
+vcpkg_fixup_pkgconfig()
+
+file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include")
+
+vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/${PACKAGE_NAME}/Doc/License.txt")

ports/suitesparse-amd/vcpkg.json

@@ -0,0 +1,19 @@
+{
+  "$comment": "Use the suitesparse/update_suitesparse.py script to update all SuiteSparse ports",
+  "name": "suitesparse-amd",
+  "version-semver": "3.3.3",
+  "description": "AMD: Routines for permuting sparse matrices prior to factorization in SuiteSparse",
+  "homepage": "https://people.engr.tamu.edu/davis/suitesparse.html",
+  "license": "BSD-3-Clause",
+  "dependencies": [
+    "suitesparse-config",
+    {
+      "name": "vcpkg-cmake",
+      "host": true
+    },
+    {
+      "name": "vcpkg-cmake-config",
+      "host": true
+    }
+  ]
+}

ports/suitesparse-btf/portfile.cmake

@@ -0,0 +1,36 @@
+vcpkg_from_github(
+    OUT_SOURCE_PATH SOURCE_PATH
+    REPO DrTimothyAldenDavis/SuiteSparse
+    REF v7.8.1
+    SHA512 d07709ad8567e5fe954f04d0c38a95a5610394aaa5ff5c809518c378b937d20556114b95c9dc052b316c8e8fcbb2eca294b425b21e8bbfa5c04f72c6f15a5eb6
+    HEAD_REF dev
+)
+
+set(PACKAGE_NAME BTF)
+
+string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "static" BUILD_STATIC_LIBS)
+vcpkg_cmake_configure(
+    SOURCE_PATH "${SOURCE_PATH}/${PACKAGE_NAME}"
+    DISABLE_PARALLEL_CONFIGURE
+    OPTIONS
+        -DBUILD_STATIC_LIBS=${BUILD_STATIC_LIBS}
+        -DSUITESPARSE_USE_CUDA=OFF
+        -DSUITESPARSE_USE_STRICT=ON
+        -DSUITESPARSE_USE_FORTRAN=OFF
+        -DSUITESPARSE_DEMOS=OFF
+)
+
+vcpkg_cmake_install()
+
+vcpkg_cmake_config_fixup(
+    PACKAGE_NAME ${PACKAGE_NAME}
+    CONFIG_PATH lib/cmake/${PACKAGE_NAME}
+)
+vcpkg_fixup_pkgconfig()
+
+file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include")
+
+vcpkg_install_copyright(FILE_LIST
+    "${SOURCE_PATH}/${PACKAGE_NAME}/Doc/License.txt"
+    "${SOURCE_PATH}/${PACKAGE_NAME}/Doc/lesser.txt"
+)

ports/suitesparse-btf/vcpkg.json

@@ -0,0 +1,19 @@
+{
+  "$comment": "Use the suitesparse/update_suitesparse.py script to update all SuiteSparse ports",
+  "name": "suitesparse-btf",
+  "version-semver": "2.3.2",
+  "description": "BTF: Software package for permuting a matrix into block upper triangular form in SuiteSparse",
+  "homepage": "https://people.engr.tamu.edu/davis/suitesparse.html",
+  "license": "LGPL-2.1-or-later",
+  "dependencies": [
+    "suitesparse-config",
+    {
+      "name": "vcpkg-cmake",
+      "host": true
+    },
+    {
+      "name": "vcpkg-cmake-config",
+      "host": true
+    }
+  ]
+}

ports/suitesparse-camd/portfile.cmake

@@ -0,0 +1,33 @@
+vcpkg_from_github(
+    OUT_SOURCE_PATH SOURCE_PATH
+    REPO DrTimothyAldenDavis/SuiteSparse
+    REF v7.8.1
+    SHA512 d07709ad8567e5fe954f04d0c38a95a5610394aaa5ff5c809518c378b937d20556114b95c9dc052b316c8e8fcbb2eca294b425b21e8bbfa5c04f72c6f15a5eb6
+    HEAD_REF dev
+)
+
+set(PACKAGE_NAME CAMD)
+
+string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "static" BUILD_STATIC_LIBS)
+vcpkg_cmake_configure(
+    SOURCE_PATH "${SOURCE_PATH}/${PACKAGE_NAME}"
+    DISABLE_PARALLEL_CONFIGURE
+    OPTIONS
+        -DBUILD_STATIC_LIBS=${BUILD_STATIC_LIBS}
+        -DSUITESPARSE_USE_CUDA=OFF
+        -DSUITESPARSE_USE_STRICT=ON
+        -DSUITESPARSE_USE_FORTRAN=OFF
+        -DSUITESPARSE_DEMOS=OFF
+)
+
+vcpkg_cmake_install()
+
+vcpkg_cmake_config_fixup(
+    PACKAGE_NAME ${PACKAGE_NAME}
+    CONFIG_PATH lib/cmake/${PACKAGE_NAME}
+)
+vcpkg_fixup_pkgconfig()
+
+file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include")
+
+vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/${PACKAGE_NAME}/Doc/License.txt")

ports/suitesparse-camd/vcpkg.json

@@ -0,0 +1,19 @@
+{
+  "$comment": "Use the suitesparse/update_suitesparse.py script to update all SuiteSparse ports",
+  "name": "suitesparse-camd",
+  "version-semver": "3.3.3",
+  "description": "AMD: Routines for permuting sparse matrices prior to factorization in SuiteSparse",
+  "homepage": "https://people.engr.tamu.edu/davis/suitesparse.html",
+  "license": "BSD-3-Clause",
+  "dependencies": [
+    "suitesparse-config",
+    {
+      "name": "vcpkg-cmake",
+      "host": true
+    },
+    {
+      "name": "vcpkg-cmake-config",
+      "host": true
+    }
+  ]
+}

ports/suitesparse-ccolamd/portfile.cmake

@@ -0,0 +1,33 @@
+vcpkg_from_github(
+    OUT_SOURCE_PATH SOURCE_PATH
+    REPO DrTimothyAldenDavis/SuiteSparse
+    REF v7.8.1
+    SHA512 d07709ad8567e5fe954f04d0c38a95a5610394aaa5ff5c809518c378b937d20556114b95c9dc052b316c8e8fcbb2eca294b425b21e8bbfa5c04f72c6f15a5eb6
+    HEAD_REF dev
+)
+
+set(PACKAGE_NAME CCOLAMD)
+
+string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "static" BUILD_STATIC_LIBS)
+vcpkg_cmake_configure(
+    SOURCE_PATH "${SOURCE_PATH}/${PACKAGE_NAME}"
+    DISABLE_PARALLEL_CONFIGURE
+    OPTIONS
+        -DBUILD_STATIC_LIBS=${BUILD_STATIC_LIBS}
+        -DSUITESPARSE_USE_CUDA=OFF
+        -DSUITESPARSE_USE_STRICT=ON
+        -DSUITESPARSE_USE_FORTRAN=OFF
+        -DSUITESPARSE_DEMOS=OFF
+)
+
+vcpkg_cmake_install()
+
+vcpkg_cmake_config_fixup(
+    PACKAGE_NAME ${PACKAGE_NAME}
+    CONFIG_PATH lib/cmake/${PACKAGE_NAME}
+)
+vcpkg_fixup_pkgconfig()
+
+file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include")
+
+vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/${PACKAGE_NAME}/Doc/License.txt")