Attachment #68459 for bug #100636

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




#

PORTNAME=	ode
PORTVERSION=	0.6
PORTREVISION=	1
PORTEPOCH=	1
CATEGORIES=	devel
MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR=	opende
DISTNAME=	${PORTNAME}-src-${PORTVERSION}

MAINTAINER=	dyeske@yahoo.com
COMMENT=	Articulated rigid body dynamics library

CONFLICTS=	ode-devel-[0-9].*

USE_ZIP=	yes
USE_X_PREFIX=	yes
USE_GL=		yes
USE_GMAKE=	yes
GNU_CONFIGURE=	yes

CONFIGURE_ARGS=	--program-prefix=
CONFIGURE_ENV=	CPPFLAGS="-I${X11BASE}/include" \
		LIBS="-L${X11BASE}/lib"

OPTIONS=	OPCODE	"Enable code required by TriList (trimesh) class" on \
		GYROSCOPIC "Configure ODE to work with gyroscopic term" on \
		DOUBLE	"Enable double precision" off

WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}

.include <bsd.port.pre.mk>

.if defined(WITHOUT_OPCODE)
CONFIGURE_ARGS+=	--disable-opcode
.endif

.if defined(WITHOUT_GYROSCOPIC)
CONFIGURE_ARGS+=	--disable-gyroscopic
.endif

.if defined(WITH_DOUBLE)
CONFIGURE_ARGS+=	--enable-double-precision
		s|-L/usr/lib/X11||; \
		s|-L/usr/X11R6/lib|-L${X11BASE}/lib|; \
		s|-fno-rtti||; \
		s|-ffast-math|${CXXFLAGS} -I${X11BASE}/include|' \
		${WRKSRC}/config/makefile.unix-gcc
.if !defined(WITHOUT_OPCODE)
	@${REINPLACE_CMD} -e \
		's/^#OPCODE_DIRECTORY/OPCODE_DIRECTORY/' \
		${WRKSRC}/config/user-settings
.endif

post-patch:
	@${REINPLACE_CMD} -e '/if test/ s|==|=|' -e 's|^\( *CFLAGS=\)|#\1|;' \
		-e 's|^\( *CPPFLAGS=\)|#\1|' -e 's|^\( *CXXFLAGS=\)|#\1|' \
		-e 's|__isnanf||g; s|__isnan||g' -e 's|-lpthread|-pthread|g' \
		${WRKSRC}/configure
	@${REINPLACE_CMD} -e '/^traplib_PROGRAMS / d' ${WRKSRC}/ode/src/Makefile.in
	@${FIND} ${WRKSRC} -type f -name Makefile.in -print0 | xargs -0 ${REINPLACE_CMD} \
		-e '/^DEFAULT_INCLUDES/ s|$$| -I$$(top_builddir)/include|' \
		-e '/CFLAGS/ s|-O[12]||'

.include <bsd.port.post.mk>

Lines 1-3 Link Here

(-)ode/distinfo (-3 / +3 lines)
1	MD5 (ode-0.5.tgz) = b33b21e04ee9661f27802b6b6c8eefd2	1	MD5 (ode-src-0.6.zip) = 7afdb1d434a1e2cc2d701fdf8d1f2fad
2	SHA256 (ode-0.5.tgz) = 5388c4cd4666f270f18216c90ab6526229c53fdc7e82f93ddb0824e69521df1c	2	SHA256 (ode-src-0.6.zip) = 5bc01923bd68b122368f15d4e969bff4d53acbd69af521712b33181d47b36b88
3	SIZE (ode-0.5.tgz) = 1710720	3	SIZE (ode-src-0.6.zip) = 1808849




--- Makefile.orig	Wed Jun  9 16:12:12 2004
+++ Makefile	Wed Jun  9 16:13:39 2004
@@ -329,13 +329,13 @@
 	-$(DEL_CMD) OPCODE/*.obj OPCODE/*.o OPCODE/Ice/*.obj OPCODE/Ice/*.o
 
 %$(OBJ): %.c
-	$(CC) $(C_FLAGS) $(C_INC)$(INCPATH) $(DEFINES) $(C_OPT)1 $(C_OUT)$@ $<
+	$(CC) $(C_INC)$(INCPATH) $(C_FLAGS) $(DEFINES) $(C_OUT)$@ $<
 
 %$(OBJ): %.cpp
-	$(CC) $(C_FLAGS) $(C_INC)$(INCPATH) $(INC_OPCODE) $(DEFINES) $(C_OPT)$(OPT) $(C_OUT)$@ $<
+	$(CC) $(C_INC)$(INCPATH) $(C_FLAGS) $(INC_OPCODE) $(DEFINES) $(C_OUT)$@ $<
 
 %.exe: %$(OBJ)
-	$(CC) $(C_EXEOUT)$@ $< $(ODE_LIB) $(DRAWSTUFF_LIB) $(RESOURCE_FILE) $(LINK_OPENGL) $(LINK_MATH)
+	$(CC) $(C_EXEOUT)$@ $< $(ODE_LIB) $(DRAWSTUFF_LIB) $(RESOURCE_FILE) $(LINK_OPENGL) $(LINK_MATH) ${LDFLAGS}
 
 
 # windows specific rules
@@ -357,7 +357,7 @@
 
 # unix-gcc specific dependency making
 
-DEP_RULE=gcc -M $(C_INC)$(INCPATH) $(DEFINES)
+DEP_RULE=${CC} -M $(C_INC)$(INCPATH) $(DEFINES)
 depend:
 	$(DEP_RULE) $(ODE_SRC) $(ODE_PREGEN_SRC) | tools/process_deps ode/src/ > Makefile.deps
 	$(DEP_RULE) $(DRAWSTUFF_SRC) | tools/process_deps drawstuff/src/ >> Makefile.deps




--- 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__
 							}
 

Lines 1-11 Link Here

(-)ode/files/patch-configurator.c (-11 lines)
1	--- configurator.c.orig Sat May 29 21:46:03 2004
2	+++ configurator.c Tue Dec 6 03:48:15 2005
3	@@ -222,7 +222,7 @@
4	write_header_comment (file,"is this a pentium on a gcc-based platform?");
5	write_to_file ("ctest.cpp",
6	"int main() {\n"
7	- " asm (\"mov $0,%%eax\\n cpuid\\n\" : : : \"%eax\");\n"
8	+ " asm (\"mov $0,%%eax\\n mov %%eax,(%%esi)\\n cpuid\\n\" : : : \"%eax\");\n"
9	" return 0;\n"
10	"}\n");
11	delete_file ("ctest.exe");

Lines 1-5 Link Here

(-)ode/pkg-plist (-2 / +2 lines)
1	lib/libdrawstuff.a	1	bin/ode-config
2	lib/libode.a
3	include/ode/collision.h	2	include/ode/collision.h
4	include/ode/collision_space.h	3	include/ode/collision_space.h
5	include/ode/collision_trimesh.h	4	include/ode/collision_trimesh.h
Lines 21-24 Link Here
21	include/ode/odemath.h	20	include/ode/odemath.h
22	include/ode/rotation.h	21	include/ode/rotation.h
23	include/ode/timer.h	22	include/ode/timer.h
		23	lib/libode.a
24	@dirrm include/ode	24	@dirrm include/ode

Return to bug 100636

Lines 6-61 Link Here

(-)ode/Makefile (-32 / +32 lines)
6	#	6	#
7		7
8	PORTNAME= ode	8	PORTNAME= ode
9	PORTVERSION= 0.5	9	PORTVERSION= 0.6
10	PORTREVISION= 1
11	PORTEPOCH= 1	10	PORTEPOCH= 1
12	CATEGORIES= devel	11	CATEGORIES= devel
13	MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}	12	MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
14	MASTER_SITE_SUBDIR= opende	13	MASTER_SITE_SUBDIR= opende
15	EXTRACT_SUFX= .tgz	14	DISTNAME= ${PORTNAME}-src-${PORTVERSION}
16		15
17	MAINTAINER= dyeske@yahoo.com	16	MAINTAINER= dyeske@yahoo.com
18	COMMENT= Articulated rigid body dynamics library	17	COMMENT= Articulated rigid body dynamics library
19		18
20	CONFLICTS= ode-devel-[0-9].*	19	CONFLICTS= ode-devel-[0-9].*
21		20
		21	USE_ZIP= yes
22	USE_X_PREFIX= yes	22	USE_X_PREFIX= yes
23	USE_GL= yes	23	USE_GL= yes
24	USE_GMAKE= yes	24	USE_GMAKE= yes
		25	GNU_CONFIGURE= yes
25		26
26	OPTIONS= OPCODE "Enable code required by TriList (trimesh) class" on	27	CONFIGURE_ARGS= --program-prefix=
		28	CONFIGURE_ENV= CPPFLAGS="-I${X11BASE}/include" \
		29	LIBS="-L${X11BASE}/lib"
		30
		31	OPTIONS= OPCODE "Enable code required by TriList (trimesh) class" on \
		32	GYROSCOPIC "Configure ODE to work with gyroscopic term" on \
		33	DOUBLE "Enable double precision" off
		34
		35	WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION}
27		36
28	.include <bsd.port.pre.mk>	37	.include <bsd.port.pre.mk>
29		38
30	post-patch:	39	.if defined(WITHOUT_OPCODE)
31	@${REINPLACE_CMD} -e \	40	CONFIGURE_ARGS+= --disable-opcode
32	's\|malloc.h\|stdlib.h\|g' \	41	.endif
33	${WRKSRC}/configurator.c	42
34		43	.if defined(WITHOUT_GYROSCOPIC)
35	@${REINPLACE_CMD} -e \	44	CONFIGURE_ARGS+= --disable-gyroscopic
36	's\|g++\|${CXX}\|; \	45	.endif
37	s\|-Wall\|\|g; \	46
38	s\|-L/usr/X11/lib\|-lXext\|; \	47	.if defined(WITH_DOUBLE)
39	s\|-L/usr/lib/X11R6\|\|; \	48	CONFIGURE_ARGS+= --enable-double-precision
40	s\|-L/usr/lib/X11\|\|; \
41	s\|-L/usr/X11R6/lib\|-L${X11BASE}/lib\|; \
42	s\|-fno-rtti\|\|; \
43	s\|-ffast-math\|${CXXFLAGS} -I${X11BASE}/include\|' \
44	${WRKSRC}/config/makefile.unix-gcc
45	.if !defined(WITHOUT_OPCODE)
46	@${REINPLACE_CMD} -e \
47	's/^#OPCODE_DIRECTORY/OPCODE_DIRECTORY/' \
48	${WRKSRC}/config/user-settings
49	.endif	49	.endif
50		50
51	do-configure:	51	post-patch:
52	cd ${WRKSRC} ; ${GMAKE} configure	52	@${REINPLACE_CMD} -e '/if test/ s\|==\|=\|' -e 's\|^\( *CFLAGS=\)\|#\1\|;' \
53	@${REINPLACE_CMD} -e '/include.*values.h/d' ${WRKSRC}/include/ode/config.h	53	-e 's\|^\( CPPFLAGS=\)\|#\1\|' -e 's\|^\( CXXFLAGS=\)\|#\1\|' \
54		54	-e 's\|__isnanf\|\|g; s\|__isnan\|\|g' -e 's\|-lpthread\|-pthread\|g' \
55	do-install:	55	${WRKSRC}/configure
56	@${INSTALL_DATA} ${WRKSRC}/lib/libode.a ${PREFIX}/lib	56	@${REINPLACE_CMD} -e '/^traplib_PROGRAMS / d' ${WRKSRC}/ode/src/Makefile.in
57	@${INSTALL_DATA} ${WRKSRC}/lib/libdrawstuff.a ${PREFIX}/lib	57	@${FIND} ${WRKSRC} -type f -name Makefile.in -print0 \| xargs -0 ${REINPLACE_CMD} \
58	@${MKDIR} ${PREFIX}/include/ode	58	-e '/^DEFAULT_INCLUDES/ s\|$$\| -I$$(top_builddir)/include\|' \
59	@${INSTALL_DATA} ${WRKSRC}/include/ode/*.h ${PREFIX}/include/ode	59	-e '/CFLAGS/ s\|-O[12]\|\|'
60		60
61	.include <bsd.port.post.mk>	61	.include <bsd.port.post.mk>

Lines 1-28 Link Here

(-)ode/files/patch-Makefile (-28 lines)
1	--- Makefile.orig Wed Jun 9 16:12:12 2004
2	+++ Makefile Wed Jun 9 16:13:39 2004
3	@@ -329,13 +329,13 @@
4	-$(DEL_CMD) OPCODE/.obj OPCODE/.o OPCODE/Ice/.obj OPCODE/Ice/.o
5
6	%$(OBJ): %.c
7	- $(CC) $(C_FLAGS) $(C_INC)$(INCPATH) $(DEFINES) $(C_OPT)1 $(C_OUT)$@ $<
8	+ $(CC) $(C_INC)$(INCPATH) $(C_FLAGS) $(DEFINES) $(C_OUT)$@ $<
9
10	%$(OBJ): %.cpp
11	- $(CC) $(C_FLAGS) $(C_INC)$(INCPATH) $(INC_OPCODE) $(DEFINES) $(C_OPT)$(OPT) $(C_OUT)$@ $<
12	+ $(CC) $(C_INC)$(INCPATH) $(C_FLAGS) $(INC_OPCODE) $(DEFINES) $(C_OUT)$@ $<
13
14	%.exe: %$(OBJ)
15	- $(CC) $(C_EXEOUT)$@ $< $(ODE_LIB) $(DRAWSTUFF_LIB) $(RESOURCE_FILE) $(LINK_OPENGL) $(LINK_MATH)
16	+ $(CC) $(C_EXEOUT)$@ $< $(ODE_LIB) $(DRAWSTUFF_LIB) $(RESOURCE_FILE) $(LINK_OPENGL) $(LINK_MATH) ${LDFLAGS}
17
18
19	# windows specific rules
20	@@ -357,7 +357,7 @@
21
22	# unix-gcc specific dependency making
23
24	-DEP_RULE=gcc -M $(C_INC)$(INCPATH) $(DEFINES)
25	+DEP_RULE=${CC} -M $(C_INC)$(INCPATH) $(DEFINES)
26	depend:
27	$(DEP_RULE) $(ODE_SRC) $(ODE_PREGEN_SRC) \| tools/process_deps ode/src/ > Makefile.deps
28	$(DEP_RULE) $(DRAWSTUFF_SRC) \| tools/process_deps drawstuff/src/ >> Makefile.deps

Lines 1-30 Link Here

(-)ode/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