From 74a227667122a8dbe6ed0a1eac69046575fac660 Mon Sep 17 00:00:00 2001 From: pkubaj Date: Mon, 29 Nov 2021 00:03:45 +0000 Subject: [PATCH 1/6] Fix build on FreeBSD/armv7 1. FreeBSD uses elf_aux_info instead of getauxval. 2. FreeBSD uses HWCAP_NEON macro for Neon. --- src/zm_utils.cpp | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/src/zm_utils.cpp b/src/zm_utils.cpp index 5da5509ff..409429667 100644 --- a/src/zm_utils.cpp +++ b/src/zm_utils.cpp @@ -252,8 +252,15 @@ void HwCapsDetect() { #elif defined(__arm__) // ARM processor in 32bit mode // To see if it supports NEON, we need to get that information from the kernel + #ifdef __linux__ unsigned long auxval = getauxval(AT_HWCAP); if (auxval & HWCAP_ARM_NEON) { + #elif defined(__FreeBSD__) + unsigned long auxval = 0; + elf_aux_info(AT_HWCAP, &auxval, sizeof(auxval)); + if (auxval & HWCAP_NEON) { + #error Unsupported OS. + #endif Debug(1,"Detected ARM (AArch32) processor with Neon"); neonversion = 1; } else { From 01f4aee45034cea6e027dc6be031e0277a794133 Mon Sep 17 00:00:00 2001 From: Isaac Connor Date: Sat, 27 Nov 2021 19:10:09 -0500 Subject: [PATCH 2/6] Fix underline --- docs/installationguide/debian.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/installationguide/debian.rst b/docs/installationguide/debian.rst index f7325fe1f..e6a3404df 100644 --- a/docs/installationguide/debian.rst +++ b/docs/installationguide/debian.rst @@ -4,7 +4,7 @@ Debian .. contents:: Easy Way: Debian 11 (Bullseye) ------------------------- +------------------------------ This procedure will guide you through the installation of ZoneMinder on Debian 11 (Bullseye). From 1f19ad7c9d9b483a92679f225c4efbafd9f3e290 Mon Sep 17 00:00:00 2001 From: Isaac Connor Date: Sat, 27 Nov 2021 19:16:32 -0500 Subject: [PATCH 3/6] fix by removing code block --- docs/installationguide/debian.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/installationguide/debian.rst b/docs/installationguide/debian.rst index e6a3404df..b92ff267a 100644 --- a/docs/installationguide/debian.rst +++ b/docs/installationguide/debian.rst @@ -104,7 +104,7 @@ Add the following to the /etc/apt/sources.list.d/zoneminder.list file You can do this using: -.. code-block:: +:: echo "deb https://zmrepo.zoneminder.com/debian/release-1.36 buster/" | sudo tee /etc/apt/sources.list.d/zoneminder.list From ea6a84ae66ea3a3d7ae72f6ba5047b815bb26db7 Mon Sep 17 00:00:00 2001 From: Isaac Connor Date: Mon, 29 Nov 2021 12:53:44 -0500 Subject: [PATCH 4/6] Fix AlarmEndCommand => EventEndCommand --- db/zm_update-1.37.5.sql | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/db/zm_update-1.37.5.sql b/db/zm_update-1.37.5.sql index 1f40eb923..0f205ff77 100644 --- a/db/zm_update-1.37.5.sql +++ b/db/zm_update-1.37.5.sql @@ -7,7 +7,7 @@ SET @s = (SELECT IF( FROM INFORMATION_SCHEMA.COLUMNS WHERE table_name = 'Monitors' AND table_schema = DATABASE() - AND column_name = 'AlarmEndCommand' + AND column_name = 'EventEndCommand' ) > 0, "SELECT 'Column EventEndCommand already exists in Monitors'", "ALTER TABLE `Monitors` ADD COLUMN `EventEndCommand` VARCHAR(255) NOT NULL DEFAULT '' AFTER `Triggers`" From 072d181f79c41889ba44107ade0f48254157c2ae Mon Sep 17 00:00:00 2001 From: Isaac Connor Date: Mon, 29 Nov 2021 12:54:46 -0500 Subject: [PATCH 5/6] Fix AlarmStartCommand => EventStartCommand --- db/zm_update-1.37.5.sql | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/db/zm_update-1.37.5.sql b/db/zm_update-1.37.5.sql index 0f205ff77..035a73a1a 100644 --- a/db/zm_update-1.37.5.sql +++ b/db/zm_update-1.37.5.sql @@ -21,7 +21,7 @@ SET @s = (SELECT IF( FROM INFORMATION_SCHEMA.COLUMNS WHERE table_name = 'Monitors' AND table_schema = DATABASE() - AND column_name = 'AlarmStartCommand' + AND column_name = 'EventStartCommand' ) > 0, "SELECT 'Column EventStartCommand already exists in Monitors'", "ALTER TABLE `Monitors` ADD COLUMN `EventStartCommand` VARCHAR(255) NOT NULL DEFAULT '' AFTER `Triggers`" From 82a4cbaec520cc46ad2e75aba5e433013da80f46 Mon Sep 17 00:00:00 2001 From: Isaac Connor Date: Mon, 29 Nov 2021 13:48:44 -0500 Subject: [PATCH 6/6] Fix task=>action so that deleting works. Pause streaming before delete to prevent errors being logged due to missing files --- web/skins/classic/views/js/event.js | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/web/skins/classic/views/js/event.js b/web/skins/classic/views/js/event.js index 05914f911..94e132cc1 100644 --- a/web/skins/classic/views/js/event.js +++ b/web/skins/classic/views/js/event.js @@ -773,8 +773,9 @@ function manageDelConfirmModalBtns() { return; } + pauseClicked(); evt.preventDefault(); - $j.getJSON(thisUrl + '?request=event&task=delete&id='+eventData.Id) + $j.getJSON(thisUrl + '?request=event&action=delete&id='+eventData.Id) .done(function(data) { $j('#deleteConfirm').modal('hide'); streamNext(true);