From owner-svn-ports-head@freebsd.org Fri Jul 14 01:45:44 2017 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 716A0DB2A02; Fri, 14 Jul 2017 01:45:44 +0000 (UTC) (envelope-from ultima@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 4ADBE70938; Fri, 14 Jul 2017 01:45:44 +0000 (UTC) (envelope-from ultima@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v6E1jh95093091; Fri, 14 Jul 2017 01:45:43 GMT (envelope-from ultima@FreeBSD.org) Received: (from ultima@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v6E1jhpf093086; Fri, 14 Jul 2017 01:45:43 GMT (envelope-from ultima@FreeBSD.org) Message-Id: <201707140145.v6E1jhpf093086@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: ultima set sender to ultima@FreeBSD.org using -f From: Richard Gallamore Date: Fri, 14 Jul 2017 01:45:43 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r445722 - in head/graphics/pfstools: . files X-SVN-Group: ports-head X-SVN-Commit-Author: ultima X-SVN-Commit-Paths: in head/graphics/pfstools: . files X-SVN-Commit-Revision: 445722 X-SVN-Commit-Repository: ports 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.23 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: Fri, 14 Jul 2017 01:45:44 -0000 Author: ultima Date: Fri Jul 14 01:45:43 2017 New Revision: 445722 URL: https://svnweb.freebsd.org/changeset/ports/445722 Log: * Fix qt option build * Changed OCTAVE USES to option helper PR: 220247 Submitted by: Iouri V. Ivliev (maintainer) Reported by: Jov Reviewed by: lifanov (mentor), matthew (mentor), matt Approved by: lifanov (mentor) Differential Revision: https://reviews.freebsd.org/D11495 Modified: head/graphics/pfstools/Makefile head/graphics/pfstools/files/patch-src-filter-pfswb.cpp head/graphics/pfstools/files/patch-src-pfs-pfs.h Modified: head/graphics/pfstools/Makefile ============================================================================== --- head/graphics/pfstools/Makefile Fri Jul 14 00:21:29 2017 (r445721) +++ head/graphics/pfstools/Makefile Fri Jul 14 01:45:43 2017 (r445722) @@ -3,7 +3,7 @@ PORTNAME= pfstools PORTVERSION= 1.8.5 -PORTREVISION= 4 +PORTREVISION= 5 CATEGORIES= graphics MASTER_SITES= SF @@ -60,6 +60,7 @@ OCTAVE_CONFIGURE_ENABLE= octave OCTAVE_PATCH_DEPENDS= octave-config:math/octave OCTAVE_BUILD_DEPENDS= mkoctfile:math/octave OCTAVE_RUN_DEPENDS= octave:math/octave +OCTAVE_USES= shebangfix .include @@ -72,7 +73,6 @@ PLIST_SUB+= \ OCTAVE_BASE=${OCTAVE_BASE} \ OCTAVE_SITE_M=${OCTAVE_SITE_M:S|^${OCTAVE_BASE}/||} \ OCTAVE_SITE_OCT=${OCTAVE_SITE_OCT:S|^${OCTAVE_BASE}/||} -USES+= shebangfix SHEBANG_FILES= src/octave/* SHEBANG_LANG+= octave octave_OLD_CMD?=/usr/bin/octave Modified: head/graphics/pfstools/files/patch-src-filter-pfswb.cpp ============================================================================== --- head/graphics/pfstools/files/patch-src-filter-pfswb.cpp Fri Jul 14 00:21:29 2017 (r445721) +++ head/graphics/pfstools/files/patch-src-filter-pfswb.cpp Fri Jul 14 01:45:43 2017 (r445722) @@ -1,6 +1,6 @@ ---- src/filter/pfswb.cpp.orig 2016-02-12 17:10:27 UTC +--- src/filter/pfswb.cpp.orig 2016-08-12 19:10:44 UTC +++ src/filter/pfswb.cpp -@@ -0,0 +1,297 @@ +@@ -0,0 +1,299 @@ +/** + * @file pfswb.cpp + * @brief Adjust white balance in RGB color space @@ -184,10 +184,12 @@ + float nmin = 1e20, nmax = -1e20; + for (int i=s; i--; ) + { -+ float const &l = ((*Y)(i)-amin)*k+min; ++ float const l = ((*Y)(i)-amin)*k+min; + if (nmin > l) nmin = l; + if (nmax < l) nmax = l; + (*Y)(i) = l; ++ (*X)(i) *= k; ++ (*Z)(i) *= k; + } + VERBOSE_STR << "restored luminance range: " << nmin << ":" << nmax << std::endl; + } Modified: head/graphics/pfstools/files/patch-src-pfs-pfs.h ============================================================================== --- head/graphics/pfstools/files/patch-src-pfs-pfs.h Fri Jul 14 00:21:29 2017 (r445721) +++ head/graphics/pfstools/files/patch-src-pfs-pfs.h Fri Jul 14 01:45:43 2017 (r445722) @@ -43,3 +43,12 @@ } ~Exception() {}; +@@ -590,7 +596,7 @@ namespace pfs + * + * @return text description of the cause for the exception + */ +- const char* getMessage() ++ const char* getMessage() const + { + return msg; + }