diff --git a/.vscode/extensions.json b/.vscode/extensions.json index 12d461e..9544756 100644 --- a/.vscode/extensions.json +++ b/.vscode/extensions.json @@ -13,4 +13,4 @@ "unwantedRecommendations": [ "rust-lang.rust" ] -} \ No newline at end of file +} diff --git a/CHANGELOG.md b/CHANGELOG.md index ea459e1..2ecdd68 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -6,6 +6,10 @@ changes, see Git history. Each release is tagged in Git and on the Docker repository [`scottlamb/moonfire-nvr`](https://hub.docker.com/r/scottlamb/moonfire-nvr). +## unreleased + +* use Retina 0.4.1, which is compatible with rtsp-simple-server v0.19.3. + ## 0.7.5 (2022-05-09) * [#219](https://github.com/scottlamb/moonfire-nvr/issues/219): fix diff --git a/server/Cargo.lock b/server/Cargo.lock index 2d5e9f6..5958e7e 100644 --- a/server/Cargo.lock +++ b/server/Cargo.lock @@ -627,7 +627,7 @@ checksum = "d39cd93900197114fa1fcb7ae84ca742095eed9442088988ae74fa744e930e77" dependencies = [ "cfg-if", "libc", - "wasi", + "wasi 0.10.0+wasi-snapshot-preview1", ] [[package]] @@ -651,7 +651,7 @@ dependencies = [ "indexmap", "slab", "tokio", - "tokio-util", + "tokio-util 0.6.9", "tracing", ] @@ -990,14 +990,15 @@ dependencies = [ [[package]] name = "mio" -version = "0.8.0" +version = "0.8.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ba272f85fa0b41fc91872be579b3bbe0f56b792aa361a380eb669469f68dafb2" +checksum = "52da4364ffb0e4fe33a9841a98a3f3014fb964045ce4f7a45a398243c8d6b0c9" dependencies = [ "libc", "log", "miow", "ntapi", + "wasi 0.11.0+wasi-snapshot-preview1", "winapi", ] @@ -1427,9 +1428,9 @@ checksum = "eb9f9e6e233e5c4a35559a617bf40a4ec447db2e84c20b55a6f83167b7e57872" [[package]] name = "pretty-hex" -version = "0.2.1" +version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bc5c99d529f0d30937f6f4b8a86d988047327bb88d04d2c4afc356de74722131" +checksum = "c6fa0831dd7cc608c38a5e323422a0077678fa5744aa2be4ad91c4ece8eec8d5" [[package]] name = "proc-macro-error" @@ -1654,9 +1655,9 @@ dependencies = [ [[package]] name = "retina" -version = "0.4.0" +version = "0.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "57bdeafed8d429e892754895f028852e666cdf77c3fb248c3780d70606e3e2c7" +checksum = "35edba0fc81d60f9ac4d69afaa640b150d761e0a3982c1381d7929139306ef06" dependencies = [ "base64", "bitreader", @@ -1676,7 +1677,7 @@ dependencies = [ "thiserror", "time 0.1.44", "tokio", - "tokio-util", + "tokio-util 0.7.3", "url", ] @@ -2027,7 +2028,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6db9e6914ab8b1ae1c260a4ae7a49b6c5611b40328a735b21862567685e73255" dependencies = [ "libc", - "wasi", + "wasi 0.10.0+wasi-snapshot-preview1", "winapi", ] @@ -2059,10 +2060,11 @@ checksum = "cda74da7e1a664f795bb1f8a87ec406fb89a02522cf6e50620d016add6dbbf5c" [[package]] name = "tokio" -version = "1.17.0" +version = "1.20.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2af73ac49756f3f7c01172e34a23e5d0216f6c32333757c2c61feb2bbff5a5ee" +checksum = "7a8325f63a7d4774dd041e363b2409ed1c5cbbd0f867795e661df066b2b0a581" dependencies = [ + "autocfg", "bytes", "libc", "memchr", @@ -2125,6 +2127,20 @@ dependencies = [ "tokio", ] +[[package]] +name = "tokio-util" +version = "0.7.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cc463cd8deddc3770d20f9852143d50bf6094e640b485cb2e189a2099085ff45" +dependencies = [ + "bytes", + "futures-core", + "futures-sink", + "pin-project-lite", + "tokio", + "tracing", +] + [[package]] name = "toml" version = "0.5.8" @@ -2306,6 +2322,12 @@ version = "0.10.0+wasi-snapshot-preview1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1a143597ca7c7793eff794def352d41792a93c481eb1042423ff7ff72ba2c31f" +[[package]] +name = "wasi" +version = "0.11.0+wasi-snapshot-preview1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423" + [[package]] name = "wasm-bindgen" version = "0.2.79" diff --git a/server/db/Cargo.toml b/server/db/Cargo.toml index 76885eb..328a8a3 100644 --- a/server/db/Cargo.toml +++ b/server/db/Cargo.toml @@ -32,7 +32,7 @@ nix = "0.23.0" num-rational = { version = "0.4.0", default-features = false, features = ["std"] } odds = { version = "0.4.0", features = ["std-vec"] } parking_lot = "0.12.0" -pretty-hex = "0.2.1" +pretty-hex = "0.3.0" protobuf = "3.0" ring = "0.16.2" rusqlite = "0.27.0"