From 2a9ed44d93e0e3f294925c4e8d243238140217ba Mon Sep 17 00:00:00 2001 From: Robert Bragg Date: Sun, 14 Aug 2022 00:08:42 +0100 Subject: [PATCH] agdk-cpal: Use cpal git master I was mistaken recently, thinking that cpal's dev-dependency on ndk-glue was somehow being inherited by the example. Actually the real issue was that cpal 0.13.5 has a regular _dependency_ on ndk-glue, which is a much simpler explanation for why we were seeing a crash. This updates the example to just use the master branch of cpal, which we'll need until there is a new release of cpal. --- examples/agdk-cpal/Cargo.toml | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/examples/agdk-cpal/Cargo.toml b/examples/agdk-cpal/Cargo.toml index 2ebcf8a..b418a67 100644 --- a/examples/agdk-cpal/Cargo.toml +++ b/examples/agdk-cpal/Cargo.toml @@ -9,12 +9,14 @@ edition = "2021" log = "0.4" android_logger = "0.11.0" android-activity = { path="../../android-activity", features = ["game-activity"] } -cpal = { version = "0.13" } +cpal = "0.13" atomic_float = "0.1" anyhow = "1" +# We currently need to use cpal master which doesn't have ndk-glue as a dependency +# and is also updated to ndk 0.7 [patch.crates-io] -cpal = { git = "https://github.com/rib/cpal", branch = "no-ndk-glue-dev-dependency" } +cpal = { git = "https://github.com/RustAudio/cpal", commit = "9b7bb339650" } [lib] name="main"