Skip site navigation (1)Skip section navigation (2)
Date:      Tue, 17 Sep 2013 15:53:01 +0000 (UTC)
From:      Dmitry Marakasov <amdmi3@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r327480 - in head/graphics: animorph animorph/files makehuman makehuman/files mhgui
Message-ID:  <201309171553.r8HFr1lV025913@svn.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: amdmi3
Date: Tue Sep 17 15:53:01 2013
New Revision: 327480
URL: http://svnweb.freebsd.org/changeset/ports/327480

Log:
  Fix build with clang/libc++

Added:
  head/graphics/animorph/files/
  head/graphics/animorph/files/patch-include-animorph-util.h   (contents, props changed)
  head/graphics/animorph/files/patch-src-BodySettings.cpp   (contents, props changed)
  head/graphics/animorph/files/patch-src-FaceGroup.cpp   (contents, props changed)
  head/graphics/animorph/files/patch-src-Hotspot.cpp   (contents, props changed)
  head/graphics/makehuman/files/
  head/graphics/makehuman/files/patch-src-ComponentID.h   (contents, props changed)
  head/graphics/makehuman/files/patch-src-FileTools.cpp   (contents, props changed)
Modified:
  head/graphics/animorph/Makefile
  head/graphics/makehuman/Makefile
  head/graphics/mhgui/Makefile

Modified: head/graphics/animorph/Makefile
==============================================================================
--- head/graphics/animorph/Makefile	Tue Sep 17 13:27:06 2013	(r327479)
+++ head/graphics/animorph/Makefile	Tue Sep 17 15:53:01 2013	(r327480)
@@ -15,6 +15,7 @@ GNU_CONFIGURE=	yes
 USE_GMAKE=	yes
 USES=		pkgconfig
 USE_LDCONFIG=	yes
+USE_GCC=	yes # otherwise graphics/makehuman won't link
 
 CPPFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib

Added: head/graphics/animorph/files/patch-include-animorph-util.h
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/graphics/animorph/files/patch-include-animorph-util.h	Tue Sep 17 15:53:01 2013	(r327480)
@@ -0,0 +1,10 @@
+--- include/animorph/util.h.orig	2007-11-25 12:34:57.000000000 +0300
++++ include/animorph/util.h	2013-09-14 08:03:24.413227432 +0400
+@@ -37,6 +37,7 @@
+ #include <iomanip>
+ #include <vector>
+ #include <iostream>
++#include <cstdlib> // for atoi()
+ #include "Vector3.h"
+ #include "Vertex.h"
+ #include "VertexVector.h"

Added: head/graphics/animorph/files/patch-src-BodySettings.cpp
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/graphics/animorph/files/patch-src-BodySettings.cpp	Tue Sep 17 15:53:01 2013	(r327480)
@@ -0,0 +1,10 @@
+--- src/BodySettings.cpp.orig	2007-12-03 01:30:41.000000000 +0300
++++ src/BodySettings.cpp	2013-09-17 17:25:49.896520104 +0400
+@@ -1,5 +1,7 @@
+ #include "../include/animorph/BodySettings.h"
+ 
++#include <cstring>
++
+ using namespace std;
+ using namespace Animorph;
+ 

Added: head/graphics/animorph/files/patch-src-FaceGroup.cpp
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/graphics/animorph/files/patch-src-FaceGroup.cpp	Tue Sep 17 15:53:01 2013	(r327480)
@@ -0,0 +1,10 @@
+--- src/FaceGroup.cpp.orig	2007-12-03 01:30:41.000000000 +0300
++++ src/FaceGroup.cpp	2013-09-17 17:56:37.772519994 +0400
+@@ -1,5 +1,7 @@
+ #include "../include/animorph/FaceGroup.h"
+ 
++#include <cstring>
++
+ using namespace std;
+ using namespace Animorph;
+ 

Added: head/graphics/animorph/files/patch-src-Hotspot.cpp
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/graphics/animorph/files/patch-src-Hotspot.cpp	Tue Sep 17 15:53:01 2013	(r327480)
@@ -0,0 +1,10 @@
+--- src/Hotspot.cpp.orig	2007-11-25 12:34:58.000000000 +0300
++++ src/Hotspot.cpp	2013-09-17 17:32:58.043519323 +0400
+@@ -1,5 +1,7 @@
+ #include "../include/animorph/Hotspot.h"
+ 
++#include <cstring>
++
+ using namespace std;
+ using namespace Animorph;
+ 

Modified: head/graphics/makehuman/Makefile
==============================================================================
--- head/graphics/makehuman/Makefile	Tue Sep 17 13:27:06 2013	(r327479)
+++ head/graphics/makehuman/Makefile	Tue Sep 17 15:53:01 2013	(r327480)
@@ -16,7 +16,7 @@ LIB_DEPENDS=	animorph:${PORTSDIR}/graphi
 USES=		gmake pkgconfig
 GNU_CONFIGURE=	yes
 USE_GL=		glut
-USE_GCC=	any # Animation.cpp:94:26: error: variable length array of non-POD element type 'Animorph::BodySettings'
+USE_GCC=	yes # Animation.cpp:94:26: error: variable length array of non-POD element type 'Animorph::BodySettings'
 
 CPPFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib

Added: head/graphics/makehuman/files/patch-src-ComponentID.h
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/graphics/makehuman/files/patch-src-ComponentID.h	Tue Sep 17 15:53:01 2013	(r327480)
@@ -0,0 +1,11 @@
+--- src/ComponentID.h.orig	2007-12-03 01:30:18.000000000 +0300
++++ src/ComponentID.h	2013-09-14 14:26:25.451226331 +0400
+@@ -27,6 +27,8 @@
+ #ifndef COMPONENTID_H
+ #define COMPONENTID_H 1
+ 
++#include <algorithm> // for for_each in *Panel.cpp
++
+ #ifdef HAVE_CONFIG_H
+   #include <config.h>
+ #endif

Added: head/graphics/makehuman/files/patch-src-FileTools.cpp
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/graphics/makehuman/files/patch-src-FileTools.cpp	Tue Sep 17 15:53:01 2013	(r327480)
@@ -0,0 +1,11 @@
+--- src/FileTools.cpp.orig	2007-11-25 12:28:07.000000000 +0300
++++ src/FileTools.cpp	2013-09-17 06:11:17.036227572 +0400
+@@ -45,6 +45,8 @@
+ #include <dirent.h>
+ #include <limits.h>
+ #include <iostream>
++#include <cstdlib>
++#include <cstring>
+ 
+ /* ========================================================================== *
+  * FileTools - Implementation

Modified: head/graphics/mhgui/Makefile
==============================================================================
--- head/graphics/mhgui/Makefile	Tue Sep 17 13:27:06 2013	(r327479)
+++ head/graphics/mhgui/Makefile	Tue Sep 17 15:53:01 2013	(r327480)
@@ -21,6 +21,7 @@ USES=		pkgconfig
 USE_LDCONFIG=	yes
 USE_XORG=	xi xmu ice sm
 USE_GL=		glut
+USE_GCC=	yes # otherwise graphics/makehuman won't link
 
 CPPFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201309171553.r8HFr1lV025913>