Merge branch 'master' into feature-h264-videostorage

.travis.yml

@@ -1,4 +1,6 @@
 language: cpp
+sudo: required
+dist: trusty
 notifications:
   irc: "chat.freenode.net#zoneminder-dev"
 branches:
@@ -19,11 +21,12 @@ env:
     - ZM_BUILDMETHOD=cmake
 compiler:
   - gcc
+  - clang
 before_install:
   - sudo apt-get update -qq
-  - sudo apt-get install -y -qq libpolkit-gobject-1-dev zlib1g-dev apache2 mysql-server php5 php5-mysql build-essential libmysqlclient-dev libssl-dev libbz2-dev libpcre3-dev libdbi-perl libarchive-zip-perl libdate-manip-perl libdevice-serialport-perl libmime-perl libwww-perl libdbd-mysql-perl libsys-mmap-perl yasm automake autoconf cmake libjpeg-turbo8-dev apache2-mpm-prefork libapache2-mod-php5 php5-cli libtheora-dev libvorbis-dev libvpx-dev libx264-dev libvlccore-dev libvlc-dev libvlccore5 libvlc5 2>&1 > /dev/null 
+  - sudo apt-get install -y -qq libpolkit-gobject-1-dev zlib1g-dev apache2 mysql-server php5 php5-mysql build-essential libmysqlclient-dev libssl-dev libbz2-dev libpcre3-dev libdbi-perl libarchive-zip-perl libdate-manip-perl libdevice-serialport-perl libmime-perl libwww-perl libdbd-mysql-perl libsys-mmap-perl yasm automake autoconf cmake libjpeg-turbo8-dev apache2-mpm-prefork libapache2-mod-php5 php5-cli libtheora-dev libvorbis-dev libvpx-dev libx264-dev libvlccore-dev libvlc-dev 2>&1 > /dev/null 
 install:
-  - git clone -b n2.8.1 --depth=1 git://source.ffmpeg.org/ffmpeg.git
+  - git clone -b n3.0 --depth=1 git://source.ffmpeg.org/ffmpeg.git
   - cd ffmpeg
   - ./configure --enable-shared --enable-swscale --enable-gpl  --enable-libx264 --enable-libvpx --enable-libvorbis --enable-libtheora 
   - make -j `grep processor /proc/cpuinfo|wc -l` 

distros/debian/control

@@ -3,41 +3,41 @@ Section: net
 Priority: optional
 Maintainer: Isaac Connor <iconnor@connortechnology.com>
 Build-Depends: debhelper (>= 9), autoconf, automake, quilt , libtool, dh-autoreconf
-,libgnutls-dev|libgnutls28-dev
+    ,libgnutls-dev|libgnutls28-dev
-,libmysqlclient-dev | libmariadbclient-dev, libdbd-mysql-perl
+    ,libmysqlclient-dev | libmariadbclient-dev, libdbd-mysql-perl
-,libjpeg8-dev|libjpeg9-dev|libjpeg62-turbo-dev
+    ,libjpeg8-dev|libjpeg9-dev|libjpeg62-turbo-dev
-,libpcre3-dev
+    ,libpcre3-dev
-,libavcodec-dev, libavformat-dev (>= 3:0.svn20090204), libswscale-dev (>= 3:0.svn20090204), libavutil-dev, libavdevice-dev
+    ,libavcodec-dev, libavformat-dev (>= 3:0.svn20090204), libswscale-dev (>= 3:0.svn20090204), libavutil-dev, libavdevice-dev
-,libv4l-dev (>= 0.8.3), libvlccore-dev, libvlc-dev
+    ,libv4l-dev (>= 0.8.3), libvlccore-dev, libvlc-dev
-,libbz2-dev
+    ,libbz2-dev
-,libsys-mmap-perl
+    ,libsys-mmap-perl
-,libnetpbm10-dev
+    ,libnetpbm10-dev
-,libcurl4-gnutls-dev | libcurl4-nss-dev | libcurl4-openssl-dev
+    ,libcurl4-gnutls-dev | libcurl4-nss-dev | libcurl4-openssl-dev
-,libgcrypt11-dev|libgcrypt20-dev, libpolkit-gobject-1-dev
+    ,libgcrypt11-dev|libgcrypt20-dev, libpolkit-gobject-1-dev
 Standards-Version: 3.9.4
 
 Package: zoneminder
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}, ${perl:Depends}
-, apache2, libapache2-mod-php5 | libapache2-mod-fcgid
+    , apache2, libapache2-mod-php5 | libapache2-mod-fcgid
-, php5, php5-mysql|php5-mysqlnd, libphp-serialization-perl
+    , php5, php5-mysql|php5-mysqlnd, libphp-serialization-perl
-, libdate-manip-perl, libmime-lite-perl, libmime-tools-perl
+    , libdate-manip-perl, libmime-lite-perl, libmime-tools-perl
-, mariadb-client|mysql-client
+    , mariadb-client|mysql-client
-, libwww-perl, libarchive-tar-perl, libarchive-zip-perl
+    , libwww-perl, libarchive-tar-perl, libarchive-zip-perl
-, libdevice-serialport-perl, libpcre3
+    , libdevice-serialport-perl, libpcre3
-, ffmpeg | libav-tools
+    , ffmpeg | libav-tools
-, rsyslog | system-log-daemon
+    , rsyslog | system-log-daemon
-, libmodule-load-perl, libsys-mmap-perl, libjson-any-perl
+    , libmodule-load-perl, libsys-mmap-perl, libjson-any-perl
-, netpbm
+    , netpbm
-, libavdevice53 | libavdevice55
+    , libavdevice53 | libavdevice55
-, libjpeg8|libjpeg9|libjpeg62-turbo
+    , libjpeg8|libjpeg9|libjpeg62-turbo
-, zip
+    , zip
-, libnet-sftp-foreign-perl, libio-pty-perl, libexpect-perl
+    , libnet-sftp-foreign-perl, libio-pty-perl, libexpect-perl
-, libvlccore5 | libvlccore7 | libvlccore8, libvlc5
+    , libvlccore5 | libvlccore7 | libvlccore8, libvlc5
-, libcurl4-gnutls-dev | libcurl4-nss-dev | libcurl4-openssl-dev
+    , libcurl4-gnutls-dev | libcurl4-nss-dev | libcurl4-openssl-dev
-, libpolkit-gobject-1-0, liburi-encode-perl, php5-gd
+    , libpolkit-gobject-1-0, liburi-encode-perl, php5-gd
-, libdata-dump-perl, libclass-std-fast-perl, libsoap-wsdl-perl, libio-socket-multicast-perl, libdigest-sha-perl
+    , libdata-dump-perl, libclass-std-fast-perl, libsoap-wsdl-perl, libio-socket-multicast-perl, libdigest-sha-perl
-, libsys-cpu-perl, libsys-meminfo-perl
+    , libsys-cpu-perl, libsys-meminfo-perl
 Recommends: mysql-server|mariadb-server
 Description: Video camera security and surveillance solution
  ZoneMinder is intended for use in single or multi-camera video security