From owner-svn-ports-head@freebsd.org Thu Oct 3 19:15:14 2019 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 DB8AE13DF64; Thu, 3 Oct 2019 19:15:14 +0000 (UTC) (envelope-from thierry@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 46kjPt5JVhz4ZVj; Thu, 3 Oct 2019 19:15:14 +0000 (UTC) (envelope-from thierry@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 98DD618B54; Thu, 3 Oct 2019 19:15:14 +0000 (UTC) (envelope-from thierry@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id x93JFEul016266; Thu, 3 Oct 2019 19:15:14 GMT (envelope-from thierry@FreeBSD.org) Received: (from thierry@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id x93JFDBO016263; Thu, 3 Oct 2019 19:15:13 GMT (envelope-from thierry@FreeBSD.org) Message-Id: <201910031915.x93JFDBO016263@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: thierry set sender to thierry@FreeBSD.org using -f From: Thierry Thomas Date: Thu, 3 Oct 2019 19:15:13 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r513712 - in head/graphics/cimg: . files X-SVN-Group: ports-head X-SVN-Commit-Author: thierry X-SVN-Commit-Paths: in head/graphics/cimg: . files X-SVN-Commit-Revision: 513712 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.29 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: Thu, 03 Oct 2019 19:15:14 -0000 Author: thierry Date: Thu Oct 3 19:15:13 2019 New Revision: 513712 URL: https://svnweb.freebsd.org/changeset/ports/513712 Log: 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 Added: head/graphics/cimg/files/patch-CImg.h (contents, props changed) Modified: head/graphics/cimg/Makefile head/graphics/cimg/files/patch-examples__Makefile Modified: head/graphics/cimg/Makefile ============================================================================== --- head/graphics/cimg/Makefile Thu Oct 3 18:33:13 2019 (r513711) +++ head/graphics/cimg/Makefile Thu Oct 3 19:15:13 2019 (r513712) @@ -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) Added: head/graphics/cimg/files/patch-CImg.h ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/graphics/cimg/files/patch-CImg.h Thu Oct 3 19:15:13 2019 (r513712) @@ -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: head/graphics/cimg/files/patch-examples__Makefile ============================================================================== --- head/graphics/cimg/files/patch-examples__Makefile Thu Oct 3 18:33:13 2019 (r513711) +++ head/graphics/cimg/files/patch-examples__Makefile Thu Oct 3 19:15:13 2019 (r513712) @@ -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