Merge branch 'master' into migrate/ncurses

conan-io · Nov 16, 2023 · deade1c · deade1c
2 parents fdda017 + b0fcb6f
commit deade1c
Show file tree

Hide file tree

Showing 355 changed files with 4,118 additions and 1,938 deletions.
diff --git a/.c3i/authorized_users.yml b/.c3i/authorized_users.yml
@@ -1261,3 +1261,5 @@ authorized_users:
 - Kischy
 - MangaD
 - fabiorossetto
+- Bronek
+- agdavydov81
diff --git a/.c3i/conan_v2_ready_references.yml b/.c3i/conan_v2_ready_references.yml
@@ -268,6 +268,7 @@ required_for_references:
 - detools
 - di
 - dice-template-library
+- dime
 - directx-headers
 - dirent
 - discount
@@ -313,9 +314,11 @@ required_for_references:
 - embree3
 - emio
 - emsdk
+- enchant
 - enet
 - enhex-generic_serialization
 - enhex-strong_type
+- enjincppsdk
 - enkits
 - ensmallen
 - entityx
@@ -424,6 +427,7 @@ required_for_references:
 - glshaderpp
 - glslang
 - glu
+- gm2calc
 - gmp
 - gnu-config
 - gnutls
@@ -445,6 +449,7 @@ required_for_references:
 - gtk
 - gtk-doc-stub
 - gtsam
+- guetzli
 - gumbo-parser
 - gurkenlaeufer
 - gzip-hpp
@@ -477,7 +482,9 @@ required_for_references:
 - hwdata
 - hwloc
 - hyperscan
+- i2c-tools
 - icecream-cpp
+- iceoryx
 - iconfontcppheaders
 - icu
 - id3v2lib
@@ -543,6 +550,7 @@ required_for_references:
 - kmod
 - ktx
 - kuba-zip
+- lager
 - laszip
 - lazycsv
 - lcms
@@ -574,10 +582,13 @@ required_for_references:
 - libcbor
 - libccd
 - libcds
+- libcheck
+- libcoap
 - libconfig
 - libconfuse
 - libcoro
 - libcorrect
+- libcpuid
 - libcuckoo
 - libcurl
 - libdaemon
@@ -665,6 +676,7 @@ required_for_references:
 - libpng
 - libpq
 - libpqxx
+- libproperties
 - libpsl
 - libqrencode
 - librasterlite
@@ -688,6 +700,7 @@ required_for_references:
 - libsmacker
 - libsndfile
 - libsodium
+- libsolace
 - libspatialindex
 - libspatialite
 - libspng
@@ -708,6 +721,7 @@ required_for_references:
 - libunistring
 - libunwind
 - libusb
+- libusb-compat
 - libuuid
 - libuv
 - libuvc
@@ -914,6 +928,7 @@ required_for_references:
 - opencore-amr
 - opencv
 - openddl-parser
+- opene57
 - openexr
 - openfbx
 - openfst
@@ -1054,6 +1069,7 @@ required_for_references:
 - rapidyaml
 - raylib
 - re2
+- re2c
 - reactiveplusplus
 - read-excel
 - readerwriterqueue
@@ -1093,6 +1109,7 @@ required_for_references:
 - samurai
 - sbepp
 - sbp
+- scdoc
 - scip
 - scippp
 - scnlib
@@ -1153,10 +1170,12 @@ required_for_references:
 - spirv-tools
 - spscqueue
 - spy
+- sqlcipher
 - sqlite3
 - sqlite_orm
 - sqlitecpp
 - sqlpp11
+- sqlpp11-connector-sqlite3
 - squirrel
 - ssht
 - ssp
@@ -1200,6 +1219,7 @@ required_for_references:
 - tcl
 - tclap
 - tcp-wrappers
+- tcsbank-uconfig
 - tcsbank-uri-template
 - tensorflow-lite
 - tensorpipe
@@ -1265,6 +1285,7 @@ required_for_references:
 - turtle
 - tweetnacl
 - twitch-native-ipc
+- twitchtv-libsoundtrackutil
 - type_safe
 - tz
 - ua-nodeset
@@ -1286,6 +1307,7 @@ required_for_references:
 - utf8.h
 - utf8proc
 - utfcpp
+- uthash
 - util-linux-libuuid
 - uvw
 - uwebsockets
@@ -1299,6 +1321,7 @@ required_for_references:
 - vectorclass
 - vectorial
 - veque
+- very-simple-smtps
 - vincentlaucsb-csv-parser
 - vir-simd
 - visit_struct
@@ -1315,6 +1338,7 @@ required_for_references:
 - vulkan-validationlayers
 - vvenc
 - wasm-micro-runtime
+- wasmedge
 - wasmer
 - wasmtime
 - wasmtime-cpp
@@ -1370,6 +1394,7 @@ required_for_references:
 - yaclib
 - yajl
 - yaml-cpp
+- yandex-ozo
 - yas
 - yasm
 - yder

diff --git a/linter/check_package_name.py b/linter/check_package_name.py
@@ -32,7 +32,7 @@ class PackageName(BaseChecker):
 
     def visit_classdef(self, node: nodes) -> None:
         filename = Path(node.root().file)
-        is_test = filename.match('test_package/*.py') or filename.match('test_v1_package/*.py')
+        is_test = filename.match('test_*/*.py')
 
         if node.basenames == ['ConanFile']:
             for attr in node.body:

diff --git a/recipes/abseil/all/conandata.yml b/recipes/abseil/all/conandata.yml
@@ -29,6 +29,10 @@ patches:
       patch_description: "link libm to absl string"
       patch_type: "portability"
       patch_source: "https://github.com/abseil/abseil-cpp/issues/1100"
+    - patch_file: "patches/20230802.1-0001-fix-mingw.patch"
+      patch_description: "Fix build with MinGW"
+      patch_type: "portability"
+      patch_source: "https://github.com/abseil/abseil-cpp/commit/2f77684e8dc473a48dbc19167ffe69c40ce8ada4"
   "20230125.3":
     - patch_file: "patches/0003-absl-string-libm.patch"
       patch_description: "link libm to absl string"

diff --git a/recipes/abseil/all/patches/20230802.1-0001-fix-mingw.patch b/recipes/abseil/all/patches/20230802.1-0001-fix-mingw.patch
@@ -0,0 +1,40 @@
+--- a/absl/synchronization/internal/pthread_waiter.h
++++ b/absl/synchronization/internal/pthread_waiter.h
+@@ -16,7 +16,7 @@
+ #ifndef ABSL_SYNCHRONIZATION_INTERNAL_PTHREAD_WAITER_H_
+ #define ABSL_SYNCHRONIZATION_INTERNAL_PTHREAD_WAITER_H_
+
+-#ifndef _WIN32
++#if !defined(_WIN32) && !defined(__MINGW32__)
+ #include <pthread.h>
+
+ #include "absl/base/config.h"
+@@ -55,6 +55,6 @@ class PthreadWaiter : public WaiterCrtp<PthreadWaiter> {
+ ABSL_NAMESPACE_END
+ }  // namespace absl
+
+-#endif  // ndef _WIN32
++#endif  // !defined(_WIN32) && !defined(__MINGW32__)
+
+ #endif  // ABSL_SYNCHRONIZATION_INTERNAL_PTHREAD_WAITER_H_
+--- a/absl/synchronization/internal/win32_waiter.h
++++ b/absl/synchronization/internal/win32_waiter.h
+@@ -20,7 +20,8 @@
+ #include <sdkddkver.h>
+ #endif
+
+-#if defined(_WIN32) && _WIN32_WINNT >= _WIN32_WINNT_VISTA
++#if defined(_WIN32) && !defined(__MINGW32__) && \
++    _WIN32_WINNT >= _WIN32_WINNT_VISTA
+
+ #include "absl/base/config.h"
+ #include "absl/synchronization/internal/kernel_timeout.h"
+@@ -65,6 +66,7 @@ class Win32Waiter : public WaiterCrtp<Win32Waiter> {
+ ABSL_NAMESPACE_END
+ }  // namespace absl
+
+-#endif  // defined(_WIN32) && _WIN32_WINNT >= _WIN32_WINNT_VISTA
++#endif  // defined(_WIN32) && !defined(__MINGW32__) &&
++        // _WIN32_WINNT >= _WIN32_WINNT_VISTA
+
+ #endif  // ABSL_SYNCHRONIZATION_INTERNAL_WIN32_WAITER_H_
diff --git a/recipes/alembic/all/conandata.yml b/recipes/alembic/all/conandata.yml
@@ -1,19 +1,30 @@
 sources:
+  "1.8.6":
+    url: "https://github.com/alembic/alembic/archive/refs/tags/1.8.6.tar.gz"
+    sha256: "c572ebdea3a5f0ce13774dd1fceb5b5815265cd1b29d142cf8c144b03c131c8c"
   "1.8.5":
-    url: "https://github.com/alembic/alembic/archive/1.8.5.tar.gz"
+    url: "https://github.com/alembic/alembic/archive/refs/tags/1.8.5.tar.gz"
     sha256: "180a12f08d391cd89f021f279dbe3b5423b1db751a9898540c8059a45825c2e9"
   "1.8.3":
-    url: "https://github.com/alembic/alembic/archive/1.8.3.tar.gz"
+    url: "https://github.com/alembic/alembic/archive/refs/tags/1.8.3.tar.gz"
     sha256: "b0bc74833bff118a869e81e6acb810a58797e77ef63143954b2f8e817c7f65cb"
   "1.8.2":
     url: "https://github.com/alembic/alembic/archive/refs/tags/1.8.2.tar.gz"
     sha256: "3f1c466ee1600578689b32b1f2587066d3259704ec7ed1fcf80c324d01274f48"
 patches:
+  "1.8.6":
+    - patch_file: "patches/1.8.5-0001-fix-cmake.patch"
+      patch_description: "CMake: fix install layout, don't link directly to zlib if hdf5, relocatable shared lib for macOS"
+      patch_type: "conan"
   "1.8.5":
     - patch_file: "patches/1.8.5-0001-fix-cmake.patch"
-      patch_description: "Disable a line in a CMakeLists.txt to build with shared=True"
-      patch_type: "portability"
+      patch_description: "CMake: fix install layout, don't link directly to zlib if hdf5, relocatable shared lib for macOS"
+      patch_type: "conan"
   "1.8.3":
     - patch_file: "patches/1.8.2-0001-fix-cmake.patch"
+      patch_description: "CMake: fix install layout, don't link directly to zlib if hdf5, relocatable shared lib for macOS"
+      patch_type: "conan"
   "1.8.2":
     - patch_file: "patches/1.8.2-0001-fix-cmake.patch"
+      patch_description: "CMake: fix install layout, don't link directly to zlib if hdf5, relocatable shared lib for macOS"
+      patch_type: "conan"
diff --git a/recipes/alembic/all/conanfile.py b/recipes/alembic/all/conanfile.py
@@ -46,7 +46,7 @@ def layout(self):
     def requirements(self):
         self.requires("imath/3.1.9", transitive_headers=True)
         if self.options.with_hdf5:
-            self.requires("hdf5/1.14.1")
+            self.requires("hdf5/1.14.2")
 
     def validate(self):
         if self.settings.compiler.get_safe("cppstd"):

diff --git a/recipes/alembic/config.yml b/recipes/alembic/config.yml
@@ -1,4 +1,6 @@
 versions:
+  "1.8.6":
+    folder: all
   "1.8.5":
     folder: all
   "1.8.3":

diff --git a/recipes/argparse/all/conandata.yml b/recipes/argparse/all/conandata.yml
@@ -1,4 +1,7 @@
 sources:
+  "3.0":
+    url: "https://github.com/p-ranav/argparse/archive/v3.0.tar.gz"
+    sha256: "ba7b465759bb01069d57302855eaf4d1f7d677f21ad7b0b00b92939645c30f47"
   "2.9":
     url: "https://github.com/p-ranav/argparse/archive/v2.9.tar.gz"
     sha256: "cd563293580b9dc592254df35b49cf8a19b4870ff5f611c7584cf967d9e6031e"

diff --git a/recipes/argparse/config.yml b/recipes/argparse/config.yml
@@ -1,4 +1,6 @@
 versions:
+  "3.0":
+    folder: all
   "2.9":
     folder: all
   "2.6":

diff --git a/recipes/arrow/all/conandata.yml b/recipes/arrow/all/conandata.yml
@@ -1,4 +1,7 @@
 sources:
+  "14.0.1":
+    url: "https://www.apache.org/dyn/closer.lua/arrow/arrow-14.0.1/apache-arrow-14.0.1.tar.gz?action=download"
+    sha256: "5c70eafb1011f9d124bafb328afe54f62cc5b9280b7080e1e3d668f78c0e407e"
   "14.0.0":
     url: "https://www.apache.org/dyn/closer.lua/arrow/arrow-14.0.0/apache-arrow-14.0.0.tar.gz?action=download"
     sha256: "4eb0da50ec071baf15fc163cb48058931e006f1c862c8def0e180fd07d531021"

diff --git a/recipes/arrow/config.yml b/recipes/arrow/config.yml
@@ -1,4 +1,6 @@
 versions:
+  "14.0.1":
+    folder: all
   "14.0.0":
     folder: all
   "13.0.0":

diff --git a/recipes/avahi/all/conanfile.py b/recipes/avahi/all/conanfile.py
@@ -42,10 +42,10 @@ def layout(self):
         basic_layout(self, src_folder="src")
 
     def requirements(self):
-        self.requires("glib/2.77.1")
+        self.requires("glib/2.78.1")
         self.requires("expat/2.5.0")
         self.requires("libdaemon/0.14")
-        self.requires("dbus/1.15.6")
+        self.requires("dbus/1.15.8")
         self.requires("gdbm/1.23")
         self.requires("libevent/2.1.12")
 
@@ -56,7 +56,7 @@ def validate(self):
     def build_requirements(self):
         self.tool_requires("glib/<host_version>")
         if not self.conf.get("tools.gnu:pkg_config", default=False, check_type=str):
-            self.tool_requires("pkgconf/1.9.5")
+            self.tool_requires("pkgconf/2.0.3")
 
     def source(self):
         get(self, **self.conan_data["sources"][self.version], strip_root=True)

diff --git a/recipes/aws-c-cal/all/conandata.yml b/recipes/aws-c-cal/all/conandata.yml
@@ -20,9 +20,6 @@ sources:
   "0.5.12":
     url: "https://github.com/awslabs/aws-c-cal/archive/v0.5.12.tar.gz"
     sha256: "350c29a288d5d498bd6574fca659cffc9453bf62691fbde5788399716c2bd132"
-  "0.5.11":
-    url: "https://github.com/awslabs/aws-c-cal/archive/v0.5.11.tar.gz"
-    sha256: "ef46e121b2231a0b19afce8af4b32d77501df4d470e926990918456636cd83c0"
 patches:
   "0.6.9":
     - patch_file: "patches/0002-apple-corefoundation-0.6.9.patch"
@@ -60,9 +57,3 @@ patches:
       patch_description: "Link to CoreFoundation on Apple"
       patch_type: "backport"
       patch_source: "https://github.com/awslabs/aws-c-cal/pull/126"
-  "0.5.11":
-    - patch_file: "patches/0001-use-openssl-cmake-imported-target.patch"
-    - patch_file: "patches/0002-apple-corefoundation-0.5.11.patch"
-      patch_description: "Link to CoreFoundation on Apple"
-      patch_type: "backport"
-      patch_source: "https://github.com/awslabs/aws-c-cal/pull/126"
diff --git a/recipes/aws-c-cal/all/conanfile.py b/recipes/aws-c-cal/all/conanfile.py
@@ -48,12 +48,7 @@ def layout(self):
         cmake_layout(self, src_folder="src")
 
     def requirements(self):
-        if Version(self.version) <= "0.5.11":
-            # transitive_libs probably not strictly required, but it's impossible to write a robust test package
-            # without it for conan v2 (we would have to required aws-c-common in test package, but we can't know
-            # which version to require in test package)
-            self.requires("aws-c-common/0.6.11", transitive_headers=True, transitive_libs=True)
-        elif Version(self.version) <= "0.5.20":
+        if Version(self.version) <= "0.5.20":
             self.requires("aws-c-common/0.8.2", transitive_headers=True, transitive_libs=True)
         else:
             self.requires("aws-c-common/0.9.6", transitive_headers=True, transitive_libs=True)

diff --git a/recipes/aws-c-cal/config.yml b/recipes/aws-c-cal/config.yml
@@ -13,5 +13,3 @@ versions:
     folder: all
   "0.5.12":
     folder: all
-  "0.5.11":
-    folder: all
diff --git a/recipes/aws-c-io/all/conandata.yml b/recipes/aws-c-io/all/conandata.yml
@@ -17,9 +17,3 @@ sources:
   "0.10.13":
     url: "https://github.com/awslabs/aws-c-io/archive/v0.10.13.tar.gz"
     sha256: "ee34a93190e35a5c372ba73661dd69c48986e051a4b26dedb62bc5aa78f1660f"
-  "0.10.9":
-    url: "https://github.com/awslabs/aws-c-io/archive/v0.10.9.tar.gz"
-    sha256: "c64464152abe8b7e23f10bc026ed54a15eaf0ec0aae625d28e2caf4489090327"
-  "0.10.5":
-    url: "https://github.com/awslabs/aws-c-io/archive/v0.10.5.tar.gz"
-    sha256: "59abd4606661790cc0b777807938f3134cce77c03383015781498cfbfd191811"