Compare revisions

amyspark · Tim-Philipp Müller · GStreamer Marge Bot · Tim-Philipp Müller · Tim-Philipp Müller · Nicolas Dufresne
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -86,6 +86,8 @@ default:
  rules:
    # If this pipeline is triggered from gstreamer, trigger the pipeline automatically
    - if: '$CI_PIPELINE_SOURCE == "pipeline"'
+    # If this pipeline is triggered by a schedule, trigger the pipeline automatically
+    - if: '$CI_PIPELINE_SOURCE == "schedule"'
    # If this matches, it means the pipeline is running against either the main
    # or a stable branch, so make it automatic cause they need to update artifacts,
    # like the docs site or cerbero deps
@@ -408,7 +410,7 @@ cerbero cross-android universal examples:
      - "gstreamer-1.0-devel-1.*.pkg"
 .cerbero macos arm64 image:
-  image: "registry.freedesktop.org/gstreamer/cerbero/macos-arm64/13-ventura:2023-07-27.5"
+  image: "registry.freedesktop.org/gstreamer/cerbero/macos-arm64/14-sonoma:2023-10-25.2"
  tags:
    - gst-mac-arm
@@ -592,6 +594,13 @@ cerbero deps msvc x86_64:
    ARCH: 'msvc_x86_64'
  script:
    - C:\msys64\msys2_shell.cmd -ucrt64 -defterm -no-start -here -use-full-path -lc "./ci/cerbero_setup.sh cerbero_deps_script"
+  rules:
+    - if: '$CI_PIPELINE_SOURCE != "schedule"'
+    # Don't run automatically for scheduled pipeline
+    - if: '$CI_PIPELINE_SOURCE == "schedule"'
+      when: 'manual'
+      # workaround for gitlab bug where it otherwise blocks the pipeline for manual jobs from rules
+      allow_failure: true
 cerbero deps mingw x86_64:
  extends: ['.cerbero deps', '.cerbero windows native']
@@ -618,7 +627,20 @@ cerbero deps msvc x86_64 msi package:
      - "*/sources/*/*/_builddir/CMakeFiles/CMakeError.log"
      - "*/sources/*/*/_builddir/CMakeFiles/CMakeLog.log"
      - "*.msi"
-  when: 'manual'
+  rules:
+    # Run automatically if it's a scheduled pipeline
+    - if: '$CI_PIPELINE_SOURCE == "schedule"'
+    # Otherwise require manual trigger
+    - if: '$CI_PIPELINE_SOURCE != "schedule"'
+      when: 'manual'
+      # workaround for gitlab bug where it otherwise blocks the pipeline for manual jobs from rules
+      allow_failure: true
+cerbero deps msvc x86 msi package:
+  extends: ['cerbero deps msvc x86_64 msi package']
+  variables:
+    ARCH: 'msvc_x86'
+    CONFIG: 'win32.cbc'
 build cerbero msvc x86_64:
  extends: ['.cerbero mr', '.cerbero windows native']

--- a/cerbero/bootstrap/rust.py
+++ b/cerbero/bootstrap/rust.py
@@ -37,7 +37,7 @@ class RustBootstrapper(BootstrapperBase):
    SERVER = 'https://static.rust-lang.org'
    RUSTUP_VERSION = '1.26.0'
-    RUST_VERSION = '1.72.0'
+    RUST_VERSION = '1.73.0'
    RUSTUP_URL_TPL = '{server}/rustup/archive/{version}/{triple}/rustup-init{exe_suffix}'
    RUSTUP_NAME_TPL = 'rustup-init-{version}-{triple}{exe_suffix}'
    CHANNEL_URL_TPL = '{server}/dist/channel-rust-{version}.toml'
@@ -46,7 +46,7 @@ class RustBootstrapper(BootstrapperBase):
    TOMLI_URL = 'https://files.pythonhosted.org/packages/c0/3f/d7af728f075fb08564c5949a9c95e44352e23dee646869fa104a3b2060a3/tomli-2.0.1.tar.gz'
    DOWNLOAD_CHECKSUMS = {
        # Rust packages metadata
-        'channel-rust-1.72.0.toml': '43d520cf3bf12e2e31f5a5942539feff91177a40bdf0e0d15354f0854b3d4676',
+        'channel-rust-1.73.0.toml': 'acb3fcf9f4f19cf1e847de9926209aff9027b353a88c8ecc2ec992a91da2a7ca',
        # Tomli Python module
        'tomli-2.0.1.tar.gz': 'de526c12914f0c550d15924c62d72abc48d6fe7364aa87328337a31007fe8a4f',
        # Rustup

--- a/cerbero/build/build.py
+++ b/cerbero/build/build.py
@@ -22,6 +22,7 @@ import glob
 import copy
 import shutil
 import shlex
+import sys
 import subprocess
 import asyncio
 from pathlib import Path
@@ -29,7 +30,7 @@ from itertools import chain
 from cerbero.enums import Platform, Architecture, Distro, LibraryType
 from cerbero.errors import FatalError, InvalidRecipeError
-from cerbero.utils import shell, to_unixpath, to_winpath, add_system_libs
+from cerbero.utils import shell, to_unixpath, to_winpath, add_system_libs, determine_num_of_cpus, determine_total_ram
 from cerbero.utils import EnvValue, EnvValueSingle, EnvValueArg, EnvValueCmd, EnvValuePath
 from cerbero.utils import messages as m
@@ -386,7 +387,6 @@ class Build(object):
            return self.config.num_of_cpus
        return None
 class CustomBuild(Build, ModifyEnvBase):
    def __init__(self):
@@ -1215,15 +1215,36 @@ class Cargo(Build, ModifyEnvBase):
                    self.config.target_platform, self.using_msvc())
        except FatalError as e:
            raise InvalidRecipeError(self.name, e.msg)
        self.cargo_args = [
            '--verbose', '--offline',
            '--target', self.target_triple,
            '--target-dir', self.cargo_dir,
        ]
+        jobs = self.num_of_rustc_jobs()
+        if jobs is not None:
+            self.cargo_args += [f'-j{jobs}']
        # https://github.com/lu-zero/cargo-c/issues/278
        if self.config.target_platform in (Platform.ANDROID, Platform.IOS):
            self.library_type = LibraryType.STATIC
+    def num_of_rustc_jobs(self):
+        '''
+        Restricts parallelism with <= 4 threads or with <= 8 GB RAM.
+        '''
+        ncpu = super().num_of_cpus()
+        num_of_jobs = determine_num_of_cpus()
+        has_enough_ram = determine_total_ram() > (8 * 1 << 30) # 8 GB
+        if num_of_jobs <= 4 or not has_enough_ram:
+            return 1
+        elif ncpu:
+            return ncpu
+        return None
    def get_cargo_features_args(self):
        if not self.cargo_features:
            return []

--- a/cerbero/enums.py
+++ b/cerbero/enums.py
@@ -136,6 +136,7 @@ class DistroVersion:
    WINDOWS_8 = 'windows_08'
    WINDOWS_8_1 = 'windows_08_1'
    WINDOWS_10 = 'windows_10'
+    WINDOWS_11 = 'windows_11'
    OS_X_MAVERICKS = 'osx_mavericks'
    OS_X_MOUNTAIN_LION = 'osx_mountain_lion'
    OS_X_YOSEMITE = 'osx_yosemite'

--- a/cerbero/hacks.py
+++ b/cerbero/hacks.py
@@ -184,7 +184,7 @@ class ZipFile(zipfile_ZipFile):
        # destination.
        try:
            os.unlink(targetpath)
-        except FileNotFoundError:
+        except (FileNotFoundError, IsADirectoryError):
            pass
        if member.is_dir():

--- a/cerbero/utils/__init__.py
+++ b/cerbero/utils/__init__.py
@@ -16,7 +16,9 @@
 # Free Software Foundation, Inc., 59 Temple Place - Suite 330,
 # Boston, MA 02111-1307, USA.
+import functools
 import os
+import subprocess
 import sys
 import shlex
 import shutil
@@ -76,8 +78,8 @@ def user_is_root():
        ''' Check if the user running the process is root '''
        return hasattr(os, 'getuid') and os.getuid() == 0
+@functools.lru_cache()
-def determine_num_of_cpus():
+def determine_num_of_cpus() -> int:
    ''' Number of virtual or logical CPUs on this system '''
    # Python 2.6+
@@ -87,6 +89,26 @@ def determine_num_of_cpus():
    except (ImportError, NotImplementedError):
        return 1
+@functools.lru_cache()
+def determine_total_ram() -> int:
+    ''' Total amount of RAM in this system, in bytes '''
+    platform = system_info()[0]
+    if platform == Platform.DARWIN:
+        ram_size_query = subprocess.run([shutil.which('sysctl'), '-n', 'hw.memsize'], stdout=subprocess.PIPE, text=True)
+        if ram_size_query.returncode() == 0:
+            return int(ram_size_query.stdout.strip())
+    elif platform == Platform.WINDOWS:
+        ram_size_query = subprocess.run([shutil.which('wmic'), 'computersystem', 'get', 'totalphysicalmemory'], stdout=subprocess.PIPE, text=True)
+        if ram_size_query.returncode() == 0:
+            return int(ram_size_query.stdout.strip())
+    elif platform == Platform.LINUX:
+        ram_size_query = subprocess.run([shutil.which('free'), '-b'], stdout=subprocess.PIPE, text=True)
+        if ram_size_query.returncode() == 0:
+            return int(re.split(r'\s+', ram_size_query.stdout.splitlines()[1]))
+    return 4 << 30 # Assume 4GB
 def to_winpath(path):
    if path.startswith('/'):
@@ -365,7 +387,8 @@ Terminating.''', file=sys.stderr)
                '8': DistroVersion.WINDOWS_8,
                'post2012Server': DistroVersion.WINDOWS_8_1,
                '8.1': DistroVersion.WINDOWS_8_1,
-                '10': DistroVersion.WINDOWS_10}
+                '10': DistroVersion.WINDOWS_10,
+                '11': DistroVersion.WINDOWS_11}
        if win32_ver in dmap:
            distro_version = dmap[win32_ver]
        else:

--- a/ci/cerbero_setup.sh
+++ b/ci/cerbero_setup.sh
@@ -145,8 +145,11 @@ cerbero_deps_script() {
    # doing something silly like [[ -n ${CERBERO_...} ]] because it will get
    # printed in the CI logs due to set -x
    if env | grep -q -e CERBERO_PRIVATE_SSH_KEY; then
-        time $CERBERO $CERBERO_ARGS gen-cache --branch "${GST_UPSTREAM_BRANCH}"
+        # Don't generate and upload caches for scheduled pipelines on main branch
-        time $CERBERO $CERBERO_ARGS upload-cache --branch "${GST_UPSTREAM_BRANCH}"
+        if [[ "x${CI_PIPELINE_SOURCE}" != "xschedule" ]]; then
+            time $CERBERO $CERBERO_ARGS gen-cache --branch "${GST_UPSTREAM_BRANCH}"
+            time $CERBERO $CERBERO_ARGS upload-cache --branch "${GST_UPSTREAM_BRANCH}"
+        fi
    fi
    cerbero_package_and_check

--- a/config/ios.config
+++ b/config/ios.config
@@ -133,10 +133,7 @@ else:
 env['CFLAGS'] = env['CPPFLAGS']
 env['LDFLAGS'] = env['CPPFLAGS'] + ' -L{} '.format(lib_dir)
 if ios_platform == 'iPhoneOS':
-  env['LDFLAGS'] += '-Wl,-iphoneos_version_min,{0} '.format(ios_min_version)
  env['CCASFLAGS'] = '-miphoneos-version-min={} '.format(ios_min_version)
-else:
-  env['LDFLAGS'] += '-Wl,-ios_simulator_version_min,{0} '.format(ios_min_version)
 env['CFLAGS'] += extra_cflags
 env['LDFLAGS'] += extra_ldflags
 env['OBJCFLAGS'] = env['CFLAGS'] + extra_objcflags

--- a/recipes/build-tools/cargo-c.recipe
+++ b/recipes/build-tools/cargo-c.recipe
@@ -2,22 +2,17 @@
 class Recipe(recipe.Recipe):
    name = 'cargo-c'
-    version = '0.9.24'
+    version = '0.9.27'
    stype = SourceType.TARBALL
    btype = BuildType.CARGO
-    url = 'https://github.com/lu-zero/cargo-c/archive/refs/tags/v0.9.24.tar.gz'
+    url = 'https://github.com/lu-zero/cargo-c/archive/refs/tags/v0.9.27.tar.gz'
-    tarball_checksum = '32f2f5c802c01c51cf93471fcf876d0cc68edbc31d22005b9f07e4549d5b98b1'
+    tarball_checksum = 'caca521e893ae7cc63a9e2c5e58f2151b7b74754a4fd884c8eb5939b967ae0d5'
    tarball_dirname = '%(name)s-%(version)s'
    # Get this from the release page on github
    cargo_lock = f'{name}/{version}-Cargo.lock'
    # Need system openssl on Linux
    use_system_libs = True
-    patches = [
-        # https://github.com/lu-zero/cargo-c/pull/277
-        name + '/0001-Fix-linking-with-Android-NDK-linker.patch',
-    ]
    deps = ['zlib', 'pkg-config']
    # Need openssl on macOS. On Windows, a prebuilt openssl crate is downloaded.
    platform_deps = {

--- a/recipes/build-tools/cargo-c/0.9.24-Cargo.lock
+++ b/recipes/build-tools/cargo-c/0.9.24-Cargo.lock
@@ -22,18 +22,18 @@ dependencies = [
 [[package]]
 name = "aho-corasick"
-version = "1.0.4"
+version = "1.1.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6748e8def348ed4d14996fa801f4122cd763fff530258cdc03f64b25f89d3a5a"
+checksum = "b2969dcb958b36655471fc61f7e416fa76033bdd4bfed0678d8fee1e2d07a1f0"
 dependencies = [
 "memchr",
 ]
 [[package]]
 name = "anstream"
-version = "0.5.0"
+version = "0.6.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b1f58811cfac344940f1a400b6e6231ce35171f614f26439e80f8c1465c5cc0c"
+checksum = "2ab91ebe16eb252986481c5b62f6098f3b698a45e34b5b98200cf20dd2484a44"
 dependencies = [
 "anstyle",
 "anstyle-parse",
@@ -45,15 +45,15 @@ dependencies = [
 [[package]]
 name = "anstyle"
-version = "1.0.2"
+version = "1.0.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "15c4c2c83f81532e5845a733998b6971faca23490340a418e9b72a3ec9de12ea"
+checksum = "7079075b41f533b8c61d2a4d073c4676e1f8b249ff94a393b0595db304e0dd87"
 [[package]]
 name = "anstyle-parse"
-version = "0.2.1"
+version = "0.2.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "938874ff5980b03a87c5524b3ae5b59cf99b1d6bc836848df7bc5ada9643c333"
+checksum = "317b9a89c1868f5ea6ff1d9539a69f45dffc21ce321ac1fd1160dfa48c8e2140"
 dependencies = [
 "utf8parse",
 ]
@@ -64,17 +64,17 @@ version = "1.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "5ca11d4be1bab0c8bc8734a9aa7bf4ee8316d462a08c6ac5052f888fef5b494b"
 dependencies = [
- "windows-sys 0.48.0",
+ "windows-sys",
 ]
 [[package]]
 name = "anstyle-wincon"
-version = "2.1.0"
+version = "3.0.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "58f54d10c6dfa51283a066ceab3ec1ab78d13fae00aa49243a45e4571fb79dfd"
+checksum = "f0699d10d2f4d628a98ee7b57b289abbc98ff3bad977cb3152709d4bf2330628"
 dependencies = [
 "anstyle",
- "windows-sys 0.48.0",
+ "windows-sys",
 ]
 [[package]]
@@ -109,9 +109,9 @@ checksum = "4c7f02d4ea65f2c1853089ffd8d2787bdbc63de2f0d29dedbcf8ccdfa0ccd4cf"
 [[package]]
 name = "base64"
-version = "0.21.3"
+version = "0.21.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "414dcefbc63d77c526a76b3afcf6fbb9b5e2791c19c3aa2297733208750c6e53"
+checksum = "9ba43ea6f343b788c8764558649e08df62f86c6ef251fdaeb1ffd010a9ae50a2"
 [[package]]
 name = "base64ct"
@@ -151,12 +151,12 @@ dependencies = [
 [[package]]
 name = "bstr"
-version = "1.6.0"
+version = "1.7.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6798148dccfbff0fae41c7574d2fa8f1ef3492fba0face179de5d8d447d67b05"
+checksum = "c79ad7fb2dd38f3dabd76b09c6a5a20c038fc0213ef1e9afd30eb777f120f019"
 dependencies = [
 "memchr",
- "regex-automata",
+ "regex-automata 0.4.1",
 "serde",
 ]
@@ -171,15 +171,15 @@ dependencies = [
 [[package]]
 name = "bumpalo"
-version = "3.13.0"
+version = "3.14.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a3e2c3daef883ecc1b5d58c15adae93470a91d425f3532ba1695849656af3fc1"
+checksum = "7f30e7476521f6f8af1a1c4c0b8cc94f0bee37d91763d0ca2665f299b6cd8aec"
 [[package]]
 name = "bytes"
-version = "1.4.0"
+version = "1.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "89b2fd2a0dcf38d7971e2194b6b6eebab45ae01067456a7fd93d5547a61b70be"
+checksum = "a2bd12c1caf447e69cd4528f47f94d203fd2582878ecb9e9465484c4148a8223"
 [[package]]
 name = "bytesize"
@@ -189,20 +189,23 @@ checksum = "a3e368af43e418a04d52505cf3dbc23dda4e3407ae2fa99fd0e4f308ce546acc"
 [[package]]
 name = "cargo"
-version = "0.73.1"
+version = "0.74.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "77a6fe1f5394d14b81d2f3f605832a3ce35ed0bf120bc7ef437ce27fd4929c6a"
+checksum = "244574fb9c19dfe9b9d11cd6398f718aca7d11fb4f0d46f22cd867876a6c4c56"
 dependencies = [
 "anyhow",
 "base64",
 "bytesize",
+ "cargo-credential",
+ "cargo-credential-libsecret",
+ "cargo-credential-macos-keychain",
+ "cargo-credential-wincred",
 "cargo-platform",
 "cargo-util",
 "clap",
 "crates-io",
 "curl",
 "curl-sys",
- "env_logger",
 "filetime",
 "flate2",
 "fwdansi",
@@ -218,13 +221,12 @@ dependencies = [
 "humantime",
 "ignore",
 "im-rc",
- "indexmap 1.9.3",
+ "indexmap 2.0.2",
 "itertools 0.10.5",
 "jobserver",
 "lazycell",
 "libc",
 "libgit2-sys",
- "log",
 "memchr",
 "opener",
 "openssl",
@@ -242,23 +244,26 @@ dependencies = [
 "sha1",
 "shell-escape",
 "strip-ansi-escapes",
- "syn 2.0.29",
+ "syn 2.0.38",
 "tar",
 "tempfile",
 "termcolor",
 "time",
- "toml 0.7.6",
+ "toml 0.7.8",
 "toml_edit",
+ "tracing",
+ "tracing-subscriber",
+ "unicase",
 "unicode-width",
 "unicode-xid",
 "url",
 "walkdir",
- "windows-sys 0.48.0",
+ "windows-sys",
 ]
 [[package]]
 name = "cargo-c"
-version = "0.9.24+cargo-0.73.0"
+version = "0.9.27+cargo-0.74.0"
 dependencies = [
 "anyhow",
 "cargo",
@@ -274,25 +279,70 @@ dependencies = [
 "serde",
 "serde_derive",
 "serde_json",
- "strip-ansi-escapes",
+ "toml 0.7.8",
- "toml 0.7.6",
+ "windows-sys",
- "windows-sys 0.48.0",
+]
+[[package]]
+name = "cargo-credential"
+version = "0.3.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "626c6c87f7906515d241db80b2e35e6818ea771da38003dec873914d417f48b5"
+dependencies = [
+ "anyhow",
+ "libc",
+ "serde",
+ "serde_json",
+ "thiserror",
+ "time",
+ "windows-sys",
+]
+[[package]]
+name = "cargo-credential-libsecret"
+version = "0.3.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "fbbb9372b45e669060bba532a7a78f7e05a5791d8450eceab93006d72a542ee4"
+dependencies = [
+ "anyhow",
+ "cargo-credential",
+ "libloading",
+]
+[[package]]
+name = "cargo-credential-macos-keychain"
+version = "0.3.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3a07e26e78213508bf6007c9187f48ef1c98584d912d8195496828f30b7e2796"
+dependencies = [
+ "cargo-credential",
+ "security-framework",
+]
+[[package]]
+name = "cargo-credential-wincred"
+version = "0.3.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6637491b9d0fe5350a839903742de909c01e8440b2eadb561177039cbd8f0c71"
+dependencies = [
+ "cargo-credential",
+ "windows-sys",
 ]
 [[package]]
 name = "cargo-platform"
-version = "0.1.3"
+version = "0.1.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2cfa25e60aea747ec7e1124f238816749faa93759c6ff5b31f1ccdda137f4479"
+checksum = "12024c4645c97566567129c204f65d5815a8c9aecf30fcbe682b2fe034996d36"
 dependencies = [
 "serde",
 ]
 [[package]]
 name = "cargo-util"
-version = "0.2.5"
+version = "0.2.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dd54c8b94a0c851d687924460637361c355afafa72d973fe8644499fbdee8fae"
+checksum = "77042b5b585f701f1cfb4b6b12ebc02b9b0cefbc8dcce235906b6bf376d4245d"
 dependencies = [
 "anyhow",
 "core-foundation",
@@ -300,21 +350,21 @@ dependencies = [
 "hex",
 "jobserver",
 "libc",
- "log",
 "miow",
 "same-file",
 "sha2",
 "shell-escape",
 "tempfile",
+ "tracing",
 "walkdir",
- "windows-sys 0.48.0",
+ "windows-sys",
 ]
 [[package]]
 name = "cbindgen"
-version = "0.25.0"
+version = "0.26.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "faeaa693e5a727975a79211b8f35c0cb09b031fdb6eaa4a788bc6713d01488ca"
+checksum = "da6bc11b07529f16944307272d5bd9b22530bc7d05751717c9d416586cedab49"
 dependencies = [
 "heck",
 "indexmap 1.9.3",
@@ -346,39 +396,37 @@ checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd"
 [[package]]
 name = "clap"
-version = "4.4.0"
+version = "4.4.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1d5f1946157a96594eb2d2c10eb7ad9a2b27518cb3000209dec700c35df9197d"
+checksum = "d04704f56c2cde07f43e8e2c154b43f216dc5c92fc98ada720177362f953b956"
 dependencies = [
 "clap_builder",
 "clap_derive",
- "once_cell",
 ]
 [[package]]
 name = "clap_builder"
-version = "4.4.0"
+version = "4.4.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "78116e32a042dd73c2901f0dc30790d20ff3447f3e3472fad359e8c3d282bcd6"
+checksum = "0e231faeaca65ebd1ea3c737966bf858971cd38c3849107aa3ea7de90a804e45"
 dependencies = [
 "anstream",
 "anstyle",
 "clap_lex",
- "once_cell",
 "strsim",
 "terminal_size",
 ]
 [[package]]
 name = "clap_derive"
-version = "4.4.0"
+version = "4.4.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c9fd1a5729c4548118d7d70ff234a44868d00489a4b6597b0b020918a0e91a1a"
+checksum = "0862016ff20d69b84ef8247369fabf5c008a7417002411897d40ee1f4532b873"
 dependencies = [
 "heck",
 "proc-macro2",
 "quote",
- "syn 2.0.29",
+ "syn 2.0.38",
 ]
 [[package]]
@@ -432,15 +480,15 @@ dependencies = [
 [[package]]
 name = "crates-io"
-version = "0.37.0"
+version = "0.38.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "876aa69b4afca5f2eb5e23daa3445930faf829bcb67075a20ffa884f11f8c57c"
+checksum = "4bd35a7899c7804e2f8e305438d7b70a852c0424009f3ac29ca4f6733f2aec85"
 dependencies = [
- "anyhow",
 "curl",
 "percent-encoding",
 "serde",
 "serde_json",
+ "thiserror",
 "url",
 ]
@@ -474,9 +522,9 @@ dependencies = [
 [[package]]
 name = "crypto-bigint"
-version = "0.5.2"
+version = "0.5.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cf4c2f4e1afd912bc40bfd6fed5d9dc1f288e0ba01bfcc835cc5bc3eb13efe15"
+checksum = "740fe28e594155f10cfc383984cbefd529d7396050557148f79cb0f621204124"
 dependencies = [
 "generic-array",
 "rand_core",
@@ -517,9 +565,9 @@ dependencies = [
 [[package]]
 name = "curl-sys"
-version = "0.4.65+curl-8.2.1"
+version = "0.4.67+curl-8.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "961ba061c9ef2fe34bbd12b807152d96f0badd2bebe7b90ce6c8c8b7572a0986"
+checksum = "3cc35d066510b197a0f72de863736641539957628c8a42e70e27c66849e77c34"
 dependencies = [
 "cc",
 "libc",
@@ -528,7 +576,7 @@ dependencies = [
 "openssl-sys",
 "pkg-config",
 "vcpkg",
- "winapi",
+ "windows-sys",
 ]
 [[package]]
@@ -547,6 +595,9 @@ name = "deranged"
 version = "0.3.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "f2696e8a945f658fd14dc3b87242e6b80cd0f36ff04ea560fa39082368847946"
+dependencies = [
+ "serde",
+]
 [[package]]
 name = "digest"
@@ -597,9 +648,9 @@ checksum = "a26ae43d7bcc3b814de94796a5e736d4029efb0ee900c12e2d54c993ad1a1e07"
 [[package]]
 name = "elliptic-curve"
-version = "0.13.5"
+version = "0.13.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "968405c8fdc9b3bf4df0a6638858cc0b52462836ab6b1c87377785dd09cf1c0b"
+checksum = "d97ca172ae9dc9f9b779a6e3a65d308f2af74e5b8c921299075bdb4a0370e914"
 dependencies = [
 "base16ct",
 "crypto-bigint",
@@ -616,19 +667,6 @@ dependencies = [
 "zeroize",
 ]
-[[package]]
-name = "env_logger"
-version = "0.10.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "85cdab6a89accf66733ad5a1693a4dcced6aeff64602b634530dd73c1f3ee9f0"
-dependencies = [
- "humantime",
- "is-terminal",
- "log",
- "regex",
- "termcolor",
-]
 [[package]]
 name = "equivalent"
 version = "1.0.1"
@@ -637,39 +675,28 @@ checksum = "5443807d6dff69373d433ab9ef5378ad8df50ca6298caf15de6e52e24aaf54d5"
 [[package]]
 name = "errno"
-version = "0.3.2"
+version = "0.3.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6b30f669a7961ef1631673d2766cc92f52d64f7ef354d4fe0ddfd30ed52f0f4f"
-dependencies = [
- "errno-dragonfly",
- "libc",
- "windows-sys 0.48.0",
-]
-[[package]]
-name = "errno-dragonfly"
-version = "0.1.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "aa68f1b12764fab894d2755d2518754e71b4fd80ecfb822714a1206c2aab39bf"
+checksum = "ac3e13f66a2f95e32a39eaa81f6b95d42878ca0e1db0c7543723dfe12557e860"
 dependencies = [
- "cc",
 "libc",
+ "windows-sys",
 ]
 [[package]]
 name = "faster-hex"
-version = "0.8.0"
+version = "0.8.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e9042d281a5eec0f2387f8c3ea6c4514e2cf2732c90a85aaf383b761ee3b290d"
+checksum = "239f7bfb930f820ab16a9cd95afc26f88264cf6905c960b340a615384aa3338a"
 dependencies = [
 "serde",
 ]
 [[package]]
 name = "fastrand"
-version = "2.0.0"
+version = "2.0.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6999dc1837253364c2ebb0704ba97994bd874e8f195d665c50b7548f6ea92764"
+checksum = "25cbce373ec4653f1a01a31e8a5e5ec0c622dc27ff9c4e6606eefef5cbbed4a5"
 [[package]]
 name = "ff"
@@ -683,9 +710,9 @@ dependencies = [
 [[package]]
 name = "fiat-crypto"
-version = "0.1.20"
+version = "0.2.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e825f6987101665dea6ec934c09ec6d721de7bc1bf92248e1d5810c8cd636b77"
+checksum = "d0870c84016d4b481be5c9f323c24f65e31e901ae618f0e80f4308fb00de1d2d"
 [[package]]
 name = "filetime"
@@ -696,7 +723,7 @@ dependencies = [
 "cfg-if",
 "libc",
 "redox_syscall",
- "windows-sys 0.48.0",
+ "windows-sys",
 ]
 [[package]]
@@ -1071,7 +1098,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "385f4ce6ecf3692d313ca3aa9bd3b3d8490de53368d6d94bedff3af8b6d9c58d"
 dependencies = [
 "gix-hash",
- "hashbrown 0.14.0",
+ "hashbrown 0.14.1",
 "parking_lot",
 ]
@@ -1207,9 +1234,9 @@ dependencies = [
 [[package]]
 name = "gix-packetline"
-version = "0.16.5"
+version = "0.16.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2a374cb5eba089e3c123df4d996eb00da411bb90ec92cb35bffeeb2d22ee106a"
+checksum = "d6df0b75361353e7c0a6d72d49617a37379a7a22cba4569ae33a7720a4c8755a"
 dependencies = [
 "bstr",
 "faster-hex",
@@ -1238,7 +1265,7 @@ dependencies = [
 "gix-command",
 "gix-config-value",
 "parking_lot",
- "rustix 0.38.9",
+ "rustix",
 "thiserror",
 ]
@@ -1489,9 +1516,9 @@ checksum = "8a9ee70c43aaf417c914396645a0fa852624801b24ebb7ae78fe8272889ac888"
 [[package]]
 name = "hashbrown"
-version = "0.14.0"
+version = "0.14.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2c6201b9ff9fd90a5a3bac2e56a830d0caa509576f0e503818ee82c181b3437a"
+checksum = "7dfda62a12f55daeae5015f81b0baea145391cb4520f86c248fc615d72640d12"
 [[package]]
 name = "heck"
@@ -1499,12 +1526,6 @@ version = "0.4.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "95505c38b4572b2d910cecb0281560f54b440a19336cbbcb27bf6ce6adc6f5a8"
-[[package]]
-name = "hermit-abi"
-version = "0.3.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "443144c8cdadd93ebf52ddb4056d257f5b52c04d3c804e657d19eb73fc33668b"
 [[package]]
 name = "hex"
 version = "0.4.3"
@@ -1535,7 +1556,7 @@ version = "0.5.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "5444c27eef6923071f7ebcc33e3444508466a76f7a2b93da00ed6e19f30c1ddb"
 dependencies = [
- "windows-sys 0.48.0",
+ "windows-sys",
 ]
 [[package]]
@@ -1616,12 +1637,12 @@ dependencies = [
 [[package]]
 name = "indexmap"
-version = "2.0.0"
+version = "2.0.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d5477fe2230a79769d8dc68e0eabf5437907c0457a5614a9e8dddb67f65eb65d"
+checksum = "8adf3ddd720272c6ea8bf59463c04e0f93d0bbf7c5439b691bca2987e0270897"
 dependencies = [
 "equivalent",
- "hashbrown 0.14.0",
+ "hashbrown 0.14.1",
 ]
 [[package]]
@@ -1634,28 +1655,6 @@ dependencies = [
 "winapi",
 ]
-[[package]]
-name = "io-lifetimes"
-version = "1.0.11"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "eae7b9aee968036d54dce06cebaefd919e4472e753296daccd6d344e3e2df0c2"
-dependencies = [
- "hermit-abi",
- "libc",
- "windows-sys 0.48.0",
-]
-[[package]]
-name = "is-terminal"
-version = "0.4.9"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cb0889898416213fab133e1d33a0e5858a48177452750691bde3666d0fdbaf8b"
-dependencies = [
- "hermit-abi",
- "rustix 0.38.9",
- "windows-sys 0.48.0",
-]
 [[package]]
 name = "itertools"
 version = "0.10.5"
@@ -1682,9 +1681,9 @@ checksum = "af150ab688ff2122fcef229be89cb50dd66af9e01a4ff320cc137eecc9bacc38"
 [[package]]
 name = "jobserver"
-version = "0.1.26"
+version = "0.1.27"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "936cfd212a0155903bcbc060e316fb6cc7cbf2e1907329391ebadc1fe0ce77c2"
+checksum = "8c37f63953c4c63420ed5fd3d6d398c719489b9f872b9fa683262f8edd363c7d"
 dependencies = [
 "libc",
 ]
@@ -1721,9 +1720,9 @@ checksum = "830d08ce1d1d941e6b30645f1a0eb5643013d835ce3779a5fc208261dbe10f55"
 [[package]]
 name = "libc"
-version = "0.2.147"
+version = "0.2.149"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b4668fb0ea861c1df094127ac5f1da3409a82116a4ba74fca2e58ef927159bb3"
+checksum = "a08173bc88b7955d1b3145aa561539096c421ac8debde8cbc3612ec635fee29b"
 [[package]]
 name = "libgit2-sys"
@@ -1739,6 +1738,16 @@ dependencies = [
 "pkg-config",
 ]
+[[package]]
+name = "libloading"
+version = "0.8.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c571b676ddfc9a8c12f1f3d3085a7b163966a8fd8098a90640953ce5f6170161"
+dependencies = [
+ "cfg-if",
+ "windows-sys",
+]
 [[package]]
 name = "libnghttp2-sys"
 version = "0.1.8+1.55.1"
@@ -1777,15 +1786,9 @@ dependencies = [
 [[package]]
 name = "linux-raw-sys"
-version = "0.3.8"
+version = "0.4.10"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ef53942eb7bf7ff43a617b3e2c1c4a5ecf5944a7c1bc12d7ee39bbb15e5c1519"
-[[package]]
-name = "linux-raw-sys"
-version = "0.4.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "57bcfdad1b858c2db7c38303a6d2ad4dfaf5eb53dfeb0910128b2c26d6158503"
+checksum = "da2479e8c062e40bf0066ffa0bc823de0a9368974af99c9f6df941d2c231e03f"
 [[package]]
 name = "lock_api"
@@ -1803,6 +1806,15 @@ version = "0.4.20"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "b5e6163cb8c49088c2c36f57875e58ccd8c87c7427f7fbd50ea6710b2f3f2e8f"
+[[package]]
+name = "matchers"
+version = "0.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8263075bb86c5a1b1427b5ae862e8889656f126e9f77c484496e8b47cf5c5558"
+dependencies = [
+ "regex-automata 0.1.10",
+]
 [[package]]
 name = "maybe-async"
 version = "0.2.7"
@@ -1816,9 +1828,9 @@ dependencies = [
 [[package]]
 name = "memchr"
-version = "2.5.0"
+version = "2.6.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2dffe52ecf27772e601905b7522cb4ef790d2cc203488bbd0e2fe85fcb74566d"
+checksum = "f665ee40bc4a3c5590afb1e9677db74a508659dfd71e126420da8274909a0167"
 [[package]]
 name = "memmap2"
@@ -1846,11 +1858,11 @@ dependencies = [
 [[package]]
 name = "miow"
-version = "0.5.0"
+version = "0.6.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "52ffbca2f655e33c08be35d87278e5b18b89550a37dbd598c20db92f6a471123"
+checksum = "359f76430b20a79f9e20e115b3428614e654f04fab314482fc0fda0ebd3c6044"
 dependencies = [
- "windows-sys 0.42.0",
+ "windows-sys",
 ]
 [[package]]
@@ -1863,11 +1875,30 @@ dependencies = [
 "minimal-lexical",
 ]
+[[package]]
+name = "normpath"
+version = "1.1.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ec60c60a693226186f5d6edf073232bfb6464ed97eb22cf3b01c1e8198fd97f5"
+dependencies = [
+ "windows-sys",
+]
+[[package]]
+name = "nu-ansi-term"
+version = "0.46.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "77a8165726e8236064dbb45459242600304b42a5ea24ee2948e18e023bf7ba84"
+dependencies = [
+ "overload",
+ "winapi",
+]
 [[package]]
 name = "num-traits"
-version = "0.2.16"
+version = "0.2.17"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f30b0abd723be7e2ffca1272140fac1a2f084c77ec3e123c192b66af1ee9e6c2"
+checksum = "39e3200413f237f41ab11ad6d161bc7239c84dcb631773ccd7de3dfe4b5c267c"
 dependencies = [
 "autocfg",
 ]
@@ -1889,21 +1920,22 @@ checksum = "dd8b5dd2ae5ed71462c540258bedcb51965123ad7e7ccf4b9a8cafaa4a63576d"
 [[package]]
 name = "opener"
-version = "0.5.2"
+version = "0.6.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "293c15678e37254c15bd2f092314abb4e51d7fdde05c2021279c12631b54f005"
+checksum = "6c62dcb6174f9cb326eac248f07e955d5d559c272730b6c03e396b443b562788"
 dependencies = [
 "bstr",
+ "normpath",
 "winapi",
 ]
 [[package]]
 name = "openssl"
-version = "0.10.56"
+version = "0.10.57"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "729b745ad4a5575dd06a3e1af1414bd330ee561c01b3899eb584baeaa8def17e"
+checksum = "bac25ee399abb46215765b1cb35bc0212377e58a061560d8b29b024fd0430e7c"
 dependencies = [
- "bitflags 1.3.2",
+ "bitflags 2.4.0",
 "cfg-if",
 "foreign-types",
 "libc",
@@ -1920,7 +1952,7 @@ checksum = "a948666b637a0f465e8564c73e89d4dde00d72d4d473cc972f390fc3dcee7d9c"
 dependencies = [
 "proc-macro2",
 "quote",
- "syn 2.0.29",
+ "syn 2.0.38",
 ]
 [[package]]
@@ -1931,18 +1963,18 @@ checksum = "ff011a302c396a5197692431fc1948019154afc178baf7d8e37367442a4601cf"
 [[package]]
 name = "openssl-src"
-version = "111.27.0+1.1.1v"
+version = "300.1.5+3.1.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "06e8f197c82d7511c5b014030c9b1efeda40d7d5f99d23b4ceed3524a5e63f02"
+checksum = "559068e4c12950d7dcaa1857a61725c0d38d4fc03ff8e070ab31a75d6e316491"
 dependencies = [
 "cc",
 ]
 [[package]]
 name = "openssl-sys"
-version = "0.9.91"
+version = "0.9.93"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "866b5f16f90776b9bb8dc1e1802ac6f0513de3a7a7465867bfbc563dc737faac"
+checksum = "db4d56a4c0478783083cfafcc42493dd4a981d41669da64b4572a2a089b51b1d"
 dependencies = [
 "cc",
 "libc",
@@ -1953,18 +1985,18 @@ dependencies = [
 [[package]]
 name = "ordered-float"
-version = "2.10.0"
+version = "2.10.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7940cf2ca942593318d07fcf2596cdca60a85c9e7fab408a5e21a4f9dcd40d87"
+checksum = "68f19d67e5a2795c94e73e0bb1cc1a7edeb2e28efd39e2e1c9b7a40c1108b11c"
 dependencies = [
 "num-traits",
 ]
 [[package]]
 name = "orion"
-version = "0.17.5"
+version = "0.17.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b11468cc6afd61a126fe3f91cc4cc8a0dbe7917d0a4b5e8357ba91cc47444462"
+checksum = "7abdb10181903c8c4b016ba45d6d6d5af1a1e2a461aa4763a83b87f5df4695e5"
 dependencies = [
 "fiat-crypto",
 "subtle",
@@ -1982,6 +2014,12 @@ dependencies = [
 "winapi",
 ]
+[[package]]
+name = "overload"
+version = "0.1.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b15813163c1d831bf4a13c3610c05c0d03b39feb07f7e09fa234dac9b15aaf39"
 [[package]]
 name = "p384"
 version = "0.13.0"
@@ -2059,6 +2097,12 @@ version = "2.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "9b2a4787296e9989611394c33f193f676704af1686e70b8f8033ab5ba9a35a94"
+[[package]]
+name = "pin-project-lite"
+version = "0.2.13"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8afb450f006bf6385ca15ef45d71d2288452bc3683ce2e2cacc0d18e4be60b58"
 [[package]]
 name = "pkcs8"
 version = "0.10.2"
@@ -2092,9 +2136,9 @@ dependencies = [
 [[package]]
 name = "proc-macro2"
-version = "1.0.66"
+version = "1.0.69"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "18fb31db3f9bddb2ea821cde30a9f70117e3f119938b5ee630b7403aa6e2ead9"
+checksum = "134c189feb4956b20f6f547d2cf727d4c0fe06722b20a0eec87ed445a97f92da"
 dependencies = [
 "unicode-ident",
 ]
@@ -2178,32 +2222,47 @@ dependencies = [
 [[package]]
 name = "regex"
-version = "1.9.4"
+version = "1.10.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "12de2eff854e5fa4b1295edd650e227e9d8fb0c9e90b12e7f36d6a6811791a29"
+checksum = "d119d7c7ca818f8a53c300863d4f87566aac09943aef5b355bb83969dae75d87"
 dependencies = [
 "aho-corasick",
 "memchr",
- "regex-automata",
+ "regex-automata 0.4.1",
- "regex-syntax",
+ "regex-syntax 0.8.1",
 ]
 [[package]]
 name = "regex-automata"
-version = "0.3.7"
+version = "0.1.10"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6c230d73fb8d8c1b9c0b3135c5142a8acee3a0558fb8db5cf1cb65f8d7862132"
+dependencies = [
+ "regex-syntax 0.6.29",
+]
+[[package]]
+name = "regex-automata"
+version = "0.4.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "49530408a136e16e5b486e883fbb6ba058e8e4e8ae6621a77b048b314336e629"
+checksum = "465c6fc0621e4abc4187a2bda0937bfd4f722c2730b29562e19689ea796c9a4b"
 dependencies = [
 "aho-corasick",
 "memchr",
- "regex-syntax",
+ "regex-syntax 0.8.1",
 ]
 [[package]]
 name = "regex-syntax"
-version = "0.7.5"
+version = "0.6.29"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dbb5fb1acd8a1a18b3dd5be62d25485eb770e05afb408a9627d14d451bae12da"
+checksum = "f162c6dd7b008981e4d40210aca20b4bd0f9b60ca9271061b07f78537722f2e1"
+[[package]]
+name = "regex-syntax"
+version = "0.8.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "56d84fdd47036b038fc80dd333d10b6aab10d5d31f4a366e20014def75328d33"
 [[package]]
 name = "rfc6979"
@@ -2229,29 +2288,15 @@ dependencies = [
 [[package]]
 name = "rustix"
-version = "0.37.23"
+version = "0.38.18"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4d69718bf81c6127a49dc64e44a742e8bb9213c0ff8869a22c308f84c1d4ab06"
+checksum = "5a74ee2d7c2581cd139b42447d7d9389b889bdaad3a73f1ebb16f2a3237bb19c"
-dependencies = [
- "bitflags 1.3.2",
- "errno",
- "io-lifetimes",
- "libc",
- "linux-raw-sys 0.3.8",
- "windows-sys 0.48.0",
-]
-[[package]]
-name = "rustix"
-version = "0.38.9"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9bfe0f2582b4931a45d1fa608f8a8722e8b3c7ac54dd6d5f3b3212791fedef49"
 dependencies = [
 "bitflags 2.4.0",
 "errno",
 "libc",
- "linux-raw-sys 0.4.5",
+ "linux-raw-sys",
- "windows-sys 0.48.0",
+ "windows-sys",
 ]
 [[package]]
@@ -2275,7 +2320,7 @@ version = "0.1.22"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "0c3733bf4cf7ea0880754e19cb5a462007c4a8c1914bff372ccc95b464f1df88"
 dependencies = [
- "windows-sys 0.48.0",
+ "windows-sys",
 ]
 [[package]]
@@ -2298,11 +2343,34 @@ dependencies = [
 "zeroize",
 ]
+[[package]]
+name = "security-framework"
+version = "2.9.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "05b64fb303737d99b81884b2c63433e9ae28abebe5eb5045dcdd175dc2ecf4de"
+dependencies = [
+ "bitflags 1.3.2",
+ "core-foundation",
+ "core-foundation-sys",
+ "libc",
+ "security-framework-sys",
+]
+[[package]]
+name = "security-framework-sys"
+version = "2.9.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e932934257d3b408ed8f30db49d85ea163bfe74961f017f405b025af298f0c7a"
+dependencies = [
+ "core-foundation-sys",
+ "libc",
+]
 [[package]]
 name = "semver"
-version = "1.0.18"
+version = "1.0.20"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b0293b4b29daaf487284529cc2f5675b8e57c61f70167ba415a463651fd6a918"
+checksum = "836fa6a3e1e547f9a2c4040802ec865b5d85f4014efe00555d7090a3dcaa1090"
 dependencies = [
 "serde",
 ]
@@ -2334,7 +2402,7 @@ checksum = "4eca7ac642d82aa35b60049a6eccb4be6be75e599bd2e9adb5f875a737654af2"
 dependencies = [
 "proc-macro2",
 "quote",
- "syn 2.0.29",
+ "syn 2.0.38",
 ]
 [[package]]
@@ -2348,9 +2416,9 @@ dependencies = [
 [[package]]
 name = "serde_json"
-version = "1.0.105"
+version = "1.0.107"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "693151e1ac27563d6dbcec9dee9fbd5da8539b20fa14ad3752b2e6d363ace360"
+checksum = "6b420ce6e3d8bd882e9b243c6eed35dbc9a6110c9769e74b584e0d68d1f20c65"
 dependencies = [
 "itoa",
 "ryu",
@@ -2368,9 +2436,9 @@ dependencies = [
 [[package]]
 name = "sha1"
-version = "0.10.5"
+version = "0.10.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f04293dc80c3993519f2d7f6f511707ee7094fe0c6d3406feb330cdb3540eba3"
+checksum = "e3bf829a2d51ab4a5ddf1352d8470c140cadc8301b2ae1789db023f01cedd6ba"
 dependencies = [
 "cfg-if",
 "cpufeatures",
@@ -2385,15 +2453,24 @@ checksum = "ae1a47186c03a32177042e55dbc5fd5aee900b8e0069a8d70fba96a9375cd012"
 [[package]]
 name = "sha2"
-version = "0.10.7"
+version = "0.10.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "479fb9d862239e610720565ca91403019f2f00410f1864c5aa7479b950a76ed8"
+checksum = "793db75ad2bcafc3ffa7c68b215fee268f537982cd901d132f89c6343f3a3dc8"
 dependencies = [
 "cfg-if",
 "cpufeatures",
 "digest",
 ]
+[[package]]
+name = "sharded-slab"
+version = "0.1.7"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f40ca3c46823713e0d4209592e8d6e826aa57e928f09752619fc696c499637f6"
+dependencies = [
+ "lazy_static",
+]
 [[package]]
 name = "shell-escape"
 version = "0.1.5"
@@ -2441,9 +2518,9 @@ dependencies = [
 [[package]]
 name = "smallvec"
-version = "1.11.0"
+version = "1.11.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "62bb4feee49fdd9f707ef802e22365a35de4b7b299de4763d44bfea899442ff9"
+checksum = "942b4a808e05215192e39f4ab80813e599068285906cc91aa64f923db842bd5a"
 [[package]]
 name = "socket2"
@@ -2505,9 +2582,9 @@ dependencies = [
 [[package]]
 name = "syn"
-version = "2.0.29"
+version = "2.0.38"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c324c494eba9d92503e6f1ef2e6df781e78f6a7705a0202d9801b198807d518a"
+checksum = "e96b79aaa137db8f61e26363a0c9b47d8b4ec75da28b7d1d614c2303e232408b"
 dependencies = [
 "proc-macro2",
 "quote",
@@ -2533,47 +2610,47 @@ dependencies = [
 "cfg-if",
 "fastrand",
 "redox_syscall",
- "rustix 0.38.9",
+ "rustix",
- "windows-sys 0.48.0",
+ "windows-sys",
 ]
 [[package]]
 name = "termcolor"
-version = "1.2.0"
+version = "1.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "be55cf8942feac5c765c2c993422806843c9a9a45d4d5c407ad6dd2ea95eb9b6"
+checksum = "6093bad37da69aab9d123a8091e4be0aa4a03e4d601ec641c327398315f62b64"
 dependencies = [
 "winapi-util",
 ]
 [[package]]
 name = "terminal_size"
-version = "0.2.6"
+version = "0.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8e6bf6f19e9f8ed8d4048dc22981458ebcf406d67e94cd422e5ecd73d63b3237"
+checksum = "21bebf2b7c9e0a515f6e0f8c51dc0f8e4696391e6f1ff30379559f8365fb0df7"
 dependencies = [
- "rustix 0.37.23",
+ "rustix",
- "windows-sys 0.48.0",
+ "windows-sys",
 ]
 [[package]]
 name = "thiserror"
-version = "1.0.47"
+version = "1.0.49"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "97a802ec30afc17eee47b2855fc72e0c4cd62be9b4efe6591edde0ec5bd68d8f"
+checksum = "1177e8c6d7ede7afde3585fd2513e611227efd6481bd78d2e82ba1ce16557ed4"
 dependencies = [
 "thiserror-impl",
 ]
 [[package]]
 name = "thiserror-impl"
-version = "1.0.47"
+version = "1.0.49"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6bb623b56e39ab7dcd4b1b98bb6c8f8d907ed255b18de254088016b27a8ee19b"
+checksum = "10712f02019e9288794769fba95cd6847df9874d49d871d062172f9dd41bc4cc"
 dependencies = [
 "proc-macro2",
 "quote",
- "syn 2.0.29",
+ "syn 2.0.38",
 ]
 [[package]]
@@ -2588,9 +2665,9 @@ dependencies = [
 [[package]]
 name = "time"
-version = "0.3.28"
+version = "0.3.29"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "17f6bb557fd245c28e6411aa56b6403c689ad95061f50e4be16c274e70a17e48"
+checksum = "426f806f4089c493dcac0d24c29c01e2c38baf8e30f1b716ee37e83d200b18fe"
 dependencies = [
 "deranged",
 "itoa",
@@ -2603,15 +2680,15 @@ dependencies = [
 [[package]]
 name = "time-core"
-version = "0.1.1"
+version = "0.1.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7300fbefb4dadc1af235a9cef3737cea692a9d97e1b9cbcd4ebdae6f8868e6fb"
+checksum = "ef927ca75afb808a4d64dd374f00a2adf8d0fcff8e7b184af886c3c87ec4a3f3"
 [[package]]
 name = "time-macros"
-version = "0.2.14"
+version = "0.2.15"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1a942f44339478ef67935ab2bbaec2fb0322496cf3cbe84b261e06ac3814c572"
+checksum = "4ad70d68dba9e1f8aceda7aa6711965dfec1cac869f311a51bd08b3a2ccbce20"
 dependencies = [
 "time-core",
 ]
@@ -2642,9 +2719,9 @@ dependencies = [
 [[package]]
 name = "toml"
-version = "0.7.6"
+version = "0.7.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c17e963a819c331dcacd7ab957d80bc2b9a9c1e71c804826d2f283dd65306542"
+checksum = "dd79e69d3b627db300ff956027cc6c3798cef26d22526befdfcd12feeb6d2257"
 dependencies = [
 "serde",
 "serde_spanned",
@@ -2663,22 +2740,84 @@ dependencies = [
 [[package]]
 name = "toml_edit"
-version = "0.19.14"
+version = "0.19.15"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f8123f27e969974a3dfba720fdb560be359f57b44302d280ba72e76a74480e8a"
+checksum = "1b5bb770da30e5cbfde35a2d7b9b8a2c4b8ef89548a7a6aeab5c9a576e3e7421"
 dependencies = [
- "indexmap 2.0.0",
+ "indexmap 2.0.2",
 "serde",
 "serde_spanned",
 "toml_datetime",
 "winnow",
 ]
+[[package]]
+name = "tracing"
+version = "0.1.37"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8ce8c33a8d48bd45d624a6e523445fd21ec13d3653cd51f681abf67418f54eb8"
+dependencies = [
+ "cfg-if",
+ "pin-project-lite",
+ "tracing-attributes",
+ "tracing-core",
+]
+[[package]]
+name = "tracing-attributes"
+version = "0.1.26"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5f4f31f56159e98206da9efd823404b79b6ef3143b4a7ab76e67b1751b25a4ab"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 2.0.38",
+]
+[[package]]
+name = "tracing-core"
+version = "0.1.31"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0955b8137a1df6f1a2e9a37d8a6656291ff0297c1a97c24e0d8425fe2312f79a"
+dependencies = [
+ "once_cell",
+ "valuable",
+]
+[[package]]
+name = "tracing-log"
+version = "0.1.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "78ddad33d2d10b1ed7eb9d1f518a5674713876e97e5bb9b7345a7984fbb4f922"
+dependencies = [
+ "lazy_static",
+ "log",
+ "tracing-core",
+]
+[[package]]
+name = "tracing-subscriber"
+version = "0.3.17"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "30a651bc37f915e81f087d86e62a18eec5f79550c7faff886f7090b4ea757c77"
+dependencies = [
+ "matchers",
+ "nu-ansi-term",
+ "once_cell",
+ "regex",
+ "sharded-slab",
+ "smallvec",
+ "thread_local",
+ "tracing",
+ "tracing-core",
+ "tracing-log",
+]
 [[package]]
 name = "typenum"
-version = "1.16.0"
+version = "1.17.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "497961ef93d974e23eb6f433eb5fe1b7930b659f06d12dec6fc44a8f554c0bba"
+checksum = "42ff0bf0c66b8238c6f3b578df37d0b7848e55df8577b3f74f92a69acceeb825"
 [[package]]
 name = "unicase"
@@ -2703,9 +2842,9 @@ checksum = "98e90c70c9f0d4d1ee6d0a7d04aa06cb9bbd53d8cfbdd62a0269a7c2eb640552"
 [[package]]
 name = "unicode-ident"
-version = "1.0.11"
+version = "1.0.12"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "301abaae475aa91687eb82514b328ab47a211a533026cb25fc3e519b86adfc3c"
+checksum = "3354b9ac3fae1ff6755cb6db53683adb661634f67557942dea4facebec0fee4b"
 [[package]]
 name = "unicode-normalization"
@@ -2718,9 +2857,9 @@ dependencies = [
 [[package]]
 name = "unicode-width"
-version = "0.1.10"
+version = "0.1.11"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c0edd1e5b14653f783770bce4a4dabb4a5108a5370a5f5d8cfe8710c361f6c8b"
+checksum = "e51733f11c9c4f72aa0c160008246859e340b00807569a0da0e7a1079b27ba85"
 [[package]]
 name = "unicode-xid"
@@ -2730,9 +2869,9 @@ checksum = "f962df74c8c05a667b5ee8bcf162993134c104e96440b663c8daa176dc772d8c"
 [[package]]
 name = "url"
-version = "2.4.0"
+version = "2.4.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "50bff7831e19200a85b17131d085c25d7811bc4e186efdaf54bbd132994a88cb"
+checksum = "143b538f18257fac9cad154828a57c6bf5157e1aa604d4816b5995bf6de87ae5"
 dependencies = [
 "form_urlencoded",
 "idna",
@@ -2745,6 +2884,12 @@ version = "0.2.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "711b9620af191e0cdc7468a8d14e709c3dcdb115b36f838e601583af800a370a"
+[[package]]
+name = "valuable"
+version = "0.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "830b7e5d4d90034032940e4ace0d9a9a057e7a45cd94e6c007832e39edb82f6d"
 [[package]]
 name = "vcpkg"
 version = "0.2.15"
@@ -2780,9 +2925,9 @@ dependencies = [
 [[package]]
 name = "walkdir"
-version = "2.3.3"
+version = "2.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "36df944cda56c7d8d8b7496af378e6b16de9284591917d307c9b4d313c44e698"
+checksum = "d71d857dc86794ca4c280d616f7da00d2dbfd8cd788846559a6813e6aa4b54ee"
 dependencies = [
 "same-file",
 "winapi-util",
@@ -2815,7 +2960,7 @@ dependencies = [
 "once_cell",
 "proc-macro2",
 "quote",
- "syn 2.0.29",
+ "syn 2.0.38",
 "wasm-bindgen-shared",
 ]
@@ -2837,7 +2982,7 @@ checksum = "54681b18a46765f095758388f2d0cf16eb8d4169b639ab575a8f5693af210c7b"
 dependencies = [
 "proc-macro2",
 "quote",
- "syn 2.0.29",
+ "syn 2.0.38",
 "wasm-bindgen-backend",
 "wasm-bindgen-shared",
 ]
@@ -2866,9 +3011,9 @@ checksum = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6"
 [[package]]
 name = "winapi-util"
-version = "0.1.5"
+version = "0.1.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "70ec6ce85bb158151cae5e5c87f95a8e97d2c0c4b001223f33a334e3ce5de178"
+checksum = "f29e6f9198ba0d26b4c9f07dbe6f9ed633e1f3d5b8b414090084349e46a52596"
 dependencies = [
 "winapi",
 ]
@@ -2888,21 +3033,6 @@ dependencies = [
 "windows-targets",
 ]
-[[package]]
-name = "windows-sys"
-version = "0.42.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5a3e1820f08b8513f676f7ab6c1f99ff312fb97b553d30ff4dd86f9f15728aa7"
-dependencies = [
- "windows_aarch64_gnullvm 0.42.2",
- "windows_aarch64_msvc 0.42.2",
- "windows_i686_gnu 0.42.2",
- "windows_i686_msvc 0.42.2",
- "windows_x86_64_gnu 0.42.2",
- "windows_x86_64_gnullvm 0.42.2",
- "windows_x86_64_msvc 0.42.2",
-]
 [[package]]
 name = "windows-sys"
 version = "0.48.0"
@@ -2918,93 +3048,51 @@ version = "0.48.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "9a2fa6e2155d7247be68c096456083145c183cbbbc2764150dda45a87197940c"
 dependencies = [
- "windows_aarch64_gnullvm 0.48.5",
+ "windows_aarch64_gnullvm",
- "windows_aarch64_msvc 0.48.5",
+ "windows_aarch64_msvc",
- "windows_i686_gnu 0.48.5",
+ "windows_i686_gnu",
- "windows_i686_msvc 0.48.5",
+ "windows_i686_msvc",
- "windows_x86_64_gnu 0.48.5",
+ "windows_x86_64_gnu",
- "windows_x86_64_gnullvm 0.48.5",
+ "windows_x86_64_gnullvm",
- "windows_x86_64_msvc 0.48.5",
+ "windows_x86_64_msvc",
 ]
-[[package]]
-name = "windows_aarch64_gnullvm"
-version = "0.42.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "597a5118570b68bc08d8d59125332c54f1ba9d9adeedeef5b99b02ba2b0698f8"
 [[package]]
 name = "windows_aarch64_gnullvm"
 version = "0.48.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "2b38e32f0abccf9987a4e3079dfb67dcd799fb61361e53e2882c3cbaf0d905d8"
-[[package]]
-name = "windows_aarch64_msvc"
-version = "0.42.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e08e8864a60f06ef0d0ff4ba04124db8b0fb3be5776a5cd47641e942e58c4d43"
 [[package]]
 name = "windows_aarch64_msvc"
 version = "0.48.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "dc35310971f3b2dbbf3f0690a219f40e2d9afcf64f9ab7cc1be722937c26b4bc"
-[[package]]
-name = "windows_i686_gnu"
-version = "0.42.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c61d927d8da41da96a81f029489353e68739737d3beca43145c8afec9a31a84f"
 [[package]]
 name = "windows_i686_gnu"
 version = "0.48.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "a75915e7def60c94dcef72200b9a8e58e5091744960da64ec734a6c6e9b3743e"
-[[package]]
-name = "windows_i686_msvc"
-version = "0.42.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "44d840b6ec649f480a41c8d80f9c65108b92d89345dd94027bfe06ac444d1060"
 [[package]]
 name = "windows_i686_msvc"
 version = "0.48.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "8f55c233f70c4b27f66c523580f78f1004e8b5a8b659e05a4eb49d4166cca406"
-[[package]]
-name = "windows_x86_64_gnu"
-version = "0.42.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8de912b8b8feb55c064867cf047dda097f92d51efad5b491dfb98f6bbb70cb36"
 [[package]]
 name = "windows_x86_64_gnu"
 version = "0.48.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "53d40abd2583d23e4718fddf1ebec84dbff8381c07cae67ff7768bbf19c6718e"
-[[package]]
-name = "windows_x86_64_gnullvm"
-version = "0.42.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "26d41b46a36d453748aedef1486d5c7a85db22e56aff34643984ea85514e94a3"
 [[package]]
 name = "windows_x86_64_gnullvm"
 version = "0.48.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "0b7b52767868a23d5bab768e390dc5f5c55825b6d30b86c844ff2dc7414044cc"
-[[package]]
-name = "windows_x86_64_msvc"
-version = "0.42.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9aec5da331524158c6d1a4ac0ab1541149c0b9505fde06423b02f5ef0106b9f0"
 [[package]]
 name = "windows_x86_64_msvc"
 version = "0.48.5"
@@ -3013,9 +3101,9 @@ checksum = "ed94fce61571a4006852b7389a063ab983c02eb1bb37b47f8272ce92d06d9538"
 [[package]]
 name = "winnow"
-version = "0.5.15"
+version = "0.5.16"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7c2e3184b9c4e92ad5167ca73039d0c42476302ab603e2fec4487511f38ccefc"
+checksum = "037711d82167854aff2018dfd193aa0fef5370f456732f0d5a0c59b0f1b4b907"
 dependencies = [
 "memchr",
 ]

--- a/recipes/build-tools/cargo-c/0001-Fix-linking-with-Android-NDK-linker.patch
+++ b/recipes/build-tools/cargo-c/0001-Fix-linking-with-Android-NDK-linker.patch
-From 18348bd65ce67bcd6f85e309f126792a96732943 Mon Sep 17 00:00:00 2001
-From: Nirbheek Chauhan <nirbheek@centricular.com>
-Date: Thu, 1 Sep 2022 21:33:29 +0530
-Subject: [PATCH] Fix linking with Android NDK linker
-Android ld.gold cannot handle -Wl, and it's incorrect anyway since all
-the other linker arguments passed by cargo do not have a -Wl prefix.
---
- src/target.rs | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-diff --git a/src/target.rs b/src/target.rs
-index 0cc2018..4c9d369 100644
--- a/src/target.rs
-+++ b/src/target.rs
-@@ -70,7 +70,7 @@ impl Target {
-         let env = &self.env;
-         if os == "android" {
-            lines.push(format!("-Wl,-soname,lib{lib_name}.so"));
-+            lines.push(format!("-soname,lib{lib_name}.so"));
-         } else if os == "linux"
-             || os == "freebsd"
-             || os == "dragonfly"
-- 
-2.39.1
--- a/recipes/build-tools/meson.recipe
+++ b/recipes/build-tools/meson.recipe
@@ -6,7 +6,7 @@ from pathlib import PurePath, Path
 class Recipe(recipe.Recipe):
    name = 'meson'
-    version = '1.1.1'
+    version = '1.2.3'
    licenses = [License.Apachev2]
    btype = BuildType.CUSTOM
@@ -18,16 +18,11 @@ class Recipe(recipe.Recipe):
    else:
        stype = SourceType.TARBALL
        url = 'https://github.com/mesonbuild/meson/releases/download/%(version)s/meson-%(version)s.tar.gz'
-        tarball_checksum = 'd04b541f97ca439fb82fab7d0d480988be4bd4e62563a5ca35fadb5400727b1c'
+        tarball_checksum = '4533a43c34548edd1f63a276a42690fce15bde9409bcf20c4b8fa3d7e4d7cac1'
    files_bin = ['bin/meson']
    files_python = []
-    patches = [
-        # https://github.com/mesonbuild/meson/pull/11101
-        'meson/0001-dependencies-qt-add-support-for-Qt-frameworks-refere.patch',
-    ]
    async def install(self):
        # setup.py barfs if using posix paths on Windows
        if self.config.platform == Platform.WINDOWS:

--- a/recipes/build-tools/meson/0001-dependencies-qt-add-support-for-Qt-frameworks-refere.patch
+++ b/recipes/build-tools/meson/0001-dependencies-qt-add-support-for-Qt-frameworks-refere.patch
-From dcbd46813b57289e5d115b2011bf1399312c7e8c Mon Sep 17 00:00:00 2001
-From: Matthew Waters <matthew@centricular.com>
-Date: Tue, 22 Nov 2022 13:08:06 +1100
-Subject: [PATCH] dependencies/qt: add support for Qt frameworks referencing
- includes in include directory
-e.g. QtQml with Qt 6.4.0 referencing QtQmlIntegration is one such example
---
- mesonbuild/dependencies/qt.py | 7 +++++--
- 1 file changed, 5 insertions(+), 2 deletions(-)
-diff --git a/mesonbuild/dependencies/qt.py b/mesonbuild/dependencies/qt.py
-index e1e9e07..09731e5 100644
--- a/mesonbuild/dependencies/qt.py
-+++ b/mesonbuild/dependencies/qt.py
-@@ -103,9 +103,10 @@ def _get_modules_lib_suffix(version: str, info: 'MachineInfo', is_debug: bool) -
- class QtExtraFrameworkDependency(ExtraFrameworkDependency):
-    def __init__(self, name: str, env: 'Environment', kwargs: T.Dict[str, T.Any], language: T.Optional[str] = None):
-+    def __init__(self, name: str, env: 'Environment', kwargs: T.Dict[str, T.Any], qvars: T.Dict[str, str], language: T.Optional[str] = None):
-         super().__init__(name, env, kwargs, language=language)
-         self.mod_name = name[2:]
-+        self.qt_extra_include_directory = qvars['QT_INSTALL_HEADERS']
-     def get_compile_args(self, with_private_headers: bool = False, qt_version: str = "0") -> T.List[str]:
-         if self.found():
-@@ -113,6 +114,8 @@ class QtExtraFrameworkDependency(ExtraFrameworkDependency):
-             args = ['-I' + mod_inc_dir]
-             if with_private_headers:
-                 args += ['-I' + dirname for dirname in _qt_get_private_includes(mod_inc_dir, self.mod_name, qt_version)]
-+            if self.qt_extra_include_directory:
-+                args += ['-I' + self.qt_extra_include_directory]
-             return args
-         return []
-@@ -359,7 +362,7 @@ class QmakeQtDependency(_QtBase, ConfigToolDependency, metaclass=abc.ABCMeta):
-         for m in modules:
-             fname = 'Qt' + m
-             mlog.debug('Looking for qt framework ' + fname)
-            fwdep = QtExtraFrameworkDependency(fname, self.env, fw_kwargs, language=self.language)
-+            fwdep = QtExtraFrameworkDependency(fname, self.env, fw_kwargs, qvars, language=self.language)
-             if fwdep.found():
-                 self.compile_args.append('-F' + libdir)
-                 self.compile_args += fwdep.get_compile_args(with_private_headers=self.private_headers,
-- 
-2.37.0 (Apple Git-136)
--- a/recipes/directxmath.recipe
+++ b/recipes/directxmath.recipe
+# -*- Mode: Python -*- vi:si:et:sw=4:sts=4:ts=4:syntax=python
+class Recipe(recipe.Recipe):
+    version = '3.1.8'
+    name = 'directxmath'
+    licenses = [{License.MIT: ['LICENSE']}]
+    stype = SourceType.TARBALL
+    btype = BuildType.MESON
+    url = 'https://github.com/microsoft/DirectXMath/archive/refs/tags/dec2022.tar.gz'
+    tarball_checksum = '70a18f35343ff07084d31afa7a7978b3b59160f0533424365451c72475ff480f'
+    tarball_name = 'dec2022.tar.gz'
+    tarball_dirname = 'DirectXMath-dec2022'
+    patches = [
+        # https://wrapdb.mesonbuild.com/v2/directxmath_3.1.8-1/get_patch
+        'directxmath/0001-Add-DirectXMath-wrap.patch',
+    ]
--- a/recipes/directxmath/0001-Add-DirectXMath-wrap.patch
+++ b/recipes/directxmath/0001-Add-DirectXMath-wrap.patch
+From 060db52c6eaf47273317de67522f54f87bbad5b3 Mon Sep 17 00:00:00 2001
+From: Seungha Yang <seungha@centricular.com>
+Date: Fri, 27 Oct 2023 00:33:55 +0900
+Subject: [PATCH] Add DirectXMath wrap
+---
+ meson.build | 29 +++++++++++++++++++++++++++++
+ 1 file changed, 29 insertions(+)
+ create mode 100644 meson.build
+diff --git a/meson.build b/meson.build
+new file mode 100644
+index 0000000..c7f9d46
+--- /dev/null
+++ b/meson.build
+@@ -0,0 +1,29 @@
+project('directxmath', 'cpp', version: '3.1.8')
+
+incdirs = include_directories('Inc')
+
+directxmath_headers = files(
+  'Inc/DirectXCollision.h',
+  'Inc/DirectXCollision.inl',
+  'Inc/DirectXColors.h',
+  'Inc/DirectXMath.h',
+  'Inc/DirectXMathConvert.inl',
+  'Inc/DirectXMathMatrix.inl',
+  'Inc/DirectXMathMisc.inl',
+  'Inc/DirectXMathVector.inl',
+  'Inc/DirectXPackedVector.h',
+  'Inc/DirectXPackedVector.inl',
+)
+
+directxmath_dep = declare_dependency(
+  include_directories: incdirs
+)
+
+install_headers(directxmath_headers, subdir: 'directxmath')
+
+pkgconfig = import('pkgconfig')
+pkgconfig.generate(name: 'directxmath',
+    version: meson.project_version(),
+    subdirs: 'directxmath',
+    description: 'DirectXMath SIMD C++ math library')
+
+--
+2.42.0.windows.2
--- a/recipes/ffmpeg.recipe
+++ b/recipes/ffmpeg.recipe
@@ -9,137 +9,101 @@ class Recipe(recipe.Recipe):
    url = 'https://ffmpeg.org/releases/%(name)s-%(version)s.tar.xz'
    tarball_checksum = '57be87c22d9b49c112b6d24bc67d42508660e6b718b3db89c44e47e289137082'
    patches = [
-        name + '/0001-pkgconfig-fix-generation-to-use-prefix.patch',
+        name + '/0001-Add-Meson-build.patch',
    ]
-    btype = BuildType.MAKEFILE
+    btype = BuildType.MESON
-    configure_tpl = './configure --prefix=%(prefix)s --libdir=%(libdir)s \
+    meson_options = {
-        --ar="$AR" --as="$AS" --cc="$CC" --ld="$CC" --nm="$NM" --ranlib="$RANLIB" \
+        'avdevice': 'disabled',
-        --strip="$STRIP" --windres="$RC" \
+        'programs': 'disabled',
-        --enable-static --enable-pic --enable-shared \
+        'flac_encoder': 'disabled',
-        --disable-avdevice --disable-postproc --disable-swscale \
+        'protocols': 'disabled',
-        --disable-programs --disable-ffplay --disable-ffprobe --disable-ffmpeg \
+        'devices': 'disabled',
-        --disable-encoder=flac --disable-protocols --disable-devices \
+        'network': 'disabled',
-        --disable-network --disable-hwaccels --disable-dxva2 --disable-vdpau \
+        'hwaccels': 'disabled',
-        --disable-filters --enable-filter=yadif --disable-doc --disable-d3d11va \
+        'dxva2': 'disabled',
-        --disable-audiotoolbox --disable-videotoolbox --disable-vaapi --disable-crystalhd \
+        'vdpau': 'disabled',
-        --disable-mediacodec --disable-mediafoundation --disable-nvenc --disable-mmal --disable-omx \
+        'filters': 'disabled',
-        --disable-omx-rpi --disable-cuda --disable-cuvid --disable-libmfx \
+        'yadif_filter': 'enabled',
-        --disable-libnpp --disable-iconv --disable-jni --disable-v4l2_m2m \
+        # Uncomment the following option once implemented in the port
-        --disable-vulkan --disable-large-tests --disable-stripping \
+        # 'doc': 'disabled',
-        --enable-optimizations --disable-nonfree --disable-version3 %(options)s'
+        'd3d11va': 'disabled',
+        'audiotoolbox': 'disabled',
+        'videotoolbox': 'disabled',
+        'vaapi': 'disabled',
+        'crystalhd': 'disabled',
+        'mediacodec': 'disabled',
+        'mediafoundation' : 'disabled',
+        'nvenc': 'disabled',
+        'mmal': 'disabled',
+        'omx': 'disabled',
+        'omx_rpi': 'disabled',
+        'cuda': 'disabled',
+        'cuvid': 'disabled',
+        'libmfx': 'disabled',
+        'libnpp': 'disabled',
+        'libnpp': 'disabled',
+        'iconv': 'disabled',
+        'jni': 'disabled',
+        'v4l2_m2m': 'disabled',
+        'vulkan': 'disabled',
+        'tests': 'disabled', # To not waste time
+        # These two are redundant with Meson
+        # 'stripping': 'disabled',
+        # 'optimizations': 'enabled,
+        'nonfree': 'disabled',
+        'version3': 'disabled',
+    }
    deps = ['bzip2', 'zlib']
-    files_libs = ['libavcodec', 'libavformat', 'libavutil', 'libswresample', 'libavfilter']
+    files_libs = ['libavcodec', 'libavformat', 'libavutil', 'libswresample', 'libavfilter', 'libpostproc', 'libswscale']
    files_devel = []
    def prepare(self):
+        # Arch-specific flags
+        if self.config.target_arch == Architecture.X86:
+            if self.config.target_platform == Platform.IOS:
+                # Simulator doesn't like shared libs
+                self.library_type = LibraryType.STATIC
+            elif self.config.target_platform == Platform.ANDROID:
+                # ld.lld: error: relocation R_386_32 cannot be used against local symbol; recompile with -fPIC
+                # See https://github.com/FFmpeg/FFmpeg/blob/n6.0/libavutil/x86/x86inc.asm#L104-L108
+                self.meson_options['asm'] = 'disabled'
        # Populate self.files_devel
        files_devel_tpl = ['%(libdir)s/{}.la', '%(libdir)s/pkgconfig/{}.pc', 'include/{}']
-        # ffmpeg can only build either shared or static on Windows, not both
+        if self.library_type != LibraryType.SHARED:
-        if self.config.target_platform == Platform.WINDOWS:
-            self.library_type = LibraryType.SHARED
-        else:
            files_devel_tpl += ['%(libdir)s/{}.a']
        for lib in self.files_libs:
            self.files_devel += [tpl.format(lib) for tpl in files_devel_tpl]
-        # Default AS is $CC, except iOS (set below)
-        if Architecture.is_arm(self.config.target_arch):
-            if self.config.target_platform == Platform.IOS:
-                gas = self.get_env('GAS')
-                if gas:
-                    self.set_env('AS', gas)
-                    self.set_env('ASFLAGS', self.get_env('CPPFLAGS'))
-            else:
-                cc = self.get_env('CC')
-                if cc:
-                    self.set_env('AS', cc)
-        libavextraconf = ''
-        # Arch-specific flags
-        if self.config.target_platform == Platform.ANDROID:
-            if self.config.target_arch == Architecture.X86:
-              # libav internally aligns stacks, while Android doesn't
-                libavextraconf += " --extra-cflags='-mstackrealign'"
-            if self.config.target_arch in [Architecture.X86]:
-                # Fails to link into an android app with relocation warnings
-                # in the custom assembly
-                # https://stackoverflow.com/questions/34691970/ffmpeg-for-android-neon-build-has-text-relocations/34697703#34697703
-                # https://issuetracker.google.com/issues/37067983
-                # https://trac.ffmpeg.org/ticket/4928
-                libavextraconf += " --disable-asm"
-        elif self.config.target_platform == Platform.IOS:
-            # Some optimisations that were previously silently disabled
-            # cause warnings now. Ignore them
-            libavextraconf += " --extra-cflags='-Wno-ignored-optimization-argument' "
-            if self.config.target_arch == Architecture.X86:
-                # Fails to link in gst-libav due to text relocations in
-                # custom assembly:
-                # ld: illegal text-relocation to 'anon' in libavfilter.a(vf_yadif.o)
-                # from '_ff_yadif_filter_line_ssse3' in libavfilter.a(vf_yadif.o)
-                # for architecture i386
-                libavextraconf += ' --disable-asm  '
-        # On windows, being a multilib toolchain, we have to always configure
-        # the cross-prefix
-        if self.config.cross_compiling() or \
-                self.config.target_platform == Platform.WINDOWS:
-            libavextraconf += ' --enable-cross-compile'
-            target_os = self.config.target_platform
-            if target_os == Platform.WINDOWS:
-                target_os = 'mingw32'
-            elif target_os == Platform.IOS:
-                target_os = 'darwin'
-            target_arch = self.config.host.split('-', 1)[0]
-            if target_arch == 'aarch64':
-                target_arch = 'arm64'
-            libavextraconf += ' --target-os=' + target_os
-            libavextraconf += ' --arch=' + target_arch
-            libavextraconf += ' --cross-prefix={} '\
-                    .format(self.config.tools_prefix or self.config.host)
-        self.configure_options += libavextraconf
-        # On Windows, make fails if V=1 is passed with:
-        # `couldn't commit memory for cygwin heap, Win32 error 0`
-        if self.config.platform == Platform.WINDOWS:
-            self.make.remove('V=1')
-    async def configure(self):
-        await super(recipe.Recipe, self).configure()
-        libav_path = self.build_dir
-        if self.config.target_platform in [Platform.DARWIN, Platform.IOS]:
-            if self.config.target_arch == Architecture.X86:
-                replacements = {'HAVE_EBX_AVAILABLE=yes': 'HAVE_EBX_AVAILABLE=no',
-                                'HAVE_EBX_AVAILABLE 1': 'HAVE_EBX_AVAILABLE 0',}
-                shell.replace(os.path.join(libav_path, 'ffbuild', 'config.mak'), replacements)
-                shell.replace(os.path.join(libav_path, 'config.h'), replacements)
-        # log2 and log2f are not provided by bionic, but they are not checked
-        # properly
-        elif self.config.target_platform == Platform.ANDROID:
-                replacements = {'HAVE_LOG2 1': 'HAVE_LOG2 0',
-                                'HAVE_LOG2F 1': 'HAVE_LOG2F 0',}
-                shell.replace(os.path.join(libav_path, 'config.h'), replacements)
-                v = DistroVersion.get_android_api_version(self.config.target_distro_version)
-                if self.config.target_arch in [Architecture.ARM, Architecture.ARMv7, Architecture.X86] and v < 21:
-                        replacements = {'-D_FILE_OFFSET_BITS=64': '',}
-                        shell.replace(os.path.join(libav_path, 'ffbuild', 'config.mak'), replacements)
    def post_install(self):
-        LibtoolLibrary('avutil', None, None, None,
+    # Meson does not generate la files
-                       self.config.libdir, self.config.target_platform).save()
-        LibtoolLibrary('swresample', None, None, None,
-                       self.config.libdir, self.config.target_platform,
-                       deps=['avutil']).save()
        LibtoolLibrary('avcodec', None, None, None,
                       self.config.libdir, self.config.target_platform,
-                       deps=['swresample', 'avutil', 'z']).save()
+                       deps=['swresample', 'avutil', 'z'],
+                       static_only=self.library_type == LibraryType.STATIC).save()
+        LibtoolLibrary('avfilter', None, None, None,
+                       self.config.libdir, self.config.target_platform,
+                       deps=['avformat', 'avcodec', 'swresample', 'avutil'],
+                       static_only=self.library_type == LibraryType.STATIC).save()
        LibtoolLibrary('avformat', None, None, None,
                       self.config.libdir, self.config.target_platform,
-                       deps=['avcodec', 'swresample', 'avutil', 'bz2', 'z']).save()
+                       deps=['avcodec', 'swresample', 'avutil', 'bz2', 'z'],
-        LibtoolLibrary('avfilter', None, None, None,
+                       static_only=self.library_type == LibraryType.STATIC).save()
+        LibtoolLibrary('avutil', None, None, None,
+                       self.config.libdir, self.config.target_platform,
+                       static_only=self.library_type == LibraryType.STATIC).save()
+        LibtoolLibrary('postproc', None, None, None,
+                       self.config.libdir, self.config.target_platform,
+                       static_only=self.library_type == LibraryType.STATIC).save()
+        LibtoolLibrary('swresample', None, None, None,
+                       self.config.libdir, self.config.target_platform,
+                       deps=['avutil'],
+                       static_only=self.library_type == LibraryType.STATIC).save()
+        LibtoolLibrary('swscale', None, None, None,
                       self.config.libdir, self.config.target_platform,
-                       deps=['avformat', 'avcodec', 'swresample', 'avutil']).save()
+                       deps=['avutil'],
+                       static_only=self.library_type == LibraryType.STATIC).save()
        super().post_install()
--- a/recipes/ffmpeg/0001-Add-Meson-build.patch
+++ b/recipes/ffmpeg/0001-Add-Meson-build.patch
--- a/recipes/ffmpeg/0001-pkgconfig-fix-generation-to-use-prefix.patch
+++ b/recipes/ffmpeg/0001-pkgconfig-fix-generation-to-use-prefix.patch
-From 8f5d2c0283c4cbc430ac30a6efef999c33bdb2c9 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?St=C3=A9phane=20Cerveau?= <scerveau@igalia.com>
-Date: Fri, 4 Nov 2022 12:20:25 +0100
-Subject: [PATCH] pkgconfig: fix generation to use prefix
---
- ffbuild/pkgconfig_generate.sh | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-diff --git a/ffbuild/pkgconfig_generate.sh b/ffbuild/pkgconfig_generate.sh
-index e5de671..679413e 100755
--- a/ffbuild/pkgconfig_generate.sh
-+++ b/ffbuild/pkgconfig_generate.sh
-@@ -29,8 +29,8 @@ version=$(grep ${name}_VERSION= $name/${name}.version | cut -d= -f2)
- cat <<EOF > $name/$fullname.pc
- prefix=$prefix
- exec_prefix=\${prefix}
-libdir=$libdir
-includedir=$incdir
-+libdir=\${prefix}/lib
-+includedir=\${prefix}/include
- Name: $fullname
- Description: $comment
-- 
-2.34.1
--- a/recipes/glib.recipe
+++ b/recipes/glib.recipe
@@ -47,6 +47,8 @@ class Recipe(recipe.Recipe):
        'glib/0001-gio-fix-duplicate-g_trace_-symbols-in-static-libs-wi.patch',
        # From post-2.74.4 glib upstream (remove when bumping version)
        'glib/0001-gthread-posix-need-to-include-errno.h.patch',
+        # Upstreamed since 2.75 (remove when bumping version)
+        'glib/0001-giomodule-Automatically-detect-modules-on-macOS.patch',
    ]
    files_libs = [

--- a/recipes/glib/0001-Add-missing-extern-to-the-dllexport-version-of-GLIB_.patch
+++ b/recipes/glib/0001-Add-missing-extern-to-the-dllexport-version-of-GLIB_.patch
-From fdfadfc27604b58886d7a33cf5f78bb0617733e6 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Martin=20Storsj=C3=B6?= <martin@martin.st>
-Date: Tue, 31 Mar 2020 23:15:23 +0300
-Subject: [PATCH] Add missing 'extern' to the dllexport version of
- GLIB_VAR/GOBJECT_VAR
-The __declspec(dllexport) attribute in itself doesn't imply
-'extern' - thus any intended variable declaration with
-GLIB_VAR/GOBJECT_VAR would actually be a variable definition. With
-C compilers defaulting to -fcommon, this isn't an issue, but
-upcoming compilers (GCC 10 and Clang 11) will default to -fno-common,
-ending up with duplicate definitions of these variables.
---
- glib/gtypes.h         | 2 +-
- gobject/gparamspecs.h | 2 +-
- 2 files changed, 2 insertions(+), 2 deletions(-)
-diff --git a/glib/gtypes.h b/glib/gtypes.h
-index df65836a0..23c5a1295 100644
--- a/glib/gtypes.h
-+++ b/glib/gtypes.h
-@@ -565,7 +565,7 @@ G_END_DECLS
- #    else /* !GLIB_STATIC_COMPILATION */
- #      ifdef GLIB_COMPILATION
- #        ifdef DLL_EXPORT
-#          define GLIB_VAR __declspec(dllexport)
-+#          define GLIB_VAR extern __declspec(dllexport)
- #        else /* !DLL_EXPORT */
- #          define GLIB_VAR extern
- #        endif /* !DLL_EXPORT */
-diff --git a/gobject/gparamspecs.h b/gobject/gparamspecs.h
-index 0309f9bb3..d0e4d5953 100644
--- a/gobject/gparamspecs.h
-+++ b/gobject/gparamspecs.h
-@@ -1150,7 +1150,7 @@ GParamSpec*	g_param_spec_variant	 (const gchar        *name,
- #    else /* !GOBJECT_STATIC_COMPILATION */
- #      ifdef GOBJECT_COMPILATION
- #        ifdef DLL_EXPORT
-#          define GOBJECT_VAR __declspec(dllexport)
-+#          define GOBJECT_VAR extern __declspec(dllexport)
- #        else /* !DLL_EXPORT */
- #          define GOBJECT_VAR extern
- #        endif /* !DLL_EXPORT */
-- 
-2.25.1
No results found