Attachment 172276 Details for Bug 210939 – patch

[patch] patch

zm.patch (text/plain), 2.93 KB, created by Ivan on 2016-07-09 08:56:07 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Ivan

Created: 2016-07-09 08:56:07 UTC

Size: 2.93 KB

patch

obsolete

>diff -ruN zoneminder-orig/Makefile zoneminder/Makefile
>--- zoneminder-orig/Makefile	2016-07-08 20:09:49.000000000 +0300
>+++ zoneminder/Makefile	2016-07-08 20:10:26.000000000 +0300
>@@ -3,8 +3,8 @@
> PORTNAME=	zoneminder
> PORTVERSION=	1.30.0
> DISTVERSIONPREFIX=v
>-DISTVERSIONSUFFIX=-rc1
>-PORTREVISION=	1
>+DISTVERSIONSUFFIX=-rc2
>+PORTREVISION=	2
> CATEGORIES=	multimedia
> 
> MAINTAINER=	bsd@abinet.ru
>@@ -92,7 +92,6 @@
> 	${CP} ${FILESDIR}/README.FreeBSD ${PKGMESSAGE}
> 	${REINPLACE_CMD} -e 's|/dev/shm|/tmp|g' ${WRKSRC}/scripts/ZoneMinder/lib/ZoneMinder/ConfigData.pm.in
> 	${REINPLACE_CMD} -e 's|E_ALL|E_ALL^E_NOTICE|g' ${WRKSRC}/web/index.php
>-	${REINPLACE_CMD} -e 's|sizeof(loc_addr.sun_family))+1|sizeof(loc_addr.sun_family)+1)|g' ${WRKSRC}/src/zm_stream.cpp
> 
> pre-install:
> 	${MKDIR} ${STAGEDIR}${WWWDIR}/images
>diff -ruN zoneminder-orig/distinfo zoneminder/distinfo
>--- zoneminder-orig/distinfo	2016-07-07 09:15:48.000000000 +0300
>+++ zoneminder/distinfo	2016-07-07 09:19:44.000000000 +0300
>@@ -1,5 +1,5 @@
>-TIMESTAMP = 1464895954
>-SHA256 (zoneminder-zoneminder-v1.30.0-rc1_GH0.tar.gz) = 22d2d80c473b1c00fb36fb70bf352cf72601fc839fcefe87ffa4f5fd5bd5e853
>-SIZE (zoneminder-zoneminder-v1.30.0-rc1_GH0.tar.gz) = 9373740
>+TIMESTAMP = 1467872384
>+SHA256 (zoneminder-zoneminder-v1.30.0-rc2_GH0.tar.gz) = 1dada2d5a622a8c963c27a2a0c1e33487310ba2bdf36a2a19c8e1ea97b904aa3
>+SIZE (zoneminder-zoneminder-v1.30.0-rc2_GH0.tar.gz) = 9758905
> SHA256 (FriendsOfCake-crud-c3976f1_GH0.tar.gz) = 7dfa29dd6dd95f05bca61bb05033f813828b7ab66f9d8793d306df0dd72471ce
> SIZE (FriendsOfCake-crud-c3976f1_GH0.tar.gz) = 72961
>diff -ruN zoneminder-orig/files/patch-src_zm__local__camera.h zoneminder/files/patch-src_zm__local__camera.h
>--- zoneminder-orig/files/patch-src_zm__local__camera.h	2016-07-07 09:15:48.000000000 +0300
>+++ zoneminder/files/patch-src_zm__local__camera.h	1970-01-01 03:00:00.000000000 +0300
>@@ -1,14 +0,0 @@
>---- src/zm_local_camera.h.orig 2016-06-07 07:18:44 UTC
>-+++ src/zm_local_camera.h
>-@@ -36,6 +36,11 @@
>- #include <linux/videodev2.h>
>- #endif // HAVE_LINUX_VIDEODEV2_H
>-
>-+// Required on systems with v4l1 but without v4l2 headers
>-+#ifndef VIDEO_MAX_FRAME
>-+#define VIDEO_MAX_FRAME	32
>-+#endif
>-+
>- #include "zm_ffmpeg.h"
>-
>- //
>diff -ruN zoneminder-orig/pkg-plist zoneminder/pkg-plist
>--- zoneminder-orig/pkg-plist	2016-07-07 09:15:48.000000000 +0300
>+++ zoneminder/pkg-plist	2016-07-07 09:34:24.000000000 +0300
>@@ -2973,7 +2973,6 @@
> %%SITE_PERL%%/ZoneMinder.pm
> %%SITE_PERL%%/ZoneMinder/Base.pm
> %%SITE_PERL%%/ZoneMinder/Config.pm
>-%%SITE_PERL%%/ZoneMinder/ConfigAdmin.pm
> %%SITE_PERL%%/ZoneMinder/ConfigData.pm
> %%SITE_PERL%%/ZoneMinder/Control.pm
> %%SITE_PERL%%/ZoneMinder/Control/3S.pm
>@@ -5968,7 +5967,6 @@
> %%PERL5_MAN3%%/ZoneMinder.3.gz
> %%PERL5_MAN3%%/ZoneMinder::Base.3.gz
> %%PERL5_MAN3%%/ZoneMinder::Config.3.gz
>-%%PERL5_MAN3%%/ZoneMinder::ConfigAdmin.3.gz
> %%PERL5_MAN3%%/ZoneMinder::ConfigData.3.gz
> %%PERL5_MAN3%%/ZoneMinder::Control.3.gz
> %%PERL5_MAN3%%/ZoneMinder::Control::3S.3.gz
>

Flags:

bsd: maintainer-approval+

Actions: View | Diff

Attachments on bug 210939: 172276 | 172426 | 172578 | 172841