From owner-svn-ports-all@freebsd.org Sat Jan 6 02:16:25 2018 Return-Path: Delivered-To: svn-ports-all@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 89497EB121D; Sat, 6 Jan 2018 02:16:25 +0000 (UTC) (envelope-from jbeich@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 60F496CBBE; Sat, 6 Jan 2018 02:16:25 +0000 (UTC) (envelope-from jbeich@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 933D19215; Sat, 6 Jan 2018 02:16:24 +0000 (UTC) (envelope-from jbeich@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w062GOdK016424; Sat, 6 Jan 2018 02:16:24 GMT (envelope-from jbeich@FreeBSD.org) Received: (from jbeich@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w062GOIh016423; Sat, 6 Jan 2018 02:16:24 GMT (envelope-from jbeich@FreeBSD.org) Message-Id: <201801060216.w062GOIh016423@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: jbeich set sender to jbeich@FreeBSD.org using -f From: Jan Beich Date: Sat, 6 Jan 2018 02:16:24 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r458188 - branches/2018Q1/graphics/freeimage/files X-SVN-Group: ports-branches X-SVN-Commit-Author: jbeich X-SVN-Commit-Paths: branches/2018Q1/graphics/freeimage/files X-SVN-Commit-Revision: 458188 X-SVN-Commit-Repository: ports 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.25 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: Sat, 06 Jan 2018 02:16:25 -0000 Author: jbeich Date: Sat Jan 6 02:16:24 2018 New Revision: 458188 URL: https://svnweb.freebsd.org/changeset/ports/458188 Log: MFH: r458187 graphics/freeimage: unbreak build with Clang 6 (C++14 by default) Source/LibRawLite/./internal/dcraw_common.cpp:3786:19: error: constant expression evaluates to 128 which cannot be narrowed to type 'signed char' [-Wc++11-narrowing] -1,-2,-1,+0,0,0x80, -1,-2,+0,-1,0,0x01, -1,-2,+1,-1,0,0x01, ^~~~ Source/LibRawLite/./internal/dcraw_common.cpp:3786:19: note: insert an explicit cast to silence this issue -1,-2,-1,+0,0,0x80, -1,-2,+0,-1,0,0x01, -1,-2,+1,-1,0,0x01, ^~~~ static_cast( ) Source/LibRawLite/./internal/dcraw_common.cpp:3787:39: error: constant expression evaluates to 136 which cannot be narrowed to type 'signed char' [-Wc++11-narrowing] -1,-2,+1,+0,1,0x01, -1,-1,-1,+1,0,0x88, -1,-1,+1,-2,0,0x40, ^~~~ Source/LibRawLite/./internal/dcraw_common.cpp:3787:39: note: insert an explicit cast to silence this issue -1,-2,+1,+0,1,0x01, -1,-1,-1,+1,0,0x88, -1,-1,+1,-2,0,0x40, ^~~~ static_cast( ) Source/LibRawLite/./internal/dcraw_common.cpp:3794:19: error: constant expression evaluates to 128 which cannot be narrowed to type 'signed char' [-Wc++11-narrowing] +0,-2,+0,+0,1,0x80, +0,-1,+0,+1,1,0x88, +0,-1,+1,-2,0,0x40, ^~~~ Source/LibRawLite/./internal/dcraw_common.cpp:3794:19: note: insert an explicit cast to silence this issue +0,-2,+0,+0,1,0x80, +0,-1,+0,+1,1,0x88, +0,-1,+1,-2,0,0x40, ^~~~ static_cast( ) Source/LibRawLite/./internal/dcraw_common.cpp:3794:39: error: constant expression evaluates to 136 which cannot be narrowed to type 'signed char' [-Wc++11-narrowing] +0,-2,+0,+0,1,0x80, +0,-1,+0,+1,1,0x88, +0,-1,+1,-2,0,0x40, ^~~~ Source/LibRawLite/./internal/dcraw_common.cpp:3794:39: note: insert an explicit cast to silence this issue +0,-2,+0,+0,1,0x80, +0,-1,+0,+1,1,0x88, +0,-1,+1,-2,0,0x40, ^~~~ static_cast( ) Source/LibRawLite/./internal/dcraw_common.cpp:3800:59: error: constant expression evaluates to 128 which cannot be narrowed to type 'signed char' [-Wc++11-narrowing] +0,+1,+2,+1,0,0x20, +0,+1,+2,+2,0,0x10, +1,-2,+1,+0,0,0x80, ^~~~ Source/LibRawLite/./internal/dcraw_common.cpp:3800:59: note: insert an explicit cast to silence this issue +0,+1,+2,+1,0,0x20, +0,+1,+2,+2,0,0x10, +1,-2,+1,+0,0,0x80, ^~~~ static_cast( ) Source/LibRawLite/./internal/dcraw_common.cpp:3801:19: error: constant expression evaluates to 136 which cannot be narrowed to type 'signed char' [-Wc++11-narrowing] +1,-1,+1,+1,0,0x88, +1,+0,+1,+2,0,0x08, +1,+0,+2,-1,0,0x40, ^~~~ Source/LibRawLite/./internal/dcraw_common.cpp:3801:19: note: insert an explicit cast to silence this issue +1,-1,+1,+1,0,0x88, +1,+0,+1,+2,0,0x08, +1,+0,+2,-1,0,0x40, ^~~~ static_cast( ) Source/LibRawLite/./internal/dcraw_common.cpp:7384:23: error: constant expression evaluates to 65535 which cannot be narrowed to type 'short' [-Wc++11-narrowing] { "Red One", 704, 0xffff, /* DJC */ ^~~~~~ Source/LibRawLite/./internal/dcraw_common.cpp:7384:23: note: insert an explicit cast to silence this issue { "Red One", 704, 0xffff, /* DJC */ ^~~~~~ static_cast( ) Source/LibRawLite/./internal/dcraw_common.cpp:7943:30: warning: use of logical '&&' with constant operand [-Wconstant-logical-operand] is_raw += (i = get4()) && 1; ^ ~ Source/LibRawLite/./internal/dcraw_common.cpp:7943:30: note: use '&' for a bitwise operation is_raw += (i = get4()) && 1; ^~ & Source/LibRawLite/./internal/dcraw_common.cpp:7943:30: note: remove constant to silence this warning is_raw += (i = get4()) && 1; ~^~~~ Source/LibRawLite/./internal/dcraw_common.cpp:9239:30: error: invalid suffix on literal; C++11 requires a space between literal and identifier [-Wreserved-user-defined-literal] strcpy (th->soft, "dcraw v"DCRAW_VERSION); ^ Reported by: antoine (via bug 224669) Obtained from: upstream (LibRaw 0.17.0) Approved by: ports-secteam blanket Added: branches/2018Q1/graphics/freeimage/files/patch-Source_LibRawLite_internal_dcraw__common.cpp - copied unchanged from r458187, head/graphics/freeimage/files/patch-Source_LibRawLite_internal_dcraw__common.cpp Modified: Directory Properties: branches/2018Q1/ (props changed) Copied: branches/2018Q1/graphics/freeimage/files/patch-Source_LibRawLite_internal_dcraw__common.cpp (from r458187, head/graphics/freeimage/files/patch-Source_LibRawLite_internal_dcraw__common.cpp) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2018Q1/graphics/freeimage/files/patch-Source_LibRawLite_internal_dcraw__common.cpp Sat Jan 6 02:16:24 2018 (r458188, copy of r458187, head/graphics/freeimage/files/patch-Source_LibRawLite_internal_dcraw__common.cpp) @@ -0,0 +1,50 @@ +https://github.com/LibRaw/LibRaw/commit/2cef10389486 + +--- Source/LibRawLite/internal/dcraw_common.cpp.orig 2014-02-07 19:48:10 UTC ++++ Source/LibRawLite/internal/dcraw_common.cpp +@@ -3782,22 +3782,22 @@ void CLASS vng_interpolate() + -2,+0,+0,-1,0,0x06, -2,+0,+0,+0,1,0x02, -2,+0,+0,+1,0,0x03, + -2,+1,-1,+0,0,0x04, -2,+1,+0,-1,1,0x04, -2,+1,+0,+0,0,0x06, + -2,+1,+0,+1,0,0x02, -2,+2,+0,+0,1,0x04, -2,+2,+0,+1,0,0x04, +- -1,-2,-1,+0,0,0x80, -1,-2,+0,-1,0,0x01, -1,-2,+1,-1,0,0x01, +- -1,-2,+1,+0,1,0x01, -1,-1,-1,+1,0,0x88, -1,-1,+1,-2,0,0x40, ++ -1,-2,-1,+0,0,-128, -1,-2,+0,-1,0,0x01, -1,-2,+1,-1,0,0x01, ++ -1,-2,+1,+0,1,0x01, -1,-1,-1,+1,0,-120, -1,-1,+1,-2,0,0x40, + -1,-1,+1,-1,0,0x22, -1,-1,+1,+0,0,0x33, -1,-1,+1,+1,1,0x11, + -1,+0,-1,+2,0,0x08, -1,+0,+0,-1,0,0x44, -1,+0,+0,+1,0,0x11, + -1,+0,+1,-2,1,0x40, -1,+0,+1,-1,0,0x66, -1,+0,+1,+0,1,0x22, + -1,+0,+1,+1,0,0x33, -1,+0,+1,+2,1,0x10, -1,+1,+1,-1,1,0x44, + -1,+1,+1,+0,0,0x66, -1,+1,+1,+1,0,0x22, -1,+1,+1,+2,0,0x10, + -1,+2,+0,+1,0,0x04, -1,+2,+1,+0,1,0x04, -1,+2,+1,+1,0,0x04, +- +0,-2,+0,+0,1,0x80, +0,-1,+0,+1,1,0x88, +0,-1,+1,-2,0,0x40, ++ +0,-2,+0,+0,1,-128, +0,-1,+0,+1,1,-120, +0,-1,+1,-2,0,0x40, + +0,-1,+1,+0,0,0x11, +0,-1,+2,-2,0,0x40, +0,-1,+2,-1,0,0x20, + +0,-1,+2,+0,0,0x30, +0,-1,+2,+1,1,0x10, +0,+0,+0,+2,1,0x08, + +0,+0,+2,-2,1,0x40, +0,+0,+2,-1,0,0x60, +0,+0,+2,+0,1,0x20, + +0,+0,+2,+1,0,0x30, +0,+0,+2,+2,1,0x10, +0,+1,+1,+0,0,0x44, + +0,+1,+1,+2,0,0x10, +0,+1,+2,-1,1,0x40, +0,+1,+2,+0,0,0x60, +- +0,+1,+2,+1,0,0x20, +0,+1,+2,+2,0,0x10, +1,-2,+1,+0,0,0x80, +- +1,-1,+1,+1,0,0x88, +1,+0,+1,+2,0,0x08, +1,+0,+2,-1,0,0x40, ++ +0,+1,+2,+1,0,0x20, +0,+1,+2,+2,0,0x10, +1,-2,+1,+0,0,-128, ++ +1,-1,+1,+1,0,-120, +1,+0,+1,+2,0,0x08, +1,+0,+2,-1,0,0x40, + +1,+0,+2,+1,0,0x10 + }, chood[] = { -1,-1, -1,0, -1,+1, 0,+1, +1,+1, +1,0, +1,-1, 0,-1 }; + ushort (*brow[5])[4], *pix; +@@ -7380,7 +7380,7 @@ void CLASS adobe_coeff (const char *t_make, const char + { 8035,435,-962,-6001,13872,2320,-1159,3065,5434 } }, + { "Phase One P65", 0, 0, + { 8035,435,-962,-6001,13872,2320,-1159,3065,5434 } }, +- { "Red One", 704, 0xffff, /* DJC */ ++ { "Red One", 704, -1, /* DJC */ + { 21014,-7891,-2613,-3056,12201,856,-2203,5125,8042 } }, + { "Samsung EK-GN120", 0, 0, /* Adobe; Galaxy NX */ + { 7557,-2522,-739,-4679,12949,1894,-840,1777,5311 } }, +@@ -9235,7 +9235,7 @@ void CLASS tiff_head (struct tiff_hdr *th, int full) + strncpy (th->t_desc, desc, 512); + strncpy (th->t_make, make, 64); + strncpy (th->t_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);