Merge branch 'master' into migrate/libigl

recipes/7bitdi/all/conandata.yml

@@ -1,4 +1,7 @@
 sources:
+  "2.0.0":
+    url: "https://github.com/7bitcoder/7bitDI/archive/refs/tags/v2.0.0.tar.gz"
+    sha256: "ae6d01c677b928a9c0979b9b2395692f9a3d876e07189d9b191e7b55c13d9ef4"
   "1.0.0":
     url: "https://github.com/7bitcoder/7bitDI/archive/refs/tags/v1.0.0.tar.gz"
     sha256: "4a5bfc541bf98b9943a54003c7ad1f8a2a3f879143022be805aaa343852d8279"

recipes/7bitdi/config.yml

@@ -1,3 +1,5 @@
 versions:
+  "2.0.0":
+    folder: all
   "1.0.0":
     folder: all

recipes/b2/config.yml

@@ -1,53 +1,11 @@
 versions:
-  "4.0.0":
-    folder: standard
-  "4.0.1":
-    folder: standard
-  "4.1.0":
-    folder: standard
-  "4.2.0":
-    folder: standard
-  "4.3.0":
-    folder: portable
-  "4.4.0":
-    folder: portable
-  "4.4.1":
-    folder: portable
-  "4.4.2":
-    folder: portable
-  "4.5.0":
-    folder: portable
-  "4.6.0":
-    folder: portable
-  "4.6.1":
-    folder: portable
-  "4.7.0":
-    folder: portable
-  "4.7.1":
-    folder: portable
-  "4.7.2":
-    folder: portable
-  "4.8.0":
-    folder: portable
-  "4.8.1":
-    folder: portable
   "4.8.2":
     folder: portable
-  "4.9.0":
-    folder: portable
-  "4.9.1":
-    folder: portable
-  "4.9.2":
-    folder: portable
-  "4.9.3":
-    folder: portable
-  "4.9.4":
-    folder: portable
-  "4.9.5":
-    folder: portable
   "4.9.6":
     folder: portable
   "4.10.0":
     folder: portable
   "4.10.1":
     folder: portable
+  "5.0.0":
+    folder: portable

recipes/b2/portable/conandata.yml

@@ -1,61 +1,7 @@
 sources:
-  "4.3.0":
-    sha256: 138c90b66edb0a28e225705a2cbf897a8cef5f87e68befc748f8e6808e21628a
-    url: https://github.com/bfgroup/b2/archive/4.3.0.tar.gz
-  "4.4.0":
-    sha256: fa4079370644110604895ff08057fe2eff3289bcffdaec55fcdf43ea33ff25a8
-    url: https://github.com/bfgroup/b2/archive/4.4.0.tar.gz
-  "4.4.1":
-    sha256: 4fb15abd994968a24868c13502f080c4a28b20f59831acf9eabd64a3b257554f
-    url: https://github.com/bfgroup/b2/archive/4.4.1.tar.gz
-  "4.4.2":
-    sha256: 575e59b89191a6a6780d7165cae3222b8a7a1e7d5e8165b3524eefe32fc3de46
-    url: https://github.com/bfgroup/b2/archive/4.4.2.tar.gz
-  "4.5.0":
-    url: "https://github.com/bfgroup/b2/archive/4.5.0.tar.gz"
-    sha256: "39c3b51bf9c5f32b1c249d2d405274976b166e1bdca1fc5205b595f1cb5dbac3"
-  "4.6.0":
-    url: "https://github.com/bfgroup/b2/archive/4.6.0.tar.gz"
-    sha256: "3a308e0f79a039d8a9495b375f3292f5163000c19caa79c5687e4cb5b1938b49"
-  "4.6.1":
-    url: "https://github.com/bfgroup/b2/archive/4.6.1.tar.gz"
-    sha256: "a3f3323eaeb2c27d7a3ca86842665c6c3bc3d93cc626ba362ae6d0c5a7bfbe2c"
-  "4.7.0":
-    url: "https://github.com/bfgroup/b2/archive/4.7.0.tar.gz"
-    sha256: "82c2eb92d6ab2bd447646568ac8430c316cbd2a1819c108136224498c0abed84"
-  "4.7.1":
-    url: "https://github.com/bfgroup/b2/archive/4.7.1.tar.gz"
-    sha256: "30844184ded3217c090b76e6e051c3ac663ea63bd19e1b727b05c54411cac867"
-  "4.7.2":
-    url: "https://github.com/bfgroup/b2/archive/4.7.2.tar.gz"
-    sha256: "70883f8ed82efc49f425f1961a82e961cefdbca3a28581cb57b405bd7516677f"
-  "4.8.0":
-    url: "https://github.com/bfgroup/b2/archive/4.8.0.tar.gz"
-    sha256: "2f18951d4cc267a810e44fc483b747d489e30ed42ee6d9e7c5e19de750ee5cd2"
-  "4.8.1":
-    url: "https://github.com/bfgroup/b2/archive/4.8.1.tar.gz"
-    sha256: "8ecff1025df9473d91a0d116af3e32be6fba6e57d4ea962e033ff1678609d668"
   "4.8.2":
     url: "https://github.com/bfgroup/b2/archive/4.8.2.tar.gz"
     sha256: "220edfbd5022394c5dc264dfdd8bf6d3ec53b784db87461026bb23ea9d9ec4bd"
-  "4.9.0":
-    url: "https://github.com/bfgroup/b2/archive/4.9.0.tar.gz"
-    sha256: "7c614e41f10e004c7539c75c60f7b2df26a61fe35058e9021f8fd5049c97a255"
-  "4.9.1":
-    url: "https://github.com/bfgroup/b2/archive/4.9.1.tar.gz"
-    sha256: "81e49dc85e956c3e708bdd02fcfe0b9f406fca8edca54c75c94ebd6c322ed587"
-  "4.9.2":
-    url: "https://github.com/bfgroup/b2/archive/4.9.2.tar.gz"
-    sha256: "7e1a135b308999d2a65fce3eba8f4ffb41ca82ae133f8494cc42cbca63c890de"
-  "4.9.3":
-    url: "https://github.com/bfgroup/b2/archive/4.9.3.tar.gz"
-    sha256: "4524b8ecf138a9087aa24b8889c44ea7ae9f2d373acc9535d72fb048c213e1b9"
-  "4.9.4":
-    url: "https://github.com/bfgroup/b2/releases/download/4.9.4/b2-4.9.4.tar.bz2"
-    sha256: "1996d8098955ad3fdecab242d784afaef0fba80dd5d2ef0b3a41592e26772312"
-  "4.9.5":
-    url: "https://github.com/bfgroup/b2/releases/download/4.9.5/b2-4.9.5.tar.bz2"
-    sha256: "f81bea44601613f633d3311341f3f63594608537bf38d7073b877ec1edb2760a"
   "4.9.6":
     url: "https://github.com/bfgroup/b2/releases/download/4.9.6/b2-4.9.6.tar.bz2"
     sha256: "10c1344c751fcf5a1f9ec6f52c02626cfbf78a4806f7817949b115e107bbbc5f"
@@ -65,3 +11,6 @@ sources:
   "4.10.1":
     url: "https://github.com/bfgroup/b2/releases/download/4.10.1/b2-4.10.1.tar.bz2"
     sha256: "d0818276955c3351eac26e4aa1e61046cfded88773232d76f2833c93bb917633"
+  "5.0.0":
+    url: "https://github.com/bfgroup/b2/releases/download/5.0.0/b2-5.0.0.tar.bz2"
+    sha256: "1ef867f7d374345a948baca025ed277dadda05a68439aa383a06aceb9911f7d3"

recipes/b2/portable/conanfile.py

@@ -63,10 +63,14 @@ def package_id(self):
         del self.info.options.use_cxx_env
         del self.info.options.toolset
 
-    def validate(self):
-        if hasattr(self, "settings_build") and cross_building(self):
+        if self._is_macos_intel_or_arm(self.info.settings):
+            self.info.settings.arch = "x86_64,armv8"
+
+    def validate_build(self):
+        if hasattr(self, "settings_build") and cross_building(self) and not self._is_macos_intel_or_arm(self.settings):
             raise ConanInvalidConfiguration(f"{self.ref} recipe doesn't support cross-build yet")
 
+    def validate(self):
         if (self.options.toolset == 'cxx' or self.options.toolset == 'cross-cxx') and not self.options.use_cxx_env:
             raise ConanInvalidConfiguration(
                 "Option toolset 'cxx' and 'cross-cxx' requires 'use_cxx_env=True'")
@@ -90,6 +94,9 @@ def _b2_output_dir(self):
     def _pkg_bin_dir(self):
         return os.path.join(self.package_folder, "bin")
 
+    def _is_macos_intel_or_arm(self, settings):
+        return settings.os == "Macos" and settings.arch in ["x86_64", "armv8"]
+
     @contextmanager
     def _bootstrap_env(self):
         saved_env = dict(os.environ)
@@ -145,6 +152,10 @@ def build(self):
                                     command += '"'+b2_vcvars+'" && '
         command += "build" if use_windows_commands else "./build.sh"
 
+        cxxflags = ""
+        if self._is_macos_intel_or_arm(self.settings):
+            cxxflags += " -arch arm64 -arch x86_64"
+
         if self.options.use_cxx_env:
             envvars = VirtualBuildEnv(self).vars()
 
@@ -153,9 +164,11 @@ def build(self):
                 command += f" --cxx={cxx}"
                 self._write_project_config(cxx)
 
-            cxxflags = envvars.get("CXXFLAGS")
-            if cxxflags:
-                command += f" --cxxflags={cxxflags}"
+            cxxflags_env = envvars.get("CXXFLAGS")
+            cxxflags = f"{cxxflags} {cxxflags_env}"
+
+        if cxxflags:
+            command += f' --cxxflags="{cxxflags}"'
 
         if b2_toolset != 'auto':
             command += " "+str(b2_toolset)

recipes/bdwgc/all/conanfile.py

@@ -77,7 +77,7 @@ def layout(self):
 
     def requirements(self):
         if self.settings.os == "Windows":
-            self.requires("libatomic_ops/7.8.0")
+            self.requires("libatomic_ops/7.8.2")
 
     def source(self):
         get(self, **self.conan_data["sources"][self.version],

recipes/commata/all/conandata.yml

@@ -1,4 +1,10 @@
 sources:
+  "0.2.8":
+    url: "https://github.com/furfurylic/commata/archive/refs/tags/v0.2.8.tar.gz"
+    sha256: "a762ec3ef1549aa5aebef78a160a40ee16d396fd976154f1f5c160837d145c8a"
+  "0.2.7":
+    url: "https://github.com/furfurylic/commata/archive/refs/tags/v0.2.7.tar.gz"
+    sha256: "3feeeea8eafa67a0f328382380f193df9a798665e10333e9e5b6db5fe1794283"
   "0.2.6-bug1":
     url: "https://github.com/furfurylic/commata/archive/refs/tags/v0.2.6-bug1.tar.gz"
     sha256: "141eb86f9033a808b6ead22a9367fc4d18a3047f55255ddf67d60e90f46b8f60"
@@ -8,12 +14,3 @@ sources:
   "0.2.5":
     url: "https://github.com/furfurylic/commata/archive/refs/tags/v0.2.5.tar.gz"
     sha256: "d1be1f366267af6c466c29f846f5968f57626a8a6635a2ea9a3de3f6fb88e53b"
-  "0.2.4-bug1":
-    url: "https://github.com/furfurylic/commata/archive/refs/tags/v0.2.4-bug1.tar.gz"
-    sha256: "fcde251d9b41f1601e1f8b2181613b4bf33c4318678700e2b3b54bf24bc9e1e3"
-  "0.2.4":
-    url: "https://github.com/furfurylic/commata/archive/refs/tags/v0.2.4.tar.gz"
-    sha256: "2d154c1ed7bbf6551729bcc5baf581613f6605df080ada35a9e107648d255e2e"
-  "0.2.3":
-    url: "https://github.com/furfurylic/commata/archive/refs/tags/v0.2.3.tar.gz"
-    sha256: "47521aa27b26fe650bd985c4e07df44453f9d09ab0d61ee98dd6877afe4c25a0"

recipes/commata/all/conanfile.py

@@ -1,7 +1,7 @@
 from conan import ConanFile
 from conan.errors import ConanInvalidConfiguration
 from conan.tools.build import check_min_cppstd
-from conan.tools.files import get, copy
+from conan.tools.files import get, copy, replace_in_file
 from conan.tools.layout import basic_layout
 from conan.tools.scm import Version
 import os
@@ -53,6 +53,14 @@ def validate(self):
     def source(self):
         get(self, **self.conan_data["sources"][self.version], strip_root=True)
 
+    def build(self):
+        # waiting for merge PR and release newer version. https://github.com/furfurylic/commata/pull/2
+        if Version(self.version) >= "0.2.7":
+            replace_in_file(self, os.path.join(self.source_folder, "include", "commata", "typing_aid.hpp"),
+                "#include <type_traits>",
+                """#include <type_traits>
+#include <optional>""")
+
     def package(self):
         copy(self, pattern="LICENSE", dst=os.path.join(self.package_folder, "licenses"), src=self.source_folder)
         copy(

recipes/commata/all/test_package/CMakeLists.txt

@@ -6,3 +6,7 @@ find_package(commata REQUIRED CONFIG)
 add_executable(${PROJECT_NAME} test_package.cpp)
 target_link_libraries(${PROJECT_NAME} PRIVATE commata::commata)
 target_compile_features(${PROJECT_NAME} PRIVATE cxx_std_17)
+
+if (commata_VERSION VERSION_LESS "0.2.7")
+    target_compile_definitions(${PROJECT_NAME} PRIVATE "COMMATA_VERSION_LESS_0_2_7")
+endif()

recipes/commata/all/test_package/test_package.cpp

@@ -50,7 +50,11 @@ int main(void) {
     std::vector<std::vector<std::string>> field_values;
 
     test_collector<char> collector(field_values);
+#ifdef COMMATA_VERSION_LESS_0_2_7
     commata::parse_csv(&buf, collector);
+#else
+    commata::parse_csv(buf, collector);
+#endif
 
     std::cout << field_values.size() << '\n';
 

recipes/commata/config.yml

@@ -1,13 +1,11 @@
 versions:
+  "0.2.8":
+    folder: all
+  "0.2.7":
+    folder: all
   "0.2.6-bug1":
     folder: all
   "0.2.6":
     folder: all
   "0.2.5":
     folder: all
-  "0.2.4-bug1":
-    folder: all
-  "0.2.4":
-    folder: all
-  "0.2.3":
-    folder: all

recipes/cpp-httplib/all/conandata.yml

@@ -1,4 +1,7 @@
 sources:
+  "0.14.3":
+    url: "https://github.com/yhirose/cpp-httplib/archive/v0.14.3.tar.gz"
+    sha256: "dcf6486d9030937636d8a4f820ca9531808fd7edb283893dddbaa05f99357e63"
   "0.14.2":
     url: "https://github.com/yhirose/cpp-httplib/archive/v0.14.2.tar.gz"
     sha256: "dbcf5590e8ed35c6745c2ad659a5ebec92f05187d1506eec24449d6db95e5084"

recipes/cpp-httplib/config.yml

@@ -1,4 +1,6 @@
 versions:
+  "0.14.3":
+    folder: all
   "0.14.2":
     folder: all
   "0.14.1":

recipes/ittapi/all/conandata.yml

@@ -1,4 +1,7 @@
 sources:
+  "3.24.4":
+    url: "https://github.com/intel/ittapi/archive/v3.24.4.tar.gz"
+    sha256: "f7341c563f228f4358b645fce526208c742fe13e61fc3ba2c777ba94d36e98f5"
   "3.24.0":
     url: "https://github.com/intel/ittapi/archive/v3.24.0.tar.gz"
     sha256: "36c42d3f2446ddfaa2d7dfa02dfaa79615933f1a68a72d7e4f1d70de7b56e2c9"

recipes/ittapi/all/conanfile.py

@@ -1,6 +1,7 @@
 from conan import ConanFile
 from conan.tools.cmake import CMake, CMakeToolchain, cmake_layout
 from conan.tools.files import copy, get, replace_in_file
+from conan.tools.scm import Version
 import os
 
 required_conan_version = ">=1.47.0"
@@ -52,10 +53,9 @@ def source(self):
 
     def _patch_sources(self):
         # Don't force PIC
-        replace_in_file(self, os.path.join(self.source_folder, "CMakeLists.txt"),
-            "set(CMAKE_C_FLAGS \"${CMAKE_C_FLAGS} -fPIC\")",
-            ""
-        )
+        if Version(self.version) < "3.24.1":
+            replace_in_file(self, os.path.join(self.source_folder, "CMakeLists.txt"),
+                            'set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -fPIC")', "")
 
     def generate(self):
         self._patch_sources()

recipes/ittapi/config.yml

@@ -1,4 +1,6 @@
 versions:
+  "3.24.4":
+    folder: all
   "3.24.0":
     folder: all
   "3.23.0":

recipes/libavif/all/conandata.yml

@@ -1,4 +1,7 @@
 sources:
+  "1.0.3":
+    url: "https://github.com/AOMediaCodec/libavif/archive/refs/tags/v1.0.3.tar.gz"
+    sha256: "35e3cb3cd7158209dcc31d3bf222036de5b9597e368a90e18449ecc89bb86a19"
   "1.0.2":
     url: "https://github.com/AOMediaCodec/libavif/archive/refs/tags/v1.0.2.tar.gz"
     sha256: "de8bf79488c5b523b77358df8b85ae69c3078e6b3f1636fc1f313f952269ad20"
@@ -12,6 +15,10 @@ sources:
     url: "https://github.com/AOMediaCodec/libavif/archive/refs/tags/v0.9.3.tar.gz"
     sha256: "bcd9a1f57f982a9615eb7e2faf87236dc88eb1d0c886f3471c7440ead605060d"
 patches:
+  "1.0.3":
+    - patch_file: patches/1.0.1-0001-disable-developer-only-codepaths.patch
+      patch_description: "disable compiler options for develop"
+      patch_type: "portability"
   "1.0.2":
     - patch_file: patches/1.0.1-0001-disable-developer-only-codepaths.patch
       patch_description: "disable compiler options for develop"

recipes/libavif/config.yml

@@ -1,4 +1,6 @@
 versions:
+  "1.0.3":
+    folder: all
   "1.0.2":
     folder: all
   "1.0.1":

recipes/libde265/all/conandata.yml

@@ -1,4 +1,7 @@
 sources:
+  "1.0.15":
+    url: "https://github.com/strukturag/libde265/releases/download/v1.0.15/libde265-1.0.15.tar.gz"
+    sha256: "00251986c29d34d3af7117ed05874950c875dd9292d016be29d3b3762666511d"
   "1.0.12":
     url: "https://github.com/strukturag/libde265/releases/download/v1.0.12/libde265-1.0.12.tar.gz"
     sha256: "62185ea2182e68cf68bba20cc6eb4c287407b509cf0a827d7ddb75614db77b5c"

recipes/libde265/config.yml

@@ -1,4 +1,6 @@
 versions:
+  "1.0.15":
+    folder: all
   "1.0.12":
     folder: all
   "1.0.11":

recipes/libnl/all/conandata.yml

@@ -1,4 +1,7 @@
 sources:
+  "3.9.0":
+    url: "https://github.com/thom311/libnl/releases/download/libnl3_9_0/libnl-3.9.0.tar.gz"
+    sha256: "aed507004d728a5cf11eab48ca4bf9e6e1874444e33939b9d3dfed25018ee9bb"
   "3.8.0":
     url: "https://github.com/thom311/libnl/releases/download/libnl3_8_0/libnl-3.8.0.tar.gz"
     sha256: "bb726c6d7a08b121978d73ff98425bf313fa26a27a331d465e4f1d7ec5b838c6"

recipes/libnl/config.yml

@@ -1,4 +1,6 @@
 versions:
+  3.9.0:
+    folder: all
   3.8.0:
     folder: all
   3.7.0: