From 56bd759df1d0c750a065b8c845e93d5dfa6b549d Mon Sep 17 00:00:00 2001 From: "Robin H. Johnson" Date: Sat, 8 Aug 2015 13:49:04 -0700 Subject: proj/gentoo: Initial commit MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This commit represents a new era for Gentoo: Storing the gentoo-x86 tree in Git, as converted from CVS. This commit is the start of the NEW history. Any historical data is intended to be grafted onto this point. Creation process: 1. Take final CVS checkout snapshot 2. Remove ALL ChangeLog* files 3. Transform all Manifests to thin 4. Remove empty Manifests 5. Convert all stale $Header$/$Id$ CVS keywords to non-expanded Git $Id$ 5.1. Do not touch files with -kb/-ko keyword flags. Signed-off-by: Robin H. Johnson X-Thanks: Alec Warner - did the GSoC 2006 migration tests X-Thanks: Robin H. Johnson - infra guy, herding this project X-Thanks: Nguyen Thai Ngoc Duy - Former Gentoo developer, wrote Git features for the migration X-Thanks: Brian Harring - wrote much python to improve cvs2svn X-Thanks: Rich Freeman - validation scripts X-Thanks: Patrick Lauer - Gentoo dev, running new 2014 work in migration X-Thanks: Michał Górny - scripts, QA, nagging X-Thanks: All of other Gentoo developers - many ideas and lots of paint on the bikeshed --- .../crashtest/files/crashtest-1.1-gentoo.patch | 94 ++++++++++++++++++++++ 1 file changed, 94 insertions(+) create mode 100644 games-simulation/crashtest/files/crashtest-1.1-gentoo.patch (limited to 'games-simulation/crashtest/files') diff --git a/games-simulation/crashtest/files/crashtest-1.1-gentoo.patch b/games-simulation/crashtest/files/crashtest-1.1-gentoo.patch new file mode 100644 index 000000000000..820fd4924737 --- /dev/null +++ b/games-simulation/crashtest/files/crashtest-1.1-gentoo.patch @@ -0,0 +1,94 @@ +diff -ru crashtest-1.1.orig/src-crashtest/Makefile crashtest-1.1/src-crashtest/Makefile +--- crashtest-1.1.orig/src-crashtest/Makefile 2009-02-15 17:11:31.000000000 -0500 ++++ crashtest-1.1/src-crashtest/Makefile 2009-10-14 01:00:13.900627555 -0400 +@@ -1,34 +1,12 @@ +-# EDIT THESE SETTINGS +- +-PLIBPREFIX=/usr +-ODEPREFIX=/usr +-CXX=g++ +- +-#PLIBPREFIX=$(HOME) +-#ODEPREFIX=$(HOME) +-#CXX=g++-4.0 +- +-# END OF CUSTOM SETTINGS +- +-CXXFLAGS=\ +- -I$(ODEPREFIX)/include \ +- -I$(PLIBPREFIX)/include \ +- -I../src-common \ +- -O2 -g -Wall +- +-LFLAGS=\ +- -L$(PLIBPREFIX)/lib \ +- -L/usr/X11R6/lib +- + OBJS=staticworldobject.o crashtest.o dynamicobject.o cartobject.o ++CXXFLAGS+=-I `fltk-config --includedir` `ode-config --cflags` + +-LIBS= $(ODEPREFIX)/lib/libode.a -lplibssgaux -lplibssg -lplibsg -lplibpu -lplibfnt -lplibul -lGLU -lGL `fltk-config --use-gl --use-images --ldflags` +- ++LIBS= `ode-config --libs` -lplibssgaux -lplibssg -lplibsg -lplibpu -lplibfnt -lplibul -lGLU -lGL -lasound `fltk-config --use-gl --use-images --ldflags` -lglut + + all: crashtest + + crashtest: $(OBJS) +- $(CXX) -o crashtest $(OBJS) $(LFLAGS) $(LIBS) ++ $(CXX) -o crashtest $(OBJS) $(LDFLAGS) $(LIBS) + + staticworldobject.o: ../src-common/staticworldobject.cxx ../src-common/staticworldobject.h ../src-common/worldobject.h + $(CXX) -c $(CXXFLAGS) ../src-common/staticworldobject.cxx +@@ -37,10 +14,10 @@ + $(CXX) -c $(CXXFLAGS) ../src-common/dynamicobject.cxx + + cartobject.o: cartobject.cxx cartobject.h +- $(CXX) -c $(CXXFLAGS) cartobject.cxx ++ $(CXX) -c $(CXXFLAGS) -I../src-common cartobject.cxx + + crashtest.o: crashtest.cxx crashworld.h ../src-common/modelmap.h cartobject.h bipedobject.h ../src-common/brickwall.h ../src-common/stereocontext.h ../src-common/usercam.h +- $(CXX) -c $(CXXFLAGS) crashtest.cxx ++ $(CXX) -c $(CXXFLAGS) -I../src-common crashtest.cxx + + + +@@ -48,13 +25,13 @@ + PLODE_DATADIR=`pwd` ./crashtest + + +-GAMEDIR=$(DESTDIR)/usr/share/games/crashtest ++GAMEDIR=$(DESTDIR)@GENTOO_DATADIR@ + install: crashtest + # Directories +- mkdir -p $(DESTDIR)/usr/games/ ++ mkdir -p $(DESTDIR)@GENTOO_BINDIR@ + mkdir -p $(GAMEDIR)/models/ + # Binary +- install crashtest $(DESTDIR)/usr/games/crashtest ++ install crashtest $(DESTDIR)@GENTOO_BINDIR@ + # Models + install -m 644 models/testground.3ds $(GAMEDIR)/models/testground.3ds + install -m 644 models/biped_torso.3ds $(GAMEDIR)/models/biped_torso.3ds +diff -ru crashtest-1.1.orig/src-crashtest/crashtest.cxx crashtest-1.1/src-crashtest/crashtest.cxx +--- crashtest-1.1.orig/src-crashtest/crashtest.cxx 2009-02-15 17:08:24.000000000 -0500 ++++ crashtest-1.1/src-crashtest/crashtest.cxx 2009-10-14 01:01:25.822753522 -0400 +@@ -615,13 +615,7 @@ + + int main(int argc, char *argv[]) + { +- char *bindirname = dirname(argv[0]); +- if (!strcmp(bindirname,".")) +- dirprefix="/usr/share/games/crashtest"; +- else +- { +- dirprefix = dirname(bindirname) + std::string("/share/games/crashtest"); +- } ++ dirprefix="@GENTOO_DATADIR@"; + if (getenv("PLODE_DATADIR")) + dirprefix = getenv("PLODE_DATADIR"); + modelmap = new ModelMap(dirprefix); +@@ -745,4 +739,3 @@ + Fl::add_idle(idle, &simwin); + Fl::run(); + } +- -- cgit v1.2.3-18-g5258