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

87 Commits

Author SHA1 Message Date
Kfir Itzhak bed30d32b6 Remove round() mess 2013-11-15 11:41:26 +02: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
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