From owner-svn-ports-branches@freebsd.org Sat Dec 7 13:00:45 2019 Return-Path: Delivered-To: svn-ports-branches@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 EB04C1D30F7; Sat, 7 Dec 2019 13:00:45 +0000 (UTC) (envelope-from linimon@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 47VV1n5znvz3JKm; Sat, 7 Dec 2019 13:00:45 +0000 (UTC) (envelope-from linimon@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 98AE31A3B4; Sat, 7 Dec 2019 13:00:45 +0000 (UTC) (envelope-from linimon@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id xB7D0jFV063497; Sat, 7 Dec 2019 13:00:45 GMT (envelope-from linimon@FreeBSD.org) Received: (from linimon@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id xB7D0jFM063494; Sat, 7 Dec 2019 13:00:45 GMT (envelope-from linimon@FreeBSD.org) Message-Id: <201912071300.xB7D0jFM063494@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: linimon set sender to linimon@FreeBSD.org using -f From: Mark Linimon Date: Sat, 7 Dec 2019 13:00:45 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r519208 - in branches/2019Q4/graphics/cimg: . files X-SVN-Group: ports-branches X-SVN-Commit-Author: linimon X-SVN-Commit-Paths: in branches/2019Q4/graphics/cimg: . files X-SVN-Commit-Revision: 519208 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-branches@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: SVN commit messages for all the branches of the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 07 Dec 2019 13:00:46 -0000 Author: linimon Date: Sat Dec 7 13:00:44 2019 New Revision: 519208 URL: https://svnweb.freebsd.org/changeset/ports/519208 Log: MFH: r513712 Make buildable on non-x86 architecture: - CImg.h assumes signed char, make it signed explicitly. - -mtune=generic doesn't exist on e.g. powerpc64. - USES=compiler:c11 is necessary. PR: 241026 Submitted by: pkubaj Approved by: portmgr (tier-2 blanket) Added: branches/2019Q4/graphics/cimg/files/patch-CImg.h - copied unchanged from r513712, head/graphics/cimg/files/patch-CImg.h Modified: branches/2019Q4/graphics/cimg/Makefile branches/2019Q4/graphics/cimg/files/patch-examples__Makefile Directory Properties: branches/2019Q4/ (props changed) Modified: branches/2019Q4/graphics/cimg/Makefile ============================================================================== --- branches/2019Q4/graphics/cimg/Makefile Sat Dec 7 12:35:09 2019 (r519207) +++ branches/2019Q4/graphics/cimg/Makefile Sat Dec 7 13:00:44 2019 (r519208) @@ -19,19 +19,11 @@ LICENSE_FILE_CeCILL= ${WRKSRC}/Licence_CeCILL_V2-en.tx LICENSE_PERMS_CeCILL_C= dist-mirror dist-sell pkg-mirror pkg-sell auto-accept LICENSE_PERMS_CeCILL= dist-mirror dist-sell pkg-mirror pkg-sell auto-accept -BROKEN_aarch64= invokes x86 assembler -BROKEN_armv6= invokes x86 assembler -BROKEN_armv7= invokes x86 assembler -BROKEN_mips= invokes x86 assembler -BROKEN_mips64= invokes x86 assembler -BROKEN_sparc64= invokes x86 assembler -BROKEN_powerpc64= invokes x86 assembler - USE_GITHUB= yes GH_ACCOUNT= dtschump GH_PROJECT= CImg -USES= xorg +USES= compiler:c11 xorg .if !defined(WITHOUT_LAPACK) . if defined(WITH_ATLAS) Copied: branches/2019Q4/graphics/cimg/files/patch-CImg.h (from r513712, head/graphics/cimg/files/patch-CImg.h) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2019Q4/graphics/cimg/files/patch-CImg.h Sat Dec 7 13:00:44 2019 (r519208, copy of r513712, head/graphics/cimg/files/patch-CImg.h) @@ -0,0 +1,11 @@ +--- CImg.h.orig 2019-09-24 20:44:55 UTC ++++ CImg.h +@@ -6737,7 +6737,7 @@ namespace cimg_library_suffixed { + } + + //! Return \c true if input character is blank (space, tab, or non-printable character). +- inline bool is_blank(const char c) { ++ inline bool is_blank(const signed char c) { + return c>=0 && c<=' '; + } + Modified: branches/2019Q4/graphics/cimg/files/patch-examples__Makefile ============================================================================== --- branches/2019Q4/graphics/cimg/files/patch-examples__Makefile Sat Dec 7 12:35:09 2019 (r519207) +++ branches/2019Q4/graphics/cimg/files/patch-examples__Makefile Sat Dec 7 13:00:44 2019 (r519208) @@ -26,7 +26,7 @@ +OPT_CFLAGS = # -Ofast - handled by the port CFLAGS ifdef IS_GCC -OPT_CFLAGS = -Ofast -mtune=generic -+OPT_CFLAGS = -mtune=generic ++OPT_CFLAGS = endif ifdef IS_ICPC OPT_CFLAGS = -fast