Attachment #63049 for bug #94116

View | Details | Raw Unified | Return to bug 94116
Collapse All | Expand All




#

PORTNAME=	ode
DISTVERSION=	${ODEVER}-060223
CATEGORIES=	devel
MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR=	opende
PKGNAMESUFFIX=	-devel
DISTNAME=	${PORTNAME}-${DISTVERSION:S/${ODEVER}-//}


USE_X_PREFIX=	yes
USE_GL=		yes
USE_GMAKE=	yes
USE_REINPLACE=	yes

OPTIONS=	OPCODE "Enable code required by TriList (trimesh) class" on


Lines 1-3 Link Here

(-)/usr/ports/devel/ode-devel-new/distinfo (-3 / +3 lines)
1	MD5 (ode-051009.tar.gz) = 211c991de59b6f0d1a48e6361ee4e243	1	MD5 (ode-060223.tar.gz) = c58ffce770e9dd4af21a4e8cf7cdf128
2	SHA256 (ode-051009.tar.gz) = bbc56831e64071432e9f623c916d0f8b0f4403f7da9ba422811311d0ba38fc4e	2	SHA256 (ode-060223.tar.gz) = 46d3cb9265543d57814d6c274a67e320a743e75a17ba87d057ad705cc0040b05
3	SIZE (ode-051009.tar.gz) = 1742585	3	SIZE (ode-060223.tar.gz) = 1734092




--- OPCODE/OPC_TreeCollider.h.orig	Mon May 23 20:11:48 2005
+++ OPCODE/OPC_TreeCollider.h	Mon May 23 20:16:16 2005
@@ -28,6 +28,13 @@
 	//! even entering the recursive collision code.
 	struct OPCODE_API BVTCache : Pair
 	{
+		inline_		void	ResetCountDown()
+							{
+#ifdef __MESHMERIZER_H__		// Collision hulls only supported within ICE !
+								CountDown		= 50;
+#endif // __MESHMERIZER_H__
+							}
+
 		//! Constructor
 		inline_				BVTCache()
 							{
@@ -46,13 +53,6 @@
 								SepVector.pid	= 0;
 								SepVector.qid	= 0;
 								SepVector.SV	= Point(1.0f, 0.0f, 0.0f);
-#endif // __MESHMERIZER_H__
-							}
-
-		inline_		void	ResetCountDown()
-							{
-#ifdef __MESHMERIZER_H__		// Collision hulls only supported within ICE !
-								CountDown		= 50;
 #endif // __MESHMERIZER_H__
 							}
 

Return to bug 94116

Lines 6-14 Link Here

(-)/usr/ports/devel/ode-devel-new/Makefile (-3 / +3 lines)
6	#	6	#
7		7
8	PORTNAME= ode	8	PORTNAME= ode
9	DISTVERSION= ${ODEVER}-051009	9	DISTVERSION= ${ODEVER}-060223
10	CATEGORIES= devel	10	CATEGORIES= devel
11	MASTER_SITES= http://opende.sourceforge.net/snapshots/	11	MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
		12	MASTER_SITE_SUBDIR= opende
12	PKGNAMESUFFIX= -devel	13	PKGNAMESUFFIX= -devel
13	DISTNAME= ${PORTNAME}-${DISTVERSION:S/${ODEVER}-//}	14	DISTNAME= ${PORTNAME}-${DISTVERSION:S/${ODEVER}-//}
14		15
Lines 22-28 Link Here
22	USE_X_PREFIX= yes	23	USE_X_PREFIX= yes
23	USE_GL= yes	24	USE_GL= yes
24	USE_GMAKE= yes	25	USE_GMAKE= yes
25	USE_REINPLACE= yes
26		26
27	OPTIONS= OPCODE "Enable code required by TriList (trimesh) class" on	27	OPTIONS= OPCODE "Enable code required by TriList (trimesh) class" on
28		28

Lines 1-30 Link Here

(-)/usr/ports/devel/ode-devel-new/files/patch-OPC_TreeCollider.h (-30 lines)
1	--- OPCODE/OPC_TreeCollider.h.orig Mon May 23 20:11:48 2005
2	+++ OPCODE/OPC_TreeCollider.h Mon May 23 20:16:16 2005
3	@@ -28,6 +28,13 @@
4	//! even entering the recursive collision code.
5	struct OPCODE_API BVTCache : Pair
6	{
7	+ inline_ void ResetCountDown()
8	+ {
9	+#ifdef __MESHMERIZER_H__ // Collision hulls only supported within ICE !
10	+ CountDown = 50;
11	+#endif // __MESHMERIZER_H__
12	+ }
13	+
14	//! Constructor
15	inline_ BVTCache()
16	{
17	@@ -46,13 +53,6 @@
18	SepVector.pid = 0;
19	SepVector.qid = 0;
20	SepVector.SV = Point(1.0f, 0.0f, 0.0f);
21	-#endif // __MESHMERIZER_H__
22	- }
23	-
24	- inline_ void ResetCountDown()
25	- {
26	-#ifdef __MESHMERIZER_H__ // Collision hulls only supported within ICE !
27	- CountDown = 50;
28	#endif // __MESHMERIZER_H__
29	}
30