 Isaac Connor
|
29e2cdf561
|
split the innoDB upgrade out of the version section, so that it always checked for MyISAM tables and if found, offers to update them.
|
2013-11-13 09:42:10 -05:00 |
|
|
Patrick McGuire
|
8c0ad352f5
|
Fix shared memory errors on centos 6.4
|
2013-11-08 14:53:01 -05:00 |
|
|
Isaac Connor
|
f4dfd88d9f
|
handle bad config lines better
|
2013-11-06 17:02:01 -05:00 |
|
|
Kfir Itzhak
|
be21a882ab
|
Merge pull request #242 from ZoneMinder/removeversionnumberfromzm.conf
Remove ZM_VERSION from zm.conf
|
2013-11-04 12:27:50 -08:00 |
|
|
Isaac Connor
|
7a2f3b5226
|
add in missing @
|
2013-11-04 09:57:00 -05:00 |
|
|
Kfir Itzhak
|
9d5ac7ae8c
|
Fix cmake installing wrong files in an out-of-source build
|
2013-11-04 09:56:40 +02:00 |
|
|
Kfir Itzhak
|
408cac5120
|
Remove the ZM_BLEND_ALARMED_IMAGES option (not needed anymore, global per monitor now)
|
2013-11-04 09:11:33 +02:00 |
|
|
Kfir Itzhak
|
1d0e721ba2
|
Attempt to get the perl modules to be fully out of source during an out-of-source build
|
2013-11-03 00:20:49 +02:00 |
|
|
Isaac Connor
|
d428c832e7
|
blah
|
2013-11-01 09:50:50 -04:00 |
|
|
Isaac Connor
|
72b80d7417
|
remake this branch off master instead of off mysql2PDO.
Establish an automake substitution of @VERSION@ and use it throughotu to override whatever is in zm.conf
|
2013-11-01 09:47:28 -04:00 |
|
|
Kfir Itzhak
|
c2bd7c97ec
|
First attempt at enabling out-of-source building for zm with cmake
|
2013-10-31 18:10:00 +02:00 |
|
|
Kfir Itzhak
|
36f525efae
|
Correctly hard code man dir path into cmake this time hopefully
|
2013-10-29 12:43:28 +02:00 |
|
|
Kfir Itzhak
|
604b7f4ccc
|
Clean files generated by MakeMaker when running cmake's make clean target
|
2013-10-29 11:21:23 +02:00 |
|
|
Kfir Itzhak
|
23ec8266d9
|
Hard code man dir path into cmake to fix issues with some distros
|
2013-10-29 11:02:47 +02:00 |
|
|
Kfir Itzhak
|
0143969498
|
Do not print progress while building zoneminder perl modules unless CMAKE_VERBOSE_MAKEFILE is enabled
|
2013-10-29 10:01:29 +02:00 |
|
|
Andrew Bauer
|
54a22e7fe8
|
We need a toggle for x10 support
|
2013-10-19 09:22:59 -05:00 |
|
|
Kfir Itzhak
|
b558d42cdc
|
Improvements to cmake: Better support for CMAKE_PREFIX_PATH enviroment variable (and similar ones), added ZM_PERL_SUBPREFIX and ZM_PERL_USE_PATH options and improved detection of libraries and headers
|
2013-10-09 15:41:14 +03:00 |
|
|
Kyle Johnson
|
03d12ef3e4
|
Point zmupdate to the github pages site (non-https) for version numbers
|
2013-10-07 10:11:09 -04:00 |
|
|
Kfir Itzhak
|
ba727a5611
|
Changed default HTTP version to 1.0 instead of 1.1, as we don't fully support important HTTP/1.1 features such as chunked encoding
|
2013-10-07 16:57:26 +03:00 |
|
|
Kfir Itzhak
|
1609fd688b
|
Changed default option of ZM_COLOUR_JPEG_FILES to no. It impacts performance and is not needed anymore, all modern image viewers support grayscale JPEG images
|
2013-10-07 16:54:13 +03:00 |
|
|
Andy Bauer
|
6b11db11ca
|
Update CMakeLists.txt
Need the zm.in file to be processed by CMake
|
2013-10-06 17:43:59 -05:00 |
|
|
Knniggett
|
32ee0a8976
|
create ZM_PATH_DATA and point zmupdate to ZM_PATH_DATA/db
|
2013-10-05 18:40:54 -05:00 |
|
|
Knniggett
|
d0cbb3f498
|
remove ${CMAKE_CURRENT_SOURCE_DIR} from add_custom_target
|
2013-10-05 14:29:12 -05:00 |
|
|
mastertheknife
|
3dbef94b04
|
Removed INSTALLDIRS from the cmake perl modules CMakeLists.txt
|
2013-10-04 22:50:50 +03:00 |
|
|
mastertheknife
|
5607f2823f
|
Fixed missing perl5 in path in the last commit
|
2013-10-04 22:40:09 +03:00 |
|
|
mastertheknife
|
9c3540a952
|
Attempt to fix issues with perl paths that andy is experiencing
|
2013-10-04 22:35:16 +03:00 |
|
|
Isaac Connor
|
60258e7aa1
|
Check the size of the mmap file before mmaping it. If the mmap file 0 ( can happen with remote cameras that can't be reached because it is offline ) we get sigbus. I think the mmap succeeds, but is zero sized, so the first access causes SIGBUS.
|
2013-10-04 11:54:21 -04:00 |
|
|
Chris Wiggins
|
d4654f63ae
|
merge modern into feature-h264-videostorage
|
2013-10-04 10:52:53 +13:00 |
|
|
Chris Wiggins
|
d3d3460f21
|
merge master into modern
|
2013-10-04 10:40:30 +13:00 |
|
|
Isaac Connor
|
34f84a4097
|
Merge branch 'v1.26.4-beta'
|
2013-10-03 10:14:09 -04:00 |
|
|
mastertheknife
|
79b45bec68
|
Avoid trouble with whitespaces in current directory path
|
2013-10-03 15:37:46 +03:00 |
|
|
mastertheknife
|
883e676e29
|
Fixed path issues when creating packages (rpms and such)
|
2013-10-03 15:35:10 +03:00 |
|
|
mastertheknife
|
489e832cf6
|
Fixed typo in the last commit
|
2013-10-03 15:15:59 +03:00 |
|
|
mastertheknife
|
f043c6e955
|
Changed perl paths again, this time to <prefix>/<libdir>/perl5 and few improvements
|
2013-10-03 15:08:09 +03:00 |
|
|
mastertheknife
|
5fce4c516b
|
Perl modules will be now be installed in <prefix>/<datadir>/zoneminder/perl5
|
2013-10-01 17:38:51 +03:00 |
|
|
mastertheknife
|
48f11a8064
|
Add cmake to zoneminder
|
2013-09-28 12:59:50 +03:00 |
|
|
Chris Wiggins
|
10e4ca848f
|
Update branch to track modern
|
2013-09-24 14:58:41 +12:00 |
|
|
Chris Wiggins
|
3dfff0b3ac
|
Merge branch 'master' into feature-h264-videostorage
|
2013-09-22 10:44:38 +12:00 |
|
|
Chris Wiggins
|
e37b118d1f
|
I was behind in my master. Re-merge
|
2013-09-20 09:30:23 +12:00 |
|
|
Chris Wiggins
|
e25b4d85e9
|
Merge master into modern
|
2013-09-20 09:12:36 +12:00 |
|
|
Kyle Johnson
|
5f4ff5c7cf
|
Return the full path to the generated video
|
2013-09-19 09:53:20 -04:00 |
|
|
Isaac Connor
|
ab4c091693
|
change eq's to le's so that it runs scripts for upgrading from 1.26.0
|
2013-09-15 12:59:45 -04:00 |
|
|
Chris Wiggins
|
5e0c0ffc27
|
Merge upstream master to branch to keep up to date
|
2013-09-14 01:10:09 +12:00 |
|
|
Chris Wiggins
|
774a84d487
|
Updated event processing to actually add frames into the DB. Use MP4 container
|
2013-09-14 00:50:54 +12:00 |
|
|
Isaac Connor
|
ab1314f250
|
clean out autogenerated files
|
2013-09-12 14:43:57 -04:00 |
|
|
Isaac Connor
|
e21a08c4b6
|
new code to look for update scripts instead of having distinct lines for each
|
2013-09-12 14:40:02 -04:00 |
|
|
Andy Bauer
|
0bf9aacab2
|
Update zmupdate.pl.in for 1.26.3 release
|
2013-09-10 12:46:33 -05:00 |
|
|
mastertheknife
|
caa73f608b
|
Merge remote-tracking branch 'origin/develop'
|
2013-09-09 16:44:58 +03:00 |
|
|
Kyle Johnson
|
6c134f9b4b
|
Merge pull request #116 from knnniggett/zmupdate_newrelease
Add 1.26.1 and 1.26.2 releases to zmupdate
|
2013-09-07 19:07:37 -07:00 |
|
|
Knniggett
|
8f3d95fd38
|
modify zmupdate.pl.in
|
2013-09-07 15:11:57 -05:00 |
|