From owner-svn-ports-head@freebsd.org Mon Sep 7 15:22:53 2020 Return-Path: Delivered-To: svn-ports-head@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 6D0AC3CCC7F; Mon, 7 Sep 2020 15:22:53 +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) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 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 4BlX8s2FCjz4GXy; Mon, 7 Sep 2020 15:22:53 +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 3022C21722; Mon, 7 Sep 2020 15:22:53 +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 087FMruS064154; Mon, 7 Sep 2020 15:22:53 GMT (envelope-from mi@FreeBSD.org) Received: (from mi@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 087FMrk0064152; Mon, 7 Sep 2020 15:22:53 GMT (envelope-from mi@FreeBSD.org) Message-Id: <202009071522.087FMrk0064152@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: mi set sender to mi@FreeBSD.org using -f From: Mikhail Teterin Date: Mon, 7 Sep 2020 15:22:53 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r547897 - 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: 547897 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.33 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: Mon, 07 Sep 2020 15:22:53 -0000 Author: mi Date: Mon Sep 7 15:22:52 2020 New Revision: 547897 URL: https://svnweb.freebsd.org/changeset/ports/547897 Log: Remove an unused variable from a header, because it now triggers the linker on -current into an error about duplicate symbol -- as two source-files include the same header. Reported by: pkg-fallout Sponsored by: United Marsupials Modified: head/graphics/libfpx/files/patch-warnings Modified: head/graphics/libfpx/files/patch-warnings ============================================================================== --- head/graphics/libfpx/files/patch-warnings Mon Sep 7 15:13:31 2020 (r547896) +++ head/graphics/libfpx/files/patch-warnings Mon Sep 7 15:22:52 2020 (r547897) @@ -3,8 +3,6 @@ from LLVM10. I admit, that the original author's inten 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 @@ @@ -18,3 +16,15 @@ in this code. + } } +The variable No_JPEG_Header_Flag is unused. But its mere presence may +cause a "duplicate symbol" error from linker, when it tries to link +together object files compiled after #include-ing the ejpeg.h header. + +--- jpeg/ejpeg.h 2013-09-02 11:45:00.000000000 -0400 ++++ jpeg/ejpeg.h 2020-09-07 10:50:07.600375000 -0400 +@@ -31,5 +31,2 @@ + #define IMG_FORMAT_1111 0x04 /* Four-component non-interleaved image */ + #define IMG_FORMAT_411 0x05 /* Three-component 4:1:1 image */ +- +-JPEGEXPORT +-int No_JPEG_Header_Flag;