[SM-Commit] GIT changes to master games grimoire by Pol Vinogradov (589b4256107167a3cd97afc846cd27116a516fca)

Pol Vinogradov scm at sourcemage.org
Wed Nov 5 14:18:30 EST 2008


GIT changes to master games grimoire by Pol Vinogradov <vin.public at gmail.com>:

 games-simulation/torcs/DEPENDS                         |   13 --
 games-simulation/torcs/HISTORY                         |    6 +
 games-simulation/torcs/PRE_BUILD                       |   15 +--
 games-simulation/torcs/torcs-1.3.0-gcc-4.3.0-fix.patch |   74 +++++++++++++++++
 4 files changed, 90 insertions(+), 18 deletions(-)

New commits:
commit 589b4256107167a3cd97afc846cd27116a516fca
Author: Pol Vinogradov <vin.public at gmail.com>
Commit: Pol Vinogradov <vin.public at gmail.com>

    games-simulation/torcs: added patch to build with gcc 4.3.x, some cleanups in DEPENDS

diff --git a/games-simulation/torcs/DEPENDS b/games-simulation/torcs/DEPENDS
index 1f1e82d..1dd90f4 100755
--- a/games-simulation/torcs/DEPENDS
+++ b/games-simulation/torcs/DEPENDS
@@ -2,14 +2,5 @@ depends  GLUT    &&
 depends  openal  &&
 depends  plib    &&
 depends  libpng  &&
-depends  X11-LIBS  "--with-x"  &&
-
-source  $GRIMOIRE/FUNCTIONS    &&
-
-if  check_if_xorg_modular_libs  ;  then
-  depends  libxrandr  "--enable-xrandr"
-#  optional_depends  libxrandr           \
-#                    "--enable-xrandr"   \
-#                    "--disable-xrandr"  \
-#                    "enable the XRANDR mode?"
-fi
+depends  xorg-libs  "--with-x"  &&
+depends  libxrandr  "--enable-xrandr"
diff --git a/games-simulation/torcs/HISTORY b/games-simulation/torcs/HISTORY
index 9709215..9d38a3f 100644
--- a/games-simulation/torcs/HISTORY
+++ b/games-simulation/torcs/HISTORY
@@ -1,3 +1,9 @@
+2008-11-06 Pol Vinogradov <vin.public at gmail.com>
+	* DEPENDS: got rid of xorg-modular grimoire legacy
+	* PRE_BUILD, torcs-1.3.0-gcc-4.3.0-fix.patch: added to compile with gcc 4.3.x,
+	  patch was taken from Gentoo bug
+	  (http://bugs.gentoo.org/show_bug.cgi?format=multiple&id=216622)
+
 2007-03-28 Pol Vinogradov <vin.public at gmail.com>
 	* BUILD: removed make_{single,normal}, cosmetic fix
 	* PRE_BUILD: added for fixing data directory
diff --git a/games-simulation/torcs/PRE_BUILD b/games-simulation/torcs/PRE_BUILD
index f2ddb15..b929736 100755
--- a/games-simulation/torcs/PRE_BUILD
+++ b/games-simulation/torcs/PRE_BUILD
@@ -1,9 +1,10 @@
-default_pre_build                                                                       &&
-cd ${SOURCE_DIRECTORY}                                                                  &&
+default_pre_build  &&
+cd ${SOURCE_DIRECTORY}  &&
 
-sedit "s:games/torcs:${SPELL}:" src/linux/torcs.in                                      &&
-sedit "s:games/torcs:${SPELL}:" src/tools/accc/accc.in                                  &&
-sedit "s:games/torcs:${SPELL}:" src/tools/nfsperf/nfsperf.in                            &&
-sedit "s:games/torcs:${SPELL}:" src/tools/texmapper/texmapper.in                        &&
-sedit "s:games/torcs:${SPELL}:" src/tools/nfs2ac/nfs2ac.in                              &&
+patch -p0 < ${SCRIPT_DIRECTORY}/torcs-1.3.0-gcc-4.3.0-fix.patch  &&
+sedit "s:games/torcs:${SPELL}:" src/linux/torcs.in  &&
+sedit "s:games/torcs:${SPELL}:" src/tools/accc/accc.in  &&
+sedit "s:games/torcs:${SPELL}:" src/tools/nfsperf/nfsperf.in  &&
+sedit "s:games/torcs:${SPELL}:" src/tools/texmapper/texmapper.in  &&
+sedit "s:games/torcs:${SPELL}:" src/tools/nfs2ac/nfs2ac.in  &&
 sedit "s:datadir = @datadir@/games/torcs:datadir = @datadir@/${SPELL}:" Make-config.in
diff --git a/games-simulation/torcs/torcs-1.3.0-gcc-4.3.0-fix.patch b/games-simulation/torcs/torcs-1.3.0-gcc-4.3.0-fix.patch
new file mode 100644
index 0000000..fcc5604
--- /dev/null
+++ b/games-simulation/torcs/torcs-1.3.0-gcc-4.3.0-fix.patch
@@ -0,0 +1,74 @@
+diff -aur src.old/drivers/olethros/Trajectory.cpp src/drivers/olethros/Trajectory.cpp
+--- src.old/drivers/olethros/Trajectory.cpp	2008-04-06 22:21:31.000000000 +0200
++++ src/drivers/olethros/Trajectory.cpp	2008-04-06 22:28:52.000000000 +0200
+@@ -10,8 +10,10 @@
+  ***************************************************************************/
+ #include <cstdio>
+ #include <cstdlib>
++#include <cstring>
+ #include <cmath>
+ #include <cassert>
++#include <ctime>
+ #include <list>
+ #include <vector>
+ #include "Trajectory.h"
+diff -aur src.old/modules/simu/simuv2/SOLID-2.0/src/BBoxTree.cpp src/modules/simu/simuv2/SOLID-2.0/src/BBoxTree.cpp
+--- src.old/modules/simu/simuv2/SOLID-2.0/src/BBoxTree.cpp	2008-04-06 22:21:31.000000000 +0200
++++ src/modules/simu/simuv2/SOLID-2.0/src/BBoxTree.cpp	2008-04-06 22:22:57.000000000 +0200
+@@ -32,7 +32,7 @@
+ #include "Transform.h"
+ 
+ #include <algorithm>
+-#include <new.h>
++#include <new>
+ 
+ class BBoxCompAxis {
+ public:
+diff -aur src.old/modules/simu/simuv2/SOLID-2.0/src/Complex.cpp src/modules/simu/simuv2/SOLID-2.0/src/Complex.cpp
+--- src.old/modules/simu/simuv2/SOLID-2.0/src/Complex.cpp	2008-04-06 22:21:31.000000000 +0200
++++ src/modules/simu/simuv2/SOLID-2.0/src/Complex.cpp	2008-04-06 22:23:11.000000000 +0200
+@@ -32,7 +32,7 @@
+ #include "Transform.h"
+ #include "BBoxTree.h"
+ 
+-#include <new.h>
++#include <new>
+ 
+ BBoxInternal *free_node;
+ 
+diff -aur src.old/modules/simu/simuv2/SOLID-2.0/src/Endpoint.cpp src/modules/simu/simuv2/SOLID-2.0/src/Endpoint.cpp
+--- src.old/modules/simu/simuv2/SOLID-2.0/src/Endpoint.cpp	2008-04-06 22:21:31.000000000 +0200
++++ src/modules/simu/simuv2/SOLID-2.0/src/Endpoint.cpp	2008-04-06 22:22:29.000000000 +0200
+@@ -32,7 +32,7 @@
+ #include "Object.h"
+ #include "Encounter.h"
+ 
+-#include <new.h>
++#include <new>
+ 
+ void addPair(ObjectPtr object1, ObjectPtr object2);
+ void removePair(ObjectPtr object1, ObjectPtr object2);
+diff -aur src.old/modules/simu/simuv2/SOLID-2.0/src/Object.cpp src/modules/simu/simuv2/SOLID-2.0/src/Object.cpp
+--- src.old/modules/simu/simuv2/SOLID-2.0/src/Object.cpp	2008-04-06 22:21:31.000000000 +0200
++++ src/modules/simu/simuv2/SOLID-2.0/src/Object.cpp	2008-04-06 22:22:40.000000000 +0200
+@@ -33,7 +33,7 @@
+ #include "Convex.h" 
+ #include "Complex.h" 
+ 
+-#include <new.h>
++#include <new>
+ 
+ Object::Object(DtObjectRef obj, ShapePtr shape) : 
+   ref(obj), 
+diff -aur src.old/modules/simu/simuv2/SOLID-2.0/src/Polyhedron.cpp src/modules/simu/simuv2/SOLID-2.0/src/Polyhedron.cpp
+--- src.old/modules/simu/simuv2/SOLID-2.0/src/Polyhedron.cpp	2008-04-06 22:21:31.000000000 +0200
++++ src/modules/simu/simuv2/SOLID-2.0/src/Polyhedron.cpp	2008-04-06 22:22:12.000000000 +0200
+@@ -37,7 +37,7 @@
+ }
+ 
+ #include <vector>
+-#include <new.h>  
++#include <new>  
+ 
+ typedef vector<unsigned int> IndexBuf;
+ 



More information about the SM-Commit mailing list