Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master games grimoire by Julien ROZO (d62f9feac5f8e8f4ef40d28895b2d6ab253d6085)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Julien ROZO <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master games grimoire by Julien ROZO (d62f9feac5f8e8f4ef40d28895b2d6ab253d6085)
  • Date: Wed, 24 Dec 2008 04:26:51 -0600

GIT changes to master games grimoire by Julien ROZO <julien AT rozo.org>:

ChangeLog | 3 ++
FUNCTIONS | 12 +++++++++
games-libs/bullet/BUILD | 12 ---------
games-libs/bullet/DEPENDS | 2 -
games-libs/bullet/DETAILS | 6 ++--
games-libs/bullet/HISTORY | 7 +++++
games-libs/bullet/INSTALL | 1
games-libs/bullet/PRE_BUILD | 7 -----
games-libs/bullet/bullet-multithreaded-disable.patch | 23
-------------------
9 files changed, 27 insertions(+), 46 deletions(-)

New commits:
commit d62f9feac5f8e8f4ef40d28895b2d6ab253d6085
Author: Julien ROZO <julien AT rozo.org>
Commit: Julien ROZO <julien AT rozo.org>

bullet: updated version to 2.73
build process now uses cmake instead of configure+jam
in DEPENDS, replaced jam with cmake
removed PRE_BUILD and bullet-multithreaded-disable.patch as they are not
needed anymore
removed INSTALL, installation process no longer uses jam

commit 1003332096d3f68e7d6aa4dbbdef45c8fa20d032
Author: Julien ROZO <julien AT rozo.org>
Commit: Julien ROZO <julien AT rozo.org>

FUNCTIONS: added cmake_build function from test grimoire

diff --git a/ChangeLog b/ChangeLog
index bd3c646..44395da 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,6 @@
+2008-12-24 Julien "_kaze_" ROZO <julien AT rozo.org>
+ * FUNCTIONS: added cmake_build function from test grimoire
+
2008-10-23 Mathieu Lonjaret <lejatorn AT sourcemage.org>
* games-arcade-2d/xblast: new spell

diff --git a/FUNCTIONS b/FUNCTIONS
index cf215b7..b437845 100755
--- a/FUNCTIONS
+++ b/FUNCTIONS
@@ -74,6 +74,18 @@ function default_games_build() {
default_build
}

+#---
+## @Synopsis cmake_build function to build
+## @Synopsis source code with cmake
+#---
+
+function cmake_build() {
+ cd $SOURCE_DIRECTORY &&
+ mkdir -p build &&
+ cd build &&
+ cmake -DCMAKE_INSTALL_PREFIX=$INSTALL_ROOT/usr ../ $OPTS &&
+ make
+}

#---
## @Synopsis profile_install function to make installing
diff --git a/games-libs/bullet/BUILD b/games-libs/bullet/BUILD
index 34e77cd..e013b8d 100755
--- a/games-libs/bullet/BUILD
+++ b/games-libs/bullet/BUILD
@@ -1,11 +1 @@
-OPTS="--build=${BUILD} $OPTS"
-[[ $CROSS_INSTALL == on ]] && OPTS="$OPTS --host=${HOST}"
-
-./configure --prefix=${TRACK_ROOT}/usr \
- --sysconfdir=${TRACK_ROOT}/etc \
- --localstatedir=${TRACK_ROOT}/var \
- --mandir=${TRACK_ROOT}/usr/share/man \
- --infodir=${TRACK_ROOT}/usr/share/info \
- $OPTS &&
-jam
-
+cmake_build
diff --git a/games-libs/bullet/DEPENDS b/games-libs/bullet/DEPENDS
index 32f196d..41fb8c8 100755
--- a/games-libs/bullet/DEPENDS
+++ b/games-libs/bullet/DEPENDS
@@ -1,4 +1,4 @@
depends X11-LIBS &&
depends OPENGL &&
depends GLUT &&
-depends jam
+depends cmake
diff --git a/games-libs/bullet/DETAILS b/games-libs/bullet/DETAILS
index 7b20240..fa007ba 100755
--- a/games-libs/bullet/DETAILS
+++ b/games-libs/bullet/DETAILS
@@ -1,8 +1,8 @@
SPELL=bullet
- VERSION=2.70
- SOURCE="${SPELL}-${VERSION}.tgz"
+ VERSION=2.73
+ SOURCE="${SPELL}-${VERSION}-sp1.tgz"
SOURCE_URL[0]=http://${SPELL}.googlecode.com/files/${SOURCE}
-
SOURCE_HASH=sha512:1b16c4ff247c1533e9e6cce5c7f788ecac4d61b64f0e95d17b738b5b623590bb63cfbe40d260604db6560e6cd0142add42f92d6f39cee23011c93f006ec9a6d3
+
SOURCE_HASH=sha512:9ed6b8e1dbb22b01fa9510956892fd06c71327e19c027ade39ee44501b966a75b9fc516568a97c55442e5f96bc1f402c6ef25bc93bbb5e47bc71d34583bbb81c
SOURCE_DIRECTORY="${BUILD_DIRECTORY}/${SPELL}-${VERSION}"
WEB_SITE="http://www.bulletphysics.com/";
LICENSE[0]=zlib
diff --git a/games-libs/bullet/HISTORY b/games-libs/bullet/HISTORY
index 0707501..50bb79b 100644
--- a/games-libs/bullet/HISTORY
+++ b/games-libs/bullet/HISTORY
@@ -1,3 +1,10 @@
+2008-12-24 Julien "_kaze_" ROZO <julien AT rozo.org>
+ * DETAILS: updated version to 2.73
+ * BUILD: replaced configure+jam with cmake
+ * DEPENDS: replaced jam with cmake
+ * PRE_BUILD, bullet-multithreaded-disable.patch: removed, not needed
anymore
+ * INSTALL: removed, installation no longer uses jam
+
2008-08-22 Julien "_kaze_" ROZO <julien AT rozo.org>
* DETAILS: updated version to 2.70
* PRE_BUILD: removed sedit trick as it's no longer needed,
diff --git a/games-libs/bullet/INSTALL b/games-libs/bullet/INSTALL
deleted file mode 100755
index 05c8035..0000000
--- a/games-libs/bullet/INSTALL
+++ /dev/null
@@ -1 +0,0 @@
-jam install
diff --git a/games-libs/bullet/PRE_BUILD b/games-libs/bullet/PRE_BUILD
deleted file mode 100755
index e29258e..0000000
--- a/games-libs/bullet/PRE_BUILD
+++ /dev/null
@@ -1,7 +0,0 @@
-default_pre_build &&
-cd ${SOURCE_DIRECTORY} &&
-
-# disabling compilation of BulletMultiThreaded on x86_64
-if [[ ${SMGL_COMPAT_ARCHS[1]} == "x86_64" ]]; then
- patch -p1 < ${SPELL_DIRECTORY}/bullet-multithreaded-disable.patch
-fi
diff --git a/games-libs/bullet/bullet-multithreaded-disable.patch
b/games-libs/bullet/bullet-multithreaded-disable.patch
deleted file mode 100644
index 02ceb65..0000000
--- a/games-libs/bullet/bullet-multithreaded-disable.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-diff -Naur bullet-2.70.old/Extras/Jamfile bullet-2.70/Extras/Jamfile
---- bullet-2.70.old/Extras/Jamfile 2008-04-10 22:00:41.000000000 +0200
-+++ bullet-2.70/Extras/Jamfile 2008-08-15 09:38:41.000000000 +0200
-@@ -5,7 +5,7 @@
- SubInclude TOP Extras glui ;
- SubInclude TOP Extras LibXML ;
- SubInclude TOP Extras BulletColladaConverter ;
--SubInclude TOP Extras BulletMultiThreaded ;
-+#SubInclude TOP Extras BulletMultiThreaded ;
- #SubInclude TOP Extras EPA ;
- #SubInclude TOP Extras ExtraSolid35 ;
- SubInclude TOP Extras GIMPACT ;
---- bullet-2.70.old/Demos/Jamfile 2008-04-11 20:56:49.000000000 +0200
-+++ bullet-2.70/Demos/Jamfile 2008-08-15 22:25:14.000000000 +0200
-@@ -76,7 +76,7 @@
- SubInclude TOP Demos CcdPhysicsDemo ;
- SubInclude TOP Demos Benchmarks ;
- SubInclude TOP Demos UserCollisionAlgorithm ;
--SubInclude TOP Demos MultiThreadedDemo ;
-+#SubInclude TOP Demos MultiThreadedDemo ;
- #SubInclude TOP Demos ForkLiftDemo ;
- SubInclude TOP Demos BulletDinoDemo ;
- SubInclude TOP Demos EPAPenDepthDemo ;



  • [SM-Commit] GIT changes to master games grimoire by Julien ROZO (d62f9feac5f8e8f4ef40d28895b2d6ab253d6085), Julien ROZO, 12/24/2008

Archive powered by MHonArc 2.6.24.

Top of Page