diff options
author | Michael Sterrett <mr_bones_@gentoo.org> | 2009-08-01 17:04:17 +0000 |
---|---|---|
committer | Michael Sterrett <mr_bones_@gentoo.org> | 2009-08-01 17:04:17 +0000 |
commit | 9d986e00ca593184bb1e08a91ae965c3a609c93c (patch) | |
tree | 39853cc43d310e8af43f7f34adf5c4e5e8f34eda /games-sports/torcs/files | |
parent | Mask fglrx in use.mask instead of package.use.mask (diff) | |
download | gentoo-2-9d986e00ca593184bb1e08a91ae965c3a609c93c.tar.gz gentoo-2-9d986e00ca593184bb1e08a91ae965c3a609c93c.tar.bz2 gentoo-2-9d986e00ca593184bb1e08a91ae965c3a609c93c.zip |
old
(Portage version: 2.1.6.13/cvs/Linux i686)
Diffstat (limited to 'games-sports/torcs/files')
-rw-r--r-- | games-sports/torcs/files/torcs-1.3.0-as-needed.patch | 101 | ||||
-rw-r--r-- | games-sports/torcs/files/torcs-1.3.0-gcc43.patch | 74 |
2 files changed, 0 insertions, 175 deletions
diff --git a/games-sports/torcs/files/torcs-1.3.0-as-needed.patch b/games-sports/torcs/files/torcs-1.3.0-as-needed.patch deleted file mode 100644 index e0616cd93512..000000000000 --- a/games-sports/torcs/files/torcs-1.3.0-as-needed.patch +++ /dev/null @@ -1,101 +0,0 @@ ---- configure.in -+++ configure.in -@@ -118,8 +118,7 @@ - AC_CHECK_LIB(Xrandr, XRRQueryVersion,,AC_MSG_ERROR([Can't find libXrandr. Please check config.log and if you can't solve the problem send the file to torcs-users@lists.sourceforge.net with the subject \"torcs compilation problem\"])) - AC_CHECK_LIB(openal, alEnable,, AC_MSG_ERROR([Can't find AL/al.h. OpenAL can be found on http://www.openal.org/])) - AC_CHECK_LIB(alut, alutLoadWAVFile, -- LDFLAGS="$LDFLAGS -lalut", -- LDFLAGS="$LDFLAGS") -+ LIBS="$LIBS -lalut", ) - - AC_CHECK_LIB(dl, dlopen) - AC_CHECK_FUNC(dlopen,,AC_MSG_ERROR([Can't find dlopen function. Please check config.log and if you can't solve the problem send the file to torcs-users@lists.sourceforge.net with the subject \"torcs compilation problem\"])) ---- Make-default.mk -+++ Make-default.mk -@@ -402,7 +402,7 @@ - ifdef PROGRAM - - ${PROGRAM}: ${OBJECTS} $(subst -l,${EXPORTBASE}/lib/lib, ${LIBS:=.a}) -- ${CXX} ${OBJECTS} ${LDFLAGS} ${LIBS} ${SOLIBS} ${EXT_LIBS} -o $@ -+ ${CXX} ${CXXFLAGS} ${LDFLAGS} -o $@ ${OBJECTS} ${SOLIBS} ${LIBS} ${EXT_LIBS} - - installprogram: ${PROGRAM} - @ createdir="${INSTLIBBASE}" ; \ -@@ -420,14 +420,14 @@ - ifdef LOCALTOOLS - - ${LOCALTOOLS}: ${OBJECTS} $(subst -l,${EXPORTBASE}/lib/lib, ${LIBS:=.a}) -- ${CXX} ${OBJECTS} ${LDFLAGS} ${LIBS} ${EXT_LIBS} ${SOLIBS} -o $@ -+ ${CXX} ${CXXFLAGS} ${LDFLAGS} -o $@ ${OBJECTS} ${SOLIBS} ${LIBS} ${EXT_LIBS} - - endif - - ifdef TOOLS - - ${TOOLS}: ${OBJECTS} $(subst -l,${EXPORTBASE}/lib/lib, ${LIBS:=.a}) -- ${CXX} ${OBJECTS} ${LDFLAGS} ${LIBS} ${EXT_LIBS} ${SOLIBS} -o $@ -+ ${CXX} ${CXXFLAGS} ${LDFLAGS} -o $@ ${OBJECTS} ${SOLIBS} ${LIBS} ${EXT_LIBS} - - installtools: ${TOOLS} - @createdir="${INSTBINBASE}/${TOOLSDIR}" ; \ -@@ -478,7 +478,7 @@ - ifdef SOLIBRARY - - ${SOLIBRARY}: ${OBJECTS} -- ${CXX} -shared -o ${SOLIBRARY} ${OBJECTS} ${LDFLAGS} ${LIBSPATH} ${LIBS} ${DEBUG_LIBS} -+ ${CXX} ${CXXFLAGS} ${LDFLAGS} -shared -o ${SOLIBRARY} ${OBJECTS} ${SOLIBS} ${LIBS} ${EXT_LIBS} - @D=`pwd` ; \ - createdir="${EXPORTBASE}/lib" ; \ - $(mkinstalldirs) $$createdir ; \ -@@ -509,7 +509,7 @@ - ifdef MODULE - - ${MODULE}: ${OBJECTS} -- ${CXX} -shared -o ${MODULE} ${OBJECTS} ${LDFLAGS} ${LIBSPATH} ${LIBS} -+ ${CXX} ${CXXFLAGS} ${LDFLAGS} -shared -o ${MODULE} ${OBJECTS} ${SOLIBS} ${LIBS} ${EXT_LIBS} - @D=`pwd` ; \ - createdir="${EXPORTBASE}/${MODULEDIR}" ; \ - $(mkinstalldirs) $$createdir ; \ ---- src/libs/client/Makefile -+++ src/libs/client/Makefile -@@ -23,6 +23,8 @@ - SOURCES = entry.cpp mainmenu.cpp splash.cpp exitmenu.cpp \ - optionmenu.cpp - -+SOLIBS = -lconfscreens -lraceengine -+ - LIBS = -lplibssg -lplibsg -lplibul - - EXPDIR = include ---- src/libs/Makefile -+++ src/libs/Makefile -@@ -23,7 +23,7 @@ - - TOOLSUBDIRS = txml - --SUBDIRS = confscreens racescreens robottools txml tgf tgfclient client raceengineclient learning \ -+SUBDIRS = confscreens racescreens robottools txml tgf tgfclient raceengineclient client learning \ - portability math - - PKGSUBDIRS = $(SUBDIRS) ---- src/libs/raceengineclient/Makefile -+++ src/libs/raceengineclient/Makefile -@@ -23,6 +23,8 @@ - SOURCES = singleplayer.cpp raceinit.cpp racemain.cpp racemanmenu.cpp racestate.cpp racegl.cpp \ - raceengine.cpp raceresults.cpp - -+SOLIBS = -lconfscreens -lrobottools -lracescreens -+ - EXPDIR = include - - EXPORTS = singleplayer.h raceinit.h ---- src/libs/tgf/Makefile -+++ src/libs/tgf/Makefile -@@ -29,6 +29,7 @@ - profiler.cpp \ - hash.cpp - -+SOLIBS = -ltxml - - EXPDIR = include - diff --git a/games-sports/torcs/files/torcs-1.3.0-gcc43.patch b/games-sports/torcs/files/torcs-1.3.0-gcc43.patch deleted file mode 100644 index fcc5604e79cc..000000000000 --- a/games-sports/torcs/files/torcs-1.3.0-gcc43.patch +++ /dev/null @@ -1,74 +0,0 @@ -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; - |