From d723b88bd690d5a00b0160c182ddd1dbd61071df Mon Sep 17 00:00:00 2001
From: Simone Gasparini <simone.gasparini@gmail.com>
Date: Thu, 27 Jun 2024 05:22:06 +0200
Subject: [PATCH] [cctag] update to v1.0.4 (#39467)

---
 .../fix-compatibility-with-boost-1.85.patch   | 47 -------------------
 ports/cctag/portfile.cmake                    |  6 +--
 ports/cctag/vcpkg.json                        |  2 +-
 versions/baseline.json                        |  2 +-
 versions/c-/cctag.json                        |  5 ++
 5 files changed, 8 insertions(+), 54 deletions(-)
 delete mode 100644 ports/cctag/fix-compatibility-with-boost-1.85.patch

diff --git a/ports/cctag/fix-compatibility-with-boost-1.85.patch b/ports/cctag/fix-compatibility-with-boost-1.85.patch
deleted file mode 100644
index 7d4d57ced9..0000000000
--- a/ports/cctag/fix-compatibility-with-boost-1.85.patch
+++ /dev/null
@@ -1,47 +0,0 @@
- src/applications/detection/main.cpp | 3 +--
- src/cctag/Fitting.cpp               | 4 ++--
- 2 files changed, 3 insertions(+), 4 deletions(-)
-
-diff --git a/src/applications/detection/main.cpp b/src/applications/detection/main.cpp
-index da8243b..6807ada 100644
---- a/src/applications/detection/main.cpp
-+++ b/src/applications/detection/main.cpp
-@@ -21,7 +21,6 @@
- #include <boost/archive/xml_oarchive.hpp>
- #include <boost/exception/all.hpp>
- #include <boost/filesystem.hpp>
--#include <boost/filesystem/convenience.hpp>
- #include <boost/ptr_container/ptr_list.hpp>
- #include <boost/timer/timer.hpp>
- #include <opencv2/core/core.hpp>
-@@ -501,7 +500,7 @@ int main(int argc, char** argv)
-         tbb::parallel_for(0, 2, [&](size_t fileListIdx) {
-             for(const auto& fileInFolder : files[fileListIdx])
-             {
--                const std::string subExt(bfs::extension(fileInFolder.second));
-+                const std::string subExt(fileInFolder.second.extension().string());
- 
-                 if((subExt == ".png") || (subExt == ".jpg") || (subExt == ".PNG") || (subExt == ".JPG"))
-                 {
-diff --git a/src/cctag/Fitting.cpp b/src/cctag/Fitting.cpp
-index 931922e..59b3a3a 100644
---- a/src/cctag/Fitting.cpp
-+++ b/src/cctag/Fitting.cpp
-@@ -226,7 +226,7 @@ template void fitEllipse(std::vector<cctag::Point2d<Eigen::Vector3f>>::const_ite
- } // geometry
- 
- float innerProdMin(const std::vector<cctag::EdgePoint*>& filteredChildren, float thrCosDiffMax, Point2d<Vector3s> & p1, Point2d<Vector3s> & p2) {
--            using namespace boost::numeric;
-+            //using namespace boost::numeric;
-             //using namespace cctag::numerical;
- 
-             EdgePoint* pAngle1 = nullptr;
-@@ -335,7 +335,7 @@ void ellipseFitting( cctag::numerical::geometry::Ellipse& e, const std::vector<c
- }
- 
- void circleFitting(cctag::numerical::geometry::Ellipse& e, const std::vector<cctag::EdgePoint*>& points) {
--  using namespace boost::numeric;
-+  //using namespace boost::numeric;
- 
-   std::size_t nPoints = points.size();
- 
diff --git a/ports/cctag/portfile.cmake b/ports/cctag/portfile.cmake
index 38a494af4e..8e4bf6918a 100644
--- a/ports/cctag/portfile.cmake
+++ b/ports/cctag/portfile.cmake
@@ -2,14 +2,10 @@ vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO alicevision/cctag
     REF "v${VERSION}"
-    SHA512 ccae0829480eca2a25cae70a5bf2cb3fde5ae1f71a08a9b614c05a1bb746ad66d6ac70f590ac8096635ea4fe75590d0ecb1c8c9f1b77189e5eae6f5e59c78cfe
+    SHA512 65f8260213faab1965ff97e38b890d85f5599c5db5f50f09ab1ed2d73d7008d2e93693145d66a4d9af6342666817204736c3b0384885fa50402850f1dc5dceae
     HEAD_REF develop
-    PATCHES
-        fix-compatibility-with-boost-1.85.patch
 )
 
-file(REMOVE "${SOURCE_PATH}/cmake/FindTBB.cmake" "${SOURCE_PATH}/src/applications/cmake/FindTBB.cmake")
-
 vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS
         FEATURES
             cuda       CCTAG_WITH_CUDA
diff --git a/ports/cctag/vcpkg.json b/ports/cctag/vcpkg.json
index 7b4a48a1cc..0977cbca51 100644
--- a/ports/cctag/vcpkg.json
+++ b/ports/cctag/vcpkg.json
@@ -1,6 +1,6 @@
 {
   "name": "cctag",
-  "version-semver": "1.0.3",
+  "version-semver": "1.0.4",
   "maintainers": "alicevision-team@googlegroups.com",
   "description": "Computer vision library for detecting CCTag markers made up of concentric circles",
   "homepage": "https://github.com/alicevision/CCTag",
diff --git a/versions/baseline.json b/versions/baseline.json
index 13f9eeebfb..ea3e0923e1 100644
--- a/versions/baseline.json
+++ b/versions/baseline.json
@@ -1529,7 +1529,7 @@
       "port-version": 13
     },
     "cctag": {
-      "baseline": "1.0.3",
+      "baseline": "1.0.4",
       "port-version": 0
     },
     "cctz": {
diff --git a/versions/c-/cctag.json b/versions/c-/cctag.json
index 1c8c5d6235..d50eb95f09 100644
--- a/versions/c-/cctag.json
+++ b/versions/c-/cctag.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "ce8749684cd638c95c3e2ff15ea713ae11cd991d",
+      "version-semver": "1.0.4",
+      "port-version": 0
+    },
     {
       "git-tree": "43157f8be9e5020e0e2ab708ec931f4cb3266b31",
       "version-semver": "1.0.3",