svn commit: r462249 - in head/graphics/opencollada: . files

[Thomas Zander]

Author: riggs
Date: Sun Feb 18 15:56:44 2018
New Revision: 462249
URL: https://svnweb.freebsd.org/changeset/ports/462249

Log:
  Fix build on arm
  
  Details:
  - Obtain patch-2d66943 from upstream head
  - Bump PORTREVISION
  - While on it: Pet portlint
  
  PR:		225680
  Submitted by:	mikael.urankar at gmail.com

Added:
  head/graphics/opencollada/files/patch-2d66943   (contents, props changed)
Modified:
  head/graphics/opencollada/Makefile

Modified: head/graphics/opencollada/Makefile
==============================================================================
--- head/graphics/opencollada/Makefile	Sun Feb 18 15:06:53 2018	(r462248)
+++ head/graphics/opencollada/Makefile	Sun Feb 18 15:56:44 2018	(r462249)
@@ -3,6 +3,7 @@
 PORTNAME=	opencollada
 DISTVERSIONPREFIX=	v
 DISTVERSION=	1.6.47
+PORTREVISION=	1
 CATEGORIES=	graphics devel
 
 MAINTAINER=	ports at FreeBSD.org
@@ -14,17 +15,21 @@ LIB_DEPENDS=	libpcre.so:devel/pcre
 
 BROKEN_powerpc64=	Does not build: c++: Internal error: Killed (program cc1plus)
 
+USES=		cmake:outsource compiler dos2unix iconv pkgconfig
+
 USE_GITHUB=	yes
 GH_ACCOUNT=	KhronosGroup
 GH_PROJECT=	OpenCOLLADA
 
 USE_GNOME=	libxml2
 USE_LDCONFIG=	${PREFIX}/lib/opencollada
-USES=		cmake:outsource compiler iconv pkgconfig
 CFLAGS+=	-I/${LOCALBASE}/include
 CMAKE_ARGS+=	-DUSE_SHARED:BOOL=ON -DUSE_STATIC:BOOL=OFF
 
 BROKEN_sparc64=	cannot build: runaway process
+
+# for files/patch-2d66943
+DOS2UNIX_FILES=	COLLADABaseUtils/src/COLLADABUURI.cpp
 
 post-patch:
 	@${REINPLACE_CMD} -e 's|$${OPENCOLLADA_INST_LIBRARY}/cmake|${PREFIX}/share/cmake/Modules|' \

Added: head/graphics/opencollada/files/patch-2d66943
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/graphics/opencollada/files/patch-2d66943	Sun Feb 18 15:56:44 2018	(r462249)
@@ -0,0 +1,40 @@
+From 2d66943f7ce1ba92b3cc39ad11b5c82e6d3a538f Mon Sep 17 00:00:00 2001
+From: Jonathan Scruggs <j.scruggs at gmail.com>
+Date: Wed, 10 Jan 2018 14:06:48 +0000
+Subject: [PATCH] Add signed char keyword
+
+On PowerPC and PowerPC64 systems, 'char' is unsigned by default.
+Can be reproduced by using the -funsigned-char flag for gcc.
+Adding the signed keyword adds compatibility on these systems.
+
+Signed-off by: Jonathan Scruggs <j.scruggs at gmail.com>
+---
+ COLLADABaseUtils/src/COLLADABUURI.cpp | 24 ++++++++++++------------
+ 1 file changed, 12 insertions(+), 12 deletions(-)
+
+diff --git a/COLLADABaseUtils/src/COLLADABUURI.cpp b/COLLADABaseUtils/src/COLLADABUURI.cpp
+index 1d03561a..ae403d8a 100644
+--- COLLADABaseUtils/src/COLLADABUURI.cpp.orig	2018-02-05 10:56:11 UTC
++++ COLLADABaseUtils/src/COLLADABUURI.cpp
+@@ -32,7 +32,7 @@ namespace COLLADABU
+ 
+ 
+ 
+-	const char HEX2DEC[256] = 
++	const signed char HEX2DEC[256] = 
+ 	{
+ 		/*       0  1  2  3   4  5  6  7   8  9  A  B   C  D  E  F */
+ 		/* 0 */ -1,-1,-1,-1, -1,-1,-1,-1, -1,-1,-1,-1, -1,-1,-1,-1,
+@@ -107,9 +107,9 @@ namespace COLLADABU
+ 		{
+ 			if (*pSrc == '%')
+ 			{
+-				char dec1, dec2;
+-				if (    (char)(-1) != (dec1 = HEX2DEC[*(pSrc + 1)])
+-				     && (char)(-1) != (dec2 = HEX2DEC[*(pSrc + 2)]))
++				signed char dec1, dec2;
++				if (    (signed char)(-1) != (dec1 = HEX2DEC[*(pSrc + 1)])
++				     && (signed char)(-1) != (dec2 = HEX2DEC[*(pSrc + 2)]))
+ 				{
+ 					*pEnd++ = (dec1 << 4) + dec2;
+ 					pSrc += 3;