From 67f44f49f3f95ea7d0eb6dc249c62e9709e50f4d Mon Sep 17 00:00:00 2001 From: Redzic Date: Wed, 13 Jul 2022 03:07:24 -0500 Subject: [PATCH] Don't use local paths for dependencies --- Cargo.lock | 20 ++++++++++++++------ Cargo.toml | 3 +-- av1an-core/Cargo.toml | 9 ++------- 3 files changed, 17 insertions(+), 15 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 70571540e..80a6bbf1f 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -135,6 +135,7 @@ dependencies = [ [[package]] name = "av-metrics" version = "0.8.1" +source = "git+https://github.com/redzic/av-metrics?branch=zerocopy-decode-vs#faf782fddf3fa635f5a4dfd1726910cee35c915d" dependencies = [ "crossbeam", "itertools", @@ -148,6 +149,7 @@ dependencies = [ [[package]] name = "av-metrics-decoders" version = "0.1.7" +source = "git+https://github.com/redzic/av-metrics?branch=zerocopy-decode-vs#faf782fddf3fa635f5a4dfd1726910cee35c915d" dependencies = [ "av-metrics", "ffmpeg-next", @@ -157,6 +159,7 @@ dependencies = [ [[package]] name = "av-scenechange" version = "0.7.2" +source = "git+https://github.com/redzic/av-scenechange?branch=zerocopy#ee8b4ff3dcdd8f6c64a15586c4e6cfa0753b1a1a" dependencies = [ "anyhow", "av-metrics-decoders", @@ -352,9 +355,9 @@ dependencies = [ [[package]] name = "clap" -version = "3.2.8" +version = "3.2.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "190814073e85d238f31ff738fcb0bf6910cedeb73376c87cd69291028966fd83" +checksum = "69c5a7f9997be616e47f0577ee38c91decb33392c5be4866494f34cdf329a9aa" dependencies = [ "atty", "bitflags", @@ -1223,6 +1226,7 @@ dependencies = [ [[package]] name = "rav1e" version = "0.5.0" +source = "git+https://github.com/redzic/rav1e?branch=zerocopy#c77628ead97ec5ef980c665b1c645f2b7c26056c" dependencies = [ "arbitrary", "arg_enum_proc_macro", @@ -1747,6 +1751,7 @@ dependencies = [ [[package]] name = "v_frame" version = "0.2.5" +source = "git+https://github.com/redzic/rav1e?branch=zerocopy#c77628ead97ec5ef980c665b1c645f2b7c26056c" dependencies = [ "cfg-if", "new_debug_unreachable", @@ -1759,8 +1764,9 @@ dependencies = [ [[package]] name = "vapoursynth" -version = "0.3.0" -source = "git+https://github.com/YaLTeR/vapoursynth-rs?rev=074417335ff9c139956c62771835798c9a302e67#074417335ff9c139956c62771835798c9a302e67" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0c7df702c65dec1cfa3b93f824a1e58d5b0fdb82ac8a722596f43d7214282f56" dependencies = [ "anyhow", "bitflags", @@ -1771,8 +1777,9 @@ dependencies = [ [[package]] name = "vapoursynth-sys" -version = "0.3.0" -source = "git+https://github.com/YaLTeR/vapoursynth-rs?rev=074417335ff9c139956c62771835798c9a302e67#074417335ff9c139956c62771835798c9a302e67" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2fc59bbb7980ce21ece45bc5b3e316bf27ac164b7b1c273ce4846c29d0642a9c" dependencies = [ "cfg-if", ] @@ -1786,6 +1793,7 @@ checksum = "accd4ea62f7bb7a82fe23066fb0957d48ef677f6eeb8215f372f52e48bb32426" [[package]] name = "vergen" version = "3.0.4" +source = "git+https://github.com/redzic/rav1e?branch=zerocopy#c77628ead97ec5ef980c665b1c645f2b7c26056c" dependencies = [ "bitflags", "chrono", diff --git a/Cargo.toml b/Cargo.toml index 195123990..54b866129 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -50,6 +50,5 @@ debug-assertions = true overflow-checks = true [patch.crates-io] -# av-scenechange = { git = "https://github.com/redzic/av-scenechange", branch = "zerocopy" } -av-scenechange = { path = "../av-scenechange" } +av-scenechange = { git = "https://github.com/redzic/av-scenechange", branch = "zerocopy" } console = { git = "https://github.com/console-rs/console", rev = "5484ea9d9f6884f6685349708e27bf08fab7703c" } diff --git a/av1an-core/Cargo.toml b/av1an-core/Cargo.toml index bdd0262a8..f38465c79 100644 --- a/av1an-core/Cargo.toml +++ b/av1an-core/Cargo.toml @@ -47,14 +47,10 @@ cfg-if = "1.0.0" nom = "7.1.1" # TODO: move all of this CLI stuff to av1an-cli ansi_term = "0.12.1" -# av-metrics-decoders = { git = "https://github.com/redzic/av-metrics", branch = "zerocopy-decode", features = [ -# "ffmpeg", -# ] } -av-metrics-decoders = { path = "../../av-metrics/av_metrics_decoders", features = [ +av-metrics-decoders = { git = "https://github.com/redzic/av-metrics", branch = "zerocopy-decode-vs", features = [ "ffmpeg", ] } - # TODO: https://github.com/elast0ny/affinity/issues/2 # update this when macos support is implemented [target.'cfg(any(target_os = "linux", target_os = "windows"))'.dependencies] @@ -75,8 +71,7 @@ default-features = false features = ["svg_backend", "line_series"] [dependencies.vapoursynth] -git = "https://github.com/YaLTeR/vapoursynth-rs" -rev = "074417335ff9c139956c62771835798c9a302e67" +version = "0.4.0" features = ["vsscript-functions", "vapoursynth-functions"] [dependencies.tokio]