Received: by mail.netbsd.org (Postfix, from userid 605) id 88E6A84DD3; Sun, 29 Mar 2020 01:06:12 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by mail.netbsd.org (Postfix) with ESMTP id 134C484DCB for ; Sun, 29 Mar 2020 01:06:12 +0000 (UTC) X-Virus-Scanned: amavisd-new at netbsd.org Received: from mail.netbsd.org ([IPv6:::1]) by localhost (mail.netbsd.org [IPv6:::1]) (amavisd-new, port 10025) with ESMTP id jwBVNu7-cDtz for ; Sun, 29 Mar 2020 01:06:11 +0000 (UTC) Received: from cvs.NetBSD.org (ivanova.NetBSD.org [IPv6:2001:470:a085:999:28c:faff:fe03:5984]) by mail.netbsd.org (Postfix) with ESMTP id 8357F84D3C for ; Sun, 29 Mar 2020 01:06:11 +0000 (UTC) Received: by cvs.NetBSD.org (Postfix, from userid 500) id 7ADB5FB27; Sun, 29 Mar 2020 01:06:11 +0000 (UTC) Content-Transfer-Encoding: 7bit Content-Type: multipart/mixed; boundary="_----------=_158544397120120" MIME-Version: 1.0 Date: Sun, 29 Mar 2020 01:06:11 +0000 From: "Joerg Sonnenberger" Subject: CVS commit: pkgsrc/security/zoneminder To: pkgsrc-changes@NetBSD.org Reply-To: joerg@netbsd.org X-Mailer: log_accum Message-Id: <20200329010611.7ADB5FB27@cvs.NetBSD.org> Sender: pkgsrc-changes-owner@NetBSD.org List-Id: pkgsrc-changes.NetBSD.org Precedence: bulk List-Unsubscribe: This is a multi-part message in MIME format. --_----------=_158544397120120 Content-Disposition: inline Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII" Module Name: pkgsrc Committed By: joerg Date: Sun Mar 29 01:06:11 UTC 2020 Modified Files: pkgsrc/security/zoneminder: Makefile distinfo Added Files: pkgsrc/security/zoneminder/patches: patch-src_zm__image.cpp Log Message: Fix conflict with . Resolve argument type of std::abs. To generate a diff of this commit: cvs rdiff -u -r1.47 -r1.48 pkgsrc/security/zoneminder/Makefile cvs rdiff -u -r1.13 -r1.14 pkgsrc/security/zoneminder/distinfo cvs rdiff -u -r0 -r1.1 \ pkgsrc/security/zoneminder/patches/patch-src_zm__image.cpp Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. --_----------=_158544397120120 Content-Disposition: inline Content-Length: 2691 Content-Transfer-Encoding: binary Content-Type: text/x-diff; charset=us-ascii Modified files: Index: pkgsrc/security/zoneminder/Makefile diff -u pkgsrc/security/zoneminder/Makefile:1.47 pkgsrc/security/zoneminder/Makefile:1.48 --- pkgsrc/security/zoneminder/Makefile:1.47 Sat Jan 18 21:50:50 2020 +++ pkgsrc/security/zoneminder/Makefile Sun Mar 29 01:06:11 2020 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.47 2020/01/18 21:50:50 jperkin Exp $ +# $NetBSD: Makefile,v 1.48 2020/03/29 01:06:11 joerg Exp $ # See wip/zoneminder for a draft update to 1.29.0. PKGNAME= ${DISTNAME:S/ZoneMinder-/zoneminder-/} @@ -218,6 +218,7 @@ LIBS+= -lexecinfo post-extract: ${CP} ${FILESDIR}/zoneminder.conf ${WRKSRC}/zoneminder.conf + ${RM} ${WRKSRC}/version pre-configure: set -e; cd ${WRKSRC}; \ Index: pkgsrc/security/zoneminder/distinfo diff -u pkgsrc/security/zoneminder/distinfo:1.13 pkgsrc/security/zoneminder/distinfo:1.14 --- pkgsrc/security/zoneminder/distinfo:1.13 Thu Dec 19 22:23:19 2019 +++ pkgsrc/security/zoneminder/distinfo Sun Mar 29 01:06:11 2020 @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.13 2019/12/19 22:23:19 joerg Exp $ +$NetBSD: distinfo,v 1.14 2020/03/29 01:06:11 joerg Exp $ SHA1 (ZoneMinder-1.28.1.tar.gz) = 3e173ae1aac529b60d79a5fc668c107f0679d0a2 RMD160 (ZoneMinder-1.28.1.tar.gz) = b3cc305656cb5b73d4ac0e21fe937c237467cdd1 @@ -10,6 +10,7 @@ SHA1 (patch-scripts_ZoneMinder_lib_ZoneM SHA1 (patch-scripts_zm_in) = 8f59085bb9293afa7aeb268000c75988e5371c66 SHA1 (patch-src_Makefile_am) = 0f6571c9d5a3e688544f93d687d266e1b71f0f43 SHA1 (patch-src_zm__event.cpp) = 5258e89486b1152f0ddcac9b0a6fd68b70f24256 +SHA1 (patch-src_zm__image.cpp) = 0cb4f56bdf2f4fb99ec673b5a4f81589a7bdfdb0 SHA1 (patch-src_zm__monitor.cpp) = dcc3816686a6a7c375d4716d3663b4c922c90439 SHA1 (patch-src_zm__rtp__source.cpp) = 5341938eefe5def49dc8f3e3b760d86cabd17772 SHA1 (patch-src_zm__sdp.cpp) = ed89bc14ae557281bb43baca9c90b78d801d8eb1 Added files: Index: pkgsrc/security/zoneminder/patches/patch-src_zm__image.cpp diff -u /dev/null pkgsrc/security/zoneminder/patches/patch-src_zm__image.cpp:1.1 --- /dev/null Sun Mar 29 01:06:11 2020 +++ pkgsrc/security/zoneminder/patches/patch-src_zm__image.cpp Sun Mar 29 01:06:11 2020 @@ -0,0 +1,15 @@ +$NetBSD: patch-src_zm__image.cpp,v 1.1 2020/03/29 01:06:11 joerg Exp $ + +std::abs works better with a signed argument. + +--- src/zm_image.cpp.orig 2020-03-28 21:54:25.650909348 +0000 ++++ src/zm_image.cpp +@@ -1580,7 +1580,7 @@ Image *Image::Highlight( unsigned int n_ + { + uint8_t *psrc = images[j]->buffer+c; + +- if ( (unsigned)abs((*psrc)-RGB_VAL(ref_colour,c)) >= RGB_VAL(threshold,c) ) ++ if ( (unsigned)abs(int(*psrc)-int(RGB_VAL(ref_colour,c))) >= RGB_VAL(threshold,c) ) + { + count++; + } --_----------=_158544397120120--