e2da7c37dc
bump version
2013-08-13 10:25:34 -04:00
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
9d89fb3bcb
Merge branch 'kfir-proper' into develop
2013-05-10 12:23:58 -04:00
7cf5475542
Merge ../ZoneMinder-kfir into kfir-proper
...
Conflicts:
configure
src/Makefile.am
src/Makefile.in
2013-05-02 21:28:51 -04:00
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
0913287ee1
gnutls changes from ubuntu package
2013-04-29 15:32:16 -04:00
33cbd89212
Migrate svn to git
2013-03-17 00:45:21 +01:00
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
b691879130
Fixed examples for directories.
...
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2851 e3e1d417-86f3-4887-817a-d78f3d33393f
2009-04-14 20:20:34 +00:00
75c654e654
Downgraded to support autoconf 2.59
...
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2812 e3e1d417-86f3-4887-817a-d78f3d33393f
2009-03-23 21:59:13 +00:00
c65b50e312
Minor header sort out and libz no longer mandatory.
...
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2809 e3e1d417-86f3-4887-817a-d78f3d33393f
2009-03-20 12:39:29 +00:00
Isaac Connor
Isaac Connor
nextime
Kfir Itzhak
stan
jaidhar