From cffbbd579d880924821f5812dcf52c5a213bcda4 Mon Sep 17 00:00:00 2001 From: Rainbaby Date: Tue, 8 Aug 2023 05:58:01 +0800 Subject: [PATCH] Bump version --- Cargo.lock | 248 ++++++++------------------------------------ Cargo.toml | 12 +-- README.md | 2 +- build.rs | 21 ++-- src/main.rs | 8 +- src/metadata/mod.rs | 4 +- 6 files changed, 66 insertions(+), 229 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index ede341a..f6f3490 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -22,9 +22,9 @@ dependencies = [ [[package]] name = "anyhow" -version = "1.0.70" +version = "1.0.72" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7de8ce5e0f9f8d88245311066a578d72b7af3e7088f32783804676302df237e4" +checksum = "3b13c32d80ecc7ab747b80c3784bce54ee8a7a0cc4fbda9bf4cda2cf6fe90854" [[package]] name = "autocfg" @@ -82,9 +82,6 @@ name = "cc" version = "1.0.78" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a20104e2335ce8a659d6dd92a51a767a0c062599c73b343fd152cb401e828c3d" -dependencies = [ - "jobserver", -] [[package]] name = "cfg-if" @@ -220,6 +217,12 @@ dependencies = [ "syn 1.0.107", ] +[[package]] +name = "deranged" +version = "0.3.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7684a49fb1af197853ef7b2ee694bc1f5b4179556f1e5710e1760c5db6f5e929" + [[package]] name = "dolby_vision" version = "3.1.2" @@ -234,7 +237,7 @@ dependencies = [ [[package]] name = "dovi_meta" -version = "0.2.0" +version = "0.2.1" dependencies = [ "anyhow", "chrono", @@ -253,29 +256,9 @@ dependencies = [ [[package]] name = "either" -version = "1.8.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "90e5c1c8368803113bf0c9584fc495a58b86dc8a29edbf8fe877d21d9507e797" - -[[package]] -name = "enum-iterator" -version = "1.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "706d9e7cf1c7664859d79cd524e4e53ea2b67ea03c98cc2870c5e539695d597e" -dependencies = [ - "enum-iterator-derive", -] - -[[package]] -name = "enum-iterator-derive" -version = "1.2.0" +version = "1.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "355f93763ef7b0ae1c43c4d8eccc9d5848d84ad1a1d8ce61c421d1ac85a19d05" -dependencies = [ - "proc-macro2", - "quote", - "syn 1.0.107", -] +checksum = "a26ae43d7bcc3b814de94796a5e736d4029efb0ee900c12e2d54c993ad1a1e07" [[package]] name = "errno" @@ -298,15 +281,6 @@ dependencies = [ "libc", ] -[[package]] -name = "form_urlencoded" -version = "1.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a9c384f161156f5260c24a097c56119f9be8c798586aecc13afbcbe7b7e26bf8" -dependencies = [ - "percent-encoding", -] - [[package]] name = "funty" version = "2.0.0" @@ -324,31 +298,6 @@ dependencies = [ "wasi 0.11.0+wasi-snapshot-preview1", ] -[[package]] -name = "getset" -version = "0.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e45727250e75cc04ff2846a66397da8ef2b3db8e40e0cef4df67950a07621eb9" -dependencies = [ - "proc-macro-error", - "proc-macro2", - "quote", - "syn 1.0.107", -] - -[[package]] -name = "git2" -version = "0.16.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ccf7f68c2995f392c49fffb4f95ae2c873297830eb25c6bc4c114ce8f4562acc" -dependencies = [ - "bitflags 1.3.2", - "libc", - "libgit2-sys", - "log", - "url", -] - [[package]] name = "heck" version = "0.4.0" @@ -388,16 +337,6 @@ dependencies = [ "cxx-build", ] -[[package]] -name = "idna" -version = "0.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e14ddfc70884202db2244c223200c204c2bda1bc6e0998d11b5e024d657209e6" -dependencies = [ - "unicode-bidi", - "unicode-normalization", -] - [[package]] name = "io-lifetimes" version = "1.0.3" @@ -422,9 +361,9 @@ dependencies = [ [[package]] name = "itertools" -version = "0.10.5" +version = "0.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b0fd2260e829bddf4cb6ea802289de2f86d6a7a690192fbe91b3f46e0f2c8473" +checksum = "b1c173a5686ce8bfa551b3563d0c2170bf24ca44da99c7ca4bfdab5418c3fe57" dependencies = [ "either", ] @@ -435,15 +374,6 @@ version = "1.0.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "fad582f4b9e86b6caa621cabeb0963332d92eea04729ab12892c2533951e6440" -[[package]] -name = "jobserver" -version = "0.1.25" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "068b1ee6743e4d11fb9c6a1e6064b3693a1b600e7f5f5988047d98b3dc9fb90b" -dependencies = [ - "libc", -] - [[package]] name = "js-sys" version = "0.3.60" @@ -465,30 +395,6 @@ version = "0.2.139" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "201de327520df007757c1f0adce6e827fe8562fbc28bfd9c15571c66ca1f5f79" -[[package]] -name = "libgit2-sys" -version = "0.14.2+1.5.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7f3d95f6b51075fe9810a7ae22c7095f12b98005ab364d8544797a825ce946a4" -dependencies = [ - "cc", - "libc", - "libz-sys", - "pkg-config", -] - -[[package]] -name = "libz-sys" -version = "1.1.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9702761c3935f8cc2f101793272e202c72b99da8f4224a19ddcf1279a6450bbf" -dependencies = [ - "cc", - "libc", - "pkg-config", - "vcpkg", -] - [[package]] name = "link-cplusplus" version = "1.0.8" @@ -555,13 +461,13 @@ dependencies = [ [[package]] name = "num-derive" -version = "0.3.3" +version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "876a53fff98e03a936a674b29568b0e605f06b29372c2489ff4de23f1949743d" +checksum = "9e6a0fd4f737c707bd9086cc16c925f294943eb62eb71499e9fd4cf71f8b9f4e" dependencies = [ "proc-macro2", "quote", - "syn 1.0.107", + "syn 2.0.6", ] [[package]] @@ -606,6 +512,15 @@ dependencies = [ "autocfg", ] +[[package]] +name = "num_threads" +version = "0.1.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2819ce041d2ee131036f4fc9d6ae7ae125a3a40e97ba64d04fe799ad9dabbb44" +dependencies = [ + "libc", +] + [[package]] name = "once_cell" version = "1.16.0" @@ -618,18 +533,6 @@ version = "6.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9b7820b9daea5457c9f21c69448905d723fbd21136ccf521748f23fd49e723ee" -[[package]] -name = "percent-encoding" -version = "2.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "478c572c3d73181ff3c2539045f6eb99e5491218eae919370993b890cdbdd98e" - -[[package]] -name = "pkg-config" -version = "0.3.26" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6ac9a59f73473f1b8d852421e59e64809f025994837ef743615c6d0c5b305160" - [[package]] name = "proc-macro-error" version = "1.0.4" @@ -665,9 +568,9 @@ dependencies = [ [[package]] name = "quick-xml" -version = "0.28.1" +version = "0.30.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e5c1a97b1bc42b1d550bfb48d4262153fe400a12bab1511821736f7eac76d7e2" +checksum = "eff6510e86862b57b210fd8cbe8ed3f0d7d600b9c2863cd4549a2e033c66e956" dependencies = [ "memchr", "serde", @@ -721,9 +624,9 @@ dependencies = [ [[package]] name = "rustversion" -version = "1.0.11" +version = "1.0.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5583e89e108996506031660fe09baa5011b9dd0341b89029313006d1fb508d70" +checksum = "7ffc183a10b4478d04cbbbfc96d0873219d962dd5accaff2ffbd4ceb7df837f4" [[package]] name = "ryu" @@ -832,26 +735,6 @@ dependencies = [ "windows-sys", ] -[[package]] -name = "thiserror" -version = "1.0.38" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6a9cd18aa97d5c45c6603caea1da6628790b37f7a34b6ca89522331c5180fed0" -dependencies = [ - "thiserror-impl", -] - -[[package]] -name = "thiserror-impl" -version = "1.0.38" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1fb327af4685e4d03fa8cbcf1716380da910eeb2bb8be417e7f9fd3fb164f36f" -dependencies = [ - "proc-macro2", - "quote", - "syn 1.0.107", -] - [[package]] name = "time" version = "0.1.45" @@ -865,11 +748,14 @@ dependencies = [ [[package]] name = "time" -version = "0.3.17" +version = "0.3.25" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a561bf4617eebd33bca6434b988f39ed798e527f51a1e797d0ee4f61c0a38376" +checksum = "b0fdd63d58b18d663fbdf70e049f00a22c8e42be082203be7f26589213cd75ea" dependencies = [ + "deranged", "itoa", + "libc", + "num_threads", "serde", "time-core", "time-macros", @@ -877,72 +763,31 @@ dependencies = [ [[package]] name = "time-core" -version = "0.1.0" +version = "0.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2e153e1f1acaef8acc537e68b44906d2db6436e2b35ac2c6b42640fff91f00fd" +checksum = "7300fbefb4dadc1af235a9cef3737cea692a9d97e1b9cbcd4ebdae6f8868e6fb" [[package]] name = "time-macros" -version = "0.2.6" +version = "0.2.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d967f99f534ca7e495c575c62638eebc2898a8c84c119b89e250477bc4ba16b2" +checksum = "eb71511c991639bb078fd5bf97757e03914361c48100d52878b8e52b46fb92cd" dependencies = [ "time-core", ] -[[package]] -name = "tinyvec" -version = "1.6.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "87cc5ceb3875bb20c2890005a4e226a4651264a5c75edb2421b52861a0a0cb50" -dependencies = [ - "tinyvec_macros", -] - -[[package]] -name = "tinyvec_macros" -version = "0.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cda74da7e1a664f795bb1f8a87ec406fb89a02522cf6e50620d016add6dbbf5c" - -[[package]] -name = "unicode-bidi" -version = "0.3.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "099b7128301d285f79ddd55b9a83d5e6b9e97c92e0ea0daebee7263e932de992" - [[package]] name = "unicode-ident" version = "1.0.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "84a22b9f218b40614adcb3f4ff08b703773ad44fa9423e4e0d346d5db86e4ebc" -[[package]] -name = "unicode-normalization" -version = "0.1.22" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5c5713f0fc4b5db668a2ac63cdb7bb4469d8c9fed047b1d0292cc7b0ce2ba921" -dependencies = [ - "tinyvec", -] - [[package]] name = "unicode-width" version = "0.1.10" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c0edd1e5b14653f783770bce4a4dabb4a5108a5370a5f5d8cfe8710c361f6c8b" -[[package]] -name = "url" -version = "2.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0d68c799ae75762b8c3fe375feb6600ef5602c883c5d21eb51c09f22b83c4643" -dependencies = [ - "form_urlencoded", - "idna", - "percent-encoding", -] - [[package]] name = "uuid" version = "1.2.2" @@ -952,26 +797,15 @@ dependencies = [ "getrandom", ] -[[package]] -name = "vcpkg" -version = "0.2.15" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "accd4ea62f7bb7a82fe23066fb0957d48ef677f6eeb8215f372f52e48bb32426" - [[package]] name = "vergen" -version = "7.5.1" +version = "8.2.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f21b881cd6636ece9735721cf03c1fe1e774fe258683d084bb2812ab67435749" +checksum = "bbc5ad0d9d26b2c49a5ab7da76c3e79d3ee37e7821799f8223fcb8f2f391a2e7" dependencies = [ "anyhow", - "cfg-if", - "enum-iterator", - "getset", - "git2", "rustversion", - "thiserror", - "time 0.3.17", + "time 0.3.25", ] [[package]] diff --git a/Cargo.toml b/Cargo.toml index 3b06d7a..28c3b12 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -1,15 +1,15 @@ [package] name = "dovi_meta" -version = "0.2.0" +version = "0.2.1" edition = "2021" authors = ["Rainbaby"] -rust-version = "1.64.0" +rust-version = "1.67.0" license = "MIT" build = "build.rs" [dependencies] num-traits = "0.2.15" -num-derive = "0.3.3" +num-derive = "0.4.0" uuid = { version = "1.1.2", features = ["v4"] } @@ -19,11 +19,11 @@ vtc = "0.1.12" chrono = "0.4.24" serde = { version = "1.0.158", features = ["derive"] } serde-aux = "4.0.0" -quick-xml = { version = "0.28.1", features = ["serialize"]} +quick-xml = { version = "0.30.0", features = ["serialize"]} clap = { version = "4.1.11", features = ["derive", "wrap_help"] } anyhow = "1.0.70" -itertools = "0.10.5" +itertools = "0.11.0" [build-dependencies] -vergen = { version = "7.5.1", default-features = false, features = ["build", "cargo", "git"] } \ No newline at end of file +vergen = { version = "8.2.4", features = ["build", "git", "gitcl"] } \ No newline at end of file diff --git a/README.md b/README.md index fadd552..b96e03e 100644 --- a/README.md +++ b/README.md @@ -9,7 +9,7 @@ ## **Building** ### **Toolchain** -The minimum Rust version to build **`dovi_meta`** is 1.64.0. +The minimum Rust version to build **`dovi_meta`** is 1.67.0. ### **Release binary** To build release binary in `target/release/dovi_meta` run: diff --git a/build.rs b/build.rs index ef6e384..4879555 100644 --- a/build.rs +++ b/build.rs @@ -1,18 +1,15 @@ -use vergen::{vergen, Config, SemverKind, ShaKind}; +use vergen::EmitBuilder; fn main() { - let mut config = Config::default(); - - *config.git_mut().sha_kind_mut() = ShaKind::Short; - *config.git_mut().semver_kind_mut() = SemverKind::Lightweight; + let mut emit_builder = EmitBuilder::builder(); + emit_builder.fail_on_error(); + emit_builder.git_describe(true, true, Some("[0-9]*")); // Generate the instructions - if let Err(e) = vergen(config) { - eprintln!("error occured while generating instructions: {:?}", e); - - config = Config::default(); - *config.git_mut().enabled_mut() = false; - - vergen(config).expect("non-git vergen should succeed"); + if let Err(e) = emit_builder.emit() { + eprintln!("error occured while generating instructions: {e:?}"); + EmitBuilder::builder() + .emit() + .expect("non-git vergen should succeed"); } } diff --git a/src/main.rs b/src/main.rs index eff2402..73bc053 100644 --- a/src/main.rs +++ b/src/main.rs @@ -11,9 +11,13 @@ mod commands; mod functions; mod metadata; -// Some Clap features are broken, keep it for now. #[derive(Parser, Debug)] -#[clap(name = env!("CARGO_PKG_NAME"), author = "Rainbaby", about = "CLI tool for creating Dolby Vision XML metadata from an encoded deliverable with binary metadata.", version = option_env!("VERGEN_GIT_SEMVER_LIGHTWEIGHT").unwrap_or(env!("VERGEN_BUILD_SEMVER")))] +#[command( + name = env!("CARGO_PKG_NAME"), + about = "CLI tool for creating Dolby Vision XML metadata from an encoded deliverable with binary metadata", + author = "Rainbaby", + version = option_env!("VERGEN_GIT_DESCRIBE").unwrap_or(env!("CARGO_PKG_VERSION")) +)] struct Opt { #[clap(subcommand)] cmd: Command, diff --git a/src/metadata/mod.rs b/src/metadata/mod.rs index fad54c5..f763d7e 100644 --- a/src/metadata/mod.rs +++ b/src/metadata/mod.rs @@ -327,7 +327,9 @@ impl Revision { date_time: DateTime::new(), author: env!("CARGO_PKG_AUTHORS").to_string(), software: env!("CARGO_PKG_NAME").to_string(), - software_version: env!("CARGO_PKG_VERSION").to_string(), + software_version: option_env!("VERGEN_GIT_DESCRIBE") + .unwrap_or(env!("CARGO_PKG_VERSION")) + .to_string(), comment: None, } }