diff options
Diffstat (limited to 'games-sports')
-rw-r--r-- | games-sports/toycars/ChangeLog | 9 | ||||
-rw-r--r-- | games-sports/toycars/files/toycars-0.3.5-64bit.patch | 31 | ||||
-rw-r--r-- | games-sports/toycars/files/toycars-0.3.5-asneeded.patch | 10 | ||||
-rw-r--r-- | games-sports/toycars/files/toycars-0.3.5-assert.patch | 10 | ||||
-rw-r--r-- | games-sports/toycars/files/toycars-0.3.5-datadir.patch | 11 | ||||
-rw-r--r-- | games-sports/toycars/files/toycars-0.3.5-fmod.patch | 11 | ||||
-rw-r--r-- | games-sports/toycars/files/toycars-0.3.5-gcc43.patch | 66 | ||||
-rw-r--r-- | games-sports/toycars/toycars-0.3.9.ebuild (renamed from games-sports/toycars/toycars-0.3.5.ebuild) | 26 |
8 files changed, 17 insertions, 157 deletions
diff --git a/games-sports/toycars/ChangeLog b/games-sports/toycars/ChangeLog index 83c64f57e188..d143d652c2c1 100644 --- a/games-sports/toycars/ChangeLog +++ b/games-sports/toycars/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for games-sports/toycars -# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/games-sports/toycars/ChangeLog,v 1.11 2008/12/21 02:54:29 darkside Exp $ +# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/games-sports/toycars/ChangeLog,v 1.12 2009/06/03 20:05:49 ssuominen Exp $ + +*toycars-0.3.9 (03 Jun 2009) + + 03 Jun 2009; Samuli Suominen <ssuominen@gentoo.org> +toycars-0.3.9.ebuild: + Version bump wrt #239127. 21 Dec 2008; Jeremy Olexa <darkside@gentoo.org> +files/toycars-0.3.5-64bit.patch, +files/toycars-0.3.5-gcc43.patch, diff --git a/games-sports/toycars/files/toycars-0.3.5-64bit.patch b/games-sports/toycars/files/toycars-0.3.5-64bit.patch deleted file mode 100644 index e9eac480667e..000000000000 --- a/games-sports/toycars/files/toycars-0.3.5-64bit.patch +++ /dev/null @@ -1,31 +0,0 @@ -diff -ur toycars-0.3.5/src/Player.cpp ../../../toycars-0.3.5/src/Player.cpp ---- toycars-0.3.5/src/Player.cpp 2007-12-17 18:38:18.000000000 +0200 -+++ ../../../toycars-0.3.5/src/Player.cpp 2008-01-15 22:43:11.000000000 +0200 -@@ -446,7 +446,7 @@ - - void Player::printDebugInfo() const - { -- printf("player id: %x\n", (unsigned int)(this)); -+ printf("player id: %x\n", (long long)(this)); - printf("stuck: %d\n", ((Player*)(this))->playerIsStuck()); - } - -diff -ur toycars-0.3.5/src/RobotHotPotatoPlayer.cpp ../../../toycars-0.3.5/src/RobotHotPotatoPlayer.cpp ---- toycars-0.3.5/src/RobotHotPotatoPlayer.cpp 2007-12-18 15:13:22.000000000 +0200 -+++ ../../../toycars-0.3.5/src/RobotHotPotatoPlayer.cpp 2008-01-15 22:44:30.000000000 +0200 -@@ -16,6 +16,7 @@ - - #include "RobotHotPotatoPlayer.h" - #include "HotPotatoGame.h" -+#include <assert.h> - - RobotHotPotatoPlayer::RobotHotPotatoPlayer(ToyCar& inCar, list<Tuple> *path, int inPlayerNumber, FMOD::System* inFMOD_System) - : RobotPlayer(inCar, path, inPlayerNumber, inFMOD_System), backupDist(-1.0) -@@ -154,6 +155,6 @@ - printf("route: %d\n", debugRoute); - printf("avoiding: %d\n", avoiding); - printf("catching: %d\n", catching); -- printf("targetPlayer: %x\n", (unsigned int)(targetPlayer)); -+ printf("targetPlayer: %x\n", (long long)(targetPlayer)); - //printf("backupDist: %lf\n", backupDist); - } diff --git a/games-sports/toycars/files/toycars-0.3.5-asneeded.patch b/games-sports/toycars/files/toycars-0.3.5-asneeded.patch deleted file mode 100644 index 5ef161614921..000000000000 --- a/games-sports/toycars/files/toycars-0.3.5-asneeded.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- src/Makefile.am -+++ src/Makefile.am -@@ -13,6 +13,4 @@ - ./glf/libglf.a \ - ./MyFisix/libmyfisix.a \ - ./Scoobie/libscoobie.a \ -- ./tinyxml/libtinyxml.a -- --toycars_LDFLAGS = @SDL_LIBS@ @GL_LIBS@ @GLU_LIBS@ @FMOD_LIBS@ -+ ./tinyxml/libtinyxml.a @SDL_LIBS@ @GL_LIBS@ @GLU_LIBS@ @FMOD_LIBS@ diff --git a/games-sports/toycars/files/toycars-0.3.5-assert.patch b/games-sports/toycars/files/toycars-0.3.5-assert.patch deleted file mode 100644 index e29b41dd00e0..000000000000 --- a/games-sports/toycars/files/toycars-0.3.5-assert.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- src/RobotHotPotatoPlayer.cpp -+++ src/RobotHotPotatoPlayer.cpp -@@ -14,6 +14,7 @@ - * Created by Ruben Henner Zilibowitz on 31/10/07. - */ - -+#include <assert.h> - #include "RobotHotPotatoPlayer.h" - #include "HotPotatoGame.h" - diff --git a/games-sports/toycars/files/toycars-0.3.5-datadir.patch b/games-sports/toycars/files/toycars-0.3.5-datadir.patch deleted file mode 100644 index 4d233b750eb4..000000000000 --- a/games-sports/toycars/files/toycars-0.3.5-datadir.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- configure.ac -+++ configure.ac -@@ -14,7 +14,7 @@ - AM_PROG_MKDIR_P - - # Set the DATA_DIR value --FC_EXPAND_DIR(DATA_DIR, "$prefix/share/$PACKAGE_NAME") -+FC_EXPAND_DIR(DATA_DIR, "$datadir/$PACKAGE_NAME") - DATA_DIR="\"$DATA_DIR\"" - AC_DEFINE_UNQUOTED(DATA_DIR, $DATA_DIR, [Location of data directory]) - diff --git a/games-sports/toycars/files/toycars-0.3.5-fmod.patch b/games-sports/toycars/files/toycars-0.3.5-fmod.patch deleted file mode 100644 index a260af4642cc..000000000000 --- a/games-sports/toycars/files/toycars-0.3.5-fmod.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- src/Makefile.am -+++ src/Makefile.am -@@ -3,7 +3,7 @@ - bin_PROGRAMS = toycars - - AM_CXXFLAGS = -Wall @SDL_CFLAGS@ @GL_CFLAGS@ @GLU_CFLAGS@ --AM_CPPFLAGS = -I $(top_srcdir)/src/glf -I $(top_srcdir)/src/MyFisix -I $(top_srcdir)/src/Scoobie -I $(top_srcdir)/src/tinyxml -+AM_CPPFLAGS = -I $(top_srcdir)/src/glf -I $(top_srcdir)/src/MyFisix -I $(top_srcdir)/src/Scoobie -I $(top_srcdir)/src/tinyxml -I/usr/include/fmodex - - toycars_SOURCES = CarGame.cpp RobotPlayer.cpp Player.cpp Wheel.cpp Kaboom.cpp PlayerBomb.cpp WheelSprite.cpp Minimap.cpp Startline.cpp main.cpp NeedleImage.cpp ToyCar.cpp PacejkaCurve.cpp Vehicle.cpp Menu.cpp TcPreferences.cpp HotPotatoGame.cpp KnockOutGame.cpp TrackEditor.cpp RobotHotPotatoPlayer.cpp StartLight.cpp - diff --git a/games-sports/toycars/files/toycars-0.3.5-gcc43.patch b/games-sports/toycars/files/toycars-0.3.5-gcc43.patch deleted file mode 100644 index 9c446467a81e..000000000000 --- a/games-sports/toycars/files/toycars-0.3.5-gcc43.patch +++ /dev/null @@ -1,66 +0,0 @@ -diff -ur toycars-0.3.5.orig/src/CarGame.cpp toycars-0.3.5/src/CarGame.cpp ---- toycars-0.3.5.orig/src/CarGame.cpp 2008-01-17 21:04:57.000000000 +0000 -+++ toycars-0.3.5/src/CarGame.cpp 2008-01-17 21:08:10.000000000 +0000 -@@ -24,6 +24,8 @@ - #include "TcPreferences.h" - #include <cstdlib> - #include "PathLine.h" -+#include <cstdio> -+#include <ctime> - - //------------ - -diff -ur toycars-0.3.5.orig/src/KnockOutGame.cpp toycars-0.3.5/src/KnockOutGame.cpp ---- toycars-0.3.5.orig/src/KnockOutGame.cpp 2008-01-17 21:04:57.000000000 +0000 -+++ toycars-0.3.5/src/KnockOutGame.cpp 2008-01-17 21:10:52.000000000 +0000 -@@ -12,6 +12,7 @@ - #include "ScException.h" - #include "glf.h" - #include "TcPreferences.h" -+#include <cstdio> - - extern TcPreferences *gPreferences; - -diff -ur toycars-0.3.5.orig/src/Player.cpp toycars-0.3.5/src/Player.cpp ---- toycars-0.3.5.orig/src/Player.cpp 2008-01-17 21:04:57.000000000 +0000 -+++ toycars-0.3.5/src/Player.cpp 2008-01-17 21:09:28.000000000 +0000 -@@ -16,6 +16,7 @@ - - #include "Player.h" - #include "CarGame.h" -+#include <cstdio> - - // constants - -diff -ur toycars-0.3.5.orig/src/RobotHotPotatoPlayer.cpp toycars-0.3.5/src/RobotHotPotatoPlayer.cpp ---- toycars-0.3.5.orig/src/RobotHotPotatoPlayer.cpp 2008-01-17 21:04:57.000000000 +0000 -+++ toycars-0.3.5/src/RobotHotPotatoPlayer.cpp 2008-01-17 21:11:13.000000000 +0000 -@@ -17,6 +17,7 @@ - #include "RobotHotPotatoPlayer.h" - #include "HotPotatoGame.h" - #include <assert.h> -+#include <cstdio> - - RobotHotPotatoPlayer::RobotHotPotatoPlayer(ToyCar& inCar, list<Tuple> *path, int inPlayerNumber, FMOD::System* inFMOD_System) - : RobotPlayer(inCar, path, inPlayerNumber, inFMOD_System), backupDist(-1.0) -diff -ur toycars-0.3.5.orig/src/RobotPlayer.cpp toycars-0.3.5/src/RobotPlayer.cpp ---- toycars-0.3.5.orig/src/RobotPlayer.cpp 2008-01-17 21:04:57.000000000 +0000 -+++ toycars-0.3.5/src/RobotPlayer.cpp 2008-01-17 21:09:09.000000000 +0000 -@@ -8,6 +8,7 @@ - */ - - #include "RobotPlayer.h" -+#include <cstdio> - - RobotPlayer::RobotPlayer(ToyCar& inCar, list<Tuple> *path, int inPlayerNumber, FMOD::System* inFMOD_System) - : Player(inCar, path, inPlayerNumber, inFMOD_System), backupDist(0) ---- toycars-0.3.5.orig/src/main.cpp 2008-01-17 21:04:57.000000000 +0000 -+++ toycars-0.3.5/src/main.cpp 2008-01-17 21:10:28.000000000 +0000 -@@ -36,6 +36,7 @@ - #include <cstring> - #include <cstdlib> - #include <ctime> -+#include <iostream> - #include <fcntl.h> - #include <errno.h> - diff --git a/games-sports/toycars/toycars-0.3.5.ebuild b/games-sports/toycars/toycars-0.3.9.ebuild index 522c5a0288c0..63c09c7c51b1 100644 --- a/games-sports/toycars/toycars-0.3.5.ebuild +++ b/games-sports/toycars/toycars-0.3.9.ebuild @@ -1,8 +1,9 @@ -# Copyright 1999-2008 Gentoo Foundation +# Copyright 1999-2009 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/games-sports/toycars/toycars-0.3.5.ebuild,v 1.2 2008/12/21 02:54:29 darkside Exp $ +# $Header: /var/cvsroot/gentoo-x86/games-sports/toycars/toycars-0.3.9.ebuild,v 1.1 2009/06/03 20:05:49 ssuominen Exp $ -inherit autotools eutils games +EAPI=2 +inherit eutils flag-o-matic games DESCRIPTION="a physics based 2-D racer inspired by Micro Machines" HOMEPAGE="http://sourceforge.net/projects/toycars" @@ -13,23 +14,16 @@ SLOT="0" KEYWORDS="~amd64 ~x86" IUSE="" -DEPEND="media-libs/libsdl +RDEPEND="media-libs/libsdl media-libs/sdl-image - >=media-libs/fmod-4 + >=media-libs/fmod-4.25.07-r1:1 virtual/glu virtual/opengl" +DEPEND="${RDEPEND}" -src_unpack() { - unpack ${A} - cd "${S}" - epatch \ - "${FILESDIR}"/${P}-asneeded.patch \ - "${FILESDIR}"/${P}-fmod.patch \ - "${FILESDIR}"/${P}-assert.patch \ - "${FILESDIR}"/${P}-datadir.patch \ - "${FILESDIR}"/${P}-64bit.patch \ - "${FILESDIR}"/${P}-gcc43.patch - AT_M4DIR=m4 eautoreconf +src_configure() { + append-ldflags -L/opt/fmodex/api/lib + egamesconf } src_install() { |