Merge branch 'conan-io:master' into meshoptimizer

conan-io · Dec 31, 2023 · c7ad337 · c7ad337
2 parents 9fca3ab + 325457d
commit c7ad337
Show file tree

Hide file tree

Showing 83 changed files with 387 additions and 50 deletions.
diff --git a/.c3i/authorized_users.yml b/.c3i/authorized_users.yml
@@ -1256,3 +1256,9 @@ authorized_users:
 - piliugin-anton
 - Drllap
 - i-curve
+- Mi-La
+- gureedo
+- cbaecker
+- ErixenCruz
+- OrianeGourdyStilla
+- nikitasinys
diff --git a/recipes/aravis/all/conanfile.py b/recipes/aravis/all/conanfile.py
@@ -73,7 +73,7 @@ def layout(self):
     def requirements(self):
         # glib-object.h and gio/gio.h are used in several public headers
         self.requires("glib/2.78.1", transitive_headers=True)
-        self.requires("libxml2/2.12.2")
+        self.requires("libxml2/2.12.3")
         self.requires("zlib/[>=1.2.11 <2]")
 
         if self.options.usb:
@@ -104,7 +104,7 @@ def validate(self):
 
     def build_requirements(self):
         #windows build: meson/1.2.1 works, meson/1.2.2 breaks for some reason!
-        self.tool_requires("meson/1.3.0")
+        self.tool_requires("meson/1.3.1")
         self.tool_requires("glib/<host_version>")
         if not self.conf.get("tools.gnu:pkg_config", check_type=str):
             self.tool_requires("pkgconf/2.1.0")

diff --git a/recipes/autoconf-archive/all/conandata.yml b/recipes/autoconf-archive/all/conandata.yml
@@ -1,7 +1,10 @@
 sources:
-  "2021.02.19":
-    url: "https://ftpmirror.gnu.org/autoconf-archive/autoconf-archive-2021.02.19.tar.xz"
-    sha256: "e8a6eb9d28ddcba8ffef3fa211653239e9bf239aba6a01a6b7cfc7ceaec69cbd"
+  "2023.02.20":
+    url: "https://ftpmirror.gnu.org/autoconf-archive/autoconf-archive-2023.02.20.tar.xz"
+    sha256: "71d4048479ae28f1f5794619c3d72df9c01df49b1c628ef85fde37596dc31a33"
   "2022.09.03":
     url: "https://ftpmirror.gnu.org/autoconf-archive/autoconf-archive-2022.09.03.tar.xz"
     sha256: "e07454f00d8cae7907bed42d0747798927809947684d94c37207a4d63a32f423"
+  "2021.02.19":
+    url: "https://ftpmirror.gnu.org/autoconf-archive/autoconf-archive-2021.02.19.tar.xz"
+    sha256: "e8a6eb9d28ddcba8ffef3fa211653239e9bf239aba6a01a6b7cfc7ceaec69cbd"
diff --git a/recipes/autoconf-archive/config.yml b/recipes/autoconf-archive/config.yml
@@ -1,5 +1,7 @@
 versions:
-  "2021.02.19":
+  "2023.02.20":
     folder: all
   "2022.09.03":
     folder: all
+  "2021.02.19":
+    folder: all
diff --git a/recipes/boost-ext-ut/all/conandata.yml b/recipes/boost-ext-ut/all/conandata.yml
@@ -1,4 +1,7 @@
 sources:
+  "2.0.1":
+    url: "https://github.com/boost-ext/ut/archive/v2.0.1.tar.gz"
+    sha256: "1e43be17045a881c95cedc843d72fe9c1e53239b02ed179c1e39e041ebcd7dad"
   "2.0.0":
     url: "https://github.com/boost-ext/ut/archive/v2.0.0.tar.gz"
     sha256: "8b5b11197d1308dfc1fe20efd6a656e0c833dbec2807e2292967f6e2f7c0420f"

diff --git a/recipes/boost-ext-ut/config.yml b/recipes/boost-ext-ut/config.yml
@@ -1,7 +1,9 @@
 versions:
-  "2.0.0":
+  "2.0.1":
     folder: "all"
-  "1.1.8":
+  "2.0.0":
     folder: "all"
   "1.1.9":
     folder: "all"
+  "1.1.8":
+    folder: "all"
diff --git a/recipes/capstone/all/conandata.yml b/recipes/capstone/all/conandata.yml
@@ -1,11 +1,18 @@
 sources:
+  "5.0.1":
+    url: "https://github.com/capstone-engine/capstone/archive/refs/tags/5.0.1.tar.gz"
+    sha256: "2b9c66915923fdc42e0e32e2a9d7d83d3534a45bb235e163a70047951890c01a"
   "5.0":
     url: "https://github.com/capstone-engine/capstone/archive/refs/tags/5.0.tar.gz"
     sha256: "df24344407baa7415eeb006f742afc9b92cd33abf2c4c120a6e97cfb376882dc"
   "4.0.2":
     url: "https://github.com/capstone-engine/capstone/archive/refs/tags/4.0.2.tar.gz"
     sha256: "7c81d798022f81e7507f1a60d6817f63aa76e489aa4e7055255f21a22f5e526a"
 patches:
+  "5.0.1":
+    - patch_file: "patches/5.0-0001-disable-warning-flags.patch"
+      patch_description: "disable warning flags for older compilers"
+      patch_type: "portability"
   "5.0":
     - patch_file: "patches/5.0-0001-disable-warning-flags.patch"
       patch_description: "disable warning flags for older compilers"

diff --git a/recipes/capstone/config.yml b/recipes/capstone/config.yml
@@ -1,4 +1,6 @@
 versions:
+  "5.0.1":
+    folder: "all"
   "5.0":
     folder: "all"
   "4.0.2":

diff --git a/recipes/cista/all/conandata.yml b/recipes/cista/all/conandata.yml
@@ -1,4 +1,9 @@
 sources:
+  "0.14":
+    - url: "https://github.com/felixguendling/cista/releases/download/v0.14/cista.h"
+      sha256: "078933804966439ae105a6a748aa027a2f197351d735712b1efca0453340562d"
+    - url: "https://raw.githubusercontent.com/felixguendling/cista/v0.14/LICENSE"
+      sha256: "fcd47e35fd6dc22feec454c5c1e572ccb7587dedd91d824528ebbb00a7f37c56"
   "0.11":
     - url: "https://github.com/felixguendling/cista/releases/download/v0.11/cista.h"
       sha256: "e2e37fa1f7278e7f1a8dab7d84b6b00f5a0a4fb48f42fbe5761b7ddd0d07314c"

diff --git a/recipes/cista/config.yml b/recipes/cista/config.yml
@@ -1,4 +1,6 @@
 versions:
+  "0.14":
+    folder: all
   "0.11":
     folder: all
   "0.10":

diff --git a/recipes/cmake/binary/conandata.yml b/recipes/cmake/binary/conandata.yml
@@ -1,4 +1,23 @@
 sources:
+  "3.28.1":
+    Linux:
+      armv8:
+        url: "https://cmake.org/files/v3.28/cmake-3.28.1-linux-aarch64.tar.gz"
+        sha256: "e84d88e46ed8c85fbe259bcd4ca07df7a928df87e84013e0da34d91b01a25d71"
+      x86_64:
+        url: "https://cmake.org/files/v3.28/cmake-3.28.1-linux-x86_64.tar.gz"
+        sha256: "f76398c24362ad87bad1a3d6f1e8f4377632b5b1c360c4ba1fd7cd205fd9d8d4"
+    Macos:
+      universal:
+        url: "https://cmake.org/files/v3.28/cmake-3.28.1-macos10.10-universal.tar.gz"
+        sha256: "f2d296294921b209d9c7edbc12ce175e00644fcabba362b6a24c32b0a4624a9a"
+    Windows:
+      armv8:
+        url: "https://cmake.org/files/v3.28/cmake-3.28.1-windows-arm64.zip"
+        sha256: "a839b8d32c11b24f078142b5b8c3361a955ebc65788f0f0353b2121fe2f74e49"
+      x86_64:
+        url: "https://cmake.org/files/v3.28/cmake-3.28.1-windows-x86_64.zip"
+        sha256: "671332249bc7cc7424523d6c2b5edd3e3de90a43b8b82e8782f42da4fe4c562d"
   "3.27.9":
     Linux:
       armv8:

diff --git a/recipes/cmake/config.yml b/recipes/cmake/config.yml
@@ -1,4 +1,6 @@
 versions:
+  "3.28.1":
+    folder: "binary"
   "3.27.9":
     folder: "binary"
   "3.27.7":

diff --git a/recipes/drmp3/all/conandata.yml b/recipes/drmp3/all/conandata.yml
@@ -1,9 +1,11 @@
 sources:
   # NOTE: https://github.com/mackron/dr_libs/blob/dd762b861ecadf5ddd5fb03e9ca1db6707b54fbb/dr_mp3.h#L3
+  "0.6.38":
+    url: "https://github.com/mackron/dr_libs/archive/01d23df76776faccee3bc456f685900dcc273b4c.zip"
+    sha256: "fe82eac7a30c01679ddfdf1d51d1829d72a78b6ec236c47eb03abc089a4457ab"
   "0.6.34":
-    url: https://github.com/mackron/dr_libs/archive/dd762b861ecadf5ddd5fb03e9ca1db6707b54fbb.zip
+    url: "https://github.com/mackron/dr_libs/archive/dd762b861ecadf5ddd5fb03e9ca1db6707b54fbb.zip"
     sha256: "077d6b29a78da5132065fcc9b44ca50e7e168b94250f2c25614101d3f808bcc1"
-  # NOTE: https://github.com/mackron/dr_libs/blob/9497270f581f43e6b795ce5d98d8764861fb6a50/dr_mp3.h#L3
   "0.6.32":
-    url: https://github.com/mackron/dr_libs/archive/9497270f581f43e6b795ce5d98d8764861fb6a50.zip
+    url: "https://github.com/mackron/dr_libs/archive/9497270f581f43e6b795ce5d98d8764861fb6a50.zip"
     sha256: "572b59ec9719cf8f4938f982bc1f2e52689a3fbf6cceb4f27478942d7e35456b"
diff --git a/recipes/drmp3/all/conanfile.py b/recipes/drmp3/all/conanfile.py
@@ -9,7 +9,7 @@
 class Drmp3Conan(ConanFile):
     name = "drmp3"
     description = "MP3 audio decoder."
-    homepage = "https://mackron.github.io/"
+    homepage = "https://github.com/mackron/dr_libs"
     topics = ("audio", "mp3", "sound")
     license = ("Unlicense", "MIT-0")
     url = "https://github.com/conan-io/conan-center-index"

diff --git a/recipes/drmp3/config.yml b/recipes/drmp3/config.yml
@@ -1,4 +1,6 @@
 versions:
+  "0.6.38":
+    folder: all
   "0.6.34":
     folder: all
   "0.6.32":

diff --git a/recipes/fontconfig/config.yml b/recipes/fontconfig/config.yml
@@ -1,4 +1,6 @@
 versions:
+  "2.15.0":
+    folder: meson
   "2.14.2":
     folder: meson
   "2.13.93":

diff --git a/recipes/fontconfig/meson/conandata.yml b/recipes/fontconfig/meson/conandata.yml
@@ -1,4 +1,7 @@
 sources:
+  "2.15.0":
+    url: "https://www.freedesktop.org/software/fontconfig/release/fontconfig-2.15.0.tar.xz"
+    sha256: "63a0658d0e06e0fa886106452b58ef04f21f58202ea02a94c39de0d3335d7c0e"
   "2.14.2":
     url: "https://www.freedesktop.org/software/fontconfig/release/fontconfig-2.14.2.tar.xz"
     sha256: "dba695b57bce15023d2ceedef82062c2b925e51f5d4cc4aef736cf13f60a468b"

diff --git a/recipes/gdcm/all/conandata.yml b/recipes/gdcm/all/conandata.yml
@@ -1,4 +1,7 @@
 sources:
+  "3.0.22":
+    url: "https://sourceforge.net/projects/gdcm/files/gdcm%203.x/GDCM%203.0.22/gdcm-3.0.22.tar.bz2"
+    sha256: "40a20aa21d6f5b9710020920a9fbd43ac76149b1097f0fab6f9787513a7a7434"
   "3.0.21":
     url: "https://sourceforge.net/projects/gdcm/files/gdcm%203.x/GDCM%203.0.21/gdcm-3.0.21.tar.bz2"
     sha256: "f29dbdd3b6b4c30c9803e6466b88b139d67f5585768565fe29f0be65ad737744"
@@ -9,6 +12,29 @@ sources:
     url: "https://sourceforge.net/projects/gdcm/files/gdcm%203.x/GDCM%203.0.9/gdcm-3.0.9.tar.bz2"
     sha256: "1d518b0e4709cecfb7330c9bd9b3a73cfd01ffe70d1c178f36a4c847283c4672"
 patches:
+  "3.0.22":
+    - patch_file: "patches/0001-3.0.20-find-charls.patch"
+      patch_description: "allow using charls >= 2.2.0"
+      patch_type: "portability"
+      patch_source: "https://github.com/malaterre/GDCM/pull/157"
+    - patch_file: "patches/0002-3.0.20-openjpeg.patch"
+      patch_description: "fix variable names for openjpeg"
+      patch_type: "conan"
+    - patch_file: "patches/0004-3.0.20-find-expat.patch"
+      patch_description: "enforce usage of FindEXPAT.cmake"
+      patch_type: "conan"
+    - patch_file: "patches/0005-3.0.20-openssl.patch"
+      patch_description: "skip check_cxx_source_compiles usage for openssl"
+      patch_type: "conan"
+    - patch_file: "patches/0006-json.patch"
+      patch_description: "skip check_cxx_source_compiles usage for json-c"
+      patch_type: "conan"
+    - patch_file: "patches/0007-3.0.20-find-json.patch"
+      patch_description: "fix find_package for json-c"
+      patch_type: "conan"
+    - patch_file: "patches/0008-3.0.20-find-libuuid.patch"
+      patch_description: "fix find_package for libuuid"
+      patch_type: "conan"
   "3.0.21":
     - patch_file: "patches/0001-3.0.20-find-charls.patch"
       patch_description: "allow using charls >= 2.2.0"

diff --git a/recipes/gdcm/config.yml b/recipes/gdcm/config.yml
@@ -1,4 +1,6 @@
 versions:
+  "3.0.22":
+    folder: "all"
   "3.0.21":
     folder: "all"
   "3.0.20":

diff --git a/recipes/glaze/all/conandata.yml b/recipes/glaze/all/conandata.yml
@@ -1,4 +1,7 @@
 sources:
+  "1.9.9":
+    url: "https://github.com/stephenberry/glaze/archive/v1.9.9.tar.gz"
+    sha256: "7e2605046742a89ec455887a5a0d6b3188ed5c14ea309c5eb9814848c26bedca"
   "1.9.8.1":
     url: "https://github.com/stephenberry/glaze/archive/v1.9.8.1.tar.gz"
     sha256: "f1dd8d93440096d186695814848c9cd350a9ec5b0e114e933579ef2467a35558"

diff --git a/recipes/glaze/config.yml b/recipes/glaze/config.yml
@@ -1,4 +1,6 @@
 versions:
+  "1.9.9":
+    folder: all
   "1.9.8.1":
     folder: all
   "1.9.5":

diff --git a/recipes/homog2d/all/conandata.yml b/recipes/homog2d/all/conandata.yml
@@ -1,4 +1,7 @@
 sources:
+  "2.11":
+    url: "https://github.com/skramm/homog2d/archive/refs/tags/v2.11.tar.gz"
+    sha256: "469a557b87f3285170d84eb06d9b23c6b422f01b17eb753819bfc488d59bf83a"
   "2.10":
     url: "https://github.com/skramm/homog2d/archive/refs/tags/v2.10.tar.gz"
     sha256: "fb71f709d78c386188894b7f08a2c4690b45a5695b8d988e24efbe1216c53052"

diff --git a/recipes/homog2d/config.yml b/recipes/homog2d/config.yml
@@ -1,4 +1,6 @@
 versions:
+  "2.11":
+    folder: all
   "2.10":
     folder: all
   "2.9":

diff --git a/recipes/hwloc/all/conanfile.py b/recipes/hwloc/all/conanfile.py
@@ -32,7 +32,7 @@ def configure(self):
 
     def requirements(self):
         if self.options.with_libxml2:
-            self.requires("libxml2/2.12.2")
+            self.requires("libxml2/2.12.3")
 
     def source(self):
         get(self, **self.conan_data["sources"][self.version], strip_root=True)

diff --git a/recipes/icu/all/conandata.yml b/recipes/icu/all/conandata.yml
@@ -1,4 +1,7 @@
 sources:
+  "74.2":
+    url: "https://github.com/unicode-org/icu/releases/download/release-74-2/icu4c-74_2-src-FIXED.tgz"
+    sha256: "68db082212a96d6f53e35d60f47d38b962e9f9d207a74cfac78029ae8ff5e08c"
   "74.1":
     url: "https://github.com/unicode-org/icu/releases/download/release-74-1/icu4c-74_1-src.tgz"
     sha256: "86ce8e60681972e60e4dcb2490c697463fcec60dd400a5f9bffba26d0b52b8d0"
@@ -24,6 +27,8 @@ sources:
     url: "https://github.com/unicode-org/icu/releases/download/release-68-2/icu4c-68_2-src.tgz"
     sha256: "c79193dee3907a2199b8296a93b52c5cb74332c26f3d167269487680d479d625"
 patches:
+  "74.2":
+    - patch_file: "patches/0001-69.1-fix-mingw.patch"
   "74.1":
     - patch_file: "patches/0001-69.1-fix-mingw.patch"
   "73.2":

diff --git a/recipes/icu/config.yml b/recipes/icu/config.yml
@@ -1,4 +1,6 @@
 versions:
+  "74.2":
+    folder: all
   "74.1":
     folder: all
   "73.2":

diff --git a/recipes/libarchive/all/conanfile.py b/recipes/libarchive/all/conanfile.py
@@ -85,15 +85,15 @@ def requirements(self):
         if self.options.with_bzip2:
             self.requires("bzip2/1.0.8")
         if self.options.with_libxml2:
-            self.requires("libxml2/2.12.2")
+            self.requires("libxml2/2.12.3")
         if self.options.with_expat:
             self.requires("expat/2.5.0")
         if self.options.with_iconv:
             self.requires("libiconv/1.17")
         if self.options.with_pcreposix:
             self.requires("pcre2/10.42")
         if self.options.with_nettle:
-            self.requires("nettle/3.8.1")
+            self.requires("nettle/3.9.1")
         if self.options.with_openssl:
             self.requires("openssl/[>=1.1 <4]")
         if self.options.with_libb2:
@@ -107,7 +107,7 @@ def requirements(self):
         if self.options.with_zstd:
             self.requires("zstd/1.5.5")
         if self.options.get_safe("with_mbedtls"):
-            self.requires("mbedtls/3.5.0")
+            self.requires("mbedtls/3.5.1")
 
     def validate(self):
         if self.settings.os != "Windows" and self.options.with_cng:

diff --git a/recipes/libdc1394/all/conandata.yml b/recipes/libdc1394/all/conandata.yml
@@ -1,4 +1,7 @@
 sources:
+  "2.2.7":
+    url: "https://sourceforge.net/projects/libdc1394/files/libdc1394-2/2.2.7/libdc1394-2.2.7.tar.gz"
+    sha256: "537ceb78dd3cef271a183f4a176191d1cecf85f025520e6bd3758b0e19e6609f"
   "2.2.6":
     url: "https://sourceforge.net/projects/libdc1394/files/libdc1394-2/2.2.6/libdc1394-2.2.6.tar.gz"
     sha256: "2b905fc9aa4eec6bdcf6a2ae5f5ba021232739f5be047dec8fe8dd6049c10fed"
diff --git a/recipes/libdc1394/config.yml b/recipes/libdc1394/config.yml
@@ -1,3 +1,5 @@
 versions:
+  "2.2.7":
+    folder: all
   "2.2.6":
     folder: all
diff --git a/recipes/libdrm/all/conandata.yml b/recipes/libdrm/all/conandata.yml
@@ -1,4 +1,7 @@
 sources:
+  "2.4.119":
+    url: "https://dri.freedesktop.org/libdrm/libdrm-2.4.119.tar.xz"
+    sha256: "0a49f12f09b5b6e68eaaaff3f02ca7cff9aa926939b212d343161d3e8ac56291"
   "2.4.114":
     url: "https://dri.freedesktop.org/libdrm/libdrm-2.4.114.tar.xz"
     sha256: "3049cf843a47d12e5eeefbc3be3496d782fa09f42346bf0b7defe3d1e598d026"

diff --git a/recipes/libdrm/config.yml b/recipes/libdrm/config.yml
@@ -1,4 +1,6 @@
 versions:
+  "2.4.119":
+    folder: all
   "2.4.114":
     folder: all
   "2.4.109":

diff --git a/recipes/libenvpp/all/conandata.yml b/recipes/libenvpp/all/conandata.yml
@@ -1,8 +1,15 @@
 sources:
+  "1.4.0":
+    url: "https://github.com/ph3at/libenvpp/archive/refs/tags/v1.4.0.tar.gz"
+    sha256: "3f9a4a4b62abc06522de76e3a999cc3cd6b60299dc26b28ccc2183aa614f10cd"
   "1.3.0":
     url: "https://github.com/ph3at/libenvpp/archive/refs/tags/v1.3.0.tar.gz"
     sha256: "9201ae39dc67118ee46b4e60fe2e5d22b046faceae4a4b4eec6ab62bc48875dd"
 patches:
+  "1.4.0":
+    - patch_file: "patches/0001-use-cci-fmt.patch"
+      patch_description: "use cci fmt package, remove static flag from add_library"
+      patch_type: "conan"
   "1.3.0":
     - patch_file: "patches/0001-use-cci-fmt.patch"
       patch_description: "use cci fmt package, remove static flag from add_library"

diff --git a/recipes/libenvpp/config.yml b/recipes/libenvpp/config.yml
@@ -1,3 +1,5 @@
 versions:
+  "1.4.0":
+    folder: all
   "1.3.0":
     folder: all
diff --git a/recipes/libfdk_aac/all/conandata.yml b/recipes/libfdk_aac/all/conandata.yml
@@ -1,4 +1,7 @@
 sources:
+  "2.0.3":
+    url: "https://sourceforge.net/projects/opencore-amr/files/fdk-aac/fdk-aac-2.0.3.tar.gz"
+    sha256: "829b6b89eef382409cda6857fd82af84fabb63417b08ede9ea7a553f811cb79e"
   "2.0.2":
     url: "https://sourceforge.net/projects/opencore-amr/files/fdk-aac/fdk-aac-2.0.2.tar.gz"
     sha256: "c9e8630cf9d433f3cead74906a1520d2223f89bcd3fa9254861017440b8eb22f"

diff --git a/recipes/libfdk_aac/config.yml b/recipes/libfdk_aac/config.yml
@@ -1,4 +1,6 @@
 versions:
+  "2.0.3":
+    folder: all
   "2.0.2":
     folder: all
   "2.0.1":

diff --git a/recipes/libfuse/all/conandata.yml b/recipes/libfuse/all/conandata.yml
@@ -1,4 +1,7 @@
 sources:
+  "3.16.2":
+    url: "https://github.com/libfuse/libfuse/releases/download/fuse-3.16.2/fuse-3.16.2.tar.gz"
+    sha256: "f797055d9296b275e981f5f62d4e32e089614fc253d1ef2985851025b8a0ce87"
   "3.10.5":
     url: "https://github.com/libfuse/libfuse/releases/download/fuse-3.10.5/fuse-3.10.5.tar.xz"
     sha256: "b2e283485d47404ac896dd0bb7f7ba81e1470838e677e45f659804c3a3b69666"