Merge remote-tracking branch 'upstream/master' into update/sundials

conan-io · Sep 11, 2024 · b010c8b · b010c8b
2 parents c9beef8 + 1266024
commit b010c8b
Show file tree

Hide file tree

Showing 788 changed files with 10,796 additions and 7,277 deletions.
diff --git a/.c3i/authorized_users.yml b/.c3i/authorized_users.yml
@@ -1388,3 +1388,33 @@ authorized_users:
 - fpoirotte
 - cuppajoeman
 - vsbogd
+- Nevermore1994
+- maciejjablonsky
+- luc-c
+- willprice
+- pasbi
+- liuzicheng1987
+- guyutongxue
+- ciclark
+- John-LittleBearLabs
+- jasal82
+- philipp-m-w
+- nine
+- OMGtechy
+- sabapathi20
+- seekstar
+- dcoburnMEDITECH
+- mattangus
+- arnaudmathias
+- hankhsu1996
+- stephematician
+- awest03
+- sun-mir
+- fhamonic
+- simbahebinbo
+- alessiosacco
+- Blackflame576
+- Bakul-Gaur
+- itsmejoeeey
+- JustCallMeRay
+- shun2wang
diff --git a/.c3i/conan_v2_ready_references.yml b/.c3i/conan_v2_ready_references.yml
@@ -43,6 +43,7 @@ required_for_references:
 - args-parser
 - argtable2
 - argtable3
+- argz
 - armadillo
 - arrow
 - arsenalgear
@@ -83,6 +84,7 @@ required_for_references:
 - aws-libfabric
 - aws-sdk-cpp
 - azure-sdk-for-cpp
+- azure-storage-cpp
 - b2
 - b64
 - backport-cpp
@@ -92,6 +94,7 @@ required_for_references:
 - bandit
 - base64
 - basu
+- battery-embed
 - bazel
 - bdwgc
 - bear
@@ -179,6 +182,7 @@ required_for_references:
 - chipmunk2d
 - choc
 - chunkio
+- cigi-ccl
 - cimg
 - circularbuffer
 - cista
@@ -209,6 +213,7 @@ required_for_references:
 - coin-osi
 - coin-utils
 - commata
+- compute_library
 - concurrencpp
 - concurrentqueue
 - console_bridge
@@ -278,6 +283,7 @@ required_for_references:
 - cuda-samples
 - cunit
 - cute_headers
+- cutlass
 - cvplot
 - cwalk
 - cxxgraph
@@ -411,6 +417,7 @@ required_for_references:
 - fftw
 - fire-hpp
 - fixed-containers
+- fixed_math
 - flac
 - flann
 - flatbuffers
@@ -426,6 +433,7 @@ required_for_references:
 - fmi3
 - fmt
 - fmtlog
+- folly
 - fontconfig
 - foonathan-lexy
 - foonathan-memory
@@ -453,6 +461,7 @@ required_for_references:
 - fusepp
 - fxdiv
 - g3log
+- gaia-ecs
 - gainput
 - gamenetworkingsockets
 - gamma
@@ -468,6 +477,7 @@ required_for_references:
 - geographiclib
 - geos
 - geotrans
+- getdns
 - getopt-for-visual-studio
 - gettext
 - gf-complete
@@ -498,6 +508,7 @@ required_for_references:
 - gnu-config
 - gnulib
 - gnutls
+- gobject-introspection
 - godot-cpp
 - godot_headers
 - googleapis
@@ -585,6 +596,7 @@ required_for_references:
 - inversify-cpp
 - iowow
 - ipaddress
+- iphreeqc
 - iqa
 - irrxml
 - isa-l
@@ -653,6 +665,7 @@ required_for_references:
 - lest
 - leveldb
 - lexbor
+- libaec
 - libaesgm
 - libaio
 - libalsa
@@ -708,6 +721,7 @@ required_for_references:
 - libevdev
 - libevent
 - libexif
+- libfabric
 - libfdk_aac
 - libffi
 - libfork
@@ -754,6 +768,7 @@ required_for_references:
 - libmd
 - libmediainfo
 - libmemcached
+- libmeshb
 - libmetalink
 - libmicrohttpd
 - libmikmod
@@ -783,7 +798,9 @@ required_for_references:
 - libpcap
 - libpciaccess
 - libpfm4
+- libphonenumber
 - libpng
+- libpointmatcher
 - libpq
 - libpqxx
 - libproperties
@@ -953,6 +970,7 @@ required_for_references:
 - mimalloc
 - mingw-builds
 - mingw-w64
+- minhook
 - mini
 - miniaudio
 - minicoro
@@ -1011,6 +1029,7 @@ required_for_references:
 - nasm
 - ncurses
 - neargye-semver
+- net-snmp
 - netcdf
 - nettle
 - newmat
@@ -1095,6 +1114,7 @@ required_for_references:
 - openjpeg
 - openldap
 - openmesh
+- openmpi
 - openmvg
 - openpam
 - openscenegraph
@@ -1189,6 +1209,7 @@ required_for_references:
 - poppler-data
 - popt
 - portable-file-dialogs
+- poselib
 - poshlib
 - pprint
 - pranav-csv2
@@ -1259,6 +1280,7 @@ required_for_references:
 - readerwriterqueue
 - readline
 - readosm
+- rebound
 - recastnavigation
 - reckless
 - rectanglebinpack
@@ -1314,6 +1336,7 @@ required_for_references:
 - sdf
 - sdl
 - sdl_image
+- sdl_mixer
 - sdl_net
 - sdl_ttf
 - seadex-essentials
@@ -1344,6 +1367,7 @@ required_for_references:
 - simfil
 - simple-websocket-server
 - simple-yaml
+- simple_enum
 - sioclient
 - sjson-cpp
 - skyr-url
@@ -1591,6 +1615,7 @@ required_for_references:
 - wslay
 - wt
 - wtl
+- wxwidgets
 - wyhash
 - xapian-core
 - xbyak

diff --git a/.c3i/waitlist_users.yml b/.c3i/waitlist_users.yml
@@ -6,3 +6,7 @@ waitlist_users:
 - synaptics-lspintzyk
 - wer14
 - connor-i-clark
+- NeXuS4Developer
+- sabapathim
+- pixelsoba
+- liss-h
diff --git a/.github/workflows/linter-yaml.yml b/.github/workflows/linter-yaml.yml
@@ -91,7 +91,7 @@ jobs:
           done
           echo "::remove-matcher owner=yamllint_matcher::"
 
-          for file in ${{ steps.changed_files_conandata.outputs.all_changed_files }}; do
+          for file in ${{ steps.changed_files_config.outputs.all_changed_files }}; do
             python3 linter/config_yaml_linter.py ${file}
           done
 

diff --git a/docs/adding_packages/dependencies.md b/docs/adding_packages/dependencies.md
@@ -196,7 +196,7 @@ version range only when a requirement for a newer version is needed.
 * qt5: `[~5.15]`, if your library depends on qt5, only the 5.15 minor version is allowed
 * qt6: `[>=6.x <7]`, where 6.x is the lower bound of your needed qt6 version
 * c-ares: `[>=1.27 <2]`
-* zstd: `[^1.5]` it's equivalent to `[>=1.5 <1.6]`
+* zstd: `[~1.5]` it's equivalent to `[>=1.5 <1.6]`
 * ninja: `[>=1.10.2 <2]`
 * meson: `[>=1.2.3 <2]`
 * pkgconf: `[>=2.2 <3]`

diff --git a/recipes/7bitdi/all/conandata.yml b/recipes/7bitdi/all/conandata.yml
@@ -1,4 +1,7 @@
 sources:
+  "3.4.0":
+    url: "https://github.com/7bitcoder/7bitDI/archive/refs/tags/v3.4.0.tar.gz"
+    sha256: "8381102f5966a5d83cf590b8fa45904d055d74ec90822628240786ab100fb929"
   "3.3.0":
     url: "https://github.com/7bitcoder/7bitDI/archive/refs/tags/v3.3.0.tar.gz"
     sha256: "b9ddb2fc263c79cb414544e97d44dcc8cd1e1a91b38129d96b7051728a4583b9"

diff --git a/recipes/7bitdi/all/conanfile.py b/recipes/7bitdi/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.cmake import CMake, CMakeToolchain, CMakeDeps, cmake_layout
+from conan.tools.cmake import CMake, CMakeToolchain, cmake_layout
 from conan.tools.files import get, copy, rmdir
 from conan.tools.scm import Version
 import os

diff --git a/recipes/7bitdi/config.yml b/recipes/7bitdi/config.yml
@@ -1,4 +1,6 @@
 versions:
+  "3.4.0":
+    folder: all
   "3.3.0":
     folder: all
   "3.2.0":

diff --git a/recipes/abseil/all/conandata.yml b/recipes/abseil/all/conandata.yml
@@ -1,4 +1,7 @@
 sources:
+  "20240722.0":
+    url: "https://github.com/abseil/abseil-cpp/archive/20240722.0.tar.gz"
+    sha256: "f50e5ac311a81382da7fa75b97310e4b9006474f9560ac46f54a9967f07d4ae3"
   "20240116.2":
     url: "https://github.com/abseil/abseil-cpp/archive/20240116.2.tar.gz"
     sha256: "733726b8c3a6d39a4120d7e45ea8b41a434cdacde401cba500f14236c49b39dc"
@@ -18,6 +21,11 @@ sources:
     url: "https://github.com/abseil/abseil-cpp/archive/20211102.0.tar.gz"
     sha256: "dcf71b9cba8dc0ca9940c4b316a0c796be8fab42b070bb6b7cab62b48f0e66c4"
 patches:
+  "20240722.0":
+    - 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"
   "20240116.2":
     - patch_file: "patches/0003-absl-string-libm-20240116.patch"
       patch_description: "link libm to absl string"

diff --git a/recipes/abseil/all/conanfile.py b/recipes/abseil/all/conanfile.py
@@ -74,6 +74,11 @@ def validate(self):
             # upstream tries its best to export symbols, but it's broken for the moment
             raise ConanInvalidConfiguration(f"{self.ref} shared not availabe for Visual Studio, please use version 20230802.1 or newer")
 
+    def build_requirements(self):
+        # https://github.com/abseil/abseil-cpp/blob/20240722.0/CMakeLists.txt#L19
+        if Version(self.version) >= "20240722.0":
+            self.tool_requires("cmake/[>=3.16 <4]")
+
     def layout(self):
         cmake_layout(self, src_folder="src")
 

diff --git a/recipes/abseil/config.yml b/recipes/abseil/config.yml
@@ -1,4 +1,6 @@
 versions:
+  "20240722.0":
+    folder: all
   "20240116.2":
     folder: all
   "20240116.1":

diff --git a/recipes/ada/all/conandata.yml b/recipes/ada/all/conandata.yml
@@ -1,4 +1,10 @@
 sources:
+  "2.9.2":
+    url: "https://github.com/ada-url/ada/archive/v2.9.2.tar.gz"
+    sha256: "f41575ad7eec833afd9f6a0d6101ee7dc2f947fdf19ae8f1b54a71d59f4ba5ec"
+  "2.9.1":
+    url: "https://github.com/ada-url/ada/archive/v2.9.1.tar.gz"
+    sha256: "64eb3d91db941645d1b68ac8d1cbb7b534fbe446b66c1da11e384e17fca975e7"
   "2.9.0":
     url: "https://github.com/ada-url/ada/archive/v2.9.0.tar.gz"
     sha256: "8b992f0ce9134cb4eafb74b164d2ce2cb3af1900902162713b0e0c5ab0b6acd8"

diff --git a/recipes/ada/config.yml b/recipes/ada/config.yml
@@ -1,4 +1,8 @@
 versions:
+  "2.9.2":
+    folder: all
+  "2.9.1":
+    folder: all
   "2.9.0":
     folder: all
   "2.8.0":

diff --git a/recipes/amgcl/all/conandata.yml b/recipes/amgcl/all/conandata.yml
@@ -1,4 +1,7 @@
 sources:
+  "1.4.4":
+    url: "https://github.com/ddemidov/amgcl/archive/1.4.4.tar.gz"
+    sha256: "02fd5418e14d669422f65fc739ce72bf9516ced2d8942574d4b8caa05dda9d8c"
   "1.4.3":
     url: "https://github.com/ddemidov/amgcl/archive/1.4.3.tar.gz"
     sha256: "e920d5767814ce697d707d1f359a16c9b9eb79eba28fe19e14c18c2a505fe0ad"

diff --git a/recipes/amgcl/all/conanfile.py b/recipes/amgcl/all/conanfile.py
@@ -2,6 +2,7 @@
 from conan.tools.build import check_min_cppstd
 from conan.tools.files import copy, get
 from conan.tools.layout import basic_layout
+from conan.tools.scm import Version
 import os
 
 required_conan_version = ">=1.51.1"
@@ -20,12 +21,19 @@ class AmgclConan(ConanFile):
     package_type = "header-library"
     settings = "os", "arch", "compiler", "build_type"
     no_copy_source = True
+    options = { 'with_boost': [True, False] }
+    default_options = { 'with_boost': True }
+
+    def config_options(self):
+        if Version(self.version) < "1.4.4":
+            del self.options.with_boost
 
     def layout(self):
         basic_layout(self, src_folder="src")
 
     def requirements(self):
-        self.requires("boost/1.81.0")
+        if self.options.get_safe("with_boost"):
+            self.requires("boost/1.85.0")
 
     def package_id(self):
         self.info.clear()
@@ -37,9 +45,6 @@ def validate(self):
     def source(self):
         get(self, **self.conan_data["sources"][self.version], strip_root=True)
 
-    def build(self):
-        pass
-
     def package(self):
         copy(self, "LICENSE.md", src=self.source_folder, dst=os.path.join(self.package_folder, "licenses"))
         copy(self, "*", src=os.path.join(self.source_folder, "amgcl"),

diff --git a/recipes/amgcl/config.yml b/recipes/amgcl/config.yml
@@ -1,4 +1,6 @@
 versions:
+  "1.4.4":
+    folder: all
   "1.4.3":
     folder: all
   "1.4.2":

diff --git a/recipes/angelscript/all/conandata.yml b/recipes/angelscript/all/conandata.yml
@@ -1,4 +1,7 @@
 sources:
+  "2.37.0":
+    url: "https://www.angelcode.com/angelscript/sdk/files/angelscript_2.37.0.zip"
+    sha256: "0c52d1688016a0b2484e9ca549471c4e295df060770c57840144c64815f54f10"
   "2.36.1":
     url: "https://www.angelcode.com/angelscript/sdk/files/angelscript_2.36.1.zip"
     sha256: "58bb749af9c7e386304705f4e6e627ae41dfe03e0b6a73c3d0d2e017c4fc948f"