mirror of https://github.com/ZoneMinder/zoneminder.git synced 2026-08-02 16:27:19 -04:00

Files

Isaac Connor 12616cd296 Merge branch 'master' into openbsd

Conflict resolutions:

- src/zm_monitor.cpp: keep master's %EID%/%MID%/%EC% substitution and
  /bin/sh -c exec path for event start/end commands, but retain
  std::abort() instead of std::quick_exit(0), which OpenBSD lacks.
- src/zm_image.cpp: take master's AssignDirect(AVFrame*) rewrite using
  zm_colours_from_pixformat(); the openbsd-side change was a missing
  break in the hardcoded switch that no longer exists.
- src/zm_rtp_source.cpp: take master's %jd format with the
  static_cast<intmax_t> that the openbsd-side change omitted.
- web/ajax/events.php: take master's explanatory comment.
- scripts/ZoneMinder/lib/ZoneMinder/Server.pm: combine master's uname -s
  FreeBSD top variant with the openbsd fallback that parses
  "CPU\d+ states:" when the %Cpu(s) grep yields nothing. Also fix the
  misplaced % in the sys field of that regex, which prevented it from
  ever matching.

Verified: zmc builds clean, perl -c Server.pm and php -l events.php pass.

Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_01CuqKActdr5XtySk7C6i3Vm

2026-07-20 22:39:02 -04:00