From owner-freebsd-ports-bugs@FreeBSD.ORG Sun May 29 01:00:14 2005 Return-Path: X-Original-To: freebsd-ports-bugs@hub.freebsd.org Delivered-To: freebsd-ports-bugs@hub.freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id B3A1616A41C for ; Sun, 29 May 2005 01:00:14 +0000 (GMT) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (freefall.freebsd.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id CF4BB43D5F for ; Sun, 29 May 2005 01:00:13 +0000 (GMT) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (gnats@localhost [127.0.0.1]) by freefall.freebsd.org (8.13.3/8.13.3) with ESMTP id j4T10DkQ009312 for ; Sun, 29 May 2005 01:00:13 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.13.3/8.13.1/Submit) id j4T10DrN009311; Sun, 29 May 2005 01:00:13 GMT (envelope-from gnats) Resent-Date: Sun, 29 May 2005 01:00:13 GMT Resent-Message-Id: <200505290100.j4T10DrN009311@freefall.freebsd.org> Resent-From: FreeBSD-gnats-submit@FreeBSD.org (GNATS Filer) Resent-To: freebsd-ports-bugs@FreeBSD.org Resent-Reply-To: FreeBSD-gnats-submit@FreeBSD.org, Jonathan Hanna Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id D64F616A41C for ; Sun, 29 May 2005 00:52:26 +0000 (GMT) (envelope-from jhanna@pangolin-systems.com) Received: from pd3mo2so.prod.shaw.ca (shawidc-mo1.cg.shawcable.net [24.71.223.10]) by mx1.FreeBSD.org (Postfix) with ESMTP id 881BB43D48 for ; Sun, 29 May 2005 00:52:26 +0000 (GMT) (envelope-from jhanna@pangolin-systems.com) Received: from pd5mr3so.prod.shaw.ca (pd5mr3so-qfe3.prod.shaw.ca [10.0.141.144]) by l-daemon (Sun ONE Messaging Server 6.0 HotFix 1.01 (built Mar 15 2004)) with ESMTP id <0IH80084R7QKOA50@l-daemon> for FreeBSD-gnats-submit@freebsd.org; Sat, 28 May 2005 18:51:56 -0600 (MDT) Received: from pn2ml2so.prod.shaw.ca ([10.0.121.146]) by pd5mr3so.prod.shaw.ca (Sun ONE Messaging Server 6.0 HotFix 1.01 (built Mar 15 2004)) with ESMTP id <0IH8002WI7QKSHG0@pd5mr3so.prod.shaw.ca> for FreeBSD-gnats-submit@freebsd.org; Sat, 28 May 2005 18:51:56 -0600 (MDT) Received: from cub.pangolin-systems.com ([24.82.231.238]) by l-daemon (iPlanet Messaging Server 5.2 HotFix 1.18 (built Jul 28 2003)) with ESMTP id <0IH8006237QKMY@l-daemon> for FreeBSD-gnats-submit@freebsd.org; Sat, 28 May 2005 18:51:56 -0600 (MDT) Received: from cub.pangolin-systems.com (localhost [127.0.0.1]) by cub.pangolin-systems.com (8.13.3/8.13.3) with ESMTP id j4T0ptHF006913 for ; Sat, 28 May 2005 17:51:55 -0700 Received: (from jhanna@localhost) by cub.pangolin-systems.com (8.13.3/8.13.3/Submit) id j4T0ptci006912; Sat, 28 May 2005 17:51:55 -0700 (PDT envelope-from jhanna) Message-Id: <200505290051.j4T0ptci006912@cub.pangolin-systems.com> Date: Sat, 28 May 2005 17:51:55 -0700 (PDT) From: Jonathan Hanna To: FreeBSD-gnats-submit@FreeBSD.org X-Send-Pr-Version: 3.113 Cc: Subject: ports/81610: [PATCH] devel/ode: add option to support trimesh X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list Reply-To: Jonathan Hanna List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 29 May 2005 01:00:14 -0000 >Number: 81610 >Category: ports >Synopsis: [PATCH] devel/ode: add option to support trimesh >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: change-request >Submitter-Id: current-users >Arrival-Date: Sun May 29 01:00:13 GMT 2005 >Closed-Date: >Last-Modified: >Originator: Jonathan Hanna >Release: FreeBSD 5.4-STABLE i386 >Organization: >Environment: >Description: The ode distribution includes an "OPCODE" library that is required to support triangle mesh objects. It is not currently enabled in the port. This patch: - adds an option (on by default) to use OPCODE, enabling trimesh - changes the header include order so as not to pick up installed includes before local ones - suppresses the unneeded use of values.h - works around an inlining limitation in g++ >How-To-Repeat: >Fix: diff -urPN --exclude=CVS ode.orig/Makefile ode/Makefile --- ode.orig/Makefile Fri Jul 23 01:44:18 2004 +++ ode/Makefile Mon May 23 20:55:28 2005 @@ -21,6 +21,8 @@ USE_GMAKE= yes USE_REINPLACE= yes +OPTIONS= OPCODE "Enable code required by TriList (trimesh) class" on + .include .if ${ARCH} == "amd64" @@ -42,6 +44,15 @@ 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 + +do-configure: + cd ${WRKSRC} ; ${GMAKE} configure + @${REINPLACE_CMD} -e '/include.*values.h/d' ${WRKSRC}/include/ode/config.h do-install: @${INSTALL_DATA} ${WRKSRC}/lib/libode.a ${PREFIX}/lib diff -urPN --exclude=CVS ode.orig/files/patch-Makefile ode/files/patch-Makefile --- ode.orig/files/patch-Makefile Sat Jun 26 11:36:17 2004 +++ ode/files/patch-Makefile Mon May 23 21:00:04 2005 @@ -5,11 +5,11 @@ %$(OBJ): %.c - $(CC) $(C_FLAGS) $(C_INC)$(INCPATH) $(DEFINES) $(C_OPT)1 $(C_OUT)$@ $< -+ $(CC) $(C_FLAGS) $(C_INC)$(INCPATH) $(DEFINES) $(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_FLAGS) $(C_INC)$(INCPATH) $(INC_OPCODE) $(DEFINES) $(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) diff -urPN --exclude=CVS ode.orig/files/patch-OPC_TreeCollider.h ode/files/patch-OPC_TreeCollider.h --- ode.orig/files/patch-OPC_TreeCollider.h Wed Dec 31 16:00:00 1969 +++ ode/files/patch-OPC_TreeCollider.h Mon May 23 20:17:42 2005 @@ -0,0 +1,30 @@ +--- 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__ + } + >Release-Note: >Audit-Trail: >Unformatted: