Revert "[SuiteSparse] Update and split into sub-packages (v2)"

This reverts commit ab42fb3.

Author: cbentejac

ports/ceres/0001_cmakelists_fixes.patch

@@ -2,7 +2,63 @@ diff --git a/CMakeLists.txt b/CMakeLists.txt
 index 8e49c19e..f8c61d92 100644
 --- a/CMakeLists.txt
 +++ b/CMakeLists.txt
-@@ -430,28 +430,7 @@ if (MINIGLOG)
+@@ -292,27 +292,28 @@ if (SUITESPARSE)
+   # built with SuiteSparse support.
+ 
+   # Check for SuiteSparse and dependencies.
+-  find_package(SuiteSparse 4.5.6 COMPONENTS CHOLMOD SPQR
+-    OPTIONAL_COMPONENTS Partition)
+-  if (SuiteSparse_FOUND)
+-    set(SuiteSparse_DEPENDENCY "find_dependency(SuiteSparse ${SuiteSparse_VERSION})")
++  find_package(SuiteSparse REQUIRED CONFIG)
++  if (SUITESPARSE_FOUND)
++    set(SuiteSparse_DEPENDENCY "find_dependency(SuiteSparse ${SuiteSparse_VERSION} CONFIG)")
+     # By default, if all of SuiteSparse's dependencies are found, Ceres is
+     # built with SuiteSparse support.
+     message("-- Found SuiteSparse ${SuiteSparse_VERSION}, "
+             "building with SuiteSparse.")
+-
+-    if (SuiteSparse_NO_CMAKE OR NOT SuiteSparse_DIR)
+-      install(FILES ${Ceres_SOURCE_DIR}/cmake/FindSuiteSparse.cmake
+-                    ${Ceres_SOURCE_DIR}/cmake/FindMETIS.cmake
+-              DESTINATION ${RELATIVE_CMAKECONFIG_INSTALL_DIR})
+-    endif (SuiteSparse_NO_CMAKE OR NOT SuiteSparse_DIR)
+-  else (SuiteSparse_FOUND)
++    add_library(SuiteSparse::CONFIG ALIAS SuiteSparse::suitesparseconfig)
++    add_library(SuiteSparse::AMD ALIAS SuiteSparse::amd)
++    add_library(SuiteSparse::CAMD ALIAS SuiteSparse::camd)
++    add_library(SuiteSparse::CCOLAMD ALIAS SuiteSparse::ccolamd)
++    add_library(SuiteSparse::COLAMD ALIAS SuiteSparse::colamd)
++    add_library(SuiteSparse::CHOLMOD ALIAS SuiteSparse::cholmod)
++    add_library(SuiteSparse::SPQR ALIAS SuiteSparse::spqr)
++    add_library(METIS::METIS ALIAS metis)
++  else (SUITESPARSE_FOUND)
+     # Disable use of SuiteSparse if it cannot be found and continue.
+     message("-- Did not find all SuiteSparse dependencies, disabling "
+       "SuiteSparse support.")
+     update_cache_variable(SUITESPARSE OFF)
+     list(APPEND CERES_COMPILE_OPTIONS CERES_NO_SUITESPARSE)
+-  endif (SuiteSparse_FOUND)
++  endif (SUITESPARSE_FOUND)
+ else (SUITESPARSE)
+   message("-- Building without SuiteSparse.")
+   list(APPEND CERES_COMPILE_OPTIONS CERES_NO_SUITESPARSE)
+@@ -395,9 +396,12 @@ endif()
+ # GFlags.
+ if (GFLAGS)
+   # Don't search with REQUIRED as we can continue without gflags.
+-  find_package(gflags 2.2.0)
++  find_package(gflags CONFIG REQUIRED)
+   if (gflags_FOUND)
+-    if (TARGET gflags)
++    if (TARGET gflags::gflags)
++      if(NOT TARGET gflags)
++        add_library(gflags ALIAS gflags::gflags)
++      endif()
+       message("-- Found Google Flags (gflags) version ${gflags_VERSION}: ${gflags_DIR}")
+     else()
+       message("-- Detected version of gflags: ${gflags_VERSION} does not define "
+@@ -430,28 +434,7 @@ if (MINIGLOG)
    mark_as_advanced(FORCE GLOG_INCLUDE_DIR
                           GLOG_LIBRARY)
  else (MINIGLOG)
@@ -32,7 +88,7 @@ index 8e49c19e..f8c61d92 100644
  endif (MINIGLOG)
 
  if (NOT SCHUR_SPECIALIZATIONS)
-@@ -466,7 +445,7 @@ endif (NOT CUSTOM_BLAS)
+@@ -466,7 +449,7 @@ endif (NOT CUSTOM_BLAS)
 
  if (BUILD_BENCHMARKS)
    # Version 1.3 was first to provide import targets

ports/ceres/0003_fix_exported_ceres_config.patch

@@ -2,28 +2,16 @@ diff --git a/cmake/CeresConfig.cmake.in b/cmake/CeresConfig.cmake.in
 index ceb7e269..5dee7e3c 100644
 --- a/cmake/CeresConfig.cmake.in
 +++ b/cmake/CeresConfig.cmake.in
-@@ -178,7 +178,10 @@
- include(CMakeFindDependencyMacro)
- # Optional dependencies
- @METIS_DEPENDENCY@
--@SuiteSparse_DEPENDENCY@
-+if (@SUITESPARSE@)
-+  find_dependency(CHOLMOD)
-+  find_dependency(SPQR)
-+endif()
- @CUDAToolkit_DEPENDENCY@
- @Threads_DEPENDENCY@
- 
-@@ -195,7 +198,7 @@
+@@ -195,7 +195,7 @@ set(CERES_EIGEN_VERSION @Eigen3_VERSION@)
  # Search quietly to control the timing of the error message if not found. The
  # search should be for an exact match, but for usability reasons do a soft
  # match and reject with an explanation below.
 -find_package(Eigen3 ${CERES_EIGEN_VERSION} QUIET)
-+find_dependency(Eigen3 CONFIG ${CERES_EIGEN_VERSION} QUIET)
++find_package(Eigen3 CONFIG ${CERES_EIGEN_VERSION} QUIET)
  if (Eigen3_FOUND)
    if (NOT Eigen3_VERSION VERSION_EQUAL CERES_EIGEN_VERSION)
      # CMake's VERSION check in FIND_PACKAGE() will accept any version >= the
-@@ -217,55 +220,7 @@
+@@ -217,55 +217,8 @@ else (Eigen3_FOUND)
  endif (Eigen3_FOUND)
 
  # glog (and maybe gflags).
@@ -76,6 +64,7 @@ index ceb7e269..5dee7e3c 100644
 -    endif()
 -  endif()
 -endif(CERES_USES_MINIGLOG)
++include(CMakeFindDependencyMacro)
 +find_dependency(glog NO_MODULE)
 
  # Import exported Ceres targets, if they have not already been imported.

ports/ceres/vcpkg.json

@@ -1,7 +1,6 @@
 {
   "name": "ceres",
   "version": "2.2.0",
-  "port-version": 1,
   "description": "non-linear optimization package",
   "homepage": "https://github.com/ceres-solver/ceres-solver",
   "license": "Apache-2.0",
@@ -50,12 +49,9 @@
           ]
         },
         {
-          "name": "suitesparse-cholmod",
-          "features": [
-            "matrixops"
-          ]
-        },
-        "suitesparse-spqr"
+          "name": "suitesparse",
+          "default-features": false
+        }
       ]
     },
     "tools": {

ports/colmap/vcpkg.json

@@ -1,7 +1,6 @@
 {
   "name": "colmap",
   "version": "3.11.1",
-  "port-version": 2,
   "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",

ports/g2o/portfile.cmake

@@ -25,7 +25,6 @@ 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,15 +1,14 @@
 {
   "name": "g2o",
   "version-date": "2024-12-14",
-  "port-version": 3,
+  "port-version": 2,
   "description": "g2o: A General Framework for Graph Optimization",
   "homepage": "https://openslam.org/g2o.html",
   "dependencies": [
     "ceres",
     "eigen3",
     "lapack",
-    "suitesparse-cholmod",
-    "suitesparse-cxsparse",
+    "suitesparse",
     {
       "name": "vcpkg-cmake",
       "host": true