Commit Graph

1109 Commits

Author SHA1 Message Date
Emmanuel Papin 90fd90ae1e Add support to compile with -fPIC when using CMAKE on x86_64 architecture 2015-06-03 20:34:11 +02:00
Emmanuel Papin 3f20a08d16 Add cmake support 2015-05-31 02:37:58 +02:00
Emmanuel Papin 872fead1fa Rename zoneminder library 2015-05-30 14:11:42 +02:00
Emmanuel Papin 33f7342cec Enable plugin support on legacy debian folder and add a missing conditional build in zm_monitor.cpp 2015-05-30 00:30:35 +02:00
Emmanuel Papin de2ec868b4 Merge branch 'fix_iostream_include' into plugin_support
Conflicts:
	src/zm_image_analyser.h
2015-05-29 23:49:10 +02:00
Emmanuel Papin 7811354d92 Move iostream inclusion in zm.h and declare explicitely the namespace for cout 2015-05-29 23:22:20 +02:00
Emmanuel Papin 746deece73 Rename some files, remove links to unused libraries on binaries and some cleanup 2015-05-29 22:26:11 +02:00
Emmanuel Papin eff56664c3 Merge branch 'master' of https://github.com/ZoneMinder/ZoneMinder into plugin_support
Conflicts:
	web/lang/de_de.php
	web/skins/classic/views/monitor.php
	web/skins/classic/views/plugin.php
2015-05-28 23:43:13 +02:00
Isaac Connor 45b5fd3945 Merge pull request #801 from knnniggett/nph-zms
link zms to nph-zms, rather than build identical
2015-05-21 13:15:38 -04:00
Rick Sayre 12516da3dc Patched in changes to 1.28.1 to allow OmniOS/Illumos to build and work
haven't attempted to build yet, there are some changes
2015-05-17 17:18:54 -07:00
Emmanuel Papin 6b2c435460 Merge branch 'master' of https://github.com/ZoneMinder/ZoneMinder into plugin_support_list
Conflicts:
	scripts/ZoneMinder/lib/ZoneMinder/ConfigData.pm.in
2015-05-14 11:12:38 +02:00
Andrew Bauer 5ded77f8de Merge pull request #825 from rwg0/688-fix-fast-forward
Fix fast forward/reverse in event playback (#688)
2015-05-09 19:39:23 -05:00
Isaac Connor 79398a2bec Merge pull request #821 from onlyjob/PBP
beautifying *.pm
2015-05-08 08:56:01 -04:00
Emmanuel Papin 630c8f335f Merge master 2015-05-05 23:37:20 +02:00
Isaac Connor ea795c4040 Fix to compile on 32bit kFreeBSD 2015-04-24 13:55:10 -04:00
rwg0 422020a3b2 Fix fast forward/reverse in event playback not being fast if effectivefps < maxfps 2015-04-22 22:11:33 +01:00
Isaac Connor 209f23cc6e Fix build issues on kFreeBSD. Fixes #771 2015-04-20 12:53:02 -04:00
Dmitry Smirnov eddada011c spelling corrections (thanks, /usr/bin/codespell) 2015-04-19 20:38:23 +10:00
Andrew Bauer d5e403b7e0 Merge pull request #775 from ZoneMinder/freebsd_fixes
Freebsd fixes
2015-04-17 15:21:42 -05:00
Isaac Connor 0c0a23bf86 Merge pull request #778 from onlyjob/build-hurd
build: add PATH_MAX definitions (needed on GNU Hurd)
2015-04-16 01:00:00 -04:00
Dmitry Smirnov 0a2f1cd2b6 build: add PATH_MAX definitions (needed on GNU Hurd)
Signed-off-by: Dmitry Smirnov <onlyjob@member.fsf.org>
2015-04-16 11:25:04 +10:00
Andrew Bauer fc64e3f01b Merge pull request #772 from balr0g/linked-cameras-trigger-on-new-events
Don't trigger linked cameras on new events
2015-04-15 20:23:54 -05:00
Andrew Bauer e4cf323949 Merge pull request #800 from Sune1337/pthread_join
* use pthread_join instead of pthread_tryjoin_np
2015-04-12 11:51:50 -05:00
Andrew Bauer 4cb8cf8681 remove commented commands 2015-04-12 11:48:49 -05:00
Andrew Bauer 3a3f186e74 update working_directory 2015-04-12 11:48:18 -05:00
Andrew Bauer 8f337999d4 remove nph-zms target 2015-04-12 11:47:28 -05:00
Andrew Bauer 3108fd2109 link nph-zms rather than build 2015-04-12 11:00:43 -05:00
Andrew Bauer 124ba1c2a8 Merge pull request #796 from ZoneMinder/zm_image_cleanups
one small fix for a log line where the 4th parameter wasn't included.  T...
2015-04-10 12:38:35 -05:00
Isaac Connor 065a372678 one small fix for a log line where the 4th parameter wasn't included. The rest are very small optimisations. 2015-04-10 13:26:17 -04:00
Sune1337 5779b2e20f * use pthread_join instead of pthread_tryjoin_np 2015-04-08 22:15:54 +02:00
Andrew Bauer 549d7fd426 include libv4l1-videodev headers 2015-04-03 18:24:51 -05:00
balr0g e4e2160bf6 Don't trigger linked cameras on new events 2015-03-31 13:22:02 -04:00
Isaac Connor 21915eb92c Merge branch 'master' into freebsd_fixes 2015-03-31 11:06:53 -04:00
Dmitry Smirnov 6bbe42c5eb build: fix FTBFS with format-hardening
~~~~
x86_64-linux-gnu-g++ -DHAVE_CONFIG_H -I. -I..  -I/usr/include -I/usr/include -I/usr/include -D__STDC_CONSTANT_MACROS -Wall -finline-functions -fomit-frame-pointer -I/usr/include -D__STDC_CONSTANT_MACROS -D_FORTIFY_SOURCE=2 -D__STDC_CONSTANT_MACROS -D__STDC_CONSTANT_MACROS -g -O2 -fstack-protector-strong -Wformat -Werror=format-security -DZM_FFMPEG_CVS -DHAVE_LIBCRYPTO -MT zm_mpeg.o -MD -MP -MF .deps/zm_mpeg.Tpo -c -o zm_mpeg.o zm_mpeg.cpp
zm_mpeg.cpp: In member function ‘void VideoStream::SetupFormat()’:
zm_mpeg.cpp:112:56: error: format not a string literal and no format arguments [-Werror=format-security]
snprintf( s->filename, sizeof(s->filename), filename );
                                                     ^
zm_mpeg.cpp:112:56: error: format not a string literal and no format arguments [-Werror=format-security]
~~~~

Signed-off-by: Dmitry Smirnov <onlyjob@member.fsf.org>
2015-03-30 15:27:37 +11:00
Isaac Connor ed28eebba4 This is already included in zm_signal.h 2015-03-27 15:16:15 -04:00
Emmanuel Papin 56b724e161 Fix text formatting in event's note 2015-03-08 14:33:55 +01:00
Emmanuel Papin 7fd2f367c6 Fix plugin output to event note 2015-03-07 21:46:01 +01:00
Emmanuel Papin 0988eaeb06 Merge branch 'master' of https://github.com/ZoneMinder/ZoneMinder into plugin_support 2015-03-07 14:44:05 +01:00
Emmanuel Papin a4e4db31bc Delete event data in event class, not in plugin function 2015-03-07 14:42:01 +01:00
Emmanuel Papin 40c3ba1ed3 Readd zone name in event's notes 2015-03-07 11:48:47 +01:00
Isaac Connor 2e10263b64 Improve logging to include monitor name and for shared cameras show 1/1 instead of 0/1 2015-03-04 16:34:31 -05:00
Isaac Connor 084e2a8b8f when auth is needed, try command again before dying. 2015-03-02 10:47:52 -05:00
Emmanuel Papin b1dbb23f13 Merge branch 'master' into plugin_support_test 2015-02-27 19:46:55 +01:00
Isaac Connor 3c5b1fd07f fix extra slash when adding trackurl to controlurl 2015-02-26 10:22:21 -05:00
Emmanuel Papin 9929233e75 Merge branch 'master' into plugin_support_test
Conflicts:
	configure.ac
	web/lang/fr_fr.php
2015-02-25 23:14:25 +01:00
Isaac Connor c7dc157f4d FreeBSD fix 2015-02-24 09:22:55 -05:00
Isaac Connor 52938920de backtrace is in execinfo on FreeBSD 2015-02-24 09:22:39 -05:00
Isaac Connor 3cc4c2e24d fixes to get pid on FreeBSD 2015-02-24 09:22:08 -05:00
Isaac Connor 0bea381510 sendfile tricks 2015-02-24 09:20:55 -05:00
Isaac Connor 550d517701 sigh... fix the image to capture_image 2015-02-22 16:36:01 -05:00