ZaneYork
/
zoneminder
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
6,039 Commits 20 Branches 69 Tags 131 MiB
Commit Graph

171 Commits

Author SHA1 Message Date
SteveGilvarry bf33eab17c Merge branch 'video' into feature-h264-videostorage 
Conflicts:
	src/CMakeLists.txt
	src/Makefile.am
	src/zm_event.cpp
	web/skins/classic/views/js/event.js
 2014-12-02 20:58:35 +11:00
Isaac Connor 82c01479c6 move flat css files into the classic skin. 
remove autotools references to the flat skin, add the classic/flat css dirs
remove the flat skin
 2014-12-01 15:44:01 -05:00
Isaac Connor 69090563d5 Merge branch 'master' into video 
Conflicts:
	src/CMakeLists.txt
	src/zm_monitor.cpp
 2014-11-28 14:23:05 -05:00
Isaac Connor 1e6902f870 Correct the list of Makefiles to be generated 2014-11-26 11:59:51 -05:00
Andrew Bauer 2e8935daf2 Add the ability to specify the zm configdir at build time. 2014-11-11 09:15:15 -06:00
altaroca e0a43adf82 Merge pull request #4 from knnniggett/optional_install 
Make onvif support optional
 2014-11-01 09:19:00 +01:00
Andrew Bauer 21f34392d4 Make onvif support optional 2014-10-31 19:23:18 -05:00
Andrew Bauer d55e656028 Fix build issue with autotools 2014-10-31 18:33:04 -05:00
Andrew Bauer 71b56a163d Zoneminder 1.28.0 Release 2014-10-18 15:23:13 -05:00
Andrew Bauer a359ea7101 fix copy paste typo 2014-10-05 11:40:10 -05:00
Andrew Bauer 56fd08d6e9 Change TMPDIR default to /var/tmp, Add ZM_SOCKDIR 2014-10-05 09:42:47 -05:00
Jan M. Hochstein f1b2ba091c Update meta makefiles 2014-09-12 16:06:19 +02:00
Andrew Bauer ad364d090a rename and process zmsystemctl.pl.in 2014-08-19 17:19:44 -05:00
Andrew Bauer 1e8e710f5a full systemd support 2014-08-10 08:47:11 -05:00
Isaac Connor 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
Jan M. Hochstein 3971e4cb3c Revert unintended changes 2014-07-15 13:42:27 +02:00
Jan M. Hochstein 0a2515c00e Added basic ONVIF support 2014-07-14 20:36:18 +02:00
Isaac Connor c58c4a9720 add the glue to define HOST_OS and use it to detect BSD and use different arguments to killall 2014-06-25 15:28:10 -04:00
Kfir Itzhak 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
Kfir Itzhak caa0cb0fd5 Bump version to v1.27.1 to fix upgrade db issues 2014-06-06 08:58:35 +03:00
Kfir Itzhak 0d7c52dc1f Merge remote branch 'origin/master' into video 
Conflicts:
	src/CMakeLists.txt
	src/zm_monitor.cpp
 2014-04-17 13:26:00 +03:00
Isaac Connor ffa952419c Merge branch 'mysql2PDO' 
Conflicts:
	distros/ubuntu1204/changelog
	scripts/ZoneMinder/lib/ZoneMinder/ConfigAdmin.pm
	web/includes/actions.php
 2014-03-20 16:48:03 -04:00
Andrew Bauer 189d9938cc Add zmcamtool to autotools file manifest 2014-03-16 07:32:18 -05:00
Kyle Johnson 9d3117a428 Bumped version to 1.27 2014-02-06 22:40:16 -05:00
Kyle Johnson 6f5c9182ce Add paths to flat skin in configure.ac and Makefile.am 2014-01-24 13:58:51 -05:00
Kfir Itzhak ff9a26273c cURL is now working! 2013-12-27 18:02:32 +02:00
Kfir Itzhak e652441996 Merge remote-tracking branch 'origin/master' into video 
Conflicts:
	configure.ac
	src/CMakeLists.txt
 2013-12-26 21:03:45 +02:00
Kfir Itzhak dce1cbf0ce Add header file checks for vlc/vlc.h 2013-12-21 06:47:12 +02:00
Edward Barnard 3321506b45 Working libvlc camera implementation. 2013-12-19 21:51:39 +00:00
Kfir Itzhak e9044b436d Search for MP4V2 header file 3 times: mp4v2/mp4v2.h, mp4v2.h, mp4.h 2013-12-19 19:21:30 +02:00
Kfir Itzhak 2b79ff2cbd Initial commit for saving events as videos :) 2013-12-19 18:38:07 +02:00
Kyle Johnson dc0d305811 Bump version to 1.26.5 2013-12-13 13:39:23 -05:00
Kfir Itzhak bed30d32b6 Remove round() mess 2013-11-15 11:41:26 +02:00
Isaac Connor 463d8a136f Merge branch 'master' into mysql2PDO 
Conflicts:
	zm.conf.in
 2013-11-08 11:22:09 -05:00
Kfir Itzhak 9979385c3b Remove the crashtrace option from configure.ac (autoconf) 2013-11-07 23:35:44 +02:00
Isaac Connor d87709528d fix assigning DB_TYPE 2013-11-06 17:47:23 -05:00
Kfir Itzhak 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
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
Isaac Connor cd63b0a2a7 add defaults for ZM_DB_TYPE 2013-10-16 16:10:31 -04:00
Kfir Itzhak 022ecf4227 Merge pull request #201 from ZoneMinder/signalfixes 
Signal improvements and fixes
 2013-10-07 08:45:12 -07:00
Andy Bauer 01be7a8aec Update configure.ac 
make ZoneMinder lowercase to match the folder with the same name
 2013-10-07 09:14:53 -05:00
Andrew Bauer e04cc4d026 Create pkgdatadir in make 2013-10-07 08:28:19 -05:00
Kfir Itzhak 1d7f664627 1) Removed the use of deprecated and undocumented sigcontext (Replaced by siginfo and ucontext) 
2) Removed the checks for sigcontext, strsignal and siginfo.h
3) Added debugging code to the die handler
4) Using SA_RESTART in the hup and reload handlers to prevent certain functions returning EINTR
5) Added SIGINT and SIGQUIT to the term handler
 2013-10-07 10:37:58 +03:00
Kfir Itzhak b5c536b134 Signal and backtrace improvements 2013-10-06 18:26:33 +03:00
Isaac Connor 34f84a4097 Merge branch 'v1.26.4-beta' 2013-10-03 10:14:09 -04:00
mastertheknife e8d20faec8 Proper checking for sys/syscall.h 2013-09-25 07:11:59 +03:00
Isaac Connor f4a7101d82 bump version 2013-09-12 13:58:18 -04:00
Kyle Johnson 219f21a904 Bumping the version numbers. 2013-09-10 11:50:39 -04:00
Kyle Johnson f604872eb3 Forgot to bump the version number for 1.26.1. Fixes #113 2013-09-06 13:29:05 -04:00
Kyle Johnson 93631c0ac4 Fixing AM_CONFIG_HEADER is deprecated in automake > 1.13. Should fix #94. 2013-08-30 21:57:52 -04:00
Kyle Johnson 2333a8b445 Merge pull request #77 from knnniggett/patch-2 
Change default dB Engine from MyISAM to InnoDB
 2013-08-19 12:22:20 -07:00
Andy e3576ccd17 Don't check for gnutls-openssl on systems with older gnutls 
This was causing a false warning on CentOS 6 w/ gnutls 2.8.5. It would otherwise compile and work fine despite the warning.
 2013-08-17 10:24:30 -05:00
Andy 050a5ac414 Change default dB Engine from MyISAM to InnoDB 
I have long ago converted my production zoneminder dB tables to InnoDB and have not experienced any side effects.  One benefit of using InnoDB is a significantly lesser chance of table corruption after an unclean shutdown.  Thoughts?
 2013-08-17 09:44:40 -05:00
Isaac Connor e2da7c37dc bump version 2013-08-13 10:25:34 -04:00
Isaac Connor cdac403fb1 Merge ../zum into develop 
Conflicts:
	AUTHORS
	configure.ac
	db/zm_create.sql.in
	scripts/ZoneMinder/lib/ZoneMinder/ConfigData.pm.in
	scripts/zmupdate.pl.in
	src/Makefile.am
	src/zm_buffer.cpp
	src/zm_config_defines.h
	src/zm_event.cpp
	src/zm_ffmpeg.h
	src/zm_ffmpeg_camera.cpp
	src/zm_image.cpp
	src/zm_jpeg.h
	src/zm_local_camera.cpp
	src/zm_logger.cpp
	src/zm_mem_utils.h
	src/zm_monitor.cpp
	src/zm_monitor.h
	src/zm_mpeg.cpp
	src/zm_remote_camera_http.cpp
	src/zm_remote_camera_rtsp.cpp
	src/zm_rtsp.cpp
	src/zm_sdp.cpp
	src/zm_sdp.h
	src/zm_stream.cpp
	src/zm_thread.cpp
	src/zm_thread.h
	src/zm_threaddata.cpp
	src/zm_user.cpp
	src/zm_user.h
	src/zm_utils.cpp
	src/zm_zone.cpp
	src/zm_zone.h
	web/includes/actions.php
	web/lang/big5_big5.php
	web/lang/cn_zh.php
	web/lang/cs_cz.php
	web/lang/de_de.php
	web/lang/dk_dk.php
	web/lang/en_gb.php
	web/lang/es_ar.php
	web/lang/et_ee.php
	web/lang/fr_fr.php
	web/lang/he_il.php
	web/lang/hu_hu.php
	web/lang/it_it.php
	web/lang/ja_jp.php
	web/lang/nl_nl.php
	web/lang/pl_pl.php
	web/lang/pt_br.php
	web/lang/ro_ro.php
	web/lang/ru_ru.php
	web/lang/se_se.php
	web/skins/classic/js/skin.js
	web/skins/classic/views/js/monitor.js.php
	web/skins/classic/views/monitor.php
	web/skins/classic/views/zone.php
 2013-07-25 11:49:55 -04:00
Isaac Connor 9d89fb3bcb Merge branch 'kfir-proper' into develop 2013-05-10 12:23:58 -04:00
Isaac Connor 7cf5475542 Merge ../ZoneMinder-kfir into kfir-proper 
Conflicts:
	configure
	src/Makefile.am
	src/Makefile.in
 2013-05-02 21:28:51 -04:00
Isaac Connor c0e634d856 add a check for gnutls-openssl which is required to add the -lgnutls-openssl to the compile line to make it compile 2013-04-29 16:43:49 -04:00
Isaac Connor 0913287ee1 gnutls changes from ubuntu package 2013-04-29 15:32:16 -04:00
nextime 33cbd89212 Migrate svn to git 2013-03-17 00:45:21 +01:00
Kfir Itzhak 0ef29743f2 Merged the deinterlacing code, although only four field is optimized so far, and is still not working perfectly. 
1) Fixed compile errors that may occur when compiling with gcc 4.7 or newer.
2) Modified the check for libavcodec to work correctly with the latest versions of ffmpeg.
 2012-07-17 12:23:13 +03:00
stan 8dd2bbfc17 Support gnutls md5 generation 
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@3660 e3e1d417-86f3-4887-817a-d78f3d33393f
 2012-07-04 09:00:20 +00:00
Kfir Itzhak 5c418133bf Lots accomplished! 
1) Delta and blend SSE and standard alogirthms inside
2) Changed event streaming to use sendfile() syscall if available
3) Direct memory capture (Less memcpys required)
4) Added macros for BGR24 and RGB32(and its variants) formats
5) Modified Monitors database table to add a target colorspace option
6) Changed most image buffer allocations to be on 16 byte boundary, work still in progress
7) Added Target colorspace instead of the old colours selection. this one also visible to local cameras
8) Replacing Y deltas option with ZM_CPU_EXTENSIONS
9) Added SSE detection code
10) Changed some code to make linking success with inlining enabled.
11) Some other changes and work still in progress for some listed above
 2012-02-01 07:33:20 +02:00
stan 56cc21ef3a Added check for Expect perl module for sftp uploading. 
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@3502 e3e1d417-86f3-4887-817a-d78f3d33393f
 2011-08-25 20:44:56 +00:00
stan b64c506659 Added SFTP upload option. 
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@3500 e3e1d417-86f3-4887-817a-d78f3d33393f
 2011-08-23 14:10:20 +00:00
stan 8ac2beb985 Changed AC_INIT to remove brackets 
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@3493 e3e1d417-86f3-4887-817a-d78f3d33393f
 2011-08-03 14:28:20 +00:00
stan 950ddcec57 Changed address to report configure errors to. 
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@3486 e3e1d417-86f3-4887-817a-d78f3d33393f
 2011-07-28 21:21:12 +00:00
stan 02831ddcb1 Removed support for old locations of ffmpeg headers 
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@3468 e3e1d417-86f3-4887-817a-d78f3d33393f
 2011-06-24 16:05:06 +00:00
stan 6ff385e407 git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@3459 e3e1d417-86f3-4887-817a-d78f3d33393f 2011-06-21 09:19:10 +00:00
stan c4143007a9 Added check for zlib (for ffmpeg dependency) and ExtUtils::MakeMaker as was not present by default on Fedora 15. 
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@3385 e3e1d417-86f3-4887-817a-d78f3d33393f
 2011-06-05 17:03:55 +00:00
stan 471982ed78 Fixed syntax in message to not have comma 
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@3359 e3e1d417-86f3-4887-817a-d78f3d33393f
 2011-05-25 07:26:31 +00:00
stan 58c77d2b40 Updates for version 1.24.4 
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@3358 e3e1d417-86f3-4887-817a-d78f3d33393f
 2011-05-23 16:19:12 +00:00
stan 4498710239 Remove dependency on PHP::Serialization 
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@3355 e3e1d417-86f3-4887-817a-d78f3d33393f
 2011-05-23 16:10:41 +00:00
stan 3cb202c1a3 Updated comments etc concerning ENABLE_MMAP option 
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@3353 e3e1d417-86f3-4887-817a-d78f3d33393f
 2011-05-23 15:16:57 +00:00
stan 24c3c068dd Removed original apache config and merged with new one in misc 
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@3339 e3e1d417-86f3-4887-817a-d78f3d33393f
 2011-05-15 21:16:36 +00:00
stan e59ed8d9dc Added Apache config file 
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@3333 e3e1d417-86f3-4887-817a-d78f3d33393f
 2011-04-27 14:32:41 +00:00
stan aadb1e0e94 Added syslog sample config 
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@3331 e3e1d417-86f3-4887-817a-d78f3d33393f
 2011-04-27 11:28:36 +00:00
stan 011777c1c6 Added misc directory and sample logrotate config file 
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@3330 e3e1d417-86f3-4887-817a-d78f3d33393f
 2011-04-27 11:04:06 +00:00
stan 8048c1c355 Updated to allow the versions of video4linux to existed independently of each other. Ubuntu 11.04 oalyn has V4L2. 
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@3302 e3e1d417-86f3-4887-817a-d78f3d33393f
 2011-02-15 21:59:06 +00:00
stan 6a5dd68cac Ooops, extra bracket 
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@3291 e3e1d417-86f3-4887-817a-d78f3d33393f
 2011-02-08 14:33:13 +00:00
stan a41ac3f33e Remove warning for libavcore as not present in older versions of ffmpeg 
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@3290 e3e1d417-86f3-4887-817a-d78f3d33393f
 2011-02-08 14:31:53 +00:00
stan d67d19dc4f Removed dependency on DB existing for config generation 
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@3245 e3e1d417-86f3-4887-817a-d78f3d33393f
 2011-01-21 23:53:36 +00:00
stan 420843cfa9 Fixed perl MakeMaker parameters not being passed into Makefile creation 
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@3223 e3e1d417-86f3-4887-817a-d78f3d33393f
 2011-01-07 12:14:01 +00:00
stan 46358c84e9 Changed configure/build procedure to allow specified run, tmp and log dirs and avoid early replacement of configure variables in SQL defautl config. 
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@3222 e3e1d417-86f3-4887-817a-d78f3d33393f
 2011-01-07 11:10:18 +00:00
stan 04dbf0f016 Renamed zmHttpd conf file to zmApache 
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@3219 e3e1d417-86f3-4887-817a-d78f3d33393f
 2011-01-03 23:30:20 +00:00
stan dc9e2755b0 Added sample apache config file. 
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@3218 e3e1d417-86f3-4887-817a-d78f3d33393f
 2011-01-03 23:27:58 +00:00
stan 3f1158c2a4 Allow RUNDIR to be specified on command line 
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@3190 e3e1d417-86f3-4887-817a-d78f3d33393f
 2010-11-11 12:23:47 +00:00
stan ca4358bfd6 Initial libgcrypt to remove warning in zms and zmu 
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@3188 e3e1d417-86f3-4887-817a-d78f3d33393f
 2010-11-11 12:11:06 +00:00
jaidhar e86444cbc3 Importing initial XML Plugin files to build structure. Updated autoconf files to include Makefiles 
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@3173 e3e1d417-86f3-4887-817a-d78f3d33393f
 2010-11-04 07:07:40 +00:00
stan 2dd17900a6 Added package url and changed output files to all be on same line to avoid issues with newlines in configure file. 
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@3165 e3e1d417-86f3-4887-817a-d78f3d33393f
 2010-11-03 16:21:04 +00:00
stan 0103dbede7 Updated to version 1.24.3 
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@3161 e3e1d417-86f3-4887-817a-d78f3d33393f
 2010-11-03 15:55:45 +00:00
stan a011e83d85 Updated to check jor jpeg library headers 
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@3147 e3e1d417-86f3-4887-817a-d78f3d33393f
 2010-10-13 15:38:43 +00:00
stan af84cf053e Added check for libavcore.a 
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@3145 e3e1d417-86f3-4887-817a-d78f3d33393f
 2010-10-13 15:19:00 +00:00
stan 1c2d30fc9a Added x264 and avdevice libraries. 
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@3017 e3e1d417-86f3-4887-817a-d78f3d33393f
 2010-02-15 17:04:25 +00:00
stan 5f05f2c843 Made mapped memory the new default 
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@3000 e3e1d417-86f3-4887-817a-d78f3d33393f
 2009-12-02 18:39:16 +00:00
stan 46b92e6f51 Updated confgen to use local perl paths if set 
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2998 e3e1d417-86f3-4887-817a-d78f3d33393f
 2009-12-02 18:35:47 +00:00
stan 3c07382931 Submitted patches to correct perl paths in Ubuntu etc 
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2997 e3e1d417-86f3-4887-817a-d78f3d33393f
 2009-12-02 18:08:08 +00:00
stan e977aaa71c Fixed (hopefully) issue where perl libraries were installed in odd place 
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2932 e3e1d417-86f3-4887-817a-d78f3d33393f
 2009-06-24 10:22:11 +00:00
stan 54d4cbc4f0 Updated for version 1.24.2 
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2915 e3e1d417-86f3-4887-817a-d78f3d33393f
 2009-06-09 14:13:43 +00:00
stan 11a1cc2d41 Now supports custom perl install path 
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2908 e3e1d417-86f3-4887-817a-d78f3d33393f
 2009-06-08 09:11:56 +00:00