From owner-svn-ports-head@freebsd.org Sun Jul 1 21:42:51 2018 Return-Path: Delivered-To: svn-ports-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id D07E2FDDB9F; Sun, 1 Jul 2018 21:42:50 +0000 (UTC) (envelope-from rodrigo@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 7D37F8003D; Sun, 1 Jul 2018 21:42:50 +0000 (UTC) (envelope-from rodrigo@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 mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 5E62724579; Sun, 1 Jul 2018 21:42:50 +0000 (UTC) (envelope-from rodrigo@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w61LgoCF037996; Sun, 1 Jul 2018 21:42:50 GMT (envelope-from rodrigo@FreeBSD.org) Received: (from rodrigo@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w61LgnG5037993; Sun, 1 Jul 2018 21:42:49 GMT (envelope-from rodrigo@FreeBSD.org) Message-Id: <201807012142.w61LgnG5037993@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: rodrigo set sender to rodrigo@FreeBSD.org using -f From: Rodrigo Osorio Date: Sun, 1 Jul 2018 21:42:49 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r473684 - in head/graphics/ufraw: . files X-SVN-Group: ports-head X-SVN-Commit-Author: rodrigo X-SVN-Commit-Paths: in head/graphics/ufraw: . files X-SVN-Commit-Revision: 473684 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.27 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: Sun, 01 Jul 2018 21:42:51 -0000 Author: rodrigo Date: Sun Jul 1 21:42:49 2018 New Revision: 473684 URL: https://svnweb.freebsd.org/changeset/ports/473684 Log: Fix graphics/ufraw build for 12.0 Fix code issues who causes build failures due to missing spaces between literal and identifier. Bump PORTREVISION. PR: 229271 Submitted by: Added: head/graphics/ufraw/files/patch-ufraw__developer.c (contents, props changed) Modified: head/graphics/ufraw/Makefile head/graphics/ufraw/files/patch-dcraw.cc Modified: head/graphics/ufraw/Makefile ============================================================================== --- head/graphics/ufraw/Makefile Sun Jul 1 21:22:35 2018 (r473683) +++ head/graphics/ufraw/Makefile Sun Jul 1 21:42:49 2018 (r473684) @@ -3,7 +3,7 @@ PORTNAME= ufraw PORTVERSION= 0.22 -PORTREVISION= 7 +PORTREVISION= 8 CATEGORIES= graphics MAINTAINER= rodrigo@FreeBSD.org Modified: head/graphics/ufraw/files/patch-dcraw.cc ============================================================================== --- head/graphics/ufraw/files/patch-dcraw.cc Sun Jul 1 21:22:35 2018 (r473683) +++ head/graphics/ufraw/files/patch-dcraw.cc Sun Jul 1 21:42:49 2018 (r473684) @@ -1,4 +1,4 @@ ---- dcraw.cc.orig 2018-04-03 22:16:35 UTC +--- dcraw.cc.orig 2018-06-23 21:54:05 UTC +++ dcraw.cc @@ -2287,7 +2287,7 @@ void CLASS quicktake_100_load_raw() @@ -21,3 +21,21 @@ if (!(pix & 1) && HOLE(pix / raw_width)) pix += 2; } maximum = 0xff; +@@ -8946,7 +8949,7 @@ void CLASS identify() + parse_fuji (get4()); + if (thumb_offset > 120) { + fseek (ifp, 120, SEEK_SET); +- is_raw += (i = get4()) && 1; ++ is_raw += (i = get4()) & 1; + if (is_raw == 2 && shot_select) + parse_fuji (i); + } +@@ -10192,7 +10195,7 @@ void CLASS tiff_head (struct tiff_hdr *t + strncpy (th->desc, desc, 512); + strncpy (th->make, make, 64); + strncpy (th->model, model, 64); +- strcpy (th->soft, "dcraw v"DCRAW_VERSION); ++ strcpy (th->soft, " dcraw v " DCRAW_VERSION); + t = localtime (×tamp); + sprintf (th->date, "%04d:%02d:%02d %02d:%02d:%02d", + t->tm_year+1900,t->tm_mon+1,t->tm_mday,t->tm_hour,t->tm_min,t->tm_sec); Added: head/graphics/ufraw/files/patch-ufraw__developer.c ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/graphics/ufraw/files/patch-ufraw__developer.c Sun Jul 1 21:42:49 2018 (r473684) @@ -0,0 +1,11 @@ +--- ufraw_developer.c.orig 2018-06-23 21:40:09 UTC ++++ ufraw_developer.c +@@ -387,7 +387,7 @@ static double findExpCoeff(double b) + else a = b; + bg = a / (1 - exp(-a)); + /* The limit on try is just to be sure there is no infinite loop. */ +- for (try = 0; abs(bg - b) > 0.001 || try < 100; try++) { ++ for (try = 0; fabs(bg - b) > 0.001 || try < 100; try++) { + a = a + (b - bg); + bg = a / (1 - exp(-a)); + }