From beaf27ed254eaaaaec8ddae424c0b02293896867 Mon Sep 17 00:00:00 2001 From: CJ Pais Date: Tue, 9 Sep 2025 15:25:19 -0700 Subject: [PATCH] move to my fork for vad-rs/ort for rc10 --- src-tauri/Cargo.lock | 103 ++++++++++++++++++++++++------------------- src-tauri/Cargo.toml | 5 +-- 2 files changed, 58 insertions(+), 50 deletions(-) diff --git a/src-tauri/Cargo.lock b/src-tauri/Cargo.lock index 3d99e0a..064bf93 100644 --- a/src-tauri/Cargo.lock +++ b/src-tauri/Cargo.lock @@ -651,7 +651,7 @@ version = "0.15.8" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d067ad48b8650848b989a59a86c6c36a995d02d2bf778d45c3c5d57bc2718f02" dependencies = [ - "smallvec", + "smallvec 1.13.2", "target-lexicon", ] @@ -985,12 +985,6 @@ version = "0.8.21" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d0a5c400df2834b80a4c3327b3aad3a4c4cd4de0629063962b03235697506a28" -[[package]] -name = "crunchy" -version = "0.2.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "43da5946c66ffcc7745f48db692ffbb10a83bfe0afd96235c5c2a4fb23994929" - [[package]] name = "crypto-common" version = "0.1.6" @@ -1014,7 +1008,7 @@ dependencies = [ "phf 0.10.1", "proc-macro2", "quote", - "smallvec", + "smallvec 1.13.2", "syn 1.0.109", ] @@ -1287,7 +1281,7 @@ dependencies = [ "bitflags 1.3.2", "dasp_frame", "dasp_sample", - "smallvec", + "smallvec 1.13.2", ] [[package]] @@ -1950,7 +1944,7 @@ dependencies = [ "libc", "once_cell", "pin-project-lite", - "smallvec", + "smallvec 1.13.2", "thiserror 1.0.69", ] @@ -1986,7 +1980,7 @@ dependencies = [ "libc", "memchr", "once_cell", - "smallvec", + "smallvec 1.13.2", "thiserror 1.0.69", ] @@ -2119,16 +2113,6 @@ dependencies = [ "tracing", ] -[[package]] -name = "half" -version = "2.4.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6dd08c532ae367adf81c312a4580bc67f1d0fe8bc9c460520283f4c0ff277888" -dependencies = [ - "cfg-if", - "crunchy", -] - [[package]] name = "handy" version = "0.4.2" @@ -2143,7 +2127,6 @@ dependencies = [ "log", "natural", "once_cell", - "ort-sys", "rdev", "reqwest 0.11.27", "rodio", @@ -2403,7 +2386,7 @@ dependencies = [ "httparse", "itoa", "pin-project-lite", - "smallvec", + "smallvec 1.13.2", "tokio", "want", ] @@ -2547,7 +2530,7 @@ dependencies = [ "icu_normalizer_data", "icu_properties", "icu_provider", - "smallvec", + "smallvec 1.13.2", "utf16_iter", "utf8_iter", "write16", @@ -2622,7 +2605,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "686f825264d630750a544639377bae737628043f20d38bbc029e8f29ea968a7e" dependencies = [ "idna_adapter", - "smallvec", + "smallvec 1.13.2", "utf8_iter", ] @@ -3313,7 +3296,7 @@ dependencies = [ "num-iter", "num-traits", "rand 0.8.5", - "smallvec", + "smallvec 1.13.2", "zeroize", ] @@ -3806,21 +3789,21 @@ dependencies = [ [[package]] name = "ort" -version = "2.0.0-rc.9" +version = "2.0.0-rc.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "52afb44b6b0cffa9bf45e4d37e5a4935b0334a51570658e279e9e3e6cf324aa5" +checksum = "1fa7e49bd669d32d7bc2a15ec540a527e7764aec722a45467814005725bcd721" dependencies = [ - "half", "ndarray", "ort-sys", + "smallvec 2.0.0-alpha.10", "tracing", ] [[package]] name = "ort-sys" -version = "2.0.0-rc.9" +version = "2.0.0-rc.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c41d7757331aef2d04b9cb09b45583a59217628beaf91895b7e76187b6e8c088" +checksum = "e2aba9f5c7c479925205799216e7e5d07cc1d4fa76ea8058c60a9a30f6a4e890" dependencies = [ "flate2", "pkg-config", @@ -3904,7 +3887,7 @@ dependencies = [ "cfg-if", "libc", "redox_syscall", - "smallvec", + "smallvec 1.13.2", "windows-targets 0.52.6", ] @@ -4694,7 +4677,7 @@ dependencies = [ "fallible-streaming-iterator", "hashlink 0.9.1", "libsqlite3-sys", - "smallvec", + "smallvec 1.13.2", ] [[package]] @@ -4780,7 +4763,6 @@ version = "0.23.22" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9fb9263ab4eb695e42321db096e3b8fbd715a59b154d5c88d82db2175b681ba7" dependencies = [ - "log", "once_cell", "ring", "rustls-pki-types", @@ -4937,7 +4919,7 @@ dependencies = [ "phf_codegen 0.8.0", "precomputed-hash", "servo_arc", - "smallvec", + "smallvec 1.13.2", ] [[package]] @@ -5180,6 +5162,12 @@ dependencies = [ "serde", ] +[[package]] +name = "smallvec" +version = "2.0.0-alpha.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "51d44cfb396c3caf6fbfd0ab422af02631b69ddd96d2eff0b0f0724f9024051b" + [[package]] name = "socket2" version = "0.5.8" @@ -5307,7 +5295,7 @@ dependencies = [ "serde", "serde_json", "sha2", - "smallvec", + "smallvec 1.13.2", "thiserror 2.0.11", "time", "tokio", @@ -5388,7 +5376,7 @@ dependencies = [ "serde", "sha1", "sha2", - "smallvec", + "smallvec 1.13.2", "sqlx-core", "stringprep", "thiserror 2.0.11", @@ -5426,7 +5414,7 @@ dependencies = [ "serde", "serde_json", "sha2", - "smallvec", + "smallvec 1.13.2", "sqlx-core", "stringprep", "thiserror 2.0.11", @@ -6764,18 +6752,33 @@ checksum = "8ecb6da28b8a351d773b68d5825ac39017e680750f980f3a1a85cd8dd28a47c1" [[package]] name = "ureq" -version = "2.12.1" +version = "3.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "02d1a66277ed75f640d608235660df48c8e3c19f3b4edb6a263315626cc3c01d" +checksum = "99ba1025f18a4a3fc3e9b48c868e9beb4f24f4b4b1a325bada26bd4119f46537" dependencies = [ "base64 0.22.1", + "der", "log", - "once_cell", - "rustls", + "native-tls", + "percent-encoding", + "rustls-pemfile 2.2.0", "rustls-pki-types", "socks", - "url", - "webpki-roots", + "ureq-proto", + "utf-8", + "webpki-root-certs", +] + +[[package]] +name = "ureq-proto" +version = "0.5.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "60b4531c118335662134346048ddb0e54cc86bd7e81866757873055f0e38f5d2" +dependencies = [ + "base64 0.22.1", + "http 1.2.0", + "httparse", + "log", ] [[package]] @@ -6839,8 +6842,7 @@ dependencies = [ [[package]] name = "vad-rs" version = "0.1.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c53326a6c46b158e5376c26d5745c15b499159fb7d800e5d28ac4b6c2f25443b" +source = "git+https://github.com/cjpais/vad-rs#88b3a01f72f83a5d80d0e7ea9bacfc0d897fd03f" dependencies = [ "ebur128", "eyre", @@ -7082,6 +7084,15 @@ dependencies = [ "system-deps", ] +[[package]] +name = "webpki-root-certs" +version = "1.0.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4e4ffd8df1c57e87c325000a3d6ef93db75279dc3a231125aac571650f22b12a" +dependencies = [ + "rustls-pki-types", +] + [[package]] name = "webpki-roots" version = "0.26.8" diff --git a/src-tauri/Cargo.toml b/src-tauri/Cargo.toml index c2a11e7..ec7d9d6 100644 --- a/src-tauri/Cargo.toml +++ b/src-tauri/Cargo.toml @@ -47,7 +47,7 @@ hound = "3.5.1" env_logger = "0.11.6" log = "0.4.25" tokio = "1.43.0" -vad-rs = "0.1.5" +vad-rs = { git = "https://github.com/cjpais/vad-rs" } tauri-plugin-store = "2" tauri-plugin-os = "2" enigo = "0.5.0" @@ -63,9 +63,6 @@ chrono = "0.4" rusqlite = { version = "0.32", features = ["bundled"] } tauri-plugin-sql = { version = "2", features = ["sqlite"] } -[dependencies.ort-sys] -version = "=2.0.0-rc.9" - [target.'cfg(target_os = "macos")'.dependencies] whisper-rs = { version = "0.13.2", features = ["metal"] }