From 439b9d0bbbcd5f29ca9fe1dfbb60f41c1a63f809 Mon Sep 17 00:00:00 2001 From: Robbert van der Helm Date: Thu, 3 Nov 2022 03:20:04 +0100 Subject: [PATCH] Use an older pre-rebase jack commit The current version of the jack crate always links to libjack, even when using the dynamic loading feature. --- Cargo.lock | 6 +++--- Cargo.toml | 5 +++-- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index be631f7d..3b1a5ecc 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -2110,7 +2110,7 @@ checksum = "4217ad341ebadf8d8e724e264f13e593e0648f5b3e94b3896a5df283be015ecc" [[package]] name = "jack" version = "0.10.0" -source = "git+https://github.com/robbert-vdh/rust-jack.git?branch=feature/handle-library-failure#1b4055a7b9f6f6bab7646f3dc10cc9355791d706" +source = "git+https://github.com/robbert-vdh/rust-jack.git?tag=tmp-handle-library-failure#1b4055a7b9f6f6bab7646f3dc10cc9355791d706" dependencies = [ "bitflags", "jack-sys", @@ -2122,7 +2122,7 @@ dependencies = [ [[package]] name = "jack-sys" version = "0.4.0" -source = "git+https://github.com/robbert-vdh/rust-jack.git?branch=feature/handle-library-failure#1b4055a7b9f6f6bab7646f3dc10cc9355791d706" +source = "git+https://github.com/robbert-vdh/rust-jack.git?tag=tmp-handle-library-failure#1b4055a7b9f6f6bab7646f3dc10cc9355791d706" dependencies = [ "bitflags", "lazy_static", @@ -4311,7 +4311,7 @@ version = "1.6.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "97fee6b57c6a41524a810daee9286c02d7752c4253064d0b05472833a438f675" dependencies = [ - "cfg-if 1.0.0", + "cfg-if 0.1.10", "rand 0.8.5", "static_assertions", ] diff --git a/Cargo.toml b/Cargo.toml index fa6a01fb..92e7c664 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -107,8 +107,9 @@ baseview = { git = "https://github.com/robbert-vdh/baseview.git", branch = "feat # All the claps! clap = { version = "3.2", features = ["derive"], optional = true } cpal = { version = "0.14.1", optional = true } -# The current upstream jack panics when it can't load the JACK library, which breaks the backend fallback -jack = { git = "https://github.com/robbert-vdh/rust-jack.git", branch = "feature/handle-library-failure", optional = true } +# Current upstream JACK always links to libjack, even when using the default +# dynamic loading feature +jack = { git = "https://github.com/robbert-vdh/rust-jack.git", tag = "tmp-handle-library-failure", optional = true } rtrb = { version = "0.2.2", optional = true } # Used for the `vst3` feature