diff options
| author | Kurt Jaeger <pi@FreeBSD.org> | 2017-03-12 19:41:42 +0000 |
|---|---|---|
| committer | Kurt Jaeger <pi@FreeBSD.org> | 2017-03-12 19:41:42 +0000 |
| commit | 14389cc24fdd3ed62bd96370a4b975f0e4d3e372 (patch) | |
| tree | fe31300a317532b6945974c7d3d115c4a4f725aa /multimedia/zoneminder | |
| parent | - Update x11-toolkits/scintilla t o 3.7.3 (diff) | |
multimedia/zoneminder{-h264}: fix build with clang 4.0
PR: 216627
Reported by: jbeich
Submitted by: Ivan <bsd@abinet.ru> (maintainer)
MFH: 2017Q1
Notes
Notes:
svn path=/head/; revision=436017
Diffstat (limited to 'multimedia/zoneminder')
| -rw-r--r-- | multimedia/zoneminder/Makefile | 7 | ||||
| -rw-r--r-- | multimedia/zoneminder/files/patch-src_zm__monitor.cpp | 29 | ||||
| -rw-r--r-- | multimedia/zoneminder/files/patch-src_zmf.cpp | 11 |
3 files changed, 45 insertions, 2 deletions
diff --git a/multimedia/zoneminder/Makefile b/multimedia/zoneminder/Makefile index 3de93697f586..1827d22737d7 100644 --- a/multimedia/zoneminder/Makefile +++ b/multimedia/zoneminder/Makefile @@ -3,7 +3,7 @@ PORTNAME= zoneminder PORTVERSION= 1.30.0 DISTVERSIONPREFIX= v -PORTREVISION= 4 +PORTREVISION= 5 CATEGORIES= multimedia MAINTAINER= bsd@abinet.ru @@ -11,6 +11,8 @@ COMMENT= Complete security camera solution, fully web based with image analysis LICENSE= GPLv2 +CONFLICTS_INSTALL= zoneminder-h264 + ZM_DEPENDS= p5-DBI>=0:databases/p5-DBI \ p5-DBD-mysql>=0:databases/p5-DBD-mysql \ p5-Date-Manip>=0:devel/p5-Date-Manip \ @@ -27,6 +29,7 @@ ZM_DEPENDS= p5-DBI>=0:databases/p5-DBI \ BUILD_DEPENDS= ${ZM_DEPENDS} RUN_DEPENDS= ${ZM_DEPENDS} \ sudo:security/sudo \ + p5-Device-SerialPort>=0:comms/p5-Device-SerialPort \ zip:archivers/zip USE_GITHUB= yes @@ -35,7 +38,7 @@ GH_TUPLE= FriendsOfCake:crud:c3976f1:crud USES= cmake jpeg mysql perl5 php shebangfix ssl USE_RC_SUBR= zoneminder -USE_PHP= json pdo_mysql session gd sockets +USE_PHP= json pdo_mysql session gd sockets ctype ONLY_FOR_ARCHS= amd64 i386 diff --git a/multimedia/zoneminder/files/patch-src_zm__monitor.cpp b/multimedia/zoneminder/files/patch-src_zm__monitor.cpp new file mode 100644 index 000000000000..629ae40f2d09 --- /dev/null +++ b/multimedia/zoneminder/files/patch-src_zm__monitor.cpp @@ -0,0 +1,29 @@ +--- src/zm_monitor.cpp.orig 2016-07-28 01:45:26 UTC ++++ src/zm_monitor.cpp +@@ -160,7 +160,7 @@ bool Monitor::MonitorLink::connect() + return( false ); + } + mem_ptr = (unsigned char *)shmat( shm_id, 0, 0 ); +- if ( mem_ptr < 0 ) ++ if ( mem_ptr < (void *)0 ) + { + Debug( 3, "Can't shmat link memory: %s", strerror(errno) ); + connected = false; +@@ -194,7 +194,7 @@ bool Monitor::MonitorLink::disconnect() + connected = false; + + #if ZM_MEM_MAPPED +- if ( mem_ptr > 0 ) ++ if ( mem_ptr > (void *)0 ) + { + msync( mem_ptr, mem_size, MS_ASYNC ); + munmap( mem_ptr, mem_size ); +@@ -558,7 +558,7 @@ bool Monitor::connect() { + exit( -1 ); + } + mem_ptr = (unsigned char *)shmat( shm_id, 0, 0 ); +- if ( mem_ptr < 0 ) ++ if ( mem_ptr < (void *)0 ) + { + Error( "Can't shmat: %s", strerror(errno)); + exit( -1 ); diff --git a/multimedia/zoneminder/files/patch-src_zmf.cpp b/multimedia/zoneminder/files/patch-src_zmf.cpp new file mode 100644 index 000000000000..e2b736ba06d3 --- /dev/null +++ b/multimedia/zoneminder/files/patch-src_zmf.cpp @@ -0,0 +1,11 @@ +--- src/zmf.cpp.orig 2016-07-28 01:45:26 UTC ++++ src/zmf.cpp +@@ -331,7 +331,7 @@ int main( int argc, char *argv[] ) + Debug( 1, "Got image, writing to %s", path ); + + FILE *fd = 0; +- if ( (fd = fopen( path, "w" )) < 0 ) ++ if ( (fd = fopen( path, "w" )) == NULL ) + { + Error( "Can't fopen '%s': %s", path, strerror(errno) ); + exit( -1 ); |