mirror/zoneminder
1
0 Fork 0
mirror of https://github.com/ZoneMinder/zoneminder.git synced 2026-10-27 16:58:31 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of github.com:ZoneMinder/ZoneMinder

Browse Source 
Conflicts:
	src/zm_comms.cpp
This commit is contained in:
Isaac Connor committed 2015-01-03 13:56:40 -05:00
2 parents e02da8833a cff42093b9
commit 14c65aefd2
9 files changed
+6 -53
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

distros/debian/patches/01_vendor-perl.diff
-17
View File
@@ -1,17 +0,0 @@
Index: ZoneMinder/configure.ac
===================================================================
--- ZoneMinder.orig/configure.ac 2014-12-13 15:10:27.705191682 +0100
+++ ZoneMinder/configure.ac 2014-12-13 16:50:07.101049743 +0100
@@ -443,10 +443,10 @@
PERL_SITE_LIB=`perl -V:installsitelib | sed -e "s/.*='\(.*\)';/\1/"`
PERL_LIB_PATH=`echo $PERL_SITE_LIB | sed -e "s|^$PERL_SITE_PREFIX||"`
EXTRA_PERL_LIB="use lib '$prefix$PERL_LIB_PATH'; # Include custom perl install path"
- PERL_MM_PARMS="PREFIX=$prefix"
+ PERL_MM_PARMS="\"PREFIX=$prefix INSTALLDIRS=vendor\""
else
EXTRA_PERL_LIB="# Include from system perl paths only"
- PERL_MM_PARMS=
+ PERL_MM_PARMS="\"INSTALLDIRS=vendor\""
fi
AC_SUBST(PERL_MM_PARMS)
AC_SUBST(EXTRA_PERL_LIB)
distros/debian/patches/series
-1
View File
@@ -1 +0,0 @@
01_vendor-perl.diff
distros/debian8/patches/01_vendor-perl.diff
-15
View File
@@ -1,15 +0,0 @@
--- a/configure.ac
+++ b/configure.ac
@@ -437,10 +437,10 @@
PERL_SITE_LIB=`perl -V:installsitelib | sed -e "s/.*='\(.*\)';/\1/"`
PERL_LIB_PATH=`echo $PERL_SITE_LIB | sed -e "s|^$PERL_SITE_PREFIX||"`
EXTRA_PERL_LIB="use lib '$prefix$PERL_LIB_PATH'; # Include custom perl install path"
- PERL_MM_PARMS="PREFIX=$prefix"
+ PERL_MM_PARMS="\"PREFIX=$prefix INSTALLDIRS=vendor\""
else
EXTRA_PERL_LIB="# Include from system perl paths only"
- PERL_MM_PARMS=
+ PERL_MM_PARMS="\"INSTALLDIRS=vendor\""
fi
AC_SUBST(PERL_MM_PARMS)
AC_SUBST(EXTRA_PERL_LIB)
distros/debian8/patches/series
-1
View File
@@ -1 +0,0 @@
01_vendor-perl.diff
distros/ubuntu1204/patches/01_vendor-perl.diff
-17
View File
@@ -1,17 +0,0 @@
Index: ZoneMinder/configure.ac
===================================================================
--- ZoneMinder.orig/configure.ac 2014-12-13 15:10:27.705191682 +0100
+++ ZoneMinder/configure.ac 2014-12-13 16:50:07.101049743 +0100
@@ -443,10 +443,10 @@
PERL_SITE_LIB=`perl -V:installsitelib | sed -e "s/.*='\(.*\)';/\1/"`
PERL_LIB_PATH=`echo $PERL_SITE_LIB | sed -e "s|^$PERL_SITE_PREFIX||"`
EXTRA_PERL_LIB="use lib '$prefix$PERL_LIB_PATH'; # Include custom perl install path"
- PERL_MM_PARMS="PREFIX=$prefix"
+ PERL_MM_PARMS="\"PREFIX=$prefix INSTALLDIRS=vendor\""
else
EXTRA_PERL_LIB="# Include from system perl paths only"
- PERL_MM_PARMS=
+ PERL_MM_PARMS="\"INSTALLDIRS=vendor\""
fi
AC_SUBST(PERL_MM_PARMS)
AC_SUBST(EXTRA_PERL_LIB)
distros/ubuntu1204/patches/series
-1
View File
@@ -1 +0,0 @@
01_vendor-perl.diff
scripts/zmfilter.pl.in
+1 -1
View File
@@ -278,7 +278,7 @@ sub getFilters
my $sql = "select E.Id,E.MonitorId,M.Name as MonitorName,M.DefaultRate,M.DefaultScale,E.Name,E.Cause,E.Notes,E.StartTime,unix_timestamp(E.StartTime) as Time,E.Length,E.Frames,E.AlarmFrames,E.TotScore,E.AvgScore,E.MaxScore,E.Archived,E.Videoed,E.Uploaded,E.Emailed,E.Messaged,E.Executed from Events as E inner join Monitors as M on M.Id = E.MonitorId";
$db_filter->{Sql} = '';
if ( @{$filter_expr->{terms}} )
if ( $filter_expr->{terms} )
{
for ( my $i = 0; $i < @{$filter_expr->{terms}}; $i++ )
{
src/zm_comms.cpp
+1
View File
@@ -30,6 +30,7 @@
#else
#include <alloca.h>
#endif
//#include <unistd.h>
#include <sys/ioctl.h>
#include <sys/param.h>
src/zmc.cpp
+4
View File
@@ -19,7 +19,11 @@
#include <getopt.h>
#include <signal.h>
#if defined(BSD)
#include <limits.h>
#else
#include <values.h>
#endif
#include "zm.h"
#include "zm_db.h"