Skip to content

Commit

Permalink
prep v0.7.19
Browse files Browse the repository at this point in the history
  • Loading branch information
scottlamb committed Jan 28, 2025
1 parent b4836f3 commit 24bbb02
Show file tree
Hide file tree
Showing 4 changed files with 13 additions and 4 deletions.
1 change: 1 addition & 0 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -62,6 +62,7 @@ jobs:
- arch: armv7l
rust_target: armv7-unknown-linux-musleabihf
docker_platform: linux/arm/v7
fail-fast: false
runs-on: ubuntu-latest
steps:
- name: Checkout
Expand Down
6 changes: 5 additions & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -8,14 +8,18 @@ upgrades, e.g. `v0.6.x` -> `v0.7.x`. The config file format and
[API](ref/api.md) currently have no stability guarantees, so they may change
even on minor releases, e.g. `v0.7.5` -> `v0.7.6`.

## v0.7.18 (2025-01-28)
## v0.7.19 (2025-01-28)

* support recording H.265 ([#33](https://github.com/scottlamb/moonfire-nvr/issues/33)).
Browser support may vary.
* bump minimum Rust version to 1.82.
* improve error message on timeout opening stream.
* use `jiff` for time manipulations.

## v0.7.18 (2025-01-28)

This release was skipped due to build problems on `armv7-unknown-linux-musleabif`.

## v0.7.17 (2024-09-03)

* bump minimum Rust version to 1.79.
Expand Down
7 changes: 5 additions & 2 deletions server/base/clock.rs
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,11 @@ use crate::shutdown::ShutdownError;
pub struct SystemTime(pub TimeSpec);

impl SystemTime {
pub fn new(sec: nix::sys::time::time_t, nsec: i64) -> Self {
SystemTime(TimeSpec::new(sec, nsec))
pub fn new(sec: u64, nsec: i64) -> Self {
// `TimeSpec::new`'s arguments vary by platform.
// * currently uses 32-bit time_t on musl <https://github.com/rust-lang/libc/issues/1848>
// * nsec likewise can vary.
SystemTime(TimeSpec::new(sec as _, nsec as _))
}

pub fn as_secs(&self) -> i64 {
Expand Down
3 changes: 2 additions & 1 deletion server/base/time.rs
Original file line number Diff line number Diff line change
Expand Up @@ -161,7 +161,8 @@ impl Time {

impl From<SystemTime> for Time {
fn from(tm: SystemTime) -> Self {
Time(tm.0.tv_sec() * TIME_UNITS_PER_SEC + tm.0.tv_nsec() * 9 / 100_000)
#[allow(clippy::unnecessary_cast)]
Time((tm.0.tv_sec() as i64) * TIME_UNITS_PER_SEC + (tm.0.tv_nsec() as i64) * 9 / 100_000)
}
}

Expand Down

0 comments on commit 24bbb02

Please sign in to comment.