colmap: unstable-3.12.5-openimageio -> 4.0.2

pkgs/by-name/co/colmap/disambiguate-gradientchecker.patch

@@ -0,0 +1,19 @@
+commit a1f0a46b4932ed1c98ceb872e6b346b370f1b638
+Author: Patrick Chilton <chpatrick@gmail.com>
+Date:   Wed Mar 18 15:59:05 2026 +0100
+
+    Disambiguate ceres::GradientChecker constructor
+
+diff --git a/src/colmap/estimators/cost_functions/reprojection_error_test.cc b/src/colmap/estimators/cost_functions/reprojection_error_test.cc
+index 25e6ffdc..7a1e4777 100644
+--- a/src/colmap/estimators/cost_functions/reprojection_error_test.cc
++++ b/src/colmap/estimators/cost_functions/reprojection_error_test.cc
+@@ -106,7 +106,7 @@ TEST(ReprojErrorCostFunctor, AnalyticalVersusAutoDiff) {
+ 
+         ceres::NumericDiffOptions numeric_diff_options;
+         ceres::GradientChecker gradient_checker(
+-            analytical_cost_function.get(), nullptr, numeric_diff_options);
++            analytical_cost_function.get(), static_cast<const std::vector<const ceres::Manifold*>*>(nullptr), numeric_diff_options);
+         ceres::GradientChecker::ProbeResults results;
+         EXPECT_TRUE(
+             gradient_checker.Probe(parameter_blocks.data(), kEps, &results));

pkgs/by-name/co/colmap/package.nix

@@ -15,6 +15,8 @@
   cgal,
   gmp,
   mpfr,
+  suitesparse,
+  onnxruntime,
   poselib,
   lz4,
   autoAddDriverRunpath,
@@ -52,6 +54,8 @@ let
     mpfr
     lz4
     qt5.qtbase
+    suitesparse
+    onnxruntime
   ]
   ++ lib.optionals cudaSupport [
     cudatoolkit
@@ -63,26 +67,30 @@ let
   inherit (cudaPackages) cudatoolkit;
 in
 stdenv'.mkDerivation {
-  version = "unstable-3.12.5-openimageio";
+  version = "4.0.2";
   pname = "colmap";
   src = fetchFromGitHub {
     owner = "colmap";
     repo = "colmap";
-    rev = "f8edccaa36909713b9d3930e1ca65cb364a38b26";
-    hash = "sha256-0lD7ywM48ODe11u9D3XSk9btqQ4gs/APBFf9IyiXe6g=";
+    rev = "d927f7e518fc20afa33390712c4cc20d85b730b8";
+    hash = "sha256-+cPkksfCLyEo7A70nuRWnOBEkhx8BFevQ9XWTipEkpM=";
   };
 
-  # TODO: remove this when https://github.com/colmap/colmap/pull/3459 is in a release
-  # This was produced with:
-  # git diff f8edccaa36909713b9d3930e1ca65cb364a38b26 e40c0730020938587c9d4eb7634cbff93cbc2f81
-  patches = [ ./openimageio.patch ];
+  patches = [
+    ./suitesparse-no-include-subdir.patch
+    # Remove when https://github.com/colmap/colmap/pull/4265 is merged
+    ./disambiguate-gradientchecker.patch
+  ];
 
   cmakeFlags = [
     (lib.cmakeBool "DOWNLOAD_ENABLED" false)
     (lib.cmakeBool "UNINSTALL_ENABLED" false)
     (lib.cmakeBool "FETCH_POSELIB" false)
     (lib.cmakeBool "FETCH_FAISS" false)
+    (lib.cmakeBool "FETCH_ONNX" false)
     (lib.cmakeBool "TESTS_ENABLED" true)
+    (lib.cmakeFeature "CHOLMOD_INCLUDE_DIR_HINTS" "${suitesparse.dev}/include")
+    (lib.cmakeFeature "CHOLMOD_LIBRARY_DIR_HINTS" "${suitesparse}/lib")
   ]
   ++ lib.optionals cudaSupport [
     (lib.cmakeBool "CUDA_ENABLED" cudaSupport)

pkgs/by-name/co/colmap/suitesparse-no-include-subdir.patch

@@ -0,0 +1,22 @@
+diff --git a/cmake/FindCHOLMOD.cmake b/cmake/FindCHOLMOD.cmake
+index a5daf0e3..b0f13e3e 100644
+--- a/cmake/FindCHOLMOD.cmake
++++ b/cmake/FindCHOLMOD.cmake
+@@ -57,7 +57,7 @@ if(TARGET CHOLMOD::CHOLMOD)
+ else()
+     find_path(CHOLMOD_INCLUDE_DIRS
+         NAMES
+-        suitesparse/cholmod.h
++        cholmod.h
+         PATHS
+         ${CHOLMOD_INCLUDE_DIR_HINTS}
+         /usr/include
+@@ -89,7 +89,7 @@ else()
+ 
+     add_library(CHOLMOD::CHOLMOD INTERFACE IMPORTED)
+     target_include_directories(
+-        CHOLMOD::CHOLMOD INTERFACE ${CHOLMOD_INCLUDE_DIRS}/suitesparse)
++        CHOLMOD::CHOLMOD INTERFACE ${CHOLMOD_INCLUDE_DIRS})
+     target_link_libraries(
+         CHOLMOD::CHOLMOD INTERFACE ${CHOLMOD_LIBRARIES})
+ endif()