Merge branch 'master' into crossdb-add-recipe

.c3i/authorized_users.yml

@@ -1442,3 +1442,4 @@ authorized_users:
 - witcherofthorns
 - amerry
 - kulkarniamit
+- hypengw

.c3i/conan_v2_ready_references.yml

@@ -61,6 +61,7 @@ required_for_references:
 - asyncplusplus
 - asyncpp
 - atomic_queue
+- au
 - audiofile
 - audiowaveform
 - autoconf
@@ -285,6 +286,7 @@ required_for_references:
 - cuda-kat
 - cuda-samples
 - cunit
+- curlpp
 - cute_headers
 - cutlass
 - cvplot

recipes/aruco/3.x.x/conandata.yml

@@ -1,4 +1,7 @@
 sources:
+  "3.1.15":
+    url: "https://downloads.sourceforge.net/project/aruco/3.1.15/3.1.15.zip"
+    sha256: "8408ad1621b92c885b0740641ab98ec022705d48a08deb6f071ffebf455cc8b2"
   "3.1.12":
     url: "https://downloads.sourceforge.net/project/aruco/3.1.12/aruco-3.1.12.zip"
     sha256: "70b9ec8aa8eac6fe3f622201747a3e32c77bbb5f015e28a95c1c7c91f8ee8a09"

recipes/aruco/3.x.x/conanfile.py

@@ -1,6 +1,6 @@
 from conan import ConanFile
 from conan.tools.cmake import CMake, CMakeDeps, CMakeToolchain, cmake_layout
-from conan.tools.files import collect_libs, copy, get, rmdir
+from conan.tools.files import collect_libs, copy, get, rmdir, replace_in_file
 import os
 
 required_conan_version = ">=1.53.0"
@@ -37,8 +37,11 @@ def layout(self):
         cmake_layout(self, src_folder="src")
 
     def requirements(self):
-        self.requires("opencv/4.5.5")
-        self.requires("eigen/3.4.0")
+        # Header used in public markerdetector.h
+        # cv::FileStorage::FileStorage used by aruco::CameraParameters::saveToFile
+        self.requires("opencv/4.9.0", transitive_headers=True, transitive_libs=True)
+        # Header used in levmarq.h
+        self.requires("eigen/3.4.0", transitive_headers=False)
 
     def source(self):
         get(self, **self.conan_data["sources"][self.version], strip_root=True)
@@ -55,6 +58,7 @@ def generate(self):
         tc.variables["USE_OWN_EIGEN3"] = False
         tc.generate()
         deps = CMakeDeps(self)
+        deps.set_property("eigen", "cmake_additional_variables_prefixes", ["Eigen3"])
         deps.generate()
 
     def build(self):

recipes/aruco/3.x.x/test_package/test_package.cpp

@@ -1,10 +1,10 @@
-#include <iostream>
-#include <vector>
+#include <aruco/aruco.h>
 
 #include <opencv2/core.hpp>
 #include <opencv2/highgui.hpp>
 
-#include <aruco/aruco.h>
+#include <iostream>
+#include <vector>
 
 int main() {
     cv::Mat image = cv::Mat::zeros(600,600,CV_8UC3);

recipes/aruco/config.yml

@@ -1,3 +1,5 @@
 versions:
+  "3.1.15":
+    folder: 3.x.x
   "3.1.12":
     folder: 3.x.x

recipes/bgfx/all/conanfile.py

@@ -160,7 +160,7 @@ def build(self):
         if is_msvc(self):
             # Conan to Genie translation maps
             vs_ver_to_genie = {"17": "2022", "16": "2019", "15": "2017",
-                            "193": "2022", "192": "2019", "191": "2017"}
+                            "194": "2022", "193": "2022", "192": "2019", "191": "2017"}
 
             # Use genie directly, then msbuild on specific projects based on requirements
             genie_VS = f"vs{vs_ver_to_genie[str(self.settings.compiler.version)]}"

recipes/botan/all/conandata.yml

@@ -17,6 +17,9 @@ sources:
   "2.19.4":
     url: "https://github.com/randombit/botan/archive/2.19.4.tar.gz"
     sha256: "5754a6b5ddc3c74b0cb8671531feea69d03a4f3b5bdafa5f75e4c73a1242e5b1"
+  "2.19.5":
+    url: "https://github.com/randombit/botan/archive/2.19.5.tar.gz"
+    sha256: "8d4a3826787f9febbdc225172ad2d39d7d3960346c5721fe46cb27d480d7e1de"
   "3.0.0":
     url: "https://github.com/randombit/botan/archive/3.0.0.tar.gz"
     sha256: "8bafe2e965fa9ccf92ef5741165d735c9fbbe6376c373bbf5702495ad2dfb814"
@@ -38,6 +41,9 @@ sources:
   "3.5.0":
     url: "https://github.com/randombit/botan/archive/3.5.0.tar.gz"
     sha256: "7d91d3349e6029e1a6929a50ab587f9fd4e29a9af3f3d698553451365564001f"
+  "3.6.0":
+    url: "https://github.com/randombit/botan/archive/3.6.0.tar.gz"
+    sha256: "950199a891fab62dca78780b36e12f89031c37350b2a16a2c35f2e423c041bad"
 patches:
   "2.18.2":
     - patch_file: "patches/fix-amalgamation-build.patch"

recipes/botan/config.yml

@@ -11,6 +11,8 @@ versions:
     folder: all
   "2.19.4":
     folder: all
+  "2.19.5":
+    folder: all
   "3.0.0":
     folder: all
   "3.1.0":
@@ -25,3 +27,5 @@ versions:
     folder: all
   "3.5.0":
     folder: all
+  "3.6.0":
+    folder: all

recipes/cpp-httplib/all/conandata.yml

@@ -1,4 +1,7 @@
 sources:
+  "0.18.1":
+    url: "https://github.com/yhirose/cpp-httplib/archive/v0.18.1.tar.gz"
+    sha256: "405abd8170f2a446fc8612ac635d0db5947c0d2e156e32603403a4496255ff00"
   "0.18.0":
     url: "https://github.com/yhirose/cpp-httplib/archive/v0.18.0.tar.gz"
     sha256: "6ed5894bbbc4a34a0f4c5e962672d0003d2ea099bbadacc66f6dee2b213ff394"
@@ -24,15 +27,3 @@ sources:
   "0.14.1":
     url: "https://github.com/yhirose/cpp-httplib/archive/v0.14.1.tar.gz"
     sha256: "2d4fb5544da643e5d0a82585555d8b7502b4137eb321a4abbb075e21d2f00e96"
-  "0.13.3":
-    url: "https://github.com/yhirose/cpp-httplib/archive/v0.13.3.tar.gz"
-    sha256: "2a4503f9f2015f6878baef54cd94b01849cc3ed19dfe95f2c9775655bea8b73f"
-  "0.12.6":
-    url: "https://github.com/yhirose/cpp-httplib/archive/v0.12.6.tar.gz"
-    sha256: "24bc594a9efcc08a5a6f3928e848d046d411a88b07bcd6f7f3851227a1f0133e"
-  "0.11.4":
-    url: "https://github.com/yhirose/cpp-httplib/archive/v0.11.4.tar.gz"
-    sha256: "28f76b875a332fb80972c3212980c963f0a7d2e11a8fe94a8ed0d847b9a2256f"
-  "0.10.9":
-    url: "https://github.com/yhirose/cpp-httplib/archive/refs/tags/v0.10.9.tar.gz"
-    sha256: "95ac0740ef760829a079c01a44164fd74af3fdc0748a40fc6beefd0276fd2345"

recipes/cpp-httplib/config.yml

@@ -1,4 +1,6 @@
 versions:
+  "0.18.1":
+    folder: all
   "0.18.0":
     folder: all
   "0.17.3":
@@ -15,11 +17,3 @@ versions:
     folder: all
   "0.14.1":
     folder: all
-  "0.13.3":
-    folder: all
-  "0.12.6":
-    folder: all
-  "0.11.4":
-    folder: all
-  "0.10.9":
-    folder: all

recipes/crowcpp-crow/all/conanfile.py

@@ -117,6 +117,8 @@ def package_info(self):
 
         if self.settings.os in ("FreeBSD", "Linux"):
             self.cpp_info.system_libs = ["pthread"]
+        if self.settings.os == "Windows":
+            self.cpp_info.system_libs = ["wsock32", "ws2_32"]
 
         self.cpp_info.set_property("cmake_file_name", "Crow")
         self.cpp_info.set_property("cmake_target_name", "Crow::Crow")

recipes/date/all/conandata.yml

@@ -1,4 +1,7 @@
 sources:
+  "3.0.3":
+    url: "https://github.com/HowardHinnant/date/archive/refs/tags/v3.0.3.tar.gz"
+    sha256: "30de45a34a2605cca33a993a9ea54e8f140f23b1caf1acf3c2fd436c42c7d942"
   "3.0.2":
     url: "https://github.com/HowardHinnant/date/archive/refs/tags/v3.0.2.tar.gz"
     sha256: "0449667ea85c5b411c28d08a53f1e420c73416caa5b693c249dac9763eb97b7c"

recipes/date/config.yml

@@ -1,4 +1,6 @@
 versions:
+  "3.0.3":
+    folder: all
   "3.0.2":
     folder: all
   "3.0.1":

recipes/foxglove-websocket/all/conandata.yml

@@ -1,4 +1,7 @@
 sources:
+  1.3.1:
+    url: https://github.com/foxglove/ws-protocol/archive/refs/tags/releases/cpp/v1.3.1.tar.gz
+    sha256: 48bae8599603da893e559b952e7fec1392aeb55cc6d59288feac6e6428e61bef
   1.3.0:
     url: https://github.com/foxglove/ws-protocol/archive/refs/tags/releases/cpp/v1.3.0.tar.gz
     sha256: 5c1d4cda60a89bf635ef0150e8cd2f4da569f92beb8ac8555795ed7fd47f2a21

recipes/foxglove-websocket/config.yml

@@ -1,4 +1,6 @@
 versions:
+  1.3.1:
+    folder: all
   1.3.0:
     folder: all
   1.2.0:

recipes/highs/all/conandata.yml

@@ -1,4 +1,7 @@
 sources:
+  "1.8.0":
+    url: "https://github.com/ERGO-Code/HiGHS/archive/refs/tags/v1.8.0.tar.gz"
+    sha256: "e184e63101cf19688a02102f58447acc7c021d77eef0d3475ceaceb61f035539"
   "1.7.2":
     url: "https://github.com/ERGO-Code/HiGHS/archive/refs/tags/v1.7.2.tar.gz"
     sha256: "5ff96c14ae19592d3568e9ae107624cbaf3409d328fb1a586359f0adf9b34bf7"

recipes/highs/all/test_package/CMakeLists.txt

@@ -1,7 +1,7 @@
 cmake_minimum_required(VERSION 3.8)
-project(test_package CXX)
-set(CMAKE_CXX_STANDARD 11)
+project(test_package LANGUAGES CXX)
 
 find_package(highs REQUIRED CONFIG)
 add_executable(${PROJECT_NAME} main.cpp)
 target_link_libraries(${PROJECT_NAME} PRIVATE highs::highs)
+target_compile_features(${PROJECT_NAME} PRIVATE cxx_std_11)

recipes/highs/config.yml

@@ -1,4 +1,6 @@
 versions:
+  "1.8.0":
+    folder: all
   "1.7.2":
     folder: all
   "1.7.0":

recipes/imgui/all/conandata.yml

@@ -1,4 +1,10 @@
 sources:
+  "1.91.4":
+    url: "https://github.com/ocornut/imgui/archive/v1.91.4.tar.gz"
+    sha256: "a455c28d987c78ddf56aab98ce0ff0fda791a23a2ec88ade46dd106b837f0923"
+  "1.91.4-docking":
+    url: "https://github.com/ocornut/imgui/archive/v1.91.4-docking.tar.gz"
+    sha256: "7405bdaf304b77d6d03e6d17d1f31ca3586fa0c65a466fa1dd71b6ca6a222023"
   "1.91.3":
     url: "https://github.com/ocornut/imgui/archive/v1.91.3.tar.gz"
     sha256: "29949d7b300c30565fbcd66398100235b63aa373acfee0b76853a7aeacd1be28"

recipes/imgui/config.yml

@@ -1,4 +1,8 @@
 versions:
+  "1.91.4":
+    folder: all
+  "1.91.4-docking":
+    folder: all
   "1.91.3":
     folder: all
   "1.91.3-docking":

recipes/jemalloc/all/conanfile.py

@@ -18,7 +18,8 @@ class JemallocConan(ConanFile):
     url = "https://github.com/conan-io/conan-center-index"
     license = "BSD-2-Clause"
     homepage = "https://jemalloc.net/"
-    topics = ("conan", "jemalloc", "malloc", "free")
+    topics = ("jemalloc", "malloc", "free")
+    package_type = "library"
     settings = "os", "arch", "compiler", "build_type"
     options = {
         "shared": [True, False],
@@ -119,10 +120,7 @@ def validate(self):
             if self.options.enable_cxx and self.settings.compiler.get_safe("libcxx") == "libc++" and \
                     Version(self.settings.compiler.version) < "10":
                 raise ConanInvalidConfiguration("Clang 9 or earlier with libc++ is not supported due to the missing mutex implementation.")
-        # 3. Verify the build type
-        if self.settings.build_type not in ("Release", "Debug", None):
-            raise ConanInvalidConfiguration("Only Release and Debug builds are supported.")
-        # 4: Apple Silicon specific checks
+        # 3: Apple Silicon specific checks
         if self.settings.os == "Macos" and self.settings.arch == "armv8":
             if Version(self.version) < "5.3.0":
                 raise ConanInvalidConfiguration("Support for Apple Silicon is only available as of 5.3.0.")

recipes/libassert/config.yml

@@ -1,4 +1,6 @@
 versions:
+  "2.1.2":
+    folder: v2
   "2.1.1":
     folder: v2
   "2.1.0":

recipes/libassert/v2/conandata.yml

@@ -1,4 +1,7 @@
 sources:
+  "2.1.2":
+    url: "https://github.com/jeremy-rifkin/libassert/archive/refs/tags/v2.1.2.tar.gz"
+    sha256: "a7220ca354270deca08a7a162b93523c738ba3c8037a4df1a46ababfdc664196"
   "2.1.1":
     url: "https://github.com/jeremy-rifkin/libassert/archive/refs/tags/v2.1.1.tar.gz"
     sha256: "2bdf27523f964f41668d266cfdbd7f5f58988af963d976577195969ed44359d1"

recipes/libassert/v2/conanfile.py

@@ -16,9 +16,8 @@ class LibassertConan(ConanFile):
     license = "MIT"
     url = "https://github.com/conan-io/conan-center-index"
     homepage = "https://github.com/jeremy-rifkin/libassert"
-    package_type = "library"
-
     topics = ("assert", "library", "assertions", "stacktrace", "diagnostics", "defensive programming", "testing")
+    package_type = "library"
     settings = "os", "arch", "compiler", "build_type"
     options = {
         "shared": [True, False],
@@ -52,7 +51,10 @@ def layout(self):
         cmake_layout(self, src_folder="src")
 
     def requirements(self):
-        self.requires("cpptrace/0.7.1", transitive_headers=True, transitive_libs=True)
+        if Version(self.version) >= "2.1.2":
+            self.requires("cpptrace/0.7.2", transitive_headers=True, transitive_libs=True)
+        else:
+            self.requires("cpptrace/0.7.1", transitive_headers=True, transitive_libs=True)
 
     def validate(self):
         if self.settings.compiler.cppstd:
@@ -129,7 +131,7 @@ def package_info(self):
         self.cpp_info.components["assert"].libs = ["assert"]
         if not self.options.shared:
             self.cpp_info.components["assert"].defines.append("LIBASSERT_STATIC_DEFINE")
-        
+
         if self.settings.os in ["Linux", "FreeBSD"]:
             self.cpp_info.system_libs.append("m")
         self.cpp_info.requires = ["cpptrace::cpptrace"]

recipes/libgit2/all/conandata.yml

@@ -1,4 +1,7 @@
 sources:
+  "1.8.2":
+    url: "https://github.com/libgit2/libgit2/archive/v1.8.2.tar.gz"
+    sha256: "184699f0d9773f96eeeb5cb245ba2304400f5b74671f313240410f594c566a28"
   "1.8.1":
     url: "https://github.com/libgit2/libgit2/archive/v1.8.1.tar.gz"
     sha256: "8c1eaf0cf07cba0e9021920bfba9502140220786ed5d8a8ec6c7ad9174522f8e"
@@ -24,6 +27,10 @@ sources:
     url: "https://github.com/libgit2/libgit2/archive/v1.0.1.tar.gz"
     sha256: "1775427a6098f441ddbaa5bd4e9b8a043c7401e450ed761e69a415530fea81d2"
 patches:
+  "1.8.2":
+    - patch_file: "patches/1.8.1-0001-fix-cmake.patch"
+      patch_description: "use cci's packages"
+      patch_type: "conan"
   "1.8.1":
     - patch_file: "patches/1.8.1-0001-fix-cmake.patch"
       patch_description: "use cci's packages"

recipes/libgit2/config.yml

@@ -1,4 +1,6 @@
 versions:
+  "1.8.2":
+    folder: "all"
   "1.8.1":
     folder: "all"
   "1.7.2":

recipes/libqasm/all/conandata.yml

@@ -1,4 +1,7 @@
 sources:
+  "0.6.8":
+    url: "https://github.com/QuTech-Delft/libqasm/archive/refs/tags/0.6.8.tar.gz"
+    sha256: "b98ff44f0c569a0cc20b3728ba7d4711299aaac07d4dadfe52e638b366b91251"
   "0.6.7":
     url: "https://github.com/QuTech-Delft/libqasm/archive/refs/tags/0.6.7.tar.gz"
     sha256: "3e85be4f433b178b89e32bc738bd4f69266cd1c4ad0ed12b5367381ac6e44eb2"

recipes/libqasm/all/test_package/src/test_package.cpp

@@ -1,8 +1,11 @@
+#if __has_include("cqasm.hpp")
 #include "cqasm.hpp"
+#else
+#include "libqasm/cqasm.hpp"
+#endif
 
 #include <iostream>
 
-
 int main() {
     auto analyzer = cqasm::v3x::default_analyzer();
     auto result = analyzer.analyze_string("version 3.0; qubit[2] q; H q[0]; CNOT q[0], q[1]; measure q", "");

recipes/libqasm/config.yml

@@ -1,4 +1,6 @@
 versions:
+  "0.6.8":
+    folder: all
   "0.6.7":
     folder: all
   "0.6.6":