Merge branch 'master' of https://github.com/conan-io/conan-center-index…

… into meta_qt6

.c3i/authorized_users.yml

@@ -1290,3 +1290,6 @@ authorized_users:
 - cnicolaescu
 - mmomtchev
 - ChristianHeinigk
+- metalMajor
+- joergbrech
+- dagon666

.c3i/config_v1.yml

@@ -74,7 +74,7 @@ tasks:
   validate_infrastructure:
     macos_executors: 2
     windows_executors: 4
-    open_docs_pull-request: true
+    create_docs_pull-request: true
 
 # Profile configurations to build packages
 configurations:

.c3i/config_v2.yml

@@ -66,7 +66,7 @@ tasks:
   validate_infrastructure:
     macos_executors: 2
     windows_executors: 4
-    open_docs_pull-request: false
+    create_docs_pull-request: false
 
 configurations:
   - id: linux-gcc

.github/workflows/alert-community.yml

@@ -186,6 +186,11 @@ jobs:
           files: "recipes/gtest/*/*"
           reviewers: "@Hopobcn @jwillikers"
 
+      - uses: ./.github/actions/alert-community
+        with:
+          files: "recipes/imath/*/*"
+          reviewers: "@irieger"
+
       - uses: ./.github/actions/alert-community
         with:
           files: "recipes/imgui/*/*"
@@ -266,6 +271,11 @@ jobs:
           files: "recipes/libpng/*/*"
           reviewers: "@Hopobcn"
 
+      - uses: ./.github/actions/alert-community
+        with:
+          files: "recipes/libraw/*/*"
+          reviewers: "@irieger"
+
       - uses: ./.github/actions/alert-community
         with:
           files: "recipes/libsodium/*/*"
@@ -326,6 +336,16 @@ jobs:
           files: "recipes/openapi-generator/*/*"
           reviewers: "@MartinDelille"
 
+      - uses: ./.github/actions/alert-community
+        with:
+          files: "recipes/opencolorio/*/*"
+          reviewers: "@irieger"
+
+      - uses: ./.github/actions/alert-community
+        with:
+          files: "recipes/openexr/*/*"
+          reviewers: "@irieger"
+
       - uses: ./.github/actions/alert-community
         with:
           files: "recipes/opengl/*/*"
@@ -336,6 +356,11 @@ jobs:
           files: "recipes/opengl-registry/*/*"
           reviewers: "@MartinDelille"
 
+      - uses: ./.github/actions/alert-community
+        with:
+          files: "recipes/openimageio/*/*"
+          reviewers: "@irieger"
+
       - uses: ./.github/actions/alert-community
         with:
           files: "recipes/openssl/*/*"

docs/supported_platforms_and_configurations.md

@@ -61,8 +61,8 @@ For more information see [conan-io/conan-docker-tools](https://github.com/conan-
 - 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))
 - Compilers:
-  - GCC versions: 5, 7, 9, 10, 11
-  - Clang versions: 12, 13
+  - GCC versions: 5, 7, 9, 11
+  - Clang versions: 13
 - C++ Standard Library (`libcxx`):
   - GCC compiler: `libstdc++`, `libstdc++11`
   - Clang compiler: `libstdc++`, `libc++`
@@ -76,11 +76,11 @@ For more information see [conan-io/conan-docker-tools](https://github.com/conan-
 
 - Python: 3.7.12
 - CMake: 3.20.1
-- Compilers: Apple-clang versions 11.0.3, 12.0.5, 13.0.0
-- Macos SDK versions (for each apple-clang version respectively): 10.15, 11.3
-- Macos deployment target (`minos`): 10.15, 11.0, 11.3
+- Compilers: Apple-clang versions 13.0.0
+- Macos SDK versions (for each apple-clang version respectively): 11.3
+- Macos deployment target (`minos`): 11.0
 - C++ Standard Library (`libcxx`): `libc++`
-- Architectures: x86_64, armv8
+- Architectures: armv8
 - Build types: Release, Debug
 - Options:
   - Shared, Static (option ``"shared": [True, False]`` in the recipe when available)

recipes/7bitconf/all/conandata.yml

@@ -1,7 +1,15 @@
 sources:
+  "1.2.0":
+    url: "https://github.com/7bitCoder/7bitConf/archive/refs/tags/v1.2.0.tar.gz"
+    sha256: "c2cc19618dc6616e463dbd7cc72da1fdd5b6df1b4f5d4bf8317455658ac63f0e"
   "1.1.0":
     url: "https://github.com/7bitCoder/7bitConf/archive/refs/tags/v1.1.0.tar.gz"
     sha256: "07e5bff366d66c276032021c9a9ca5cdb1d8f097b29c032d07ee6ae1a10885a2"
   "1.0.0":
     url: "https://github.com/7bitCoder/7bitConf/archive/refs/tags/v1.0.0.tar.gz"
     sha256: "48a02d331f4281c8ff691d55c54abe744228637e9ad3af500daf526f4c77696d"
+patches:
+  "1.2.0":
+    - patch_file: "patches/1.2.0-0001-fix-package-name.patch"
+      patch_description: "fix taocpp-json's package name"
+      patch_type: "conan"

recipes/7bitconf/all/conanfile.py

@@ -2,7 +2,7 @@
 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.files import get, copy, rmdir
+from conan.tools.files import get, copy, rmdir, apply_conandata_patches, copy, export_conandata_patches
 from conan.tools.scm import Version
 import os
 
@@ -43,6 +43,9 @@ def _minimum_compilers_version(self):
             "apple-clang": "10",
         }
 
+    def export_sources(self):
+        export_conandata_patches(self)
+
     def config_options(self):
         if self.settings.os == "Windows":
             self.options.rm_safe("fPIC")
@@ -80,6 +83,7 @@ def source(self):
         get(self, **self.conan_data["sources"][self.version], strip_root=True)
 
     def generate(self):
+        apply_conandata_patches(self)
         if not self.options.header_only:
             tc = CMakeToolchain(self)
             tc.variables["_7BIT_CONF_BUILD_EXAMPLES"] = False

recipes/7bitconf/all/patches/1.2.0-0001-fix-package-name.patch

@@ -0,0 +1,16 @@
+diff --git a/Source/CMakeLists.txt b/Source/CMakeLists.txt
+index 6cdab6c..04c9c4f 100644
+--- a/Source/CMakeLists.txt
++++ b/Source/CMakeLists.txt
+@@ -27,9 +27,9 @@ elseif (_7BIT_CONF_HEADER_ONLY_LIB)
+ endif ()
+
+ if (_7BIT_CONF_HEADER_ONLY_LIB)
+-    target_link_libraries(7bitConf INTERFACE taocpp-json)
++    target_link_libraries(7bitConf INTERFACE taocpp::json)
+ else ()
+-    target_link_libraries(7bitConf taocpp-json)
++    target_link_libraries(7bitConf taocpp::json)
+ endif ()
+
+ add_library(7bitConf::7bitConf ALIAS 7bitConf)

recipes/7bitconf/config.yml

@@ -1,4 +1,6 @@
 versions:
+  "1.2.0":
+    folder: all
   "1.1.0":
     folder: all
   "1.0.0":

recipes/asio-grpc/all/conanfile.py

@@ -56,13 +56,13 @@ def configure(self):
             raise ConanInvalidConfiguration(f"{self.name} 'recycling_allocator' cannot be used in combination with the 'unifex' backend.")
 
     def requirements(self):
-        self.requires("grpc/1.54.3")
+        self.requires("grpc/1.54.3", transitive_libs=True)
         if self._local_allocator_option == "boost_container" or self.options.backend == "boost":
-            self.requires("boost/1.83.0")
+            self.requires("boost/1.83.0", transitive_headers=True)
         if self.options.backend == "asio":
-            self.requires("asio/1.28.2")
+            self.requires("asio/1.29.0", transitive_headers=True)
         if self.options.backend == "unifex":
-            self.requires("libunifex/cci.20220430")
+            self.requires("libunifex/0.4.0")
 
     def package_id(self):
         self.info.clear()

recipes/aws-c-s3/all/conandata.yml

@@ -1,4 +1,10 @@
 sources:
+  "0.4.5":
+    url: "https://github.com/awslabs/aws-c-s3/archive/v0.4.5.tar.gz"
+    sha256: "c9b588f5761ae6754dab2b51124784be78887f054856f02e44b6e51c25873055"
+  "0.3.24":
+    url: "https://github.com/awslabs/aws-c-s3/archive/v0.3.24.tar.gz"
+    sha256: "09803db4af98bba0af263434e2de432cdccdb3ab709411abba8e05d34840f815"
   "0.1.49":
     url: "https://github.com/awslabs/aws-c-s3/archive/v0.1.49.tar.gz"
     sha256: "71acbba41a02477a6c352172da561bc2138bf239b936490c773d7aaa83afc9ab"

recipes/aws-c-s3/all/conanfile.py

@@ -40,17 +40,27 @@ def layout(self):
         cmake_layout(self, src_folder="src")
 
     def requirements(self):
-        self.requires("aws-c-common/0.8.2", transitive_headers=True, transitive_libs=True)
-        self.requires("aws-c-cal/0.5.13")
+        if Version(self.version) < "0.3.24":
+            self.requires("aws-c-common/0.8.2", transitive_headers=True, transitive_libs=True)
+            self.requires("aws-c-cal/0.5.13")
+        else:
+            self.requires("aws-c-common/0.9.6", transitive_headers=True, transitive_libs=True)
+            self.requires("aws-c-cal/0.6.9")
         if Version(self.version) < "0.1.49":
             self.requires("aws-c-auth/0.6.11", transitive_headers=True)
             self.requires("aws-c-http/0.6.13")
             self.requires("aws-c-io/0.10.20", transitive_headers=True)
-        else:
+        elif Version(self.version) < "0.3.24":
             self.requires("aws-c-auth/0.6.17", transitive_headers=True)
             self.requires("aws-c-http/0.6.22")
             self.requires("aws-c-io/0.13.4", transitive_headers=True)
-        if Version(self.version) >= "0.1.36":
+        else:
+            self.requires("aws-c-auth/0.7.8", transitive_headers=True)
+            self.requires("aws-c-http/0.7.14")
+            self.requires("aws-c-io/0.13.35", transitive_headers=True)
+        if Version(self.version) >= "0.3.24":
+            self.requires("aws-checksums/0.1.17")
+        elif Version(self.version) >= "0.1.36":
             self.requires("aws-checksums/0.1.13")
 
     def source(self):

recipes/aws-c-s3/config.yml

@@ -1,4 +1,8 @@
 versions:
+  "0.4.5":
+    folder: all
+  "0.3.24":
+    folder: all
   "0.1.49":
     folder: all
   "0.1.37":

recipes/aws-crt-cpp/all/conandata.yml

@@ -1,7 +1,7 @@
 sources:
-  "0.18.8":
-    url: "https://github.com/awslabs/aws-crt-cpp/archive/v0.18.8.tar.gz"
-    sha256: "70ea622cf8c1a7028b24078e909ee5898990444436584178f58d61b50b5b197d"
+  "0.24.1":
+    url: "https://github.com/awslabs/aws-crt-cpp/archive/v0.24.1.tar.gz"
+    sha256: "c627fbc76fc31332801e29872203a11ce0234b7c17e75811277aa913f1550d6f"
   "0.17.23":
     url: "https://github.com/awslabs/aws-crt-cpp/archive/v0.17.23.tar.gz"
     sha256: "28061c3efa493519cfae46e4ea96389f03a81eeec7613d7da861dd8c5f4f6598"
@@ -12,10 +12,13 @@ sources:
     url: "https://github.com/awslabs/aws-crt-cpp/archive/v0.14.3.tar.gz"
     sha256: "3ea16c43e691bab0c373ba1ad072f6535390c516ebda658dfaf4d074d920e0fb"
 patches:
-  "0.18.8":
-    - patch_file: "patches/0.17.23-fix-cast-error.patch"
+  "0.24.1":
+    - patch_file: "patches/0.24.1-fix-cast-error.patch"
       patch_description: "fix const cast error"
       patch_type: "portability"
+    - patch_file: "patches/0.24.1-disable-sanitizers.patch"
+      patch_description: "disable sanitizers"
+      patch_type: "conan"
   "0.17.23":
     - patch_file: "patches/0.17.23-fix-cast-error.patch"
       patch_description: "fix const cast error"

recipes/aws-crt-cpp/all/conanfile.py

@@ -1,6 +1,7 @@
 from conan import ConanFile
 from conan.tools.files import apply_conandata_patches, export_conandata_patches, get, copy, rmdir, save
 from conan.tools.build import check_min_cppstd
+from conan.tools.microsoft import is_msvc, is_msvc_static_runtime
 from conan.tools.scm import Version
 from conan.tools.cmake import CMake, CMakeDeps, CMakeToolchain, cmake_layout
 
@@ -47,9 +48,14 @@ def layout(self):
         cmake_layout(self, src_folder="src")
 
     def requirements(self):
-        self.requires("aws-c-cal/0.5.13", transitive_headers=True)
-        self.requires("aws-c-common/0.8.2", transitive_headers=True)
-        self.requires("aws-checksums/0.1.13")
+        if Version(self.version) < "0.24.1":
+            self.requires("aws-c-cal/0.5.13", transitive_headers=True)
+            self.requires("aws-c-common/0.8.2", transitive_headers=True)
+            self.requires("aws-checksums/0.1.13")
+        else:
+            self.requires("aws-c-cal/0.6.9", transitive_headers=True)
+            self.requires("aws-c-common/0.9.6", transitive_headers=True)
+            self.requires("aws-checksums/0.1.17")
         if Version(self.version) < "0.17.29":
             self.requires("aws-c-auth/0.6.11", transitive_headers=True)
             self.requires("aws-c-event-stream/0.2.7")
@@ -58,12 +64,13 @@ def requirements(self):
             self.requires("aws-c-mqtt/0.7.10", transitive_headers=True)
             self.requires("aws-c-s3/0.1.37")
         else:
-            self.requires("aws-c-auth/0.6.17", transitive_headers=True)
-            self.requires("aws-c-event-stream/0.2.15")
-            self.requires("aws-c-http/0.6.22", transitive_headers=True)
-            self.requires("aws-c-io/0.13.4", transitive_headers=True)
-            self.requires("aws-c-mqtt/0.7.12", transitive_headers=True)
-            self.requires("aws-c-s3/0.1.49")
+            self.requires("aws-c-auth/0.7.8", transitive_headers=True)
+            self.requires("aws-c-event-stream/0.3.1")
+            self.requires("aws-c-http/0.7.14", transitive_headers=True)
+            self.requires("aws-c-io/0.13.35", transitive_headers=True)
+            self.requires("aws-c-mqtt/0.9.10", transitive_headers=True)
+            self.requires("aws-c-s3/0.3.24")
+            self.requires("aws-c-sdkutils/0.1.12")
 
     def validate(self):
         if self.settings.compiler.get_safe("cppstd"):
@@ -74,8 +81,10 @@ def source(self):
 
     def generate(self):
         tc = CMakeToolchain(self)
+        if is_msvc(self):
+            tc.variables["AWS_STATIC_MSVC_RUNTIME_LIBRARY"] = is_msvc_static_runtime(self)
         tc.variables["BUILD_TESTING"] = False
-        tc.variables["BUILD_DEPS"] = False
+        tc.cache_variables["BUILD_DEPS"] = False
         tc.generate()
 
         deps = CMakeDeps(self)

recipes/aws-crt-cpp/all/patches/0.24.1-disable-sanitizers.patch

@@ -0,0 +1,11 @@
+--- CMakeLists.txt.orig	2024-02-23 17:49:55
++++ CMakeLists.txt	2024-02-23 17:50:20
+@@ -314,7 +314,7 @@
+ aws_use_package(aws-c-event-stream)
+ aws_use_package(aws-c-s3)
+
+-aws_add_sanitizers(${PROJECT_NAME})
++#aws_add_sanitizers(${PROJECT_NAME})
+
+ target_link_libraries(${PROJECT_NAME} PUBLIC ${DEP_AWS_LIBS})
+

recipes/aws-crt-cpp/all/patches/0.24.1-fix-cast-error.patch

@@ -0,0 +1,13 @@
+diff --git a/source/io/TlsOptions.cpp b/source/io/TlsOptions.cpp
+index 6077912..74a55c9 100644
+--- a/source/io/TlsOptions.cpp
++++ b/source/io/TlsOptions.cpp
+@@ -219,7 +219,7 @@ namespace Aws
+
+                 if (m_slotId)
+                 {
+-                    options.slot_id = &(*m_slotId);
++                    options.slot_id = const_cast<uint64_t*>(&(*m_slotId));
+                 }
+
+                 if (m_userPin)

recipes/aws-crt-cpp/config.yml

@@ -1,5 +1,5 @@
 versions:
-  "0.18.8":
+  "0.24.1":
     folder: all
   "0.17.23":
     folder: all

recipes/botan/all/conandata.yml

@@ -29,6 +29,9 @@ sources:
   "3.2.0":
     url: "https://github.com/randombit/botan/archive/3.2.0.tar.gz"
     sha256: "95af4935d56973000bb6ff20bb54ae56083f8764d5a2c89826cac26ac6127330"
+  "3.3.0":
+    url: "https://github.com/randombit/botan/archive/3.3.0.tar.gz"
+    sha256: "57fefda7b9ab6f8409329620cdaf26d2d7e962b6a10eb321d331e9ecb796f804"
 patches:
   "2.18.2":
     - patch_file: "patches/fix-amalgamation-build.patch"