From 147868412070c877c2aa405fd17ded905d4769d9 Mon Sep 17 00:00:00 2001 From: Koushik Dutta Date: Fri, 17 Jan 2025 14:58:45 -0800 Subject: [PATCH 1/4] Update install-nvidia-container-toolkit.sh --- install/docker/install-nvidia-container-toolkit.sh | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/install/docker/install-nvidia-container-toolkit.sh b/install/docker/install-nvidia-container-toolkit.sh index b4afdb312..20be99928 100644 --- a/install/docker/install-nvidia-container-toolkit.sh +++ b/install/docker/install-nvidia-container-toolkit.sh @@ -36,9 +36,8 @@ curl -fsSL https://nvidia.github.io/libnvidia-container/gpgkey | gpg --yes --dea tee /etc/apt/sources.list.d/nvidia-container-toolkit.list apt -y update # is there a way to get a versioned package automatically? -apt -y install nvidia-utils-560 +apt -y install cuda-drivers apt -y install nvidia-container-toolkit nvidia-ctk runtime configure --runtime=docker -nvidia-ctk config --set nvidia-container-cli.no-cgroups --in-place systemctl restart docker From 57480f76061ca591f5b48be110dec212d372a3d3 Mon Sep 17 00:00:00 2001 From: Brett Jia Date: Fri, 17 Jan 2025 19:50:35 -0500 Subject: [PATCH 2/4] actions: add Linux arm64 runner to tests (#1696) --- .github/workflows/test.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index ff82d13a4..bb51077e5 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -15,7 +15,7 @@ jobs: strategy: fail-fast: false matrix: - runner: [ubuntu-latest, macos-14, macos-13, windows-latest] + runner: [ubuntu-latest, ubuntu-24.04-arm, macos-14, macos-13, windows-latest] steps: - name: Checkout repository From 780182b94a3a30ee9a9ca933265d3b6f863723d0 Mon Sep 17 00:00:00 2001 From: Koushik Dutta Date: Sat, 18 Jan 2025 15:04:59 -0800 Subject: [PATCH 3/4] fix npm-install.sh --- npm-install.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/npm-install.sh b/npm-install.sh index 1e92b1478..112be972d 100755 --- a/npm-install.sh +++ b/npm-install.sh @@ -27,7 +27,7 @@ echo "external/werift > npm install" npm install popd -for directory in rtsp amcrest onvif hikvision reolink unifi-protect webrtc homekit +for directory in rtsp ffmpeg-camera amcrest onvif hikvision reolink unifi-protect webrtc homekit do echo "$directory > npm install" pushd plugins/$directory From 2e5b8d90aa644eeb1708121559194d247f38a231 Mon Sep 17 00:00:00 2001 From: George Talusan Date: Sun, 19 Jan 2025 03:32:36 -0500 Subject: [PATCH 4/4] hikvision: add ERI-K104-P4 to the list of NVRs that doesn't support channel cap checks (#1698) --- plugins/hikvision/src/hikvision-camera-api.ts | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/plugins/hikvision/src/hikvision-camera-api.ts b/plugins/hikvision/src/hikvision-camera-api.ts index 46409fd96..5ed1c9324 100644 --- a/plugins/hikvision/src/hikvision-camera-api.ts +++ b/plugins/hikvision/src/hikvision-camera-api.ts @@ -116,11 +116,15 @@ export class HikvisionCameraAPI implements HikvisionAPI { } async checkIsOldModel() { - // The old Hikvision DS-7608NI-E2 doesn't support channel capability checks, and the requests cause errors + // The old Hikvision NVRs don't support channel capability checks, and the requests cause errors + const oldModels = [ + /DS-76098NI-E2/, + /ERI-K104-P4/ + ]; const model = await this.checkDeviceModel(); if (!model) return; - return !!model?.match(/DS-7608NI-E2/); + return !!oldModels.find(oldModel => model?.match(oldModel)); } async checkStreamSetup(channel: string, isOld: boolean): Promise {