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

3022 Commits

Author SHA1 Message Date
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
mastertheknife c795afc833 Updated ZM version in cmake to 1.26.4 2013-10-04 19:53:59 +03:00
Isaac Connor 4b1ee3cae7 Merge branch 'master' of github.com:ZoneMinder/ZoneMinder 2013-10-04 11:56:46 -04: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
Kevin Crider 2649b1f827 Merge pull request #194 from WDKevin/master 
Added missing word in readme
 2013-10-04 06:33:03 -07:00
Kevin Crider f4a37bbb12 Added missing word in readme 2013-10-04 09:32:00 -04:00
Andy Bauer 1afa52637e Update zoneminder.f19.spec 
gcc4.7/4/8 patch no longer needed
 2013-10-04 06:39:44 -05:00
Isaac Connor 21caddf97b This is a copy of the debian dir, the main change is to the Changelog so that the package gets built for precise 2013-10-03 13:53:37 -04:00
Isaac Connor 80d97c7bdf Merge branch 'master' of https://github.com/FoundationUniversity/ZoneMinder into FoundationUniversity-master 
Conflicts:
	distros/debian/changelog
 2013-10-03 11:36:26 -04:00
Isaac Connor d664f3bb6e Merge branch 'master' of github.com:ZoneMinder/ZoneMinder 2013-10-03 10:37:04 -04:00
Isaac Connor 34f84a4097 Merge branch 'v1.26.4-beta' 2013-10-03 10:14:09 -04:00
Andy Bauer b505472be2 Update README.CentOS 
update documentation to add alter permission to zmuser
 2013-10-03 08:31:59 -05:00
Andy Bauer ea5c610fb1 Update README.Fedora 
added alter permission to zmuser
 2013-10-03 08:30:31 -05: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 95803cc882 Merge branch 'cmake-improvements' 2013-10-03 15:10:06 +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
Kyle Johnson 02e1a5eea6 Merge pull request #174 from POKKAHOH/rtsp-updates 
More RTSP support, decoding fragmented NAL, understand sprop-parametr-sets

 * Can now view more RTSP streams (including newer Axis cameras)
 * Decode fragmented NAL
 * Understand sprop-parametr-sets
 * Don't check unsetted video format (zm_remote_camera_rtsp.cpp)
 * Remove #else errors for avutils/ffmpeg
 2013-10-03 05:08:07 -07:00
mastertheknife 5fce4c516b Perl modules will be now be installed in <prefix>/<datadir>/zoneminder/perl5 2013-10-01 17:38:51 +03:00
mastertheknife 9c2e48ca01 Attempt three at zm database stuff on travis 2013-10-01 15:39:36 +03:00
mastertheknife 48c7892071 Another attempt to create the ZM database in travis 2013-10-01 15:29:54 +03:00
POKKAHOH b0a014928e remove #else errors for avutils/ffmpeg 2013-10-01 16:05:49 +04:00
mastertheknife 5af8e0844c Few cmake improvements 2013-09-30 14:31:36 +03:00
Andy Bauer ead696e5a7 Create zoneminder.f19.spec 2013-09-29 11:26:32 -05:00
Andy Bauer 38963520f4 Update README.Fedora 
Updated documentation to reflect current issues/workarounds when running zoneminder on Fedora 19
 2013-09-28 15:18:45 -05:00
Chris Wiggins ff4b2c0908 Merge pull request #178 from ZoneMinder/cmake 
Add cmake to ZoneMinder thanks to @mastertheknife
 2013-09-28 03:51:00 -07:00
mastertheknife d171578cb8 Fixed not logging in to mysql with a password 2013-09-28 13:37:36 +03:00
mastertheknife 3321f26408 Modified .travis.yml to include kylejohnson's changes and fix it 2013-09-28 13:32:43 +03:00
mastertheknife db48a3d8fb Add matrix to the .travis.yml file 2013-09-28 13:04:41 +03:00
mastertheknife 48f11a8064 Add cmake to zoneminder 2013-09-28 12:59:50 +03:00
Kyle Johnson 598e830659 SQL syntax error in travis test monitor 2013-09-27 15:56:06 -04:00
Kyle Johnson 2c64c5d2be SQL syntax error in travis test monitor 2013-09-27 15:43:05 -04:00
Kyle Johnson 70841d32ab Use only the needed fields for the travis test cam 2013-09-27 15:31:07 -04:00
Kyle Johnson de59dd8f10 Proper number of columns 1.26.3 for travis 2013-09-27 14:25:03 -04:00
Kyle Johnson a5e526d788 Assign a monitor ID of 500 to the test monitor for the travis builds 2013-09-27 13:58:47 -04:00
Kyle Johnson 9ac52b4a52 Replace the ZM_DB_PASS with an empty password for the travis test steps 2013-09-27 13:49:33 -04:00
Kyle Johnson 564fa216f8 Use the default travis user without a password 2013-09-27 13:32:38 -04:00
Kyle Johnson cd902b5dc1 Create the database for travis during the before_script step 2013-09-27 13:08:45 -04:00
Kyle Johnson 27349f87a6 Only grab the last 10 revisions and the master branch of ffmpeg for travis 2013-09-27 12:56:27 -04:00
Kyle Johnson 8983807570 Output apt-get install to /dev/null in travis - we don't care about it 2013-09-27 12:49:44 -04:00
Kyle Johnson fc6731e575 Create and use a dedicated ZM database user for the travis build steps 2013-09-27 12:46:16 -04:00
Kyle Johnson 167eff56be Removed verbosity, extra db creation from travis build steps and fixed a db name 2013-09-27 10:59:11 -04:00
Kyle Johnson beee057dd2 More work on the travis build steps 2013-09-27 10:48:00 -04:00
Kyle Johnson 44f4e2f981 Added a few steps to help me see the travis CI environment 2013-09-27 10:38:54 -04:00
Kyle Johnson 186b1c3836 Use the right database name 2013-09-27 09:59:23 -04:00
Kyle Johnson 3119ab7672 Added steps to install ZM binaries, insert a monitor and start ZM 2013-09-27 09:47:58 -04:00
POKKAHOH 25ff325118 Comment missed in determining stream header. 
Property 'title' and 'comment' not supported.
 2013-09-27 16:51:33 +04:00
POKKAHOH 33b6e5cd03 Now can recive RTSP stream. 
Decode fragmented NAL
Understand sprop-parametr-sets
Don't check unsetted video format (zm_remote_camera_rtsp.cpp)
 2013-09-27 15:08:11 +04:00