svn commit: r519208 - in branches/2019Q4/graphics/cimg: . files

[Mark Linimon]

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