Attachment 180654 Details for Bug 216627 – zoneminder-h264.patch

[patch] zoneminder-h264.patch

zoneminder-h264.patch (text/plain), 3.74 KB, created by Ivan on 2017-03-08 22:16:18 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Ivan

Created: 2017-03-08 22:16:18 UTC

Size: 3.74 KB

patch

obsolete

>diff -ruN /usr/local/poudriere/ports/etalon/multimedia/zoneminder-h264/Makefile /usr/local/poudriere/ports/default/multimedia/zoneminder-h264/Makefile
>--- /usr/local/poudriere/ports/etalon/multimedia/zoneminder-h264/Makefile	2017-01-11 10:08:38.000000000 +0000
>+++ /usr/local/poudriere/ports/default/multimedia/zoneminder-h264/Makefile	2017-02-03 20:06:12.045917000 +0000
>@@ -2,7 +2,7 @@
> 
> PORTNAME=	zoneminder-h264
> PORTVERSION=	1.30.20161104
>-PORTREVISION=	1
>+PORTREVISION=	2
> CATEGORIES=	multimedia
> 
> MAINTAINER=	bsd@abinet.ru
>@@ -10,6 +10,8 @@
> 
> LICENSE=	GPLv2
> 
>+CONFLICTS_INSTALL=	zoneminder
>+
> ZM_DEPENDS=	p5-DBI>=0:databases/p5-DBI \
> 		p5-DBD-mysql>=0:databases/p5-DBD-mysql \
> 		p5-Date-Manip>=0:devel/p5-Date-Manip \
>@@ -32,6 +34,7 @@
> RUN_DEPENDS=	${ZM_DEPENDS} \
> 		p5-MIME-Tools>=0:mail/p5-MIME-Tools \
> 		sudo:security/sudo \
>+		p5-Device-SerialPort>=0:comms/p5-Device-SerialPort \
> 		zip:archivers/zip
> 
> USE_GITHUB=	yes
>@@ -40,7 +43,7 @@
> 
> 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 -ruN /usr/local/poudriere/ports/etalon/multimedia/zoneminder-h264/README.md /usr/local/poudriere/ports/default/multimedia/zoneminder-h264/README.md
>--- /usr/local/poudriere/ports/etalon/multimedia/zoneminder-h264/README.md	1970-01-01 00:00:00.000000000 +0000
>+++ /usr/local/poudriere/ports/default/multimedia/zoneminder-h264/README.md	2016-11-14 01:09:42.000000000 +0000
>@@ -0,0 +1,2 @@
>+# Zoneminder-port
>+This is Zoneminder with H264 backend support
>diff -ruN /usr/local/poudriere/ports/etalon/multimedia/zoneminder-h264/files/patch-src_zm__monitor.cpp /usr/local/poudriere/ports/default/multimedia/zoneminder-h264/files/patch-src_zm__monitor.cpp
>--- /usr/local/poudriere/ports/etalon/multimedia/zoneminder-h264/files/patch-src_zm__monitor.cpp	1970-01-01 00:00:00.000000000 +0000
>+++ /usr/local/poudriere/ports/default/multimedia/zoneminder-h264/files/patch-src_zm__monitor.cpp	2017-02-06 10:09:21.661241000 +0000
>@@ -0,0 +1,29 @@
>+--- src/zm_monitor.cpp.orig	2016-11-03 20:26:18 UTC
>++++ src/zm_monitor.cpp
>+@@ -161,7 +161,7 @@ bool Monitor::MonitorLink::connect()
>+       return( false );
>+     }
>+     mem_ptr = (unsigned char *)shmat( shm_id, 0, 0 );
>+-    if ( mem_ptr < 0 )
>++    if ( mem_ptr == (void *)-1 )
>+     {
>+       Debug( 3, "Can't shmat link memory: %s", strerror(errno) );
>+       connected = false;
>+@@ -195,7 +195,7 @@ bool Monitor::MonitorLink::disconnect()
>+     connected = false;
>+ 
>+ #if ZM_MEM_MAPPED
>+-    if ( mem_ptr > 0 )
>++    if ( mem_ptr != MAP_FAILED )
>+     {
>+       msync( mem_ptr, mem_size, MS_ASYNC );
>+       munmap( mem_ptr, mem_size );
>+@@ -576,7 +576,7 @@ bool Monitor::connect() {
>+     exit( -1 );
>+   }
>+   mem_ptr = (unsigned char *)shmat( shm_id, 0, 0 );
>+-  if ( mem_ptr < 0 )
>++  if ( mem_ptr == (void *)-1 )
>+   {
>+     Error( "Can't shmat: %s", strerror(errno));
>+     exit( -1 );
>diff -ruN /usr/local/poudriere/ports/etalon/multimedia/zoneminder-h264/files/patch-src_zmf.cpp /usr/local/poudriere/ports/default/multimedia/zoneminder-h264/files/patch-src_zmf.cpp
>--- /usr/local/poudriere/ports/etalon/multimedia/zoneminder-h264/files/patch-src_zmf.cpp	1970-01-01 00:00:00.000000000 +0000
>+++ /usr/local/poudriere/ports/default/multimedia/zoneminder-h264/files/patch-src_zmf.cpp	2017-02-06 10:09:39.875962000 +0000
>@@ -0,0 +1,11 @@
>+--- src/zmf.cpp.orig	2016-11-03 20:26:18 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 );

Flags:

bsd: maintainer-approval+

Actions: View | Diff

Attachments on bug 216627: 179574 | 179575 | 179576 | 179666 | 179667 | 180649 | 180650 | 180651 | 180652 | 180653 | 180654