From 5e4e574f78b771e62c43dc46b2486ba554b9424f Mon Sep 17 00:00:00 2001 From: Sasha Hilton Date: Sun, 31 Jan 2021 02:50:20 +0000 Subject: [PATCH] Bump alsa version in playback crate, remove duplicate dependency --- Cargo.lock | 80 ++++++++++++--------------------------------- playback/Cargo.toml | 2 +- 2 files changed, 21 insertions(+), 61 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index c2e3aa68..2e4286e9 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -66,38 +66,16 @@ dependencies = [ "stream-cipher", ] -[[package]] -name = "alsa" -version = "0.2.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b4a0d4ebc8b23041c5de9bc9aee13b4bad844a589479701f31a5934cfe4aeb32" -dependencies = [ - "alsa-sys 0.1.2", - "bitflags 0.9.1", - "libc", - "nix 0.9.0", -] - [[package]] name = "alsa" version = "0.4.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "eb213f6b3e4b1480a60931ca2035794aa67b73103d254715b1db7b70dcb3c934" dependencies = [ - "alsa-sys 0.3.0", - "bitflags 1.2.1", + "alsa-sys", + "bitflags", "libc", - "nix 0.15.0", -] - -[[package]] -name = "alsa-sys" -version = "0.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b0edcbbf9ef68f15ae1b620f722180b82a98b6f0628d30baa6b8d2a5abc87d58" -dependencies = [ - "libc", - "pkg-config", + "nix", ] [[package]] @@ -196,7 +174,7 @@ version = "0.53.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c72a978d268b1d70b0e963217e60fdabd9523a941457a6c42a7315d15c7e89e5" dependencies = [ - "bitflags 1.2.1", + "bitflags", "cexpr", "cfg-if 0.1.10", "clang-sys", @@ -225,12 +203,6 @@ version = "0.6.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "5f0dc55f2d8a1a85650ac47858bb001b4c0dd73d79e3c455a842925e68d29cd3" -[[package]] -name = "bitflags" -version = "0.9.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4efd02e230a02e18f92fc2735f44597385ed02ad8f831e7c1c1156ee5e1ab3a5" - [[package]] name = "bitflags" version = "1.2.1" @@ -378,7 +350,7 @@ version = "0.0.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ddfc5b9aa5d4507acaf872de71051dfd0e309860e88966e1051e462a077aac4f" dependencies = [ - "bitflags 1.2.1", + "bitflags", ] [[package]] @@ -387,7 +359,7 @@ version = "0.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4344512281c643ae7638bbabc3af17a11307803ec8f0fcad9fae512a8bf36467" dependencies = [ - "bitflags 1.2.1", + "bitflags", ] [[package]] @@ -436,7 +408,7 @@ version = "0.9.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f229761965dad3e9b11081668a6ea00f1def7aa46062321b5ec245b834f6e491" dependencies = [ - "bitflags 1.2.1", + "bitflags", "coreaudio-sys", ] @@ -455,7 +427,7 @@ version = "0.13.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "05631e2089dfa5d3b6ea1cfbbfd092e2ee5deeb69698911bc976b28b746d3657" dependencies = [ - "alsa 0.4.3", + "alsa", "core-foundation-sys", "coreaudio-rs", "jni 0.17.0", @@ -465,7 +437,7 @@ dependencies = [ "mach", "ndk", "ndk-glue", - "nix 0.15.0", + "nix", "oboe", "parking_lot 0.11.1", "stdweb", @@ -720,7 +692,7 @@ version = "0.3.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2e9763c69ebaae630ba35f74888db465e49e259ba1bc0eda7d06f4a067615d82" dependencies = [ - "bitflags 1.2.1", + "bitflags", "fuchsia-zircon-sys", ] @@ -862,7 +834,7 @@ version = "0.10.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0c685013b7515e668f1b57a165b009d4d28cb139a8a989bbd699c10dad29d0c5" dependencies = [ - "bitflags 1.2.1", + "bitflags", "futures-channel", "futures-core", "futures-executor", @@ -924,7 +896,7 @@ version = "0.16.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "5d50f822055923f1cbede233aa5dfd4ee957cf328fb3076e330886094e11d6cf" dependencies = [ - "bitflags 1.2.1", + "bitflags", "cfg-if 1.0.0", "futures-channel", "futures-core", @@ -948,7 +920,7 @@ version = "0.16.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "cc80888271338c3ede875d8cafc452eb207476ff5539dcbe0018a8f5b827af0e" dependencies = [ - "bitflags 1.2.1", + "bitflags", "futures-core", "futures-sink", "glib", @@ -981,7 +953,7 @@ version = "0.16.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "bafd01c56f59cb10f4b5a10f97bb4bdf8c2b2784ae5b04da7e2d400cf6e6afcf" dependencies = [ - "bitflags 1.2.1", + "bitflags", "glib", "glib-sys", "gobject-sys", @@ -1201,7 +1173,7 @@ version = "0.6.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7c1871c91fa65aa328f3bedbaa54a6e5d1de009264684c153eb708ba933aa6f5" dependencies = [ - "bitflags 1.2.1", + "bitflags", "jack-sys", "lazy_static", "libc", @@ -1532,7 +1504,7 @@ dependencies = [ name = "librespot-playback" version = "0.1.3" dependencies = [ - "alsa 0.2.2", + "alsa", "byteorder", "cpal", "futures", @@ -1811,25 +1783,13 @@ dependencies = [ "winapi 0.3.9", ] -[[package]] -name = "nix" -version = "0.9.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a2c5afeb0198ec7be8569d666644b574345aad2e95a53baf3a532da3e0f3fb32" -dependencies = [ - "bitflags 0.9.1", - "cfg-if 0.1.10", - "libc", - "void", -] - [[package]] name = "nix" version = "0.15.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3b2e0b4f3320ed72aaedb9a5ac838690a8047c7b275da22711fddff4f8a14229" dependencies = [ - "bitflags 1.2.1", + "bitflags", "cc", "cfg-if 0.1.10", "libc", @@ -2126,7 +2086,7 @@ version = "0.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "cdb6b5eff96ccc9bf44d34c379ab03ae944426d83d1694345bdf8159d561d562" dependencies = [ - "bitflags 1.2.1", + "bitflags", "libc", "portaudio-sys", ] @@ -2519,7 +2479,7 @@ version = "0.34.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "fcbb85f4211627a7291c83434d6bbfa723e28dcaa53c7606087e3c61929e4b9c" dependencies = [ - "bitflags 1.2.1", + "bitflags", "lazy_static", "libc", "sdl2-sys", @@ -3266,7 +3226,7 @@ version = "3.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4ce50d8996df1f85af15f2cd8d33daae6e479575123ef4314a51a70a230739cb" dependencies = [ - "bitflags 1.2.1", + "bitflags", "chrono", ] diff --git a/playback/Cargo.toml b/playback/Cargo.toml index edd0951f..115785d2 100644 --- a/playback/Cargo.toml +++ b/playback/Cargo.toml @@ -23,7 +23,7 @@ log = "0.4" byteorder = "1.3" shell-words = "1.0.0" -alsa = { version = "0.2", optional = true } +alsa = { version = "0.4", optional = true } portaudio-rs = { version = "0.3", optional = true } libpulse-binding = { version = "2.13", optional = true, default-features = false } libpulse-simple-binding = { version = "2.13", optional = true, default-features = false }