Andrew Bauer
124ba1c2a8
Merge pull request #796 from ZoneMinder/zm_image_cleanups
...
one small fix for a log line where the 4th parameter wasn't included. T...
2015-04-10 12:38:35 -05:00
Isaac Connor
05634f694a
Merge pull request #781 from knnniggett/v4l_headers
...
Check for libv4l1-videodev headers
2015-04-10 13:30:15 -04:00
Isaac Connor
065a372678
one small fix for a log line where the 4th parameter wasn't included. The rest are very small optimisations.
2015-04-10 13:26:17 -04:00
Andrew Bauer
fa633bff92
spelling
2015-04-10 12:17:06 -05:00
Andrew Bauer
0cf82a0b71
Allow user to override perl installation. Replace old perl cmake vars with new.
2015-04-10 12:09:01 -05:00
Isaac Connor
2db94d35f6
Merge pull request #795 from onlyjob/PBP
...
zmaudit.pl, zmcamtool.pl: pod2usage, PBP/5 + readability
2015-04-10 13:02:19 -04:00
Dmitry Smirnov
53907eeba1
zmcamtool.pl: readability
2015-04-11 00:35:40 +10:00
Dmitry Smirnov
90fa57788a
zmcamtool.pl: pod2usage
2015-04-11 00:35:35 +10:00
Dmitry Smirnov
4dee542e99
zmcamtool.pl: tabs-to-spaces
2015-04-11 00:07:36 +10:00
Dmitry Smirnov
4bb8043fe5
zmaudit.pl: PBP/5 + readability
2015-04-10 20:34:17 +10:00
Dmitry Smirnov
aeb3486322
zmaudit.pl: convert to pod2usage
2015-04-10 20:34:17 +10:00
Andrew Bauer
e6631ebaf1
Propagate new perl changes to the ONVIF perl modules
2015-04-09 20:11:32 -05:00
Andrew Bauer
ef21d08dd3
Update CMakeLists.txt
...
typo
2015-04-09 10:44:16 -05:00
Sune1337
5779b2e20f
* use pthread_join instead of pthread_tryjoin_np
2015-04-08 22:15:54 +02:00
Isaac Connor
c39984b228
Merge pull request #794 from onlyjob/PBP
...
as discussed...
2015-04-08 15:07:14 -04:00
Dmitry Smirnov
373b53f8f3
zmdc.pl: Usage() --> pod2usage()
2015-04-09 03:56:04 +10:00
Dmitry Smirnov
81860d99a6
zmdc.pl: PBP/5 + reformatting
2015-04-09 03:55:51 +10:00
abauer
a2d9c0c042
Don't copy .in files into staging
2015-04-08 12:22:46 -05:00
Isaac Connor
577643ef09
Merge pull request #793 from SteveGilvarry/Leftover_Short_open
...
Leftover short open tags
2015-04-08 07:25:54 -04:00
SteveGilvarry
98d91ded90
Found some introduced short tags
2015-04-08 20:13:27 +10:00
SteveGilvarry
45fd7f1eca
Found some old open tags left over
2015-04-08 20:11:26 +10:00
Andrew Bauer
e895fd26f7
cmake - use perl INSTALLDIRS
2015-04-07 08:19:21 -05:00
Andrew Bauer
8e5ba94ff8
Merge pull request #791 from onlyjob/783
...
#783 - related corrections
2015-04-06 07:05:40 -05:00
Dmitry Smirnov
904f2989ed
Improving ZM_USE_DEEP_STORAGE description ( #783 ):
...
Removed "If you are upgrading from a previous version of ZoneMinder" from
description. From data loss prospective it is irrelevant whether database
is upgraded or not as fresh install is just as vulnerable.
Changed "enable" to "change" to emphasize the above.
Signed-off-by: Dmitry Smirnov <onlyjob@member.fsf.org>
2015-04-06 18:39:13 +10:00
Dmitry Smirnov
078c5aa14b
Briefly document "--migrate-events" option in zmupdate.pl ( #783 ).
...
Signed-off-by: Dmitry Smirnov <onlyjob@member.fsf.org>
2015-04-06 18:38:14 +10:00
Andrew Bauer
3e8c894a3e
Update ConfigData.pm.in
2015-04-04 09:20:21 -05:00
Andrew Bauer
d25f7ed362
Merge pull request #782 from onlyjob/export
...
skins/classic: fix HTML export with USE_DEEP_STORAGE (Closes : #506 ).
2015-04-04 08:37:06 -05:00
Dmitry Smirnov
d1f00f02c2
skins/classic: fix HTML export with USE_DEEP_STORAGE ( Closes : #506 ).
...
Use mygetEventPath() to get valid path.
Signed-off-by: Dmitry Smirnov <onlyjob@member.fsf.org>
2015-04-04 20:39:06 +11:00
Andrew Bauer
549d7fd426
include libv4l1-videodev headers
2015-04-03 18:24:51 -05:00
Andrew Bauer
2331d731d1
cmake - update v4l header file check
2015-04-03 18:21:28 -05:00
Andrew Bauer
a3637b9eed
Add libv4l-devel as a build req for el7, f20, & f21
2015-04-03 17:41:46 -05:00
Andrew Bauer
0a010a69bd
autotools - update v4l header file check
2015-04-03 17:36:09 -05:00
Isaac Connor
64d7a53cf6
remove lines I used for debugging.
2015-04-01 12:53:06 -04:00
Isaac Connor
2591e946af
old versions ignore other efforts to include our own m4 directory, so spceify it on the command line
2015-04-01 12:19:27 -04:00
Isaac Connor
5592f52cf8
add -I to aclocal command line since it is ignoring all other include directives
2015-04-01 12:18:45 -04:00
Isaac Connor
1b8554fad2
cleanup.
2015-04-01 12:17:23 -04:00
Isaac Connor
fd62b1a71c
show directory listing to see what's in the build dir. cat aclocal.m4 after it has actually been created.
2015-04-01 11:26:23 -04:00
Isaac Connor
59fbb4d0b5
ahem: only cat aclocal.m4 if using autotools
2015-04-01 11:16:05 -04:00
Isaac Connor
b0e6ed1d4a
check cwd and cat out the resulting aclocal.m4 in order to debug the lack of including our ac_check_sendfile macros. Also be more verbose from libtoolize
2015-04-01 11:05:11 -04:00
Isaac Connor
c2c130df37
try out the new AC_CONFIG_MACRO_DIRS feature.
2015-04-01 10:14:02 -04:00
Isaac Connor
bf3efa7a7a
allow AC_CHECK_SENDFILE because travis is complaining
2015-03-31 23:31:05 -04:00
Isaac Connor
648a05a406
have to include the m4 dir apparently
2015-03-31 23:20:39 -04:00
Isaac Connor
199c94e7db
Add Sendfile checks for cmake
2015-03-31 23:07:19 -04:00
Andrew Bauer
c0af30bdf1
fix permissions on config file
2015-03-31 20:45:12 -05:00
Andrew Bauer
7802089b82
Use tmpfiles.d to manage tmpdir and sockdir
2015-03-31 20:30:27 -05:00
balr0g
e4e2160bf6
Don't trigger linked cameras on new events
2015-03-31 13:22:02 -04:00
Isaac Connor
21915eb92c
Merge branch 'master' into freebsd_fixes
2015-03-31 11:06:53 -04:00
Isaac Connor
0669b24165
this was moved to m4
2015-03-31 11:06:14 -04:00
Emmanuel Papin
039cf09da9
Fix bad translations (first checking before tests)
2015-03-30 21:16:33 +02:00
Emmanuel Papin
c0b41ed6a8
Readd translations from Jypy
2015-03-30 20:50:42 +02:00