From b8308ce3d1dda065d37b3378690bc662b2e9f1a5 Mon Sep 17 00:00:00 2001 From: Theodore Kokkoris Date: Mon, 16 Dec 2013 18:22:11 +0000 Subject: [PATCH 1/5] Fixed ODE 0.12 recipe and patch --- dev-games/ode/ode-0.12.recipe | 61 ++++++++++++++++++++++++---- dev-games/ode/patches/ode-0.12.patch | 30 +++++++------- 2 files changed, 68 insertions(+), 23 deletions(-) diff --git a/dev-games/ode/ode-0.12.recipe b/dev-games/ode/ode-0.12.recipe index 06df78601..d23c264ac 100644 --- a/dev-games/ode/ode-0.12.recipe +++ b/dev-games/ode/ode-0.12.recipe @@ -1,19 +1,64 @@ -DESCRIPTION="ODE is an open source, high performance library for simulating rigid body dynamics." +DESCRIPTION="ODE is an open source, high performance library for simulating rigid body dynamics. It is fully featured, stable, mature and platform independent with an easy to use C/C++ API. It has advanced joint types and integrated collision detection with friction. ODE is useful for simulating vehicles, objects in virtual reality environments and virtual creatures." +SUMMARY="Library for simulating rigid body dynamics" HOMEPAGE="http://www.ode.org/" SRC_URI="http://downloads.sourceforge.net/project/opende/ODE/0.12/ode-0.12.tar.bz2?r=http%3A%2F%2Fsourceforge.net%2Fprojects%2Fopende%2Ffiles%2F&ts=1356377654&use_mirror=freefr" +CHECKSUM_MD5="48fdd41fae1a7e7831feeded09826599" REVISION="1" COPYRIGHT="2001-2004 Russell L. Smith" -LICENSE="GNU LGPL v3 - BSD (3-clause)" -CHECKSUM_MD5="48fdd41fae1a7e7831feeded09826599" +LICENSE=" + GNU LGPL v3 + BSD (3-clause) + " +ARCHITECTURES="x86_gcc2 ?x86 ?x86_64" +SECONDARY_ARCHITECTURES="x86_gcc2 ?x86" + +PROVIDES=" + ode$secondaryArchSuffix = $portVersion + cmd:ode_config = $portVersion + " + +REQUIRES=" + haiku$secondaryArchSuffix >= $haikuVersion + " + +BUILD_REQUIRES=" + haiku${secondaryArchSuffix}_devel >= $haikuVersion + " + +BUILD_PREREQUIRES=" + cmd:make + cmd:mkdepend + cmd:gcc$secondaryArchSuffix + cmd:ld$secondaryArchSuffix + " + +SOURCE_DIR="$portVersionedName" + +PATCHES="ode-0.12.patch" + BUILD() { - cd ode-0.12 - ./configure --prefix=`finddir B_COMMON_DIRECTORY` - make + runConfigure ./configure --prefix=$prefix + make $jobArgs BUILDHOME=`finddir B_SYSTEM_DEVELOP_DIRECTORY` } INSTALL() { - cd ode-0.12 make install + + prepareInstalledDevelLib libode + fixPkgconfig + + # devel package + packageEntries devel \ + $developDir } + +PROVIDES_devel=" + ode${secondaryArchSuffix}_devel = $portVersion + devel:ode$secondaryArchSuffix = $portVersion + devel:libode$secondaryArchSuffix = $portVersion + " + +REQUIRES_devel=" + ode$secondaryArchSuffix == $portVersion base + " diff --git a/dev-games/ode/patches/ode-0.12.patch b/dev-games/ode/patches/ode-0.12.patch index 131dddd87..1e00efd8e 100644 --- a/dev-games/ode/patches/ode-0.12.patch +++ b/dev-games/ode/patches/ode-0.12.patch @@ -1,18 +1,6 @@ -diff -u ode-0.12/ode/src/joints/Makefile.in ode-0.12-haiku/ode/src/joints/Makefile.in ---- ode-0.12/ode/src/joints/Makefile.in 2012-05-28 23:26:01.017825792 +0000 -+++ ode-0.12-haiku/ode/src/joints/Makefile.in 2012-12-27 19:39:57.854327296 +0000 -@@ -53,7 +53,7 @@ - contact.lo universal.lo hinge2.lo fixed.lo null.lo amotor.lo \ - lmotor.lo plane2d.lo pu.lo pr.lo piston.lo - libjoints_la_OBJECTS = $(am_libjoints_la_OBJECTS) --DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)/ode/src -+DEFAULT_INCLUDES = -I.@am__isrc@ -I- -I$(top_builddir)/ode/src - depcomp = $(SHELL) $(top_srcdir)/depcomp - am__depfiles_maybe = depfiles - am__mv = mv -f -diff -u ode-0.12/include/ode/collision.h ode-0.12-haiku/include/ode/collision.h ---- ode-0.12/include/ode/collision.h 2012-12-27 19:39:13.484704256 +0000 -+++ ode-0.12-haiku/include/ode/collision.h 2012-12-27 19:39:01.685244416 +0000 +diff -ur ode-0.12/include/ode/collision.h ode-0.12-patch/include/ode/collision.h +--- ode-0.12/include/ode/collision.h 2010-11-08 12:00:18.044564480 +0000 ++++ ode-0.12-patch/include/ode/collision.h 2013-12-16 16:47:37.561774592 +0000 @@ -1081,7 +1081,7 @@ ODE_API void dGeomRaySetClosestHit (dGeomID g, int closestHit); ODE_API int dGeomRayGetClosestHit (dGeomID g); @@ -22,3 +10,15 @@ diff -u ode-0.12/include/ode/collision.h ode-0.12-haiku/include/ode/collision.h ODE_API dGeomID dCreateGeomTransform (dSpaceID space); ODE_API void dGeomTransformSetGeom (dGeomID g, dGeomID obj); +diff -ur ode-0.12/ode/src/joints/Makefile.in ode-0.12-patch/ode/src/joints/Makefile.in +--- ode-0.12/ode/src/joints/Makefile.in 2012-05-28 23:26:01.004980736 +0000 ++++ ode-0.12-patch/ode/src/joints/Makefile.in 2013-12-16 16:35:09.259784704 +0000 +@@ -53,7 +53,7 @@ + contact.lo universal.lo hinge2.lo fixed.lo null.lo amotor.lo \ + lmotor.lo plane2d.lo pu.lo pr.lo piston.lo + libjoints_la_OBJECTS = $(am_libjoints_la_OBJECTS) +-DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)/ode/src ++DEFAULT_INCLUDES = -I.@am__isrc@ -I- -I$(top_builddir)/ode/src + depcomp = $(SHELL) $(top_srcdir)/depcomp + am__depfiles_maybe = depfiles + am__mv = mv -f From dd988ba92a95c18ec6f6174832608693794f83da Mon Sep 17 00:00:00 2001 From: Theodore Kokkoris Date: Mon, 16 Dec 2013 18:37:48 +0000 Subject: [PATCH 2/5] Modifications on the ODE recipe --- dev-games/ode/ode-0.12.recipe | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/dev-games/ode/ode-0.12.recipe b/dev-games/ode/ode-0.12.recipe index d23c264ac..6bec79857 100644 --- a/dev-games/ode/ode-0.12.recipe +++ b/dev-games/ode/ode-0.12.recipe @@ -14,7 +14,6 @@ SECONDARY_ARCHITECTURES="x86_gcc2 ?x86" PROVIDES=" ode$secondaryArchSuffix = $portVersion - cmd:ode_config = $portVersion " REQUIRES=" @@ -38,8 +37,8 @@ PATCHES="ode-0.12.patch" BUILD() { - runConfigure ./configure --prefix=$prefix - make $jobArgs BUILDHOME=`finddir B_SYSTEM_DEVELOP_DIRECTORY` + runConfigure ./configure + make $jobArgs } INSTALL() { @@ -50,13 +49,14 @@ INSTALL() # devel package packageEntries devel \ - $developDir + $developDir \ + $binDir # ode_config binary here } PROVIDES_devel=" ode${secondaryArchSuffix}_devel = $portVersion - devel:ode$secondaryArchSuffix = $portVersion devel:libode$secondaryArchSuffix = $portVersion + cmd:ode_config = $portVersion " REQUIRES_devel=" From 08cd2aa270ce66ce963c5fd79a50324b242e3200 Mon Sep 17 00:00:00 2001 From: Theodore Kokkoris Date: Mon, 16 Dec 2013 19:18:12 +0000 Subject: [PATCH 3/5] Removed SOURCE_DIR --- dev-games/ode/ode-0.12.recipe | 2 -- 1 file changed, 2 deletions(-) diff --git a/dev-games/ode/ode-0.12.recipe b/dev-games/ode/ode-0.12.recipe index 6bec79857..bce78da7c 100644 --- a/dev-games/ode/ode-0.12.recipe +++ b/dev-games/ode/ode-0.12.recipe @@ -31,8 +31,6 @@ BUILD_PREREQUIRES=" cmd:ld$secondaryArchSuffix " -SOURCE_DIR="$portVersionedName" - PATCHES="ode-0.12.patch" BUILD() From 86cb7ed16cf3629d7df5969ce9e8a1b63a006789 Mon Sep 17 00:00:00 2001 From: Theodore Kokkoris Date: Mon, 16 Dec 2013 20:03:51 +0000 Subject: [PATCH 4/5] Enable shared building for ODE --- dev-games/ode/ode-0.12.recipe | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dev-games/ode/ode-0.12.recipe b/dev-games/ode/ode-0.12.recipe index bce78da7c..d59e033d3 100644 --- a/dev-games/ode/ode-0.12.recipe +++ b/dev-games/ode/ode-0.12.recipe @@ -35,7 +35,7 @@ PATCHES="ode-0.12.patch" BUILD() { - runConfigure ./configure + runConfigure ./configure --enable-shared make $jobArgs } INSTALL() From 4ab43be501b19035537f7166174cb18da212a153 Mon Sep 17 00:00:00 2001 From: Theodore Kokkoris Date: Mon, 16 Dec 2013 21:18:42 +0000 Subject: [PATCH 5/5] New PROVIDEs, fixed references for ode-config, require haiku for devel package --- dev-games/ode/ode-0.12.recipe | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/dev-games/ode/ode-0.12.recipe b/dev-games/ode/ode-0.12.recipe index d59e033d3..2c32a8fac 100644 --- a/dev-games/ode/ode-0.12.recipe +++ b/dev-games/ode/ode-0.12.recipe @@ -14,6 +14,7 @@ SECONDARY_ARCHITECTURES="x86_gcc2 ?x86" PROVIDES=" ode$secondaryArchSuffix = $portVersion + lib:libode$secondaryArchSuffix = $portVersion " REQUIRES=" @@ -40,6 +41,8 @@ BUILD() } INSTALL() { + fixDevelopLibDirReferences ode-config + make install prepareInstalledDevelLib libode @@ -54,9 +57,10 @@ INSTALL() PROVIDES_devel=" ode${secondaryArchSuffix}_devel = $portVersion devel:libode$secondaryArchSuffix = $portVersion - cmd:ode_config = $portVersion + cmd:ode_config$secondaryArchSuffix = $portVersion " REQUIRES_devel=" + haiku$secondaryArchSuffix >= $haikuVersion ode$secondaryArchSuffix == $portVersion base "