Mirrors/blakeblackshear.frigate
1
0
Fork 0
mirror of https://github.com/blakeblackshear/frigate.git synced 2025-02-05 00:15:51 +01:00
Code Issues Projects Releases Wiki Activity

Merge remote-tracking branch 'upstream/dev' into dev

Browse Source
This commit is contained in:
Rui Alves 2024-11-29 16:41:06 +00:00
commit 6e6fc2183a
2 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
docker/hailo8l/Dockerfile
View File

@ -36,5 +36,8 @@ RUN pip3 install -U /deps/hailo-wheels/*.whl
# Copy base files from the rootfs stage # Copy base files from the rootfs stage
COPY --from=rootfs / / COPY --from=rootfs / /
# Set Library path for hailo driver
ENV LD_LIBRARY_PATH=/rootfs/usr/local/lib/
# Set workdir # Set workdir
WORKDIR /opt/frigate/ WORKDIR /opt/frigate/

2
frigate/util/builtin.py
View File

@ -13,12 +13,12 @@ import urllib.parse
from collections.abc import Mapping from collections.abc import Mapping
from pathlib import Path from pathlib import Path
from typing import Any, Optional, Tuple, Union from typing import Any, Optional, Tuple, Union
from zoneinfo import ZoneInfoNotFoundError
import numpy as np import numpy as np
import pytz import pytz
from ruamel.yaml import YAML from ruamel.yaml import YAML
from tzlocal import get_localzone from tzlocal import get_localzone
from zoneinfo import ZoneInfoNotFoundError
from frigate.const import REGEX_HTTP_CAMERA_USER_PASS, REGEX_RTSP_CAMERA_USER_PASS from frigate.const import REGEX_HTTP_CAMERA_USER_PASS, REGEX_RTSP_CAMERA_USER_PASS