Merge branch 'master' into update-opus-1.5.1

.c3i/authorized_users.yml

@@ -1325,3 +1325,22 @@ authorized_users:
 - dmpriso
 - darakelian
 - sivachandran
+- oteffahi
+- Ruwei
+- TibiIius
+- MattBelanger321
+- X1aomu
+- datalogics-rgailiunas
+- yhsng
+- omdxp
+- pierricgimmig
+- laci-aura
+- BenBudr
+- PLeVasseur
+- datalogics-staylor
+- soroosh-sdi
+- TheHugeManatee
+- FannoFlow1
+- nayakche
+- psi-func
+- deniskovalchuk

.c3i/conan_v2_ready_references.yml

@@ -649,6 +649,7 @@ required_for_references:
 - libcpuid
 - libcuckoo
 - libcurl
+- libcvd
 - libdaemon
 - libdb
 - libdc1394
@@ -775,6 +776,7 @@ required_for_references:
 - libspng
 - libsquish
 - libsrtp
+- libssh
 - libssh2
 - libsvm
 - libsvtav1
@@ -855,6 +857,7 @@ required_for_references:
 - lzma_sdk
 - lzo
 - m4
+- macdylibbundler
 - maddy
 - magic_enum
 - mailio
@@ -912,6 +915,7 @@ required_for_references:
 - minizip-ng
 - mio
 - mm_file
+- mocknetworkaccessmanager
 - modern-cpp-kafka
 - mold
 - moltenvk
@@ -1036,6 +1040,7 @@ required_for_references:
 - openmesh
 - openmvg
 - openpam
+- openssh
 - openssl
 - opensubdiv
 - opentdf-client
@@ -1053,6 +1058,7 @@ required_for_references:
 - orcania
 - osmanip
 - osqp
+- ouster_sdk
 - out_ptr
 - outcome
 - ozz-animation
@@ -1134,6 +1140,7 @@ required_for_references:
 - protobuf-c
 - protopuf
 - protozero
+- proxy
 - psimd
 - psyinf-gmtl
 - ptex
@@ -1286,6 +1293,7 @@ required_for_references:
 - span-lite
 - spdlog
 - spectra
+- speedb
 - spirv-cross
 - spirv-headers
 - spirv-tools
@@ -1393,6 +1401,7 @@ required_for_references:
 - tng
 - toml11
 - tomlplusplus
+- toon
 - tqdm-cpp
 - tracy
 - transwarp

.c3i/config_v1.yml

@@ -3,7 +3,7 @@
 id: 'conan-io/conan-center-index'
 
 conan:
-  version: 1.62.0
+  version: 1.64.0
 
 artifactory:
   url: "https://c3i.jfrog.io/c3i"

.c3i/config_v2.yml

@@ -3,7 +3,7 @@
 id: 'conan-io/conan-center-index'
 
 conan:
-  version: 2.0.16
+  version: 2.2.2
   backup_sources:
     upload_url: "https://c3i.jfrog.io/artifactory/conan-center-backup-sources/"
     download_url: "https://c3i.jfrog.io/artifactory/conan-center-backup-sources/"

.github/workflows/alert-community.yml

@@ -316,6 +316,11 @@ jobs:
           files: "recipes/lz4/*/*"
           reviewers: "@Hopobcn"
 
+      - uses: ./.github/actions/alert-community
+        with:
+          files: "recipes/mocknetworkaccessmanager/*/*"
+          reviewers: "@MartinDelille"
+
       - uses: ./.github/actions/alert-community
         with:
           files: "recipes/ms-gsl/*/*"
@@ -376,6 +381,11 @@ jobs:
           files: "recipes/psimd/*/*"
           reviewers: "@Hopobcn"
 
+      - uses: ./.github/actions/alert-community
+        with:
+          files: "recipes/qtawesome/*/*"
+          reviewers: "@MartinDelille"
+
       - uses: ./.github/actions/alert-community
         with:
           files: "recipes/qt/*/*"

docs/changelog.md

@@ -1,5 +1,10 @@
 # Changelog
 
+### 03-April-2024 - 13:53 CEST
+
+- [feature] Add support for Conan 2.2.2 in the CI
+- [feature] Add support for Conan 1.63.0 in the CI
+
 ### 20-March-2024 - 11:13 CET
 
 - [fix] Changing Version Ranges in dependencies is now bump dependencies

docs/package_templates/autotools_package/all/conanfile.py

@@ -132,7 +132,7 @@ def generate(self):
         # --enable/disable-shared is automatically managed when 'shared' option is declared
         tc = AutotoolsToolchain(self)
         # autotools usually uses 'yes' and 'no' to enable/disable options
-        yes_no = lambda v: "yes" if v else "no"
+        def yes_no(v): return "yes" if v else "no"
         tc.configure_args.extend([
             f"--with-foobar={yes_no(self.options.with_foobar)}",
             "--enable-tools=no",

docs/supported_platforms_and_configurations.md

@@ -58,8 +58,8 @@ For more information see [conan-io/conan-docker-tools](https://github.com/conan-
 
 ## Linux
 
-- Python: 3.7.13
-- CMake: 3.15.7, 3.18.2 (same version expected after all use [new docker images](https://github.com/conan-io/conan-docker-tools/tree/master/modern))
+- Python: 3.7.17
+- CMake: 3.15.7, 3.18.6 (same version expected after all use [new docker images](https://github.com/conan-io/conan-docker-tools/tree/master/modern))
 - Compilers:
   - GCC versions: 5, 7, 9, 11
   - Clang versions: 13

recipes/7bitdi/all/conandata.yml

@@ -1,4 +1,7 @@
 sources:
+  "3.1.0":
+    url: "https://github.com/7bitcoder/7bitDI/archive/refs/tags/v3.1.0.tar.gz"
+    sha256: "345bf91e2a33cfe98628cac98c75488ddd55232b8c4bcfeba9b5001fec8d4f7c"
   "3.0.0":
     url: "https://github.com/7bitcoder/7bitDI/archive/refs/tags/v3.0.0.tar.gz"
     sha256: "aabb8e907c0cafb8e4b7c8367ed5dbb3cba2d83af090bdef9a7f855c0778c8f3"

recipes/7bitdi/config.yml

@@ -1,4 +1,6 @@
 versions:
+  "3.1.0":
+    folder: all
   "3.0.0":
     folder: all
   "2.1.0":

recipes/7zip/19.00/conanfile.py → recipes/7zip/all/conanfile.py

@@ -62,9 +62,11 @@ def generate(self):
             tc.generate()
         else:
             tc = AutotoolsToolchain(self)
+            env = None
             if self.settings.os == "Windows" and self.settings.compiler == "gcc":
-                tc.environment().define("IS_MINGW", "1")
-            tc.generate()
+                env = tc.environment()
+                env.define("IS_MINGW", "1")
+            tc.generate(env=env)
             deps = AutotoolsDeps(self)
             deps.generate()
 

recipes/7zip/config.yml

@@ -1,7 +1,7 @@
 versions:
   "23.01":
-    folder: "19.00"
+    folder: "all"
   "22.01":
-    folder: "19.00"
+    folder: "all"
   "19.00":
-    folder: "19.00"
+    folder: "all"

recipes/aaf/all/conanfile.py

@@ -35,7 +35,7 @@ def layout(self):
         cmake_layout(self, src_folder="src")
 
     def requirements(self):
-        self.requires("expat/2.5.0")
+        self.requires("expat/[>=2.6.2 <3]")
         self.requires("libjpeg/9e")
         if self.settings.os in ("FreeBSD", "Linux"):
             self.requires("util-linux-libuuid/2.39")

recipes/abseil/all/conandata.yml

@@ -1,4 +1,7 @@
 sources:
+  "20240116.2":
+    url: "https://github.com/abseil/abseil-cpp/archive/20240116.2.tar.gz"
+    sha256: "733726b8c3a6d39a4120d7e45ea8b41a434cdacde401cba500f14236c49b39dc"
   "20240116.1":
     url: "https://github.com/abseil/abseil-cpp/archive/20240116.1.tar.gz"
     sha256: "3c743204df78366ad2eaf236d6631d83f6bc928d1705dd0000b872e53b73dc6a"
@@ -15,6 +18,15 @@ sources:
     url: "https://github.com/abseil/abseil-cpp/archive/20211102.0.tar.gz"
     sha256: "dcf71b9cba8dc0ca9940c4b316a0c796be8fab42b070bb6b7cab62b48f0e66c4"
 patches:
+  "20240116.2":
+    - patch_file: "patches/0003-absl-string-libm-20240116.patch"
+      patch_description: "link libm to absl string"
+      patch_type: "portability"
+      patch_source: "https://github.com/abseil/abseil-cpp/issues/1100"
+    - patch_file: "patches/20240116.1-0001-fix-filesystem-include.patch"
+      patch_description: "Fix GCC 7 including <filesystem> in C++17 mode when it is not available (until GCC 8)"
+      patch_type: "portability"
+      patch_source: "https://github.com/abseil/abseil-cpp/commit/bb83aceacb554e79e7cd2404856f0be30bd00303"
   "20240116.1":
     - patch_file: "patches/0003-absl-string-libm-20240116.patch"
       patch_description: "link libm to absl string"

recipes/abseil/config.yml

@@ -1,4 +1,6 @@
 versions:
+  "20240116.2":
+    folder: all
   "20240116.1":
     folder: all
   "20230802.1":

recipes/ada/all/conandata.yml

@@ -1,4 +1,7 @@
 sources:
+  "2.7.8":
+    url: "https://github.com/ada-url/ada/archive/v2.7.8.tar.gz"
+    sha256: "8de067b7cb3da1808bf5439279aee6048d761ba246bf8a854c2af73b16b41c75"
   "2.7.7":
     url: "https://github.com/ada-url/ada/archive/v2.7.7.tar.gz"
     sha256: "7116d86a80b79886efbc9d946d3919801815060ae62daf78de68c508552af554"

recipes/ada/config.yml

@@ -1,4 +1,6 @@
 versions:
+  "2.7.8":
+    folder: all
   "2.7.7":
     folder: all
   "2.7.5":

recipes/alembic/all/conanfile.py

@@ -44,7 +44,7 @@ def layout(self):
         cmake_layout(self, src_folder="src")
 
     def requirements(self):
-        self.requires("imath/3.1.10", transitive_headers=True)
+        self.requires("imath/3.1.9", transitive_headers=True)
         if self.options.with_hdf5:
             self.requires("hdf5/1.14.3")
 

recipes/annoy/all/conandata.yml

@@ -0,0 +1,4 @@
+sources:
+  "1.17.3":
+    url: "https://github.com/spotify/annoy/archive/refs/tags/v1.17.3.tar.gz"
+    sha256: "c121d38cacd98f5103b24ca4e94ca097f18179eed3037e9eb93ad70ec1e6356e"

recipes/annoy/all/conanfile.py

@@ -0,0 +1,44 @@
+import os
+
+from conan import ConanFile
+from conan.tools.files import copy, get
+from conan.tools.layout import basic_layout
+
+required_conan_version = ">=1.53.0"
+
+class AnnoyConan(ConanFile):
+    name = "annoy"
+    description = "Approximate Nearest Neighbors optimized for memory usage and loading/saving to disk"
+    license = "Apache-2.0"
+    homepage = "https://github.com/spotify/annoy"
+    url = "https://github.com/conan-io/conan-center-index"
+    topics = ("approximate-nearest-neighbors", "machine-learning", "nearest-neighbors", "header-only")
+
+    package_type = "header-library"
+    settings = "os", "arch", "compiler", "build_type"
+    no_copy_source = True
+
+    def layout(self):
+        basic_layout(self, src_folder="src")
+
+    def package_id(self):
+        self.info.clear()
+
+    def source(self):
+        get(self, **self.conan_data["sources"][self.version], strip_root=True)
+
+    def package(self):
+        copy(self, "LICENSE", self.source_folder, os.path.join(self.package_folder, "licenses"))
+        for header in ["annoylib.h", "kissrandom.h", "mman.h"]:
+            copy(self, header, os.path.join(self.source_folder, "src"), os.path.join(self.package_folder, "include", "annoy"))
+
+    def package_info(self):
+        self.cpp_info.set_property("cmake_file_name", "Annoy")
+        self.cpp_info.set_property("cmake_target_name", "Annoy::Annoy")
+
+        self.cpp_info.bindirs = []
+        self.cpp_info.libdirs = []
+
+        # TODO: to remove in conan v2 once cmake_find_package_* generators removed
+        self.cpp_info.names["cmake_find_package"] = "Annoy"
+        self.cpp_info.names["cmake_find_package_multi"] = "Annoy"

recipes/annoy/all/test_package/CMakeLists.txt

@@ -0,0 +1,8 @@
+cmake_minimum_required(VERSION 3.15)
+project(test_package LANGUAGES CXX)
+
+find_package(Annoy REQUIRED CONFIG)
+
+add_executable(${PROJECT_NAME} test_package.cpp)
+target_link_libraries(${PROJECT_NAME} PRIVATE Annoy::Annoy)
+target_compile_features(${PROJECT_NAME} PRIVATE cxx_std_11)

recipes/annoy/all/test_package/conanfile.py

@@ -0,0 +1,26 @@
+from conan import ConanFile
+from conan.tools.build import can_run
+from conan.tools.cmake import cmake_layout, CMake
+import os
+
+
+class TestPackageConan(ConanFile):
+    settings = "os", "arch", "compiler", "build_type"
+    generators = "CMakeDeps", "CMakeToolchain", "VirtualRunEnv"
+    test_type = "explicit"
+
+    def layout(self):
+        cmake_layout(self)
+
+    def requirements(self):
+        self.requires(self.tested_reference_str)
+
+    def build(self):
+        cmake = CMake(self)
+        cmake.configure()
+        cmake.build()
+
+    def test(self):
+        if can_run(self):
+            bin_path = os.path.join(self.cpp.build.bindir, "test_package")
+            self.run(bin_path, env="conanrun")

recipes/annoy/all/test_package/test_package.cpp

@@ -0,0 +1,27 @@
+#include <annoy/annoylib.h>
+#include <annoy/kissrandom.h>
+
+#include <iostream>
+#include <vector>
+
+int main() {
+    const int n = 3;
+    Annoy::AnnoyIndex<int, double, Annoy::Angular, Annoy::Kiss32Random, Annoy::AnnoyIndexSingleThreadedBuildPolicy> index(n);
+
+    double x[3][3] = {{1, 0, 0}, {0, 1, 0}, {0, 0, 1}};
+    double needle[3] = {0.1, 0.1, 0.8};
+
+    for (int i = 0; i < n; i++) {
+        index.add_item(i, x[i]);
+    }
+    index.build(-1);
+
+    std::vector<int> result;
+    index.get_nns_by_vector(needle, 1, -1, &result, nullptr);
+    std::cout << "Nearest neighbor to vector [1.0, 0.5, 0.5]: ";
+    for (int i : result) {
+        std::cout << i << " ";
+    }
+    std::cout << std::endl;
+    return 0;
+}

recipes/annoy/config.yml

@@ -0,0 +1,3 @@
+versions:
+  "1.17.3":
+    folder: all

recipes/apr-util/all/conanfile.py

@@ -90,7 +90,7 @@ def requirements(self):
         if self.options.with_sqlite3:
             self.requires("sqlite3/3.45.0")
         if self.options.with_expat:
-            self.requires("expat/2.5.0")
+            self.requires("expat/[>=2.6.2 <3]")
         if self.options.with_postgresql:
             self.requires("libpq/15.4")