Attachment #199966 for bug #233876

View | Details | Raw Unified | Return to bug 233876
Collapse All | Expand All

Lines 1-7 Link Here

(-)Makefile (-1 / +1 lines)
1	# $FreeBSD$	1	# $FreeBSD$
2		2
3	PORTNAME= zoneminder	3	PORTNAME= zoneminder
4	PORTVERSION= 1.32.2	4	PORTVERSION= 1.32.3
5	CATEGORIES= multimedia	5	CATEGORIES= multimedia
6		6
7	MAINTAINER= bsd@abinet.ru	7	MAINTAINER= bsd@abinet.ru

Lines 1-6 Link Here

(-)distinfo (-3 / +3 lines)
1	TIMESTAMP = 1541609433	1	TIMESTAMP = 1544308211
2	SHA256 (zoneminder-zoneminder-1.32.2_GH0.tar.gz) = cf72cbd45d91ef0232c123dac5f908993f8941a62b9ae96975c4e6043bd4b9a9	2	SHA256 (zoneminder-zoneminder-1.32.3_GH0.tar.gz) = 9a7e61c529a6269ff0344403369b160b8c8da48615c4172377c465da0b0074b1
3	SIZE (zoneminder-zoneminder-1.32.2_GH0.tar.gz) = 10639207	3	SIZE (zoneminder-zoneminder-1.32.3_GH0.tar.gz) = 10656921
4	SHA256 (zoneminder-crud-0bd63fb_GH0.tar.gz) = d4c82d714ea74606726d11be973b17d3f9b57ad6c6559e1a29affa60c6f3a579	4	SHA256 (zoneminder-crud-0bd63fb_GH0.tar.gz) = d4c82d714ea74606726d11be973b17d3f9b57ad6c6559e1a29affa60c6f3a579
5	SIZE (zoneminder-crud-0bd63fb_GH0.tar.gz) = 73129	5	SIZE (zoneminder-crud-0bd63fb_GH0.tar.gz) = 73129
6	SHA256 (zoneminder-CakePHP-Enum-Behavior-ea90c0c_GH0.tar.gz) = 3a9006c7c59f2b864ce628df4725b241fc23cfd9abc56e746acbd22d850f5ab1	6	SHA256 (zoneminder-CakePHP-Enum-Behavior-ea90c0c_GH0.tar.gz) = 3a9006c7c59f2b864ce628df4725b241fc23cfd9abc56e746acbd22d850f5ab1




--- src/zm_monitor.cpp.orig	2018-10-13 18:36:15 UTC
+++ src/zm_monitor.cpp
@@ -2110,6 +2110,7 @@ Monitor *Monitor::Load(MYSQL_ROW dbrow, bool load_zone
   Camera *camera = 0;
   if ( type == "Local" ) {
 
+#if ZM_HAS_V4L
     int extras = (deinterlacing>>24)&0xff;
 
     camera = new LocalCamera(
@@ -2132,6 +2133,9 @@ Monitor *Monitor::Load(MYSQL_ROW dbrow, bool load_zone
         record_audio,
         extras
         );
+#else
+    Fatal("ZoneMinder not built with Local Camera support");
+#endif
   } else if ( type == "Remote" ) {
     if ( protocol == "http" ) {
       camera = new RemoteCameraHttp(

Lines 1-11 Link Here

(-)files/patch-src_zm__stream.cpp (-11 lines)
1	--- src/zm_stream.cpp.orig 2018-11-07 16:33:47 UTC
2	+++ src/zm_stream.cpp
3	@@ -325,7 +325,7 @@ void StreamBase::openComms() {
4	strncpy(loc_addr.sun_path, loc_sock_path, sizeof(loc_addr.sun_path));
5	loc_addr.sun_family = AF_UNIX;
6	Debug(3, "Binding to %s", loc_sock_path);
7	- if ( bind(sd, (struct sockaddr *)&loc_addr, strlen(loc_addr.sun_path)+sizeof(loc_addr.sun_family)+1) < 0 ) {
8	+ if ( ::bind(sd, (struct sockaddr *)&loc_addr, strlen(loc_addr.sun_path)+sizeof(loc_addr.sun_family)+1) < 0 ) {
9	Fatal("Can't bind: %s", strerror(errno));
10	}
11




%%DATADIR%%/db/zm_update-1.32.0.sql
%%DATADIR%%/db/zm_update-1.32.1.sql
%%DATADIR%%/db/zm_update-1.32.2.sql
%%DATADIR%%/db/zm_update-1.32.3.sql
%%DATADIR%%/icons/16x16/icon.xpm
%%WWWDIR%%/ajax/add_monitors.php
%%WWWDIR%%/ajax/alarm.php

%%WWWDIR%%/api/app/Model/Host.php
%%WWWDIR%%/api/app/Model/Log.php
%%WWWDIR%%/api/app/Model/Monitor.php
%%WWWDIR%%/api/app/Model/Monitor_Status.php
%%WWWDIR%%/api/app/Model/Server.php
%%WWWDIR%%/api/app/Model/State.php
%%WWWDIR%%/api/app/Model/Storage.php

%%WWWDIR%%/includes/lang.php
%%WWWDIR%%/includes/logger.php
%%WWWDIR%%/index.php
%%WWWDIR%%/js/Server.js
%%WWWDIR%%/js/logger.js
%%WWWDIR%%/js/mootools.ext.js
%%WWWDIR%%/js/overlay.js
%%WWWDIR%%/js/videojs.zoomrotate.js
%%WWWDIR%%/lang/big5_big5.php
%%WWWDIR%%/lang/ba_ba.php
%%WWWDIR%%/lang/cn_zh.php
%%WWWDIR%%/lang/cs_cz.php
%%WWWDIR%%/lang/de_de.php

%%WWWDIR%%/lang/updateLangs.php
%%WWWDIR%%/robots.txt
%%WWWDIR%%/skins/classic/css/base/export.css
%%WWWDIR%%/skins/classic/css/base/jquery-ui-theme.css
%%WWWDIR%%/skins/classic/css/base/skin.css
%%WWWDIR%%/skins/classic/css/base/views/console.css
%%WWWDIR%%/skins/classic/css/base/views/control.css

%%WWWDIR%%/skins/classic/css/base/views/zone.css
%%WWWDIR%%/skins/classic/css/base/views/zones.css
%%WWWDIR%%/skins/classic/css/classic/export.css
%%WWWDIR%%/skins/classic/css/classic/jquery-ui-theme.css
%%WWWDIR%%/skins/classic/css/classic/skin.css
%%WWWDIR%%/skins/classic/css/classic/views/console.css
%%WWWDIR%%/skins/classic/css/classic/views/control.css

%%WWWDIR%%/skins/classic/css/classic/views/zone.css
%%WWWDIR%%/skins/classic/css/classic/views/zones.css
%%WWWDIR%%/skins/classic/css/dark/export.css
%%WWWDIR%%/skins/classic/css/dark/jquery-ui-theme.css
%%WWWDIR%%/skins/classic/css/dark/skin.css
%%WWWDIR%%/skins/classic/css/dark/views/console.css
%%WWWDIR%%/skins/classic/css/dark/views/control.css

Return to bug 233876

Lines 6175-6180 Link Here

(-)pkg-plist (-3 / +4 lines)
6175	%%DATADIR%%/db/zm_update-1.32.0.sql	6175	%%DATADIR%%/db/zm_update-1.32.0.sql
6176	%%DATADIR%%/db/zm_update-1.32.1.sql	6176	%%DATADIR%%/db/zm_update-1.32.1.sql
6177	%%DATADIR%%/db/zm_update-1.32.2.sql	6177	%%DATADIR%%/db/zm_update-1.32.2.sql
		6178	%%DATADIR%%/db/zm_update-1.32.3.sql
6178	%%DATADIR%%/icons/16x16/icon.xpm	6179	%%DATADIR%%/icons/16x16/icon.xpm
6179	%%WWWDIR%%/ajax/add_monitors.php	6180	%%WWWDIR%%/ajax/add_monitors.php
6180	%%WWWDIR%%/ajax/alarm.php	6181	%%WWWDIR%%/ajax/alarm.php
Lines 6236-6241 Link Here
6236	%%WWWDIR%%/api/app/Model/Host.php	6237	%%WWWDIR%%/api/app/Model/Host.php
6237	%%WWWDIR%%/api/app/Model/Log.php	6238	%%WWWDIR%%/api/app/Model/Log.php
6238	%%WWWDIR%%/api/app/Model/Monitor.php	6239	%%WWWDIR%%/api/app/Model/Monitor.php
		6240	%%WWWDIR%%/api/app/Model/Monitor_Status.php
6239	%%WWWDIR%%/api/app/Model/Server.php	6241	%%WWWDIR%%/api/app/Model/Server.php
6240	%%WWWDIR%%/api/app/Model/State.php	6242	%%WWWDIR%%/api/app/Model/State.php
6241	%%WWWDIR%%/api/app/Model/Storage.php	6243	%%WWWDIR%%/api/app/Model/Storage.php
Lines 7532-7542 Link Here
7532	%%WWWDIR%%/includes/lang.php	7534	%%WWWDIR%%/includes/lang.php
7533	%%WWWDIR%%/includes/logger.php	7535	%%WWWDIR%%/includes/logger.php
7534	%%WWWDIR%%/index.php	7536	%%WWWDIR%%/index.php
		7537	%%WWWDIR%%/js/Server.js
7535	%%WWWDIR%%/js/logger.js	7538	%%WWWDIR%%/js/logger.js
7536	%%WWWDIR%%/js/mootools.ext.js	7539	%%WWWDIR%%/js/mootools.ext.js
7537	%%WWWDIR%%/js/overlay.js	7540	%%WWWDIR%%/js/overlay.js
7538	%%WWWDIR%%/js/videojs.zoomrotate.js	7541	%%WWWDIR%%/js/videojs.zoomrotate.js
7539	%%WWWDIR%%/lang/big5_big5.php	7542	%%WWWDIR%%/lang/big5_big5.php
		7543	%%WWWDIR%%/lang/ba_ba.php
7540	%%WWWDIR%%/lang/cn_zh.php	7544	%%WWWDIR%%/lang/cn_zh.php
7541	%%WWWDIR%%/lang/cs_cz.php	7545	%%WWWDIR%%/lang/cs_cz.php
7542	%%WWWDIR%%/lang/de_de.php	7546	%%WWWDIR%%/lang/de_de.php
Lines 7561-7567 Link Here
7561	%%WWWDIR%%/lang/updateLangs.php	7565	%%WWWDIR%%/lang/updateLangs.php
7562	%%WWWDIR%%/robots.txt	7566	%%WWWDIR%%/robots.txt
7563	%%WWWDIR%%/skins/classic/css/base/export.css	7567	%%WWWDIR%%/skins/classic/css/base/export.css
7564	%%WWWDIR%%/skins/classic/css/base/jquery-ui-theme.css
7565	%%WWWDIR%%/skins/classic/css/base/skin.css	7568	%%WWWDIR%%/skins/classic/css/base/skin.css
7566	%%WWWDIR%%/skins/classic/css/base/views/console.css	7569	%%WWWDIR%%/skins/classic/css/base/views/console.css
7567	%%WWWDIR%%/skins/classic/css/base/views/control.css	7570	%%WWWDIR%%/skins/classic/css/base/views/control.css
Lines 7598-7604 Link Here
7598	%%WWWDIR%%/skins/classic/css/base/views/zone.css	7601	%%WWWDIR%%/skins/classic/css/base/views/zone.css
7599	%%WWWDIR%%/skins/classic/css/base/views/zones.css	7602	%%WWWDIR%%/skins/classic/css/base/views/zones.css
7600	%%WWWDIR%%/skins/classic/css/classic/export.css	7603	%%WWWDIR%%/skins/classic/css/classic/export.css
7601	%%WWWDIR%%/skins/classic/css/classic/jquery-ui-theme.css
7602	%%WWWDIR%%/skins/classic/css/classic/skin.css	7604	%%WWWDIR%%/skins/classic/css/classic/skin.css
7603	%%WWWDIR%%/skins/classic/css/classic/views/console.css	7605	%%WWWDIR%%/skins/classic/css/classic/views/console.css
7604	%%WWWDIR%%/skins/classic/css/classic/views/control.css	7606	%%WWWDIR%%/skins/classic/css/classic/views/control.css
Lines 7633-7639 Link Here
7633	%%WWWDIR%%/skins/classic/css/classic/views/zone.css	7635	%%WWWDIR%%/skins/classic/css/classic/views/zone.css
7634	%%WWWDIR%%/skins/classic/css/classic/views/zones.css	7636	%%WWWDIR%%/skins/classic/css/classic/views/zones.css
7635	%%WWWDIR%%/skins/classic/css/dark/export.css	7637	%%WWWDIR%%/skins/classic/css/dark/export.css
7636	%%WWWDIR%%/skins/classic/css/dark/jquery-ui-theme.css
7637	%%WWWDIR%%/skins/classic/css/dark/skin.css	7638	%%WWWDIR%%/skins/classic/css/dark/skin.css
7638	%%WWWDIR%%/skins/classic/css/dark/views/console.css	7639	%%WWWDIR%%/skins/classic/css/dark/views/console.css
7639	%%WWWDIR%%/skins/classic/css/dark/views/control.css	7640	%%WWWDIR%%/skins/classic/css/dark/views/control.css

Lines 1-20 Link Here

(-)files/patch-src_zm__monitor.cpp (-20 lines)
1	--- src/zm_monitor.cpp.orig 2018-10-13 18:36:15 UTC
2	+++ src/zm_monitor.cpp
3	@@ -2110,6 +2110,7 @@ Monitor *Monitor::Load(MYSQL_ROW dbrow, bool load_zone
4	Camera *camera = 0;
5	if ( type == "Local" ) {
6
7	+#if ZM_HAS_V4L
8	int extras = (deinterlacing>>24)&0xff;
9
10	camera = new LocalCamera(
11	@@ -2132,6 +2133,9 @@ Monitor *Monitor::Load(MYSQL_ROW dbrow, bool load_zone
12	record_audio,
13	extras
14	);
15	+#else
16	+ Fatal("ZoneMinder not built with Local Camera support");
17	+#endif
18	} else if ( type == "Remote" ) {
19	if ( protocol == "http" ) {
20	camera = new RemoteCameraHttp(