Merge branch 'master' into qt5_fix_webengine_build_err_binutils_2_41

conan-io · Dec 21, 2023 · f79692a · f79692a
2 parents a27843e + a12826d
commit f79692a
Show file tree

Hide file tree

Showing 292 changed files with 2,946 additions and 1,876 deletions.
diff --git a/.c3i/authorized_users.yml b/.c3i/authorized_users.yml
@@ -1249,3 +1249,10 @@ authorized_users:
 - jmalopoy
 - mlutken
 - hoyhoy
+- stevenhartley
+- RMZeroFour
+- rymut
+- MartyMcFlyInTheSky
+- piliugin-anton
+- Drllap
+- i-curve
diff --git a/.c3i/conan_v2_ready_references.yml b/.c3i/conan_v2_ready_references.yml
@@ -47,6 +47,7 @@ required_for_references:
 - asio
 - asio-grpc
 - asmjit
+- asn1c
 - assimp
 - astc-codec
 - astro-informatics-so3
@@ -204,6 +205,7 @@ required_for_references:
 - cpp-optparse
 - cpp-peglib
 - cpp-sort
+- cpp-validator
 - cpp_project_framework
 - cppbenchmark
 - cppcheck
@@ -251,6 +253,7 @@ required_for_references:
 - cwalk
 - cxxopts
 - cyclonedds
+- cyclonedds-cxx
 - cyrus-sasl
 - czmq
 - dacap-clip
@@ -268,11 +271,13 @@ required_for_references:
 - debug_assert
 - decimal_for_cpp
 - deco
+- dependencies
 - detools
 - dfp
 - di
 - dice-template-library
 - dime
+- directshowbaseclasses
 - directx-headers
 - dirent
 - discount
@@ -518,6 +523,7 @@ required_for_references:
 - iowow
 - iqa
 - irrxml
+- isa-l
 - iso8601lib
 - itk
 - itlib
@@ -527,6 +533,7 @@ required_for_references:
 - jasper
 - jbig
 - jeaiii-itoa
+- jerryscript
 - jfalcou-eve
 - jinja2cpp
 - joltphysics
@@ -616,6 +623,7 @@ required_for_references:
 - libdxfrw
 - libe57format
 - libelf
+- libelfin
 - libenvpp
 - libepoxy
 - libev
@@ -625,6 +633,7 @@ required_for_references:
 - libfdk_aac
 - libffi
 - libfreenect
+- libfreenect2
 - libftdi
 - libfuse
 - libgcrypt
@@ -763,6 +772,7 @@ required_for_references:
 - libzip
 - libzippp
 - lief
+- lightgbm
 - lightpcapng
 - linmath.h
 - linux-headers-generic
@@ -1000,6 +1010,7 @@ required_for_references:
 - perf
 - perfetto
 - perlinnoise
+- pexports
 - pffft
 - pfr
 - pgm-index
@@ -1039,6 +1050,7 @@ required_for_references:
 - poshlib
 - pprint
 - pranav-csv2
+- premake
 - pretty-name
 - procxx-boost-ext-simd
 - proj
@@ -1239,6 +1251,7 @@ required_for_references:
 - taocpp-sequences
 - taocpp-taopq
 - taocpp-tuple
+- tar
 - taskflow
 - taywee-args
 - tcb-span
@@ -1247,6 +1260,7 @@ required_for_references:
 - tcp-wrappers
 - tcsbank-uconfig
 - tcsbank-uri-template
+- teemo
 - tensorflow-lite
 - tensorpipe
 - termcap
@@ -1365,6 +1379,7 @@ required_for_references:
 - vulkan-memory-allocator
 - vulkan-validationlayers
 - vvenc
+- waf
 - wasm-micro-runtime
 - wasmedge
 - wasmer

diff --git a/.c3i/config_v1.yml b/.c3i/config_v1.yml
@@ -75,7 +75,6 @@ tasks:
 # Profile configurations to build packages
 configurations:
   - id: linux-gcc
-    epochs: [20211221, 20220120, 20230606]
     hrname: "Linux, GCC"
     content:
       - os: ["Linux"]
@@ -86,7 +85,6 @@ configurations:
               compiler.version: ["5", "7", "9", "10", "11"]
               build_type: ["Release", "Debug"]
   - id: linux-clang
-    epochs: [20211221, 20220120, 20230606]
     hrname: "Linux, Clang"
     content:
       - os: ["Linux"]
@@ -97,8 +95,10 @@ configurations:
               compiler.version: ["12", "13"]
               build_type: ["Release", "Debug"]
   - id: macos-clang
-    epochs: [20220120, 20230606]
     hrname: "macOS, Clang"
+    build_profile:
+      os: "Macos"
+      arch: "armv8"
     content:
       - os: [ "Macos" ]
         arch: [ "x86_64" ]
@@ -108,11 +108,7 @@ configurations:
               compiler.libcxx: [ "libc++" ]
               build_type: [ "Release", "Debug" ]
   - id: macos-m1-clang
-    epochs: [20220120, 20230606]
     hrname: "macOS, Clang (M1/arm64)"
-    build_profile:
-      os: "Macos"
-      arch: "x86_64"
     content:
       - os: [ "Macos" ]
         arch: [ "armv8" ]
@@ -122,7 +118,6 @@ configurations:
               compiler.libcxx: [ "libc++" ]
               build_type: [ "Release", "Debug" ]
   - id: windows-visual_studio
-    epochs: [0, 20211221, 20220120, 20230606]
     hrname: "Windows, Visual Studio"
     content:
       - os: [ "Windows" ]

diff --git a/.c3i/config_v2.yml b/.c3i/config_v2.yml
@@ -67,7 +67,6 @@ tasks:
 
 configurations:
   - id: linux-gcc
-    epochs: [0, 20211221, 20220120, 20220628, 20230606]
     hrname: "Linux, GCC"
     build_profile:
       os: "Linux"
@@ -80,10 +79,10 @@ configurations:
               compiler.version: ["11"]
               build_type: ["Release"]
   - id: macos-clang
-    epochs: [0, 20211221, 20220120, 20220628, 20230606]
     hrname: "macOS, Clang"
     build_profile:
       os: "Macos"
+      arch: "armv8"
     content:
       - os: [ "Macos" ]
         arch: [ "x86_64" ]
@@ -93,11 +92,10 @@ configurations:
               compiler.libcxx: [ "libc++" ]
               build_type: [ "Release"]
   - id: macos-m1-clang
-    epochs: [0, 20211221, 20220120, 20220628, 20230606]
     hrname: "macOS M1, Clang"
     build_profile:
       os: "Macos"
-      arch: "x86_64"
+      arch: "armv8"
     content:
       - os: [ "Macos" ]
         arch: [ "armv8" ]
@@ -107,7 +105,6 @@ configurations:
               compiler.libcxx: [ "libc++" ]
               build_type: [ "Release"]
   - id: windows-msvc
-    epochs: [20230606]
     hrname: "Windows, MSVC"
     build_profile:
       os: "Windows"

diff --git a/recipes/aravis/all/conandata.yml b/recipes/aravis/all/conandata.yml
@@ -1,23 +1,30 @@
 sources:
-    "0.8.29":
-        url: "https://github.com/AravisProject/aravis/releases/download/0.8.29/aravis-0.8.29.tar.xz"
-        sha256: "12e5f2f0e1a966c3a6dce0a42d96b2f24497f42ae6051d6f026811124e986963"
-    "0.8.25":  # latest version that supports GenDC data format (supported by U3V 1.1)
-        url: "https://github.com/AravisProject/aravis/releases/download/0.8.25/aravis-0.8.25.tar.xz"
-        sha256: "3ba18f941ae4e2c898fed1f63c4ce67ea41a800a902ee5684eef4ffdb87f1c09"
-    "0.8.20":
-        url: "https://github.com/AravisProject/aravis/releases/download/0.8.20/aravis-0.8.20.tar.xz"
-        sha256: "0c0eb5a76109f29180c09c7e6a23fd403633bf22bbe8468a0ae44995c4449f46"
+  "0.8.30":
+    url: "https://github.com/AravisProject/aravis/releases/download/0.8.30/aravis-0.8.30.tar.xz"
+    sha256: "40380f06fa04524a7875bd456e5a5ea78b2c058fa84b5598bc6e0642fcef00b0"
+  "0.8.29":
+    url: "https://github.com/AravisProject/aravis/releases/download/0.8.29/aravis-0.8.29.tar.xz"
+    sha256: "12e5f2f0e1a966c3a6dce0a42d96b2f24497f42ae6051d6f026811124e986963"
+  "0.8.25":    # latest version that supports GenDC data format (supported by U3V 1.1)
+    url: "https://github.com/AravisProject/aravis/releases/download/0.8.25/aravis-0.8.25.tar.xz"
+    sha256: "3ba18f941ae4e2c898fed1f63c4ce67ea41a800a902ee5684eef4ffdb87f1c09"
+  "0.8.20":
+    url: "https://github.com/AravisProject/aravis/releases/download/0.8.20/aravis-0.8.20.tar.xz"
+    sha256: "0c0eb5a76109f29180c09c7e6a23fd403633bf22bbe8468a0ae44995c4449f46"
 patches:
-    "0.8.29":
-        - patch_file: "patches/0.8.29-gst-shared-lib.patch"
-          patch_description: "remove forcing of shared library built for gst-plugins"
-          patch_type: conan
-    "0.8.25":
-        - patch_file: "patches/0.8.25-gst-shared-lib.patch"
-          patch_description: "remove forcing of shared library built for gst-plugins"
-          patch_type: conan
-    "0.8.20":
-        - patch_file: "patches/0.8.19-gst-shared-lib.patch"
-          patch_description: "remove forcing of shared library built for gst-plugins"
-          patch_type: conan
+  "0.8.30":
+    - patch_file: "patches/0.8.29-gst-shared-lib.patch"
+      patch_description: "remove forcing of shared library built for gst-plugins"
+      patch_type: conan
+  "0.8.29":
+    - patch_file: "patches/0.8.29-gst-shared-lib.patch"
+      patch_description: "remove forcing of shared library built for gst-plugins"
+      patch_type: conan
+  "0.8.25":
+    - patch_file: "patches/0.8.25-gst-shared-lib.patch"
+      patch_description: "remove forcing of shared library built for gst-plugins"
+      patch_type: conan
+  "0.8.20":
+    - patch_file: "patches/0.8.19-gst-shared-lib.patch"
+      patch_description: "remove forcing of shared library built for gst-plugins"
+      patch_type: conan
diff --git a/recipes/aravis/all/conanfile.py b/recipes/aravis/all/conanfile.py
@@ -54,7 +54,8 @@ def config_options(self):
             del self.options.fPIC
         if self.settings.os not in ["Linux", "FreeBSD"]:
             del self.options.packet_socket
-        if Version(self.version) < "8.25":
+        # https://github.com/AravisProject/aravis/commit/b4211e5e0266d0226e936818b3faefd6d0daaa3a#diff-f28598af2e23aa5d2bc7c72e022ae2c56a33802eb970afffaeca1e40607f97fe
+        if Version(self.version) < "0.8.21":
             del self.options.gv_n_buffers
 
 
@@ -66,15 +67,6 @@ def configure(self):
         if self.options.shared:
             self.options["glib"].shared = True
 
-        if self.options.get_safe("gv_n_buffers"):
-            try:
-                gv_n_buffers_val = int(str(self.options.gv_n_buffers))
-                if not (1 <= gv_n_buffers_val ):
-                    raise ConanInvalidConfiguration(
-                        f"gv_n_buffers_val must be greater than 1 Provided: {gv_n_buffers_val}")
-            except ValueError as e:
-                raise ConanInvalidConfiguration("gv_n_buffers_val must be an integer.") from e
-
     def layout(self):
         basic_layout(self, src_folder="src")
 
@@ -101,6 +93,15 @@ def validate(self):
                 "conan-io/conan#7324 gets merged to fix macOS SIP issue #8443"
             )
 
+        if self.options.get_safe("gv_n_buffers"):
+            try:
+                gv_n_buffers_val = int(str(self.options.gv_n_buffers))
+                if gv_n_buffers_val < 1:
+                    raise ConanInvalidConfiguration(
+                        f"gv_n_buffers_val must be greater than 1 Provided: {gv_n_buffers_val}")
+            except ValueError as e:
+                raise ConanInvalidConfiguration("gv_n_buffers_val must be an integer.") from e
+
     def build_requirements(self):
         #windows build: meson/1.2.1 works, meson/1.2.2 breaks for some reason!
         self.tool_requires("meson/1.2.1")

diff --git a/recipes/aravis/config.yml b/recipes/aravis/config.yml
@@ -1,4 +1,6 @@
 versions:
+  "0.8.30":
+    folder: all
   "0.8.29":
     folder: all
   # 0.8.25 is the last version to support GenDC data format

diff --git a/recipes/arduinojson/all/conandata.yml b/recipes/arduinojson/all/conandata.yml
@@ -1,4 +1,7 @@
 sources:
+  "6.21.4":
+    url: "https://github.com/bblanchon/ArduinoJson/releases/download/v6.21.4/ArduinoJson-v6.21.4.zip"
+    sha256: "60a5c4cd28d97047f63a1f9c9e8bd36a72c8b4c86809babcc2bd4b00e0502b9b"
   "6.21.2":
     url: "https://github.com/bblanchon/ArduinoJson/releases/download/v6.21.2/ArduinoJson-v6.21.2.zip"
     sha256: "1dc888061f6e7828f7a0a4e71bf059796e5ce202ce6ddb4e3a2e384d32b5cba0"

diff --git a/recipes/arduinojson/all/conanfile.py b/recipes/arduinojson/all/conanfile.py
@@ -13,7 +13,7 @@ class ArduinojsonConan(ConanFile):
     name = "arduinojson"
     description = "C++ JSON library for IoT. Simple and efficient."
     homepage = "https://github.com/bblanchon/ArduinoJson"
-    topics = ("json", "arduino", "iot", "embedded", "esp8266")
+    topics = ("json", "msgpack", "message-pack", "arduino", "iot", "embedded", "esp8266")
     license = "MIT"
     url = "https://github.com/conan-io/conan-center-index"
     package_type = "header-library"

diff --git a/recipes/arduinojson/config.yml b/recipes/arduinojson/config.yml
@@ -1,4 +1,6 @@
 versions:
+  "6.21.4":
+    folder: all
   "6.21.2":
     folder: all
   "6.21.0":

diff --git a/recipes/arrow/all/conandata.yml b/recipes/arrow/all/conandata.yml
@@ -1,4 +1,7 @@
 sources:
+  "14.0.2":
+    url: "https://www.apache.org/dyn/closer.lua/arrow/arrow-14.0.2/apache-arrow-14.0.2.tar.gz?action=download"
+    sha256: "1304dedb41896008b89fe0738c71a95d9b81752efc77fa70f264cb1da15d9bc2"
   "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"

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

diff --git a/recipes/asio/all/conandata.yml b/recipes/asio/all/conandata.yml
@@ -1,4 +1,7 @@
 sources:
+  "1.29.0":
+    url: "https://github.com/chriskohlhoff/asio/archive/asio-1-29-0.tar.gz"
+    sha256: "44305859b4e6664dbbf853c1ef8ca0259d694f033753ae309fcb2534ca20f721"
   "1.28.2":
     url: "https://github.com/chriskohlhoff/asio/archive/asio-1-28-2.tar.gz"
     sha256: "5705a0e403017eba276625107160498518838064a6dd7fd8b00b2e30c0ffbdee"

diff --git a/recipes/asio/config.yml b/recipes/asio/config.yml
@@ -1,4 +1,6 @@
 versions:
+  "1.29.0":
+    folder: all
   "1.28.2":
     folder: all
   "1.28.1":