From: Jakub Jirutka Date: Sun, 6 Feb 2022 22:23:00 +0100 Subject: [PATCH] Patch dependencies - Use latest v4l and fix incorrect types (needed for building against musl). - Link vulkan-loader at runtime instead of build-time to make it optional (it's used only for `capturer = "wlroots"`). --- a/Cargo.toml +++ b/Cargo.toml @@ -12,9 +12,9 @@ dirs = "3.0" toml = { git = "https://github.com/vgao1996/toml-rs", branch = "dotted-table-0.5.8" } chrono = "0.4" -ash = { version = "0.35", features = ["linked"], default-features = false } +ash = { version = "0.35", features = ["loaded"], default-features = false } itertools = "0.10" -v4l = { version = "0.12", features = ["libv4l"], default-features = false } +v4l = { version = "0.12.2", features = ["libv4l"], default-features = false } ddc-hi = "0.4" log = "0.4" env_logger = "0.9" @@ -23,3 +23,6 @@ [dev-dependencies] mockall = "0.10" + +[patch.crates-io] +v4l = { path = "./libv4l-rs" } --- a/Cargo.lock +++ b/Cargo.lock @@ -31,6 +31,9 @@ version = "0.35.1+1.2.203" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b7fd04def1c9101b5fb488c131022d2d6f87753ef4b1b11b279e2af404fae6b9" +dependencies = [ + "libloading", +] [[package]] name = "atty" @@ -1084,9 +1087,7 @@ [[package]] name = "v4l" -version = "0.12.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4f6eca58bca86b4b353b55e18828694f91e83dd7e9c4d7f127515e4687d5a8e9" +version = "0.12.2" dependencies = [ "bitflags", "libc", @@ -1096,8 +1097,6 @@ [[package]] name = "v4l-sys" version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f91dc47f9668a0a1a0af7ba194f2d543a68c2ef9eb61888f89565d60b34247fe" dependencies = [ "bindgen", ]