From owner-svn-ports-all@freebsd.org Tue Mar 17 22:19:15 2020 Return-Path: Delivered-To: svn-ports-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id C7148274065; Tue, 17 Mar 2020 22:19:15 +0000 (UTC) (envelope-from mi@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 48hndb3FxVz4MVY; Tue, 17 Mar 2020 22:19:15 +0000 (UTC) (envelope-from mi@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 53AB5181F0; Tue, 17 Mar 2020 22:19:15 +0000 (UTC) (envelope-from mi@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 02HMJFHB080322; Tue, 17 Mar 2020 22:19:15 GMT (envelope-from mi@FreeBSD.org) Received: (from mi@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 02HMJEww080320; Tue, 17 Mar 2020 22:19:14 GMT (envelope-from mi@FreeBSD.org) Message-Id: <202003172219.02HMJEww080320@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: mi set sender to mi@FreeBSD.org using -f From: Mikhail Teterin Date: Tue, 17 Mar 2020 22:19:14 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r528605 - head/graphics/libfpx/files X-SVN-Group: ports-head X-SVN-Commit-Author: mi X-SVN-Commit-Paths: head/graphics/libfpx/files X-SVN-Commit-Revision: 528605 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.29 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: Tue, 17 Mar 2020 22:19:15 -0000 Author: mi Date: Tue Mar 17 22:19:14 2020 New Revision: 528605 URL: https://svnweb.freebsd.org/changeset/ports/528605 Log: Unbreak the port for users of -Werror -- the code stopped qualifying for WARNS=3 a while ago, because it relies on implicit copy-constructors, which are deprecated in some cases since c++11. Fix another kind of warning by correcting the indentation. No PORTREVISION bump because the changes are superficial -- resulting binary remains the same. Reported by: pkg-fallout Tested with: llvm10 Added: head/graphics/libfpx/files/patch-warnings (contents, props changed) Modified: head/graphics/libfpx/files/Makefile.bsd Modified: head/graphics/libfpx/files/Makefile.bsd ============================================================================== --- head/graphics/libfpx/files/Makefile.bsd Tue Mar 17 22:12:02 2020 (r528604) +++ head/graphics/libfpx/files/Makefile.bsd Tue Mar 17 22:19:14 2020 (r528605) @@ -2,7 +2,7 @@ LIB = fpx INCS = fpxlib.h SHLIB_MAJOR= 2 SHLIB_MINOR= 7 -WARNS= 3 +WARNS= 2 LIBDIR = ${PREFIX}/lib INCSDIR = ${PREFIX}/include Added: head/graphics/libfpx/files/patch-warnings ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/graphics/libfpx/files/patch-warnings Tue Mar 17 22:19:14 2020 (r528605) @@ -0,0 +1,20 @@ +Shift indentation to avoid the "misleading indentation" warning +from LLVM10. I admit, that the original author's intent escapes +me here, so I cannot tell, if we have an actual bug remaining +in this code. + + -mi + +--- fpx/ptil_fpx.cpp 2013-09-02 11:45:00.000000000 -0400 ++++ fpx/ptil_fpx.cpp 2020-03-17 18:11:00.425447000 -0400 +@@ -1200,7 +1200,7 @@ + pixelsSpace = tmpPixelSpace; + } +- imageParam->GetContrast( &contrastValue); +- Contrast( contrastValue, pixelsSpace, pixels, width * height); +- } ++ imageParam->GetContrast( &contrastValue); ++ Contrast( contrastValue, pixelsSpace, pixels, width * height); ++ } + } +