From owner-svn-ports-head@freebsd.org Mon Jun 20 08:06:47 2016 Return-Path: Delivered-To: svn-ports-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id EF594A7B466; Mon, 20 Jun 2016 08:06:47 +0000 (UTC) (envelope-from olivier@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id A5DCC25A1; Mon, 20 Jun 2016 08:06:47 +0000 (UTC) (envelope-from olivier@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u5K86kgL011069; Mon, 20 Jun 2016 08:06:46 GMT (envelope-from olivier@FreeBSD.org) Received: (from olivier@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id u5K86k7S011067; Mon, 20 Jun 2016 08:06:46 GMT (envelope-from olivier@FreeBSD.org) Message-Id: <201606200806.u5K86k7S011067@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: olivier set sender to olivier@FreeBSD.org using -f From: Olivier Cochard Date: Mon, 20 Jun 2016 08:06:46 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r417142 - in head/multimedia/zoneminder: . files X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.22 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 20 Jun 2016 08:06:48 -0000 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++; + }