Skip to content

Commit 20f95cc

Browse files
connortechnologyconnortechnology
committed
Merge branch 'master' of github.com:ZoneMinder/zoneminder
2 parents 2bfab23 + d2aaae4 commit 20f95cc

38 files changed

Lines changed: 1166 additions & 77 deletions

‎db/models.sql‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,8 @@ INSERT INTO Manufacturers VALUES (2, 'Amcrest');
2323
*/
2424
INSERT IGNORE INTO Models (ManufacturerId,Name) VALUES (2, 'IP8M-T2499EW');
2525
INSERT IGNORE INTO Models (ManufacturerId,Name) VALUES (2, 'ASH42-B');
26+
INSERT IGNORE INTO Models (ManufacturerId,Name) VALUES (2, 'ASH21-B');
27+
INSERT IGNORE INTO Models (ManufacturerId,Name) VALUES (2, 'ADC2W');
2628
/*
2729
INSERT INTO Manufacturers VALUES (3, 'Airlink101');
2830
INSERT INTO Manufacturers VALUES (4, 'Arecont Vision');

‎db/zm_create.sql.in‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -131,6 +131,8 @@ CREATE TABLE `Controls` (
131131
`HasWhiteSpeed` tinyint(3) unsigned NOT NULL default '0',
132132
`MinWhiteSpeed` int(10) unsigned default NULL,
133133
`MaxWhiteSpeed` int(10) unsigned default NULL,
134+
`CanLight` tinyint(3) unsigned NOT NULL default '0',
135+
`CanIndicatorLight` tinyint(3) unsigned NOT NULL default '0',
134136
`HasPresets` tinyint(3) unsigned NOT NULL default '0',
135137
`NumPresets` tinyint(3) unsigned NOT NULL default '0',
136138
`HasHomePreset` tinyint(3) unsigned NOT NULL default '0',
@@ -1211,6 +1213,10 @@ INSERT INTO `Controls` VALUES (NULL,'PSIA','Remote','PSIA',0,0,0,0,1,0,0,1,0,0,0
12111213
INSERT INTO `Controls` VALUES (NULL,'Dahua','Ffmpeg','Dahua',0,0,1,1,1,0,0,1,0,0,0,0,0,0,0,0,1,0,0,1,0,0,0,0,0,0,0,0,1,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1,20,1,1,1,1,0,0,1,0,1,0,0,0,0,0,0,0,0,0,1,0,0,0,0,0,0,0,0,0,0,0);
12121214
INSERT INTO `Controls` VALUES (NULL,'FOSCAMR2C','Libvlc','FOSCAMR2C',1,1,1,0,0,0,0,0,0,NULL,NULL,NULL,NULL,0,NULL,NULL,0,0,0,0,0,NULL,NULL,NULL,NULL,0,NULL,NULL,0,0,0,0,0,NULL,NULL,NULL,NULL,0,NULL,NULL,0,0,0,0,0,NULL,NULL,NULL,NULL,0,NULL,NULL,0,0,0,0,0,NULL,NULL,NULL,NULL,0,NULL,NULL,1,12,0,1,1,1,0,0,0,1,1,NULL,NULL,NULL,NULL,1,0,4,0,NULL,1,NULL,NULL,NULL,NULL,1,0,4,0,NULL,0,0);
12131215
INSERT INTO `Controls` VALUES (NULL,'Amcrest HTTP API','Ffmpeg','Amcrest_HTTP',0,0,1,0,1,0,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1,5,0,0,1,0,0,0,0,1,1,0,0,0,0,0,0,0,0,0,1,0,0,0,0,0,0,0,0,0,0,5);
1216+
INSERT INTO `Controls` (`Name`,`Type`,`Protocol`,`CanReset`,`CanReboot`,`CanZoom`,`CanZoomCon`,`HasPresets`,`NumPresets`,`HasHomePreset`,`CanSetPresets`,`CanMove`,`CanMoveDiag`,`CanMoveCon`,`CanPan`,`CanTilt`,`CanLight`,`CanIndicatorLight`) VALUES ('Dahua/Amcrest RPC','Ffmpeg','Dahua_RPC',1,1,1,1,1,25,1,1,1,1,1,1,1,1,1);
1217+
INSERT INTO `Controls` (`Name`,`Type`,`Protocol`,`CanReset`,`CanReboot`,`CanZoom`,`CanZoomCon`,`HasPresets`,`NumPresets`,`HasHomePreset`,`CanSetPresets`,`CanMove`,`CanMoveDiag`,`CanMoveCon`,`CanPan`,`CanTilt`,`CanIndicatorLight`) VALUES ('Amcrest ASH21-B RPC','Ffmpeg','Dahua_RPC',1,1,0,0,0,0,0,0,1,0,1,1,1,1);
1218+
INSERT INTO `Controls` (`Name`,`Type`,`Protocol`,`CanReset`,`CanReboot`,`CanZoom`,`CanZoomCon`,`HasPresets`,`NumPresets`,`HasHomePreset`,`CanSetPresets`,`CanMove`,`CanMoveDiag`,`CanMoveCon`,`CanPan`,`CanTilt`,`CanLight`,`CanIndicatorLight`) VALUES ('Amcrest ADC2W RPC','Ffmpeg','Dahua_RPC',1,1,0,0,0,0,0,0,0,0,0,0,0,1,1);
1219+
INSERT INTO `Controls` (`Name`,`Type`,`Protocol`,`CanReset`,`CanReboot`,`CanIndicatorLight`) VALUES ('Amcrest ASH42-B RPC','Ffmpeg','Dahua_RPC',1,1,1);
12141220
INSERT INTO `Controls` VALUES (NULL,'ONVIF','Ffmpeg','ONVIF',0,0,1,1,1,0,0,0,1,NULL,NULL,NULL,NULL,0,NULL,NULL,0,0,0,0,0,NULL,NULL,NULL,NULL,0,NULL,NULL,1,0,1,0,0,0,100,1,1,0,NULL,NULL,0,0,0,0,0,NULL,NULL,NULL,NULL,0,NULL,NULL,1,0,1,0,0,0,100,1,1,0,NULL,NULL,1,20,1,1,1,1,1,0,1,1,1,NULL,NULL,NULL,NULL,0,NULL,NULL,0,NULL,1,NULL,NULL,NULL,NULL,0,NULL,NULL,0,NULL,0,0);
12151221

12161222
--

‎db/zm_update-1.39.12.sql‎

Lines changed: 45 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,45 @@
1+
--
2+
-- Add Controls definition for the Dahua/Amcrest JSON-RPC PTZ protocol.
3+
--
4+
INSERT INTO `Controls`
5+
(`Name`,`Type`,`Protocol`,`CanReset`,`CanReboot`,`CanZoom`,`CanZoomCon`,`HasPresets`,`NumPresets`,`HasHomePreset`,`CanSetPresets`,`CanMove`,`CanMoveDiag`,`CanMoveCon`,`CanPan`,`CanTilt`)
6+
SELECT 'Dahua/Amcrest RPC','Ffmpeg','Dahua_RPC',1,1,1,1,1,25,1,1,1,1,1,1,1
7+
FROM DUAL
8+
WHERE NOT EXISTS (SELECT 1 FROM `Controls` WHERE `Name`='Dahua/Amcrest RPC');
9+
10+
--
11+
-- Add a model-specific Controls entry for the Amcrest ASH21-B. This model
12+
-- exposes only pan/tilt over the Dahua RPC interface: SetPreset is a no-op,
13+
-- zoom does nothing, and the firmware reports all four diagonals as
14+
-- unsupported (verified live against the camera).
15+
--
16+
INSERT INTO `Controls`
17+
(`Name`,`Type`,`Protocol`,`CanReset`,`CanReboot`,`CanZoom`,`CanZoomCon`,`HasPresets`,`NumPresets`,`HasHomePreset`,`CanSetPresets`,`CanMove`,`CanMoveDiag`,`CanMoveCon`,`CanPan`,`CanTilt`)
18+
SELECT 'Amcrest ASH21-B RPC','Ffmpeg','Dahua_RPC',1,1,0,0,0,0,0,0,1,0,1,1,1
19+
FROM DUAL
20+
WHERE NOT EXISTS (SELECT 1 FROM `Controls` WHERE `Name`='Amcrest ASH21-B RPC');
21+
22+
--
23+
-- Add a model-specific Controls entry for the Amcrest ADC2W. This model has
24+
-- no PTZ and its white light is cloud-only (not exposed over local RPC), so
25+
-- the only locally controllable action is reboot via magicBox.reboot
26+
-- (verified live against the camera).
27+
--
28+
INSERT INTO `Controls`
29+
(`Name`,`Type`,`Protocol`,`CanReset`,`CanReboot`,`CanZoom`,`CanZoomCon`,`HasPresets`,`NumPresets`,`HasHomePreset`,`CanSetPresets`,`CanMove`,`CanMoveDiag`,`CanMoveCon`,`CanPan`,`CanTilt`)
30+
SELECT 'Amcrest ADC2W RPC','Ffmpeg','Dahua_RPC',1,1,0,0,0,0,0,0,0,0,0,0,0
31+
FROM DUAL
32+
WHERE NOT EXISTS (SELECT 1 FROM `Controls` WHERE `Name`='Amcrest ADC2W RPC');
33+
34+
--
35+
-- Add the ASH21-B and ADC2W models under the Amcrest manufacturer (id 2).
36+
--
37+
INSERT INTO `Models` (`Name`,`ManufacturerId`)
38+
SELECT 'ASH21-B', 2
39+
FROM DUAL
40+
WHERE NOT EXISTS (SELECT 1 FROM `Models` WHERE `Name`='ASH21-B');
41+
42+
INSERT INTO `Models` (`Name`,`ManufacturerId`)
43+
SELECT 'ADC2W', 2
44+
FROM DUAL
45+
WHERE NOT EXISTS (SELECT 1 FROM `Models` WHERE `Name`='ADC2W');

‎db/zm_update-1.39.13.sql‎

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
--
2+
-- Add CanLight capability column to Controls (light on/off control).
3+
--
4+
SELECT 'Adding CanLight to Controls' AS '';
5+
SET @s = (SELECT IF(
6+
(SELECT COUNT(*) FROM INFORMATION_SCHEMA.COLUMNS
7+
WHERE table_schema = DATABASE()
8+
AND table_name = 'Controls'
9+
AND column_name = 'CanLight') > 0,
10+
'SELECT ''Column CanLight already exists''',
11+
'ALTER TABLE `Controls` ADD COLUMN `CanLight` tinyint(3) unsigned NOT NULL default ''0'' AFTER `MaxWhiteSpeed`'
12+
));
13+
PREPARE stmt FROM @s;
14+
EXECUTE stmt;
15+
DEALLOCATE PREPARE stmt;
16+
17+
--
18+
-- Enable the light control on the Amcrest ADC2W row.
19+
--
20+
UPDATE `Controls` SET `CanLight`=1 WHERE `Name`='Amcrest ADC2W RPC';

‎db/zm_update-1.39.14.sql‎

Lines changed: 39 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,39 @@
1+
--
2+
-- Add CanIndicatorLight capability column to Controls (camera indicator LED on/off).
3+
--
4+
SET @s = (SELECT IF(
5+
(SELECT COUNT(*) FROM INFORMATION_SCHEMA.COLUMNS
6+
WHERE table_schema = DATABASE()
7+
AND table_name = 'Controls'
8+
AND column_name = 'CanIndicatorLight') > 0,
9+
'SELECT ''Column CanIndicatorLight already exists''',
10+
'ALTER TABLE `Controls` ADD COLUMN `CanIndicatorLight` tinyint(3) unsigned NOT NULL default ''0'' AFTER `CanLight`'
11+
));
12+
PREPARE stmt FROM @s;
13+
EXECUTE stmt;
14+
DEALLOCATE PREPARE stmt;
15+
16+
--
17+
-- Add model-specific Controls entry for the Amcrest ASH42-B.
18+
-- This model has no PTZ; its indicator LED is controlled via LightGlobal config
19+
-- (configManager.setConfig/getConfig, verified live). Reboot via magicBox.reboot.
20+
--
21+
INSERT INTO `Controls`
22+
(`Name`,`Type`,`Protocol`,`CanReset`,`CanReboot`,`CanIndicatorLight`)
23+
SELECT 'Amcrest ASH42-B RPC','Ffmpeg','Dahua_RPC',1,1,1
24+
FROM DUAL
25+
WHERE NOT EXISTS (SELECT 1 FROM `Controls` WHERE `Name`='Amcrest ASH42-B RPC');
26+
27+
--
28+
-- The ASH21-B and ADC2W also control their indicator LED via LightGlobal
29+
-- (verified live on both models), so enable the capability on their entries.
30+
--
31+
UPDATE `Controls` SET `CanIndicatorLight`=1
32+
WHERE `Name` IN ('Amcrest ASH21-B RPC','Amcrest ADC2W RPC');
33+
34+
--
35+
-- The generic entry keeps every capability enabled for testing new cameras.
36+
-- (CanLight column was added by 1.39.12, CanIndicatorLight above.)
37+
--
38+
UPDATE `Controls` SET `CanLight`=1, `CanIndicatorLight`=1
39+
WHERE `Name`='Dahua/Amcrest RPC';

‎distros/beowulf/control‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ Build-Depends: debhelper, sphinx-doc, dh-linktree, dh-apache2
1313
,ffmpeg
1414
,net-tools
1515
,libbz2-dev
16-
,libcurl4-gnutls-dev
16+
,libcurl4-gnutls-dev | libcurl4-openssl-dev | libcurl4-nss-dev
1717
,libturbojpeg0-dev
1818
,default-libmysqlclient-dev | libmysqlclient-dev | libmariadbclient-dev-compat
1919
,libpcre2-dev

‎distros/redhat/zoneminder.spec‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
%global zmtargetdistro %{?rhel:el%{rhel}}%{!?rhel:fc%{fedora}}
2222

2323
Name: zoneminder
24-
Version: 1.39.5
24+
Version: 1.39.11
2525
Release: 1%{?dist}
2626
Summary: A camera monitoring and analysis tool
2727
Group: System Environment/Daemons

‎distros/ubuntu2004/control‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ Build-Depends: debhelper (>= 11), sphinx-doc, python3-sphinx, python3-sphinx-rtd
1414
,arp-scan
1515
,net-tools, iproute2
1616
,libbz2-dev
17-
,libcurl4-gnutls-dev
17+
,libcurl4-gnutls-dev | libcurl4-openssl-dev | libcurl4-nss-dev
1818
,libjpeg-turbo8-dev | libjpeg62-turbo-dev | libjpeg8-dev | libjpeg9-dev
1919
,libturbojpeg0-dev
2020
,default-libmysqlclient-dev | libmysqlclient-dev | libmariadbclient-dev-compat
@@ -47,7 +47,6 @@ Depends: ${shlibs:Depends}, ${misc:Depends}, ${perl:Depends}
4747
,libswscale9|libswscale8|libswscale7|libswscale6|libswscale5|libswscale4
4848
,libswresample6|libswresample5|libswresample4|libswresample3|libswresample2
4949
,ffmpeg
50-
,libcurl4, libcurl4-gnutls-dev
5150
,libdatetime-perl, libdate-manip-perl, libmime-lite-perl, libmime-tools-perl
5251
,libdbd-mysql-perl
5352
,libphp-serialization-perl

0 commit comments

Comments
 (0)