284b9f963f
Merge branch 'master' into zma_to_thread
2020-12-29 12:18:26 -05:00
d571b2dd98
Add live555 detection and HAVE_RTSP_SERVER config
2020-12-08 15:59:06 -05:00
b261fbb397
Merge branch 'master' into zma_to_thread
2020-12-07 16:26:26 -05:00
7326af95a9
Add ZM_FONTDIR as a place to store fonts for timestamping
2020-12-01 09:21:25 -05:00
2eda49333f
Merge branch 'master' into zma_to_thread
2020-10-20 16:20:29 -04:00
7f06920f4a
convert polkit FATAL_ERROR to a WARNING so that codeQL will build
2020-10-02 10:33:42 -04:00
06519895d4
FATAL_ERROR to WARNING. The purpose is to allow codeQL to build cpp even though the perl deps havn't been installed.
2020-10-02 09:04:03 -04:00
5fb56c9f57
Merge branch 'master' into zma_to_thread
2020-08-07 17:52:43 -04:00
92cc03dbe8
fix pod2man out-of-source builds
2020-08-04 21:07:49 -05:00
869860bb26
Merge branch 'master' into zma_to_thread
2020-07-21 17:49:39 -04:00
7575afc8d5
Merge branch 'master' into zma_to_thread
2020-07-21 17:38:32 -04:00
dd25cb3b4e
We always build onvif
2020-05-09 17:34:15 -04:00
75082064fd
Merge branch 'master' of github.com:zoneminder/ZoneMinder into onvif_updated_to_upstream
2020-05-09 16:40:17 -04:00
732bb5416f
Merge branch 'master' into onvif_updated
2020-05-09 16:26:29 -04:00
4ff341a0f5
Merge branch 'master' into zma_to_thread
2020-05-02 18:03:42 -04:00
ed7c0815de
Merge branch 'release-1.34'
2020-04-24 17:05:32 -04:00
e79a9d5abf
Can't set this policy yet as we havn't deprecate trusty for 1.34
2020-04-23 18:33:58 -04:00
01a2880100
fix build outside of build directory
2020-04-23 18:18:04 -04:00
32c137bb8e
Do not look for gnutls if libjwt is not found
2020-04-23 18:00:00 -04:00
4b53c7660e
Merge pull request #2911 from hax0kartik/dl-curl
...
Dynamically load libcurl, libvlc and libvnc
2020-04-22 09:49:37 -04:00
89b199625a
Add Optimised setting to use -O3
2020-04-14 16:59:22 -04:00
f15ffee043
Do not include the static libvnc library
2020-04-14 03:11:28 +05:30
640dfdd4a0
Dynamically load libvnc at runtime
2020-04-14 02:46:01 +05:30
1c4e4abbab
Do not look for gnutls if libjwt is not found
2020-04-14 00:40:47 +05:30
143ad394a9
Dynamically load libvlc
2020-04-14 00:15:06 +05:30
3a8b931cda
Fix stuff
2020-04-08 12:52:09 -04:00
64f57aa373
Dynamically load libcurl at runtime
2020-04-08 05:18:16 -04:00
14c28715d8
Fix warnings about hashed authentication not being available when using gnutls. Also set cmake_policy(SET CMP0054 NEW) to quiet warnings
2020-04-05 13:36:20 -04:00
2d5d87839f
Fix warnings about hashed authentication not being available when using gnutls. Also set cmake_policy(SET CMP0054 NEW) to quiet warnings
2020-04-05 13:35:21 -04:00
72ba972a2a
whitespace
2020-04-05 13:23:36 -04:00
eed45ae66c
Fix 2892
2020-03-26 12:08:44 -04:00
5b1409d8df
Add cmake rules to check for libvnc
2020-03-25 23:29:22 -07:00
a70ab85407
Fix 2892
2020-03-24 09:29:19 -07:00
bb72e3000c
Merge pull request #2867 from veprbl/pr/cmake_install_full
...
cmake: use CMAKE_INSTALL_FULL_
2020-03-06 15:05:50 -05:00
3a129a8818
Merge pull request #2874 from hax0kartik/2810-libjwt
...
Add libjwt and remove gnutls-openssl wrapper
2020-03-06 14:48:45 -05:00
835966eb24
Merge pull request #2874 from hax0kartik/2810-libjwt
...
Add libjwt and remove gnutls-openssl wrapper
2020-03-05 15:30:27 -05:00
2091ad8c92
Add libjwt and remove gnutls-openssl wrapper
2020-03-05 09:29:27 -08:00
444c6fd372
Revert "Add libjwt as a optional library"
2020-03-04 13:57:27 -05:00
641b191c34
Merge pull request #2867 from veprbl/pr/cmake_install_full
...
cmake: use CMAKE_INSTALL_FULL_
2020-03-04 12:00:11 -05:00
5443e6385b
Merge pull request #2844 from hax0kartik/2810-libjwt
...
Add libjwt as a optional library
2020-03-04 11:58:27 -05:00
1dd8a71b52
Fix conditionals for when to look for openssl
2020-03-03 09:16:24 -08:00
c048590b49
Look for openssl when libjwt is not found
2020-03-03 08:54:00 -08:00
60d3243e69
Look for openssl as well when gnutls-openssl wrapper is not found
2020-03-03 08:35:24 -08:00
ef3d7497d0
Only look for libjwt-gnutls and look for openssl only if gnutls is not found
2020-03-03 07:39:29 -08:00
a703d96c13
cmake: use CMAKE_INSTALL_FULL_
...
CMAKE_INSTALL_FULL_ is to be used as a definition of the full path.
https://cmake.org/cmake/help/latest/module/GNUInstallDirs.html
2020-03-03 08:41:53 -05:00
cfcaf0fb81
Change how cmake looks for gnutls and gnutls-openssl
2020-03-01 08:42:39 -08:00
70ef3d0eba
Look for gnutls-openssl and gnutls separately
2020-03-01 08:33:56 -08:00
40627ab102
fix build outside of build directory
2020-02-27 12:00:09 -05:00
40742503b9
Add a warning when there is no AVCODEC
2020-02-27 11:56:49 -05:00
b1ce0ec0e8
Fix cmake
2020-02-23 06:18:32 -08:00
46d77ee849
Add libjwt as a optional library
2020-02-20 07:55:59 -08:00
396be10d6f
Merge branch 'master' into zma_to_thread
2019-08-22 12:57:00 -04:00
82672d9b86
stop bcrypt files from installing with zm
2019-06-23 13:20:08 -05:00
00183b535a
rename bcrypt to libbcrypt to reflect name of the project
2019-06-23 12:56:04 -05:00
8b37c0e9b0
remove bcrypt & jwt-cpp as submodules, bring in statically under src
2019-06-23 12:12:12 -05:00
c4d76f03c9
Introduce ZM_PATH_SHUTDOWN to cmake config
2019-05-27 12:09:32 -04:00
d252a8ba30
build bcrypt as static
2019-05-02 10:52:21 -04:00
65a57feedb
absolute path
2019-05-01 14:30:00 -04:00
c663246f0a
try add_library instead
2019-05-01 14:22:10 -04:00
a5de45419f
added sha1 and bcrypt submodules
2019-05-01 13:08:52 -04:00
a9e2011727
Merge branch 'storageareas' into zma_to_thread
2019-02-13 12:24:38 -05:00
3258d8e590
remove ZM_DIR_IMAGES ( #2374 )
2018-12-29 09:52:58 -05:00
893048c306
remove option to build with no ffmpeg ( #2365 )
2018-12-28 10:46:27 -05:00
28dafd5931
Merge branch 'storageareas' into zma_to_thread
2018-12-26 12:02:00 -05:00
6ee72aa2d9
Implement libswresample support as an alternative to libavresample, which is deprecated
2018-12-20 14:06:56 -05:00
53c66e44db
Implement libswresample in place of libavresample which is deprecated
2018-12-20 13:38:24 -05:00
3a068ae6a3
Merge branch 'master' into swresample
2018-12-16 16:15:28 -05:00
db81465fa2
allow one to set manpage destination
2018-12-07 09:47:00 -06:00
1fa13e5757
Add SWRESAMPLE libs
2018-10-24 13:10:54 -04:00
979b31ffc3
Merge branch 'storageareas' into zma_to_thread
2018-08-11 10:08:30 -04:00
18c3618e28
Arp tool ( #2155 )
...
* let cmake set path to arp
* declare cameras array
* fix probeV4L function
* typo
* fix another typo - my machine is possessed.
* update redhat, debian, ubuntu build dependencies
2018-07-11 15:43:59 -04:00
f6139d33ed
Merge branch 'storageareas' into zma_to_thread
2018-05-05 12:25:11 -04:00
02f8493b39
rpm packaging - remove support for sysvinit aka el6
2018-04-22 07:25:06 -05:00
3c225c9f1c
Migrate Webcache out of webroot ( #2083 )
...
* migrate webcache folder out of webroot, migrate htaccess files
* rpm specfile - add missing reference to cache folder
* fix submodule mixup
2018-04-19 15:01:46 -04:00
be5161391a
patching crud no longer needed
2018-04-18 15:02:42 -05:00
8bf502ee4f
upgrade to cakephp 2.10.8 ( #2067 )
...
* upgrade lib folder to cakephp 2.10.8
* recreate bootstrap.php.in
* Bump Crud module 3.0.10 -> 3.1.0
* fix CrudBaseObject.php
2018-04-17 21:24:14 -04:00
cd3046abb3
Merge branch 'storageareas' into zma_to_thread
2018-04-14 11:03:08 -04:00
6efffe62b8
add c++-11 support for older CMAKE
2018-04-06 19:48:17 +02:00
27736fb5d9
Merge ../ZoneMinder.master into storageareas
2018-03-15 11:04:41 -04:00
3475bfb672
Fix compilation on Ubuntu 18.04
...
I'm not entirely sure why this wasn't a problem with icconor's source package on launchpad. But, even unfamiliar as I am with CMake, it doesn't make sense to me to throw a fatal error by checking for a header that is already known to be unavailable.
2018-03-05 18:46:52 -05:00
865649d785
Turn on c++11
2018-03-01 19:20:00 -08:00
36ef0f5011
Merge branch 'storageareas' into zma_to_thread
2018-01-05 10:06:18 -05:00
642c3f053a
We are not using boost at this time.
2018-01-02 09:16:37 -08:00
4d73ce4109
rework locking to have a per-packet mutex
2017-12-03 11:09:01 -05:00
e679a8cfaa
Fix conf.d dir
2017-09-23 13:40:43 -04:00
676c4b7ddc
Merge branch 'master' into storageareas
2017-08-22 09:52:14 -04:00
613bbfb65b
arm neon-check "uname -m" if CMAKE_SYSTEM_PROCESSOR is not what we expect ( #1966 )
...
* arm neon - check "uname -m" if CMAKE_SYSTEM_PROCESSOR is not what we expect
* skip arm neon check it not on linux
2017-08-21 12:02:28 -04:00
da5438a6ff
detect hardware accel capabilities
2017-08-16 12:16:15 -04:00
49464d381a
Merge branch 'master' into storageareas
2017-08-14 10:44:40 -04:00
c353d5d17b
Update CMakeLists.txt
...
fix erroneous creation of /etc/zm/conf.d/conf.d during an out-of-source build
2017-08-14 08:45:03 -05:00
cfbfc0dd44
Merge branch 'master' into storageareas
2017-07-21 11:04:32 -04:00
91ccba137f
Don't create symlinks in ZoneMinder webroot ( #1923 )
...
* don't create symlinks during rpm packaging
* don't use symlinks when pacakging debs
* change default values for zm_dir_events and zm_dir_images
* remove zm_contentdir cmake var from debian packaging
* change default for zm_config_subdir
* update INSTALL documentation
2017-07-21 08:18:13 -04:00
4bca799d43
reorganize zm config files ( #1937 )
...
* reogranize config files
* process 01-system-paths.conf.in
* exclude .in files in install directive
2017-07-17 09:11:36 -04:00
085d239a6e
Merge branch 'master' into storageareas
2017-06-13 18:02:28 -04:00
bacf65ae9a
Migrate values from Options -> Paths to zm.conf ( #1908 )
...
* initial commit to migrate contents of Options->Paths to zm.conf
* remove paths items from configdata.pm
* remove paths tab from options
* update deb packaging scripts with new cmake vars
* remove extraneous file
* save custom paths variables to config file before dB is freshened
* don't check configs if the dB version is >= 1.31.0
2017-06-12 21:39:37 -04:00
371b86300a
Merge branch 'master' into storageareas
2017-06-08 14:23:40 -04:00
0892be3970
further consolidation of ZM_TARGET_DISTRO
2017-06-06 11:59:56 -05:00
54312fa994
consolidate ZM_TARGET_DISTRO parameters
2017-06-06 11:56:53 -05:00
2bc6f1627e
Add support for conf.d subfolder ( #1902 )
...
* cmake changes to support conf.d
* php changes to support conf.d
* perl changes to support conf.d
* C changes to support conf.d
* add conf.d support to rpmspecfile
* fix typo
* specify ZM_CONFIG_SUBDIR in relevant target distros
* put back my config_file perl definition
* remove quotes from ZM macros
* fix snprintf
* add README to conf.d folder
* adjust rpm specfile
* remove custom permissions from README in rpmspecfile
* modify rpm README documentation to reflect conf.d support
* set ZM_CONFIG_SUBDIR in debian rules file
2017-06-05 16:39:19 -04:00
1404785eeb
revert my attempt to make it rename zm.conf to zm.conf.new on install
2017-05-18 12:07:04 -04:00
Isaac Connor
Isaac Connor
Andrew Bauer
hax0kartik
Dmitry Kalinkin
Pliable Pixels
Andy Bauer
Isaac
Matthew Trescott
Isaac Connor
Isaac Connor
Isaac Connor