fc6a6aeaa3
Don't install zm.conf if it already exists
2015-10-02 11:27:35 -04:00
b94a148559
Bump version
2015-09-29 14:28:54 -06:00
4a04d0411b
bump version to 1.28.106
2015-08-29 08:00:02 -05:00
395e628541
Merge branch 'new_rtsp_describe' of https://github.com/knnniggett/ZoneMinder into knnniggett-new_rtsp_describe
...
Conflicts:
CMakeLists.txt
configure.ac
version
2015-08-29 07:57:18 -05:00
4fdd32b596
bump version to 1.28.106
2015-08-29 07:53:08 -05:00
9abc161995
bump version to 1.28.105
2015-08-21 10:33:42 -05:00
fbcd6f365b
Change database schema (add 'Blacken' zone type) and bump version to 1.28.105
2015-08-20 16:17:08 +02:00
fe3595bfa1
Merge branch 'add_analysis_interval' of https://github.com/manupap1/ZoneMinder into manupap1-add_analysis_interval
...
Conflicts:
CMakeLists.txt
configure.ac
db/zm_update-1.28.101.sql
src/zm_monitor.cpp
src/zm_monitor.h
version
2015-08-18 20:20:53 -05:00
55eee8d6a4
Added SQL changes to zm_create.sql.in
...
Bumped version to 1.28.103 as requested
2015-08-17 15:05:17 +02:00
0547a66870
Bump version to 1.28.102
2015-08-17 13:40:30 +02:00
7f3a07f21b
Add label size to monitor options (database and backend part)
...
This commit bumps version to 1.28.101 because of database schema change
2015-08-10 15:35:18 +02:00
f09a551d6a
Merge branch 'master' into feature-h264-videostorage
2015-07-28 21:06:52 +10:00
132e0a1798
Add analysis fps paramter to monitors
2015-07-22 21:38:35 +02:00
47be582354
bump version to 1.28.100
2015-07-14 16:11:27 -04:00
376912158c
bump version to 1.28.99 so that dbupdate scripts actually run
2015-07-07 15:47:45 -04:00
58448adb51
Merge pull request #896 from knnniggett/pod2man
...
Generate man pages for perl scripts & C Binaries in the bin folder
2015-07-03 11:40:24 -04:00
e0da473449
add check for gettime in librt, needed for building on pi
2015-07-03 10:53:23 -04:00
3f6333a33d
modify polkit checks & move host os check
2015-06-25 08:01:24 -05:00
ec1c3cfed0
Add cmake ffmpeg include path hint for distros that put headers in include/ffmpeg.
2015-06-24 01:39:26 -04:00
fa835359a1
Add install target for C binary man pages
2015-06-20 17:33:13 -05:00
dcb7b1d259
Merge pull request #883 from pliablepixels/881-bootstrap-loading-config
...
881 bootstrap loading config
2015-06-14 14:43:01 -04:00
22ec67dd3f
Find avconv as alternative to ffmpeg
2015-06-14 16:51:31 +10:00
11bd2139f4
Added API version in addition to ZM version
2015-06-13 16:30:28 +00:00
9b06b1399c
Merge branch 'master' into feature-h264-videostorage
...
Conflicts:
scripts/ZoneMinder/lib/ZoneMinder/ConfigData.pm.in
scripts/ZoneMinder/lib/ZoneMinder/Memory.pm.in
src/zm_ffmpeg_camera.cpp
web/skins/classic/views/event.php
web/skins/classic/views/monitor.php
web/skins/classic/views/timeline.php
2015-06-10 23:09:30 +10:00
e8ecc505ed
fix error
2015-05-20 17:23:41 -05:00
47012c58de
Check the Host OS, similar to configure.ac
2015-05-20 17:20:44 -05:00
d96c952047
Merge branch 'master' into Cmakelists_CleanUp
...
Conflicts:
CMakeLists.txt
2015-05-19 21:12:34 +10:00
d5e403b7e0
Merge pull request #775 from ZoneMinder/freebsd_fixes
...
Freebsd fixes
2015-04-17 15:21:42 -05:00
1668949f18
Merge pull request #792 from knnniggett/perl
...
cmake - use perl INSTALLDIRS
2015-04-15 11:07:14 -04:00
14cf1bcae6
Clean up CMakeLists.txt, wrap lines, remove comments from initial commit, update comments. No functionality changes
2015-04-15 22:09:25 +10:00
05634f694a
Merge pull request #781 from knnniggett/v4l_headers
...
Check for libv4l1-videodev headers
2015-04-10 13:30:15 -04:00
fa633bff92
spelling
2015-04-10 12:17:06 -05:00
0cf82a0b71
Allow user to override perl installation. Replace old perl cmake vars with new.
2015-04-10 12:09:01 -05:00
ef21d08dd3
Update CMakeLists.txt
...
typo
2015-04-09 10:44:16 -05:00
2331d731d1
cmake - update v4l header file check
2015-04-03 18:21:28 -05:00
199c94e7db
Add Sendfile checks for cmake
2015-03-31 23:07:19 -04:00
b3313edde0
Merge remote-tracking branch 'upstream/master' into Video-Highlander-Branch
...
Conflicts:
web/skins/classic/views/event.php
2015-03-21 23:49:56 +11:00
4182fb3295
Don't show ONVIf probe link when ONVIF support is not enabled
2015-02-21 11:12:07 -06:00
e2b3e7c705
Replace support for Fedora 19 with support for Fedora 21
2015-02-21 09:01:56 -06:00
240d97b17a
Removed el6 from endif arguments as some versions of Cmake want if and endif arguments to match
2015-02-21 20:50:00 +11:00
568fea61fa
Merge pull request #704 from clipo1979/master
...
Make el6 and el7 build process a little more automated
2015-02-19 19:18:26 -06:00
9f3ff787d1
Merge branch '478-onvif-support' of https://github.com/altaroca/ZoneMinder into altaroca-478-onvif-support
...
Conflicts:
CMakeLists.txt
configure.ac
db/zm_create.sql.in
distros/redhat/archive/zoneminder.el6.spec
distros/redhat/zoneminder.el6.spec
web/skins/classic/views/monitor.php
2015-02-18 18:53:47 -06:00
77f554f7ba
bump verion to 1.28.1 in master
2015-02-18 18:24:26 -06:00
79c82ea880
Merge remote-tracking branch 'upstream/master' into Video-Highlander-Branch
2015-02-17 23:16:42 +11:00
e3351441c7
fix cmake error, rename init script to zoneminder, modify el6 target distro
2015-02-15 15:59:58 -06:00
0991391f45
Update CMakeLists.txt
2015-02-15 11:34:27 +00:00
8da2e0a667
Update CMakeLists.txt
...
ZM_CONFIG was overwriting itself
2015-02-13 07:29:21 -06:00
d449d00569
typo
2015-02-08 16:42:03 -06:00
d833505664
typo
2015-02-08 16:39:59 -06:00
72da7a0e69
process redhat subfolder when EL7 is specified
2015-02-08 16:37:29 -06:00
9bc28c96f0
Centos 7 rpm packaging
2015-02-08 16:16:31 -06:00
b79c2c1604
Merge remote-tracking branch 'upstream/master' into Video-Highlander-Branch
...
Conflicts:
web/skins/classic/views/event.php
web/skins/classic/views/timeline.php
Also reapplied required PHP Short Tags fix to a event.php and monitor.php that got impacted in merge.
2014-12-25 08:24:48 +10:00
6c9f93af63
Merge pull request #567 from knnniggett/zm_config_dir
...
Add the ability to specify the zm configdir at build time.
2014-12-08 10:01:17 -05:00
69090563d5
Merge branch 'master' into video
...
Conflicts:
src/CMakeLists.txt
src/zm_monitor.cpp
2014-11-28 14:23:05 -05:00
bcbb0c56a6
Apply knnniggett's solution on gnutls-openssl issue which
...
adds support for RPM based distros.
2014-11-12 22:39:54 +01:00
2e8935daf2
Add the ability to specify the zm configdir at build time.
2014-11-11 09:15:15 -06:00
964cdde2b3
Use gnutls-openssl instead of gnutls to
...
fix build with CMake.
2014-11-11 00:34:23 +01:00
21f34392d4
Make onvif support optional
2014-10-31 19:23:18 -05:00
71b56a163d
Zoneminder 1.28.0 Release
2014-10-18 15:23:13 -05:00
48d45c0d00
Add F20 target distro
2014-10-05 10:27:20 -05:00
56fd08d6e9
Change TMPDIR default to /var/tmp, Add ZM_SOCKDIR
2014-10-05 09:42:47 -05:00
f1b2ba091c
Update meta makefiles
2014-09-12 16:06:19 +02:00
1e8e710f5a
full systemd support
2014-08-10 08:47:11 -05:00
2087780ec1
tweaks to make debian build with support for mariadb, update version and start using a fourth version digit set
2014-07-29 14:43:13 -04:00
64827dccbc
CMake support for onvif modules
2014-07-15 17:41:05 +02:00
5217bb668a
Merge remote branch 'origin/master' into video
...
Conflicts:
src/zm_monitor.cpp
src/zm_monitor.h
2014-06-06 09:25:05 +03:00
caa0cb0fd5
Bump version to v1.27.1 to fix upgrade db issues
2014-06-06 08:58:35 +03:00
0d7c52dc1f
Merge remote branch 'origin/master' into video
...
Conflicts:
src/CMakeLists.txt
src/zm_monitor.cpp
2014-04-17 13:26:00 +03:00
457e61ea42
tie distro/opensuse folder into cmake build process
2014-03-19 19:07:36 -05:00
9d3117a428
Bumped version to 1.27
2014-02-06 22:40:16 -05:00
c1a74c45bc
Fixed minor cmake warning
2013-12-27 18:04:24 +02:00
ff9a26273c
cURL is now working!
2013-12-27 18:02:32 +02:00
bf708a8373
Merge branch 'master' into curl
...
Conflicts:
CMakeLists.txt
src/CMakeLists.txt
src/zm_camera.h
src/zm_monitor.cpp
web/skins/classic/views/console.php
web/skins/classic/views/monitor.php
2013-12-27 14:21:12 +02:00
e652441996
Merge remote-tracking branch 'origin/master' into video
...
Conflicts:
configure.ac
src/CMakeLists.txt
2013-12-26 21:03:45 +02:00
dce1cbf0ce
Add header file checks for vlc/vlc.h
2013-12-21 06:47:12 +02:00
3321506b45
Working libvlc camera implementation.
2013-12-19 21:51:39 +00:00
e9044b436d
Search for MP4V2 header file 3 times: mp4v2/mp4v2.h, mp4v2.h, mp4.h
2013-12-19 19:21:30 +02:00
2b79ff2cbd
Initial commit for saving events as videos :)
2013-12-19 18:38:07 +02:00
dc0d305811
Bump version to 1.26.5
2013-12-13 13:39:23 -05:00
56d3c7504a
Put CMAKE_INCLUDE_CURRENT_DIR back in
2013-11-17 15:10:35 +02:00
bed30d32b6
Remove round() mess
2013-11-15 11:41:26 +02:00
762e63653c
Few minor cmake improvements, especially for whitespaces in paths
2013-11-15 11:12:33 +02:00
4a4018b8d7
Add automatic finding of the ffmpeg executable to cmake
2013-11-15 11:11:33 +02:00
82a92639ca
Remove importing of binary directory in cmakecacheimport.sh
2013-11-15 10:44:31 +02:00
90d7ce98f1
Delete PATH_BUILD and TIME_BUILD from zm.conf and setup default for
...
ZM_DB_TYPE
2013-11-04 22:38:21 +02:00
8944531f75
Added cURL checks to cmake
2013-11-04 16:57:22 +02:00
9d5ac7ae8c
Fix cmake installing wrong files in an out-of-source build
2013-11-04 09:56:40 +02:00
846fce0cb7
Fixed out-of-source building not finding config.h
2013-11-02 23:44:50 +02:00
c2bd7c97ec
First attempt at enabling out-of-source building for zm with cmake
2013-10-31 18:10:00 +02:00
c2477eb661
cmake text improvements
2013-10-21 17:13:07 +03:00
f5f573af93
Added an uninstall target to cmake and few text corrections to the INSTALL file
2013-10-21 16:11:37 +03:00
eeca5928dd
Merge pull request #216 from knnniggett/cmake_targetdistro
...
Create ZM_TARGET_DISTRO option in cmake
2013-10-19 13:02:55 -07:00
539c760d3c
Create ZM_TARGET_DISTRO
2013-10-19 09:38:58 -05:00
54a22e7fe8
We need a toggle for x10 support
2013-10-19 09:22:59 -05:00
edcca74f95
Add detection status in cmake for optional libraries
2013-10-14 07:58:21 +03:00
7d6cca13b8
Revert few changes that broke the cmake build in travis
2013-10-09 16:05:56 +03:00
49503891eb
Added ZM_NO_FFMPEG option to skip ffmpeg checks and force building without ffmpeg
2013-10-09 15:58:14 +03:00
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
fcf969f575
Fix cmake not enabling mmap in zm perl modules correctly this time
2013-10-09 07:08:29 +03:00
378d1456dc
Fixed cmake not enabling mmap in perl modules
2013-10-08 18:13:18 +03:00
Isaac Connor
Kyle Johnson
Andy Bauer
Andrew Bauer
Robin Daermann
SteveGilvarry
Emmanuel Papin
Isaac Connor
Bill McGonigle
SteveGilvarry
pliablepixels
clipo1979
Cosme Domínguez Díaz
Jan M. Hochstein
Kfir Itzhak
Edward Barnard