Merge branch 'master' of github.com:ZoneMinder/ZoneMinder

db/zm_create.sql.in

@@ -891,7 +891,7 @@ INSERT INTO MontageLayouts (`Name`,`Positions`) VALUES ('4 Wide', '{ "default":{
 INSERT INTO MontageLayouts (`Name`,`Positions`) VALUES ('5 Wide', '{ "default":{"float":"left", "width":"19%","left":"0px","right":"0px","top":"0px","bottom":"0px"} }' );
 
 -- We generally don't alter triggers, we drop and re-create them, so let's keep them in a separate file that we can just source in update scripts.
-source @ZM_PATH_DATA@/db/triggers.sql
+source @PKGDATADIR@/db/triggers.sql
 --
 -- Apply the initial configuration
 --

scripts/zmfilter.pl.in

@@ -646,8 +646,8 @@ sub substituteTags {
   $text =~ s/%MEM%/$Monitor->{MonthEvents}/g;
   $text =~ s/%MEA%/$Monitor->{ArchivedEvents}/g;
   $text =~ s/%MP%/$url?view=watch&mid=$Event->{MonitorId}/g;
-  $text =~ s/%MPS%/$url?view=watchfeed&mid=$Event->{MonitorId}&mode=stream/g;
+  $text =~ s/%MPS%/$url?view=watch&mid=$Event->{MonitorId}&mode=stream/g;
-  $text =~ s/%MPI%/$url?view=watchfeed&mid=$Event->{MonitorId}&mode=still/g;
+  $text =~ s/%MPI%/$url?view=watch&mid=$Event->{MonitorId}&mode=still/g;
   $text =~ s/%EP%/$url?view=event&mid=$Event->{MonitorId}&eid=$Event->{Id}/g;
   $text =~ s/%EPS%/$url?view=event&mode=stream&mid=$Event->{MonitorId}&eid=$Event->{Id}/g;
   $text =~ s/%EPI%/$url?view=event&mode=still&mid=$Event->{MonitorId}&eid=$Event->{Id}/g;

src/zm_eventstream.cpp

@@ -27,6 +27,7 @@
 #include <getopt.h>
 #include <arpa/inet.h>
 #include <glob.h>
+#include <cinttypes>
 
 #include "zm.h"
 #include "zm_db.h"

src/zm_ffmpeg.cpp

@@ -16,6 +16,7 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 */ 
+#include <cinttypes>
 
 #include "zm_ffmpeg.h"
 #include "zm_image.h"

src/zm_monitor.cpp

@@ -21,6 +21,7 @@
 #include <sys/stat.h>
 #include <arpa/inet.h>
 #include <glob.h>
+#include <cinttypes>
 
 #include "zm.h"
 #include "zm_db.h"

src/zm_videostore.cpp

@@ -20,7 +20,7 @@
 
 #define __STDC_FORMAT_MACROS 1
 
-#include <inttypes.h>
+#include <cinttypes>
 #include <stdlib.h>
 #include <string.h>
 

src/zms.cpp

@@ -19,6 +19,7 @@
 
 #include <sys/ipc.h>
 #include <sys/msg.h>
+#include <cinttypes>
 
 #include "zm.h"
 #include "zm_db.h"

src/zmu.cpp

@@ -87,6 +87,7 @@ Options for use with monitors:
 */
 
 #include <getopt.h>
+#include <cinttypes>
 
 #include "zm.h"
 #include "zm_db.h"

utils/packpack/startpackpack.sh

@@ -105,10 +105,11 @@ commonprep () {
     fi
 
     # fix 32bit rpm builds
-    patch --dry-run --silent -f -p1 < utils/packpack/setarch.patch
+    # FIXME: breaks arm rpm builds
-    if [ $? -eq 0 ]; then
+    #patch --dry-run --silent -f -p1 < utils/packpack/setarch.patch
-        patch -p1 < utils/packpack/setarch.patch
+    #if [ $? -eq 0 ]; then
-    fi
+    #    patch -p1 < utils/packpack/setarch.patch
+    #fi
 
     # The rpm specfile requires we download each submodule as a tarball then manually move it into place
     # Might as well do this for Debian as well, rather than git submodule init