From owner-svn-ports-all@FreeBSD.ORG Fri Jun 20 00:40:46 2014 Return-Path: Delivered-To: svn-ports-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 7C5E7FF6; Fri, 20 Jun 2014 00:40:46 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::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 4DDC92B7D; Fri, 20 Jun 2014 00:40:46 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s5K0ekoq051073; Fri, 20 Jun 2014 00:40:46 GMT (envelope-from danilo@svn.freebsd.org) Received: (from danilo@localhost) by svn.freebsd.org (8.14.8/8.14.8/Submit) id s5K0ei7C051066; Fri, 20 Jun 2014 00:40:44 GMT (envelope-from danilo@svn.freebsd.org) Message-Id: <201406200040.s5K0ei7C051066@svn.freebsd.org> From: Danilo Egea Gondolfo Date: Fri, 20 Jun 2014 00:40:44 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r358483 - in head/graphics/pfscalibration: . 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-all@freebsd.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 20 Jun 2014 00:40:46 -0000 Author: danilo Date: Fri Jun 20 00:40:44 2014 New Revision: 358483 URL: http://svnweb.freebsd.org/changeset/ports/358483 QAT: https://qat.redports.org/buildarchive/r358483/ Log: - Update from 1.3 to 1.4 - Add stage support - Convert LIB_DEPENDS to new syntax PR: ports/191183 Submitted by: ii@any.com.ru Added: head/graphics/pfscalibration/files/patch-configure (contents, props changed) head/graphics/pfscalibration/files/patch-src-responses.cpp (contents, props changed) Deleted: head/graphics/pfscalibration/files/patch-src-robertson02.cpp head/graphics/pfscalibration/files/patch-src-robertson02.h Modified: head/graphics/pfscalibration/Makefile head/graphics/pfscalibration/distinfo head/graphics/pfscalibration/files/patch-src-jpeg2hdrgen head/graphics/pfscalibration/files/patch-src-pfshdrcalibrate.cpp head/graphics/pfscalibration/pkg-plist Modified: head/graphics/pfscalibration/Makefile ============================================================================== --- head/graphics/pfscalibration/Makefile Fri Jun 20 00:29:42 2014 (r358482) +++ head/graphics/pfscalibration/Makefile Fri Jun 20 00:40:44 2014 (r358483) @@ -2,10 +2,10 @@ # $FreeBSD$ PORTNAME= pfscalibration -PORTVERSION= 1.3 -PORTREVISION= 4 +PORTVERSION= 1.4 CATEGORIES= graphics -MASTER_SITES= SF/pfstools/${PORTNAME}/${PORTVERSION} +MASTER_SITES= SF +MASTER_SITE_SUBDIR= pfstools/${PORTNAME}/${PORTVERSION} MAINTAINER= ii@any.com.ru COMMENT= Photometric calibration of cameras and recovery HDR images from the set of LDR exposures @@ -15,18 +15,16 @@ PFS_LDFLAGS= -L${LOCALBASE}/lib USES= gmake pkgconfig shebangfix perl5 GNU_CONFIGURE= yes -CPPFLAGS+= ${PFS_CPPFLAGS} -LDFLAGS+= ${PFS_LDFLAGS} +CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL} +CONFIGURE_ENV= CPPFLAGS="${PFS_CPPFLAGS}" \ + LDFLAGS="${PFS_LDFLAGS}" -LIB_DEPENDS= pfs-1.2:${PORTSDIR}/graphics/pfstools +USE_PERL5= run -MAN1= jpeg2hdrgen.1 \ - dcraw2hdrgen.1 \ - pfsinhdrgen.1 \ - pfshdrcalibrate.1 - -SHEBANG_FILES= src/dcraw2hdrgen src/jpeg2hdrgen +SHEBANG_FILES= src/dcraw2hdrgen src/jpeg2hdrgen src/pfsinhdrgen bash_CMD= ${SH} -NO_STAGE= yes +LIB_DEPENDS= libpfs-1.2.so:${PORTSDIR}/graphics/pfstools + .include + Modified: head/graphics/pfscalibration/distinfo ============================================================================== --- head/graphics/pfscalibration/distinfo Fri Jun 20 00:29:42 2014 (r358482) +++ head/graphics/pfscalibration/distinfo Fri Jun 20 00:40:44 2014 (r358483) @@ -1,2 +1,2 @@ -SHA256 (pfscalibration-1.3.tar.gz) = 4ced5e1ff45a9e3a02592b002c008c2c974b9d80762198e71e678e4c16e1b754 -SIZE (pfscalibration-1.3.tar.gz) = 306650 +SHA256 (pfscalibration-1.4.tar.gz) = 81982620c6dfd1d790e83f083e8740bfe1f34d25508054b931353d5de671db9e +SIZE (pfscalibration-1.4.tar.gz) = 338786 Added: head/graphics/pfscalibration/files/patch-configure ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/graphics/pfscalibration/files/patch-configure Fri Jun 20 00:40:44 2014 (r358483) @@ -0,0 +1,11 @@ +--- configure.orig 2008-08-21 22:57:21.000000000 +0000 ++++ configure 2014-06-18 15:27:53.728960364 +0000 +@@ -19337,7 +19337,7 @@ + + + +-CXXFLAGS="-O3 -funroll-loops -fstrength-reduce -fschedule-insns2 -felide-constructors -frerun-loop-opt -fexceptions -fno-strict-aliasing -fexpensive-optimizations -ffast-math -pipe" ++CXXFLAGS="-O3 -funroll-loops -fstrength-reduce -felide-constructors -fexceptions -fno-strict-aliasing -fexpensive-optimizations -ffast-math -pipe" + + + Modified: head/graphics/pfscalibration/files/patch-src-jpeg2hdrgen ============================================================================== --- head/graphics/pfscalibration/files/patch-src-jpeg2hdrgen Fri Jun 20 00:29:42 2014 (r358482) +++ head/graphics/pfscalibration/files/patch-src-jpeg2hdrgen Fri Jun 20 00:40:44 2014 (r358483) @@ -1,6 +1,6 @@ ---- src/jpeg2hdrgen.orig Wed Aug 23 07:25:58 2006 -+++ src/jpeg2hdrgen Thu Jun 21 14:34:33 2007 -@@ -28,18 +28,25 @@ +--- src/jpeg2hdrgen.orig 2006-08-22 18:34:04.000000000 +0000 ++++ src/jpeg2hdrgen 2014-06-18 15:27:14.288956550 +0000 +@@ -28,53 +28,105 @@ export LC_ALL @@ -11,86 +11,125 @@ - echo "Program 'jhead' is required to run this script." - echo "Install appropriate software, for example from:" - echo "http://www.sentex.net/~mwandel/jhead/" -+JHEAD='jhead' # program for extracting exif info from jpegs -+EXIF='exif' # another one -+EXIV2='exiv2' # and one more -+ -+CMD=`which ${JHEAD}` -+[ -n "${CMD}" ] || CMD=`which ${EXIF}` -+[ -n "${CMD}" ] || CMD=`which ${EXIV2}` -+if [ -z "${CMD}" ] -+then -+ cat </dev/null ++then ++ CMD="$(which ${JHEAD})" ++ AWK_PROGRAM="${AWK_PROGRAM_COMMON}${AWK_PROGRAM_JHEAD}" ++elif which ${EXIV2} >/dev/null ++then ++ CMD="$(which ${EXIV2}) -P nv pr" ++ AWK_PROGRAM="${AWK_PROGRAM_COMMON}${AWK_PROGRAM_EXIV2}" ++elif which ${EXIF} >/dev/null ++then ++ CMD="$(which ${EXIF})" ++ AWK_PROGRAM="${AWK_PROGRAM_COMMON}${AWK_PROGRAM_EXIF}" ++else ++ cat <createXYZChannels( Xj, Yj, Zj ); - -+ // !!! this currently does more bad than good, relevant command line -+ // option is disabled - if( opt_fillgaps ) - { - if( opt_luminance ) -@@ -453,42 +455,50 @@ - } - - // calibration -+ long sp = 0; // saturated pixels - switch( opt_calibration ) - { - case NONE: - if( opt_luminance ) - { - VERBOSE_STR << "applying response to Y channel..." << endl; -- robertson02_applyResponse( Yj, imgsY, Iy, w, M); -+ sp = robertson02_applyResponse( Yj, imgsY, Iy, w, M); - } - else - { - VERBOSE_STR << "applying response to R channel..." << endl; -- robertson02_applyResponse( Xj, imgsR, Ir, w, M); -+ sp = robertson02_applyResponse( Xj, imgsR, Ir, w, M); - VERBOSE_STR << "applying response to G channel..." << endl; -- robertson02_applyResponse( Yj, imgsG, Ig, w, M); -+ sp += robertson02_applyResponse( Yj, imgsG, Ig, w, M); - VERBOSE_STR << "applying response to B channel..." << endl; -- robertson02_applyResponse( Zj, imgsB, Ib, w, M); -+ sp += robertson02_applyResponse( Zj, imgsB, Ib, w, M); -+ sp /= 3; - } - break; - case ROBERTSON: - if( opt_luminance ) - { - VERBOSE_STR << "recovering Y channel..." << endl; -- robertson02_getResponse( Yj, imgsY, Iy, w, M); -+ sp = robertson02_getResponse( Yj, imgsY, Iy, w, M); - } - else - { - VERBOSE_STR << "recovering R channel..." << endl; -- robertson02_getResponse( Xj, imgsR, Ir, w, M); -+ sp = robertson02_getResponse( Xj, imgsR, Ir, w, M); - VERBOSE_STR << "recovering G channel..." << endl; -- robertson02_getResponse( Yj, imgsG, Ig, w, M); -+ sp += robertson02_getResponse( Yj, imgsG, Ig, w, M); - VERBOSE_STR << "recovering B channel..." << endl; -- robertson02_getResponse( Zj, imgsB, Ib, w, M); -+ sp += robertson02_getResponse( Zj, imgsB, Ib, w, M); -+ sp /= 3; - } - break; - case DEBEVEC: - break; -+ } -+ if( sp>0 ) -+ { -+ float perc = ceilf(100.0f*sp/size); -+ VERBOSE_STR << "saturated pixels found in " << perc << "% of the image!" << endl; - } - - // save response curve to a given file +@@ -192,7 +192,9 @@ + break; + case 'p': + mitsunaga_sample_no = (unsigned long)atoll(optarg); +- if( opt_bpp<10 || opt_bpp>=(1 << 31)) ++ if( mitsunaga_sample_no<10 ) ++ throw pfs::Exception("too few samples"); ++ if( mitsunaga_sample_no>=(1 << 31) ) + throw pfs::Exception("too many samples"); + break; + case 'A': // max response Added: head/graphics/pfscalibration/files/patch-src-responses.cpp ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/graphics/pfscalibration/files/patch-src-responses.cpp Fri Jun 20 00:40:44 2014 (r358483) @@ -0,0 +1,10 @@ +--- src/responses.cpp.orig 2006-09-13 14:27:06.000000000 +0000 ++++ src/responses.cpp 2014-06-18 15:27:14.298952630 +0000 +@@ -63,6 +63,7 @@ + { + float mid = Mmin + (Mmax-Mmin)/2.0f - 0.5f; + float mid2 = (mid-Mmin) * (mid-Mmin); ++ std::cerr << "Mmin: " << Mmin << "; mid: " << mid << "; Mmax: " << Mmax << "; M: " << M << "; sigma: " << sigma << std::endl; + for( int m=0 ; mMmax ) + w[m] = 0.0f; Modified: head/graphics/pfscalibration/pkg-plist ============================================================================== --- head/graphics/pfscalibration/pkg-plist Fri Jun 20 00:29:42 2014 (r358482) +++ head/graphics/pfscalibration/pkg-plist Fri Jun 20 00:40:44 2014 (r358483) @@ -1,4 +1,9 @@ -bin/pfshdrcalibrate -bin/jpeg2hdrgen bin/dcraw2hdrgen +bin/jpeg2hdrgen +bin/pfshdrcalibrate bin/pfsinhdrgen +bin/pfsmergehdr +man/man1/jpeg2hdrgen.1.gz +man/man1/dcraw2hdrgen.1.gz +man/man1/pfsinhdrgen.1.gz +man/man1/pfshdrcalibrate.1.gz