Date: Mon, 20 Jun 2016 08:06:46 +0000 (UTC) From: Olivier Cochard <olivier@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r417142 - in head/multimedia/zoneminder: . files Message-ID: <201606200806.u5K86k7S011067@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: olivier Date: Mon Jun 20 08:06:46 2016 New Revision: 417142 URL: https://svnweb.freebsd.org/changeset/ports/417142 Log: Fix multimedia/zoneminder build on 9.3-i386 and head-amd64 PR: 210261 Submitted by: bsd@abinet.ru Approved by: jadawin Differential Revision: https://reviews.freebsd.org/D6854 Added: head/multimedia/zoneminder/files/patch-src_zm__image.cpp (contents, props changed) Modified: head/multimedia/zoneminder/Makefile Modified: head/multimedia/zoneminder/Makefile ============================================================================== --- head/multimedia/zoneminder/Makefile Mon Jun 20 06:29:43 2016 (r417141) +++ head/multimedia/zoneminder/Makefile Mon Jun 20 08:06:46 2016 (r417142) @@ -41,6 +41,8 @@ USE_RC_SUBR= zoneminder PHP= json pdo_mysql session IGNORE_WITH_PHP=70 +ONLY_FOR_ARCHS= amd64 i386 + OPTIONS_DEFINE= NLS V4L DOCS OPTIONS_SUB= yes NLS_USES= gettext @@ -76,6 +78,10 @@ CMAKE_ARGS+= -DZM_PERL_MM_PARMS=INSTALLD -DHAVE_SENDFILE=0 \ -DCMAKE_REQUIRED_INCLUDES:STRING="${LOCALBASE}/include" +.if ${OSVERSION} < 1000000 && ${ARCH} == i386 +CFLAGS+= -msse +.endif + PKGMESSAGE= ${WRKDIR}/pkg-message post-extract: Added: head/multimedia/zoneminder/files/patch-src_zm__image.cpp ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/multimedia/zoneminder/files/patch-src_zm__image.cpp Mon Jun 20 08:06:46 2016 (r417142) @@ -0,0 +1,18 @@ +--- src/zm_image.cpp.orig 2016-06-01 00:41:17 UTC ++++ src/zm_image.cpp +@@ -1619,12 +1619,9 @@ Image *Image::Highlight( unsigned int n_ + for ( unsigned int j = 0; j < n_images; j++ ) + { + uint8_t *psrc = images[j]->buffer+c; +- +-#ifndef SOLARIS +- if ( (unsigned)abs((*psrc)-RGB_VAL(ref_colour,c)) >= RGB_VAL(threshold,c) ) +-#else +- if ( (unsigned)std::abs((*psrc)-RGB_VAL(ref_colour,c)) >= RGB_VAL(threshold,c) ) +-#endif ++ unsigned int diff = ((*psrc)-RGB_VAL(ref_colour,c)) > 0 ? (*psrc)-RGB_VAL(ref_colour,c) : RGB_VAL(ref_colour,c) - (*psrc); ++ ++ if (diff >= RGB_VAL(threshold,c)) + { + count++; + }
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201606200806.u5K86k7S011067>