[gentoo-commits] gentoo-x86 commit in games-simulation/crashtest/files: crashtest-1.0-gentoo.patch

[Michael Sterrett (mr_bones_)]

mr_bones_    09/01/22 20:21:06

  Modified:             crashtest-1.0-gentoo.patch
  Log:
  EAPI=2; re-roll patch; work around for bug #237135
  (Portage version: 2.1.6.4/cvs/Linux 2.6.28.1 i686)

Revision  Changes    Path
1.2                  games-simulation/crashtest/files/crashtest-1.0-gentoo.patch

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/games-simulation/crashtest/files/crashtest-1.0-gentoo.patch?rev=1.2&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/games-simulation/crashtest/files/crashtest-1.0-gentoo.patch?rev=1.2&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/games-simulation/crashtest/files/crashtest-1.0-gentoo.patch?r1=1.1&r2=1.2

Index: crashtest-1.0-gentoo.patch
===================================================================
RCS file: /var/cvsroot/gentoo-x86/games-simulation/crashtest/files/crashtest-1.0-gentoo.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- crashtest-1.0-gentoo.patch	18 May 2007 19:06:50 -0000	1.1
+++ crashtest-1.0-gentoo.patch	22 Jan 2009 20:21:06 -0000	1.2
@@ -1,36 +1,29 @@
---- crashtest.cxx.old	2007-05-18 19:56:02.000000000 +0200
-+++ crashtest.cxx	2007-05-18 19:58:54.000000000 +0200
-@@ -607,13 +607,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);
---- Makefile.old	2007-05-18 20:08:12.000000000 +0200
-+++ Makefile	2007-05-18 20:16:40.000000000 +0200
-@@ -10,19 +10,13 @@
- 
- # END OF CUSTOM SETTINGS
- 
+diff -ru crashtest-1.0.orig/src-crashtest/Makefile crashtest-1.0/src-crashtest/Makefile
+--- crashtest-1.0.orig/src-crashtest/Makefile	2006-10-25 12:08:52.000000000 -0400
++++ crashtest-1.0/src-crashtest/Makefile	2009-01-22 02:28:47.000000000 -0500
+@@ -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
- 
+-LFLAGS=\
+-  -L$(PLIBPREFIX)/lib \
+-  -L/usr/X11R6/lib
+-
  OBJS=staticworldobject.o crashtest.o dynamicobject.o cartobject.o
  
 -LIBS= $(ODEPREFIX)/lib/libode.a -lplibssgaux -lplibssg -lplibsg -lplibpu -lplibfnt -lplibul -lGLU -lGL -lasound `fltk-config --use-gl --use-images --ldflags` -lglut
@@ -38,7 +31,14 @@
  
  
  all: crashtest
-@@ -31,10 +31,10 @@
+ 
+ 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 +15,10 @@
  	$(CXX) -c $(CXXFLAGS) ../src-common/dynamicobject.cxx
  
  cartobject.o: cartobject.cxx cartobject.h
@@ -51,7 +51,7 @@
  
  
  
-@@ -48,13 +42,13 @@
+@@ -48,13 +26,13 @@
  	PLODE_DATADIR=`pwd` ./crashtest
  
  
@@ -68,5 +68,45 @@
  	# Models
  	install -m 644 models/testground.3ds $(GAMEDIR)/models/testground.3ds
  	install -m 644 models/biped_torso.3ds $(GAMEDIR)/models/biped_torso.3ds
---- Makefile.old	2007-05-18 20:22:57.000000000 +0200
-+++ Makefile	2007-05-18 20:23:27.000000000 +0200
+Only in crashtest-1.0/src-crashtest: Makefile.orig
+diff -ru crashtest-1.0.orig/src-crashtest/crashtest.cxx crashtest-1.0/src-crashtest/crashtest.cxx
+--- crashtest-1.0.orig/src-crashtest/crashtest.cxx	2006-10-25 11:45:26.000000000 -0400
++++ crashtest-1.0/src-crashtest/crashtest.cxx	2009-01-22 02:32:00.000000000 -0500
+@@ -11,14 +11,14 @@
+ 
+ #include <GL/glu.h>
+ 
+-#include <FL/Fl.H>
+-#include <FL/Fl_Box.H>
+-#include <FL/Fl_Button.H>
+-#include <FL/Fl_Check_Button.H>
+-#include <FL/Fl_Chart.H>
+-#include <FL/Fl_Value_Slider.H>
+-#include <FL/Fl_Gl_Window.H>
+-#include <FL/fl_draw.H>
++#include <fltk-1.1/FL/Fl.H>
++#include <fltk-1.1/FL/Fl_Box.H>
++#include <fltk-1.1/FL/Fl_Button.H>
++#include <fltk-1.1/FL/Fl_Check_Button.H>
++#include <fltk-1.1/FL/Fl_Chart.H>
++#include <fltk-1.1/FL/Fl_Value_Slider.H>
++#include <fltk-1.1/FL/Fl_Gl_Window.H>
++#include <fltk-1.1/FL/fl_draw.H>
+ 
+ #include <plib/ssg.h>
+ #include <plib/ul.h>
+@@ -607,13 +607,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);