commit aa3b9825932826acdcbb339348755a15c13d471e
Author: Jan Rękorajski <bagg...@pld-linux.org>
Date: Sat Mar 10 23:15:40 2018 +0100
- more c++ related build fixes
- rel 5
zoneminder-build.patch | 19 +++++++++++++++++++
zoneminder.spec | 2 +-
2 files changed, 20 insertions(+), 1 deletion(-)
---
diff --git a/zoneminder.spec b/zoneminder.spec
index 88ea992..014105a 100644
--- a/zoneminder.spec
+++ b/zoneminder.spec
@@ -9,7 +9,7 @@ Summary: Zone Minder is a software motion detector with
nice WWW GUI
Summary(pl.UTF-8): Zone Minder - programowy wykrywacz ruchu z miłym GUI
przez WWW
Name: zoneminder
Version: 1.28.0
-Release: 4
+Release: 5
License: GPL v2
Group: Applications/Graphics
Source0:
https://github.com/ZoneMinder/ZoneMinder/archive/v%{version}.tar.gz
diff --git a/zoneminder-build.patch b/zoneminder-build.patch
index 1aca604..0ca428a 100644
--- a/zoneminder-build.patch
+++ b/zoneminder-build.patch
@@ -1,3 +1,13 @@
+--- ZoneMinder-1.28.0/src/zm_comms.h 2014-10-18 22:23:13.000000000 +0200
++++ ZoneMinder-1.28.0-cxx/src/zm_comms.h 2018-03-10 23:09:25.399824067
+0100
+@@ -26,6 +26,7 @@
+ #include <netdb.h>
+ #include <errno.h>
+ #include <sys/un.h>
++#include <sys/uio.h>
+
+ #include <set>
+ #include <vector>
--- ZoneMinder-1.24.2/src/zm_utils.cpp.org 2009-07-12 19:45:34.387460575
+0200
+++ ZoneMinder-1.24.2/src/zm_utils.cpp 2009-07-12 19:46:00.454902859 +0200
@@ -21,6 +21,7 @@
@@ -21,6 +31,15 @@
{
--- ZoneMinder-1.28.0/src/zm_image.cpp.orig 2014-10-18 22:23:13.000000000
+0200
+++ ZoneMinder-1.28.0/src/zm_image.cpp 2017-04-14 18:25:49.847052104 +0200
+@@ -1562,7 +1562,7 @@
+ {
+ uint8_t *psrc = images[j]->buffer+c;
+
+- if (
(unsigned)abs((*psrc)-RGB_VAL(ref_colour,c)) >= RGB_VAL(threshold,c) )
++ if (
(unsigned)std::abs((int)(*psrc)-(int)RGB_VAL(ref_colour,c)) >=
RGB_VAL(threshold,c) )
+ {
+ count++;
+ }
@@ -1668,7 +1668,7 @@ const Coord Image::centreCoord( const ch
line = text+index;
line_no++;
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/zoneminder.git/commitdiff/aa3b9825932826acdcbb339348755a15c13d471e
_______________________________________________
pld-cvs-commit mailing list
pld-cvs-commit@lists.pld-linux.org
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
