View | Details | Raw Unified | Return to bug 216627 | Differences between
and this patch

Collapse All | Expand All

(-)/usr/local/poudriere/ports/default/multimedia/zoneminder-h264/Makefile (-2 / +5 lines)
Lines 2-8 Link Here
2
2
3
PORTNAME=	zoneminder-h264
3
PORTNAME=	zoneminder-h264
4
PORTVERSION=	1.30.20161104
4
PORTVERSION=	1.30.20161104
5
PORTREVISION=	1
5
PORTREVISION=	2
6
CATEGORIES=	multimedia
6
CATEGORIES=	multimedia
7
7
8
MAINTAINER=	bsd@abinet.ru
8
MAINTAINER=	bsd@abinet.ru
Lines 10-15 Link Here
10
10
11
LICENSE=	GPLv2
11
LICENSE=	GPLv2
12
12
13
CONFLICTS=	zoneminder
14
13
ZM_DEPENDS=	p5-DBI>=0:databases/p5-DBI \
15
ZM_DEPENDS=	p5-DBI>=0:databases/p5-DBI \
14
		p5-DBD-mysql>=0:databases/p5-DBD-mysql \
16
		p5-DBD-mysql>=0:databases/p5-DBD-mysql \
15
		p5-Date-Manip>=0:devel/p5-Date-Manip \
17
		p5-Date-Manip>=0:devel/p5-Date-Manip \
Lines 32-37 Link Here
32
RUN_DEPENDS=	${ZM_DEPENDS} \
34
RUN_DEPENDS=	${ZM_DEPENDS} \
33
		p5-MIME-Tools>=0:mail/p5-MIME-Tools \
35
		p5-MIME-Tools>=0:mail/p5-MIME-Tools \
34
		sudo:security/sudo \
36
		sudo:security/sudo \
37
		p5-Device-SerialPort>=0:comms/p5-Device-SerialPort \
35
		zip:archivers/zip
38
		zip:archivers/zip
36
39
37
USE_GITHUB=	yes
40
USE_GITHUB=	yes
Lines 40-46 Link Here
40
43
41
USES=		cmake jpeg mysql perl5 php shebangfix ssl
44
USES=		cmake jpeg mysql perl5 php shebangfix ssl
42
USE_RC_SUBR=	zoneminder
45
USE_RC_SUBR=	zoneminder
43
USE_PHP=	json pdo_mysql session gd sockets
46
USE_PHP=	json pdo_mysql session gd sockets ctype
44
47
45
ONLY_FOR_ARCHS=	amd64 i386
48
ONLY_FOR_ARCHS=	amd64 i386
46
49
(-)/usr/local/poudriere/ports/default/multimedia/zoneminder-h264/README.md (+2 lines)
Line 0 Link Here
1
# Zoneminder-port
2
This is Zoneminder with H264 backend support
(-)/usr/local/poudriere/ports/default/multimedia/zoneminder-h264/files/patch-src_zm__monitor.cpp (+29 lines)
Line 0 Link Here
1
--- src/zm_monitor.cpp.orig	2016-11-03 20:26:18 UTC
2
+++ src/zm_monitor.cpp
3
@@ -161,7 +161,7 @@ bool Monitor::MonitorLink::connect()
4
       return( false );
5
     }
6
     mem_ptr = (unsigned char *)shmat( shm_id, 0, 0 );
7
-    if ( mem_ptr < 0 )
8
+    if ( mem_ptr == (void *)-1 )
9
     {
10
       Debug( 3, "Can't shmat link memory: %s", strerror(errno) );
11
       connected = false;
12
@@ -195,7 +195,7 @@ bool Monitor::MonitorLink::disconnect()
13
     connected = false;
14
 
15
 #if ZM_MEM_MAPPED
16
-    if ( mem_ptr > 0 )
17
+    if ( mem_ptr != MAP_FAILED )
18
     {
19
       msync( mem_ptr, mem_size, MS_ASYNC );
20
       munmap( mem_ptr, mem_size );
21
@@ -576,7 +576,7 @@ bool Monitor::connect() {
22
     exit( -1 );
23
   }
24
   mem_ptr = (unsigned char *)shmat( shm_id, 0, 0 );
25
-  if ( mem_ptr < 0 )
26
+  if ( mem_ptr == (void *)-1 )
27
   {
28
     Error( "Can't shmat: %s", strerror(errno));
29
     exit( -1 );
(-)/usr/local/poudriere/ports/default/multimedia/zoneminder-h264/files/patch-src_zmf.cpp (+11 lines)
Line 0 Link Here
1
--- src/zmf.cpp.orig	2016-11-03 20:26:18 UTC
2
+++ src/zmf.cpp
3
@@ -331,7 +331,7 @@ int main( int argc, char *argv[] )
4
     Debug( 1, "Got image, writing to %s", path );
5
 
6
     FILE *fd = 0;
7
-    if ( (fd = fopen( path, "w" )) < 0 )
8
+    if ( (fd = fopen( path, "w" )) == NULL )
9
     {
10
       Error( "Can't fopen '%s': %s", path, strerror(errno) );
11
       exit( -1 );

Return to bug 216627