svn commit: r473684 - in head/graphics/ufraw: . files
Rodrigo Osorio
rodrigo at FreeBSD.org
Sun Jul 1 21:42:51 UTC 2018
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: <w.schwarzenfeld at utanet.at>
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 at 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));
+ }
More information about the svn-ports-all
mailing list