From bf56eefd7af552e969970b2926d56d405ba0fc52 Mon Sep 17 00:00:00 2001 From: vicrodh <103399283+vicrodh@users.noreply.github.com> Date: Sat, 23 May 2026 22:25:26 -0600 Subject: [PATCH] chore(deps): bump cpal 0.17.1 -> 0.17.3 and alsa 0.10 -> 0.11 cpal 0.17.3 requires alsa 0.11, which in turn pulls alsa-sys 0.4. The `links = "alsa"` constraint permits only one alsa-sys in the dependency graph, so qbz-audio's direct alsa stack is raised in lockstep: alsa 0.10 -> 0.11 and alsa-sys 0.3 -> 0.4. Both workspace lockfiles (crates/ and src-tauri/) are updated to cpal 0.17.3 / alsa 0.11.0 / alsa-sys 0.4.0. No source changes required: alsa_direct.rs uses only the stable high-level alsa API (pcm, HwParams, Format, Direction, ValueOr, mixer), and the snd_lib_error_set_handler FFI in alsa_error_handler.rs is unchanged in alsa-sys 0.4. Both workspaces pass cargo check. cc --- crates/Cargo.lock | 30 +++++-------------- crates/qbz-audio/Cargo.toml | 8 +++-- src-tauri/Cargo.lock | 58 ++++++++++++++----------------------- 3 files changed, 35 insertions(+), 61 deletions(-) diff --git a/crates/Cargo.lock b/crates/Cargo.lock index af2b0c42f..90237a938 100644 --- a/crates/Cargo.lock +++ b/crates/Cargo.lock @@ -72,9 +72,9 @@ checksum = "683d7910e743518b0e34f1186f92494becacb047c7b6bf616c96772180fef923" [[package]] name = "alsa" -version = "0.10.0" +version = "0.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7c88dbbce13b232b26250e1e2e6ac18b6a891a646b8148285036ebce260ac5c3" +checksum = "812947049edcd670a82cd5c73c3661d2e58468577ba8489de58e1a73c04cbd5d" dependencies = [ "alsa-sys", "bitflags 2.11.0", @@ -84,9 +84,9 @@ dependencies = [ [[package]] name = "alsa-sys" -version = "0.3.1" +version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "db8fee663d06c4e303404ef5f40488a53e062f89ba8bfed81f42325aafad1527" +checksum = "ad7569085a265dd3f607ebecce7458eaab2132a84393534c95b18dcbc3f31e04" dependencies = [ "libc", "pkg-config", @@ -814,20 +814,6 @@ dependencies = [ "libc", ] -[[package]] -name = "coreaudio-rs" -version = "0.13.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1aae284fbaf7d27aa0e292f7677dfbe26503b0d555026f702940805a630eac17" -dependencies = [ - "bitflags 1.3.2", - "libc", - "objc2-audio-toolbox", - "objc2-core-audio", - "objc2-core-audio-types", - "objc2-core-foundation", -] - [[package]] name = "coreaudio-rs" version = "0.14.1" @@ -844,12 +830,12 @@ dependencies = [ [[package]] name = "cpal" -version = "0.17.1" +version = "0.17.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5b1f9c7312f19fc2fa12fd7acaf38de54e8320ba10d1a02dcbe21038def51ccb" +checksum = "d8942da362c0f0d895d7cac616263f2f9424edc5687364dfd1d25ef7eba506d7" dependencies = [ "alsa", - "coreaudio-rs 0.13.0", + "coreaudio-rs", "dasp_sample", "jni", "js-sys", @@ -2988,7 +2974,7 @@ dependencies = [ "alsa", "alsa-sys", "async-trait", - "coreaudio-rs 0.14.1", + "coreaudio-rs", "dirs", "ebur128", "log", diff --git a/crates/qbz-audio/Cargo.toml b/crates/qbz-audio/Cargo.toml index 4aa633678..d3efc5450 100644 --- a/crates/qbz-audio/Cargo.toml +++ b/crates/qbz-audio/Cargo.toml @@ -38,9 +38,11 @@ dirs = "6" [target.'cfg(target_os = "linux")'.dependencies] # ALSA for direct hardware access (bit-perfect) -alsa = "0.10" -# alsa-sys: direct FFI for snd_lib_error_set_handler (custom error routing) -alsa-sys = "0.3" +alsa = "0.11" +# alsa-sys: direct FFI for snd_lib_error_set_handler (custom error routing). +# Kept in lockstep with alsa (0.11 -> alsa-sys 0.4); a single alsa-sys is +# required because of the `links = "alsa"` constraint shared with cpal. +alsa-sys = "0.4" # zbus for org.freedesktop.ReserveDevice1 D-Bus client (device reservation). # Pinned to v4 to share the transitive copy already pulled in by # secret-service/souvlaki and avoid duplicate zbus compiles. diff --git a/src-tauri/Cargo.lock b/src-tauri/Cargo.lock index 798cf43e5..02bd035a8 100644 --- a/src-tauri/Cargo.lock +++ b/src-tauri/Cargo.lock @@ -81,9 +81,9 @@ dependencies = [ [[package]] name = "alsa" -version = "0.10.0" +version = "0.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7c88dbbce13b232b26250e1e2e6ac18b6a891a646b8148285036ebce260ac5c3" +checksum = "812947049edcd670a82cd5c73c3661d2e58468577ba8489de58e1a73c04cbd5d" dependencies = [ "alsa-sys", "bitflags 2.11.0", @@ -93,9 +93,9 @@ dependencies = [ [[package]] name = "alsa-sys" -version = "0.3.1" +version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "db8fee663d06c4e303404ef5f40488a53e062f89ba8bfed81f42325aafad1527" +checksum = "ad7569085a265dd3f607ebecce7458eaab2132a84393534c95b18dcbc3f31e04" dependencies = [ "libc", "pkg-config", @@ -191,7 +191,7 @@ dependencies = [ "objc2-foundation", "parking_lot", "percent-encoding", - "windows-sys 0.52.0", + "windows-sys 0.60.2", "wl-clipboard-rs", "x11rb", ] @@ -1137,20 +1137,6 @@ dependencies = [ "libc", ] -[[package]] -name = "coreaudio-rs" -version = "0.13.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1aae284fbaf7d27aa0e292f7677dfbe26503b0d555026f702940805a630eac17" -dependencies = [ - "bitflags 1.3.2", - "libc", - "objc2-audio-toolbox", - "objc2-core-audio", - "objc2-core-audio-types", - "objc2-core-foundation", -] - [[package]] name = "coreaudio-rs" version = "0.14.1" @@ -1167,12 +1153,12 @@ dependencies = [ [[package]] name = "cpal" -version = "0.17.1" +version = "0.17.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5b1f9c7312f19fc2fa12fd7acaf38de54e8320ba10d1a02dcbe21038def51ccb" +checksum = "d8942da362c0f0d895d7cac616263f2f9424edc5687364dfd1d25ef7eba506d7" dependencies = [ "alsa", - "coreaudio-rs 0.13.0", + "coreaudio-rs", "dasp_sample", "jni", "js-sys", @@ -1839,7 +1825,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "39cab71617ae0d63f51a36d69f866391735b51691dbda63cf6f96d042b63efeb" dependencies = [ "libc", - "windows-sys 0.52.0", + "windows-sys 0.61.2", ] [[package]] @@ -2845,7 +2831,7 @@ dependencies = [ "libc", "percent-encoding", "pin-project-lite", - "socket2 0.5.10", + "socket2 0.6.3", "tokio", "tower-service", "tracing", @@ -2863,7 +2849,7 @@ dependencies = [ "js-sys", "log", "wasm-bindgen", - "windows-core 0.61.2", + "windows-core 0.62.2", ] [[package]] @@ -3945,7 +3931,7 @@ version = "0.7.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ff32365de1b6743cb203b710788263c44a03de03802daf96092f2da4fe6ba4d7" dependencies = [ - "proc-macro-crate 1.3.1", + "proc-macro-crate 3.4.0", "proc-macro2", "quote", "syn 2.0.117", @@ -4361,7 +4347,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7d8fae84b431384b68627d0f9b3b1245fcf9f46f6c0e3dc902e9dce64edd1967" dependencies = [ "libc", - "windows-sys 0.45.0", + "windows-sys 0.61.2", ] [[package]] @@ -5040,7 +5026,7 @@ dependencies = [ "alsa", "alsa-sys", "async-trait", - "coreaudio-rs 0.14.1", + "coreaudio-rs", "dirs", "ebur128", "log", @@ -5421,7 +5407,7 @@ dependencies = [ "quinn-udp", "rustc-hash", "rustls", - "socket2 0.5.10", + "socket2 0.6.3", "thiserror 2.0.18", "tokio", "tracing", @@ -5458,9 +5444,9 @@ dependencies = [ "cfg_aliases", "libc", "once_cell", - "socket2 0.5.10", + "socket2 0.6.3", "tracing", - "windows-sys 0.52.0", + "windows-sys 0.60.2", ] [[package]] @@ -5981,7 +5967,7 @@ dependencies = [ "errno", "libc", "linux-raw-sys 0.4.15", - "windows-sys 0.52.0", + "windows-sys 0.59.0", ] [[package]] @@ -5994,7 +5980,7 @@ dependencies = [ "errno", "libc", "linux-raw-sys 0.12.1", - "windows-sys 0.52.0", + "windows-sys 0.61.2", ] [[package]] @@ -6053,7 +6039,7 @@ dependencies = [ "security-framework", "security-framework-sys", "webpki-root-certs", - "windows-sys 0.52.0", + "windows-sys 0.61.2", ] [[package]] @@ -7498,7 +7484,7 @@ dependencies = [ "getrandom 0.4.2", "once_cell", "rustix 1.1.4", - "windows-sys 0.52.0", + "windows-sys 0.61.2", ] [[package]] @@ -8649,7 +8635,7 @@ version = "0.1.11" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c2a7b1c03c876122aa43f3020e6c3c3ee5c05081c9a00739faf7503aeba10d22" dependencies = [ - "windows-sys 0.52.0", + "windows-sys 0.61.2", ] [[package]]