rpms/scorched3d/devel scorched3d-syslibs.patch, 1.4, 1.5 scorched3d.spec, 1.21, 1.22

[Hans de Goede (jwrdegoede)]

Author: jwrdegoede

Update of /cvs/extras/rpms/scorched3d/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22312

Modified Files:
	scorched3d-syslibs.patch scorched3d.spec 
Log Message:
* Wed Apr 18 2007 Hans de Goede <j.w.r.degoede at hhs.nl> 40.1d-3
- Fix build with new ODE, scorched3d tries to force a double build of (its own
  included version of) ODE, however we use the system version which is compiled
  with single precision. With the new ODE the header files throw an #error
  because this causes both dSINGLE and dDOUBLE to be defined. This is fixed by
  patching scorched3d's configure to not add -DdDOUBLE to the CFLAGS


scorched3d-syslibs.patch:

Index: scorched3d-syslibs.patch
===================================================================
RCS file: /cvs/extras/rpms/scorched3d/devel/scorched3d-syslibs.patch,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- scorched3d-syslibs.patch	2 Nov 2006 20:45:26 -0000	1.4
+++ scorched3d-syslibs.patch	18 Apr 2007 13:46:04 -0000	1.5
@@ -1103,3 +1103,40 @@
  #include <float.h>
  #include <stdlib.h>
  
+--- scorched/src/3dsparse/ModelStore.cpp~	2007-04-18 15:37:25.000000000 +0200
++++ scorched/src/3dsparse/ModelStore.cpp	2007-04-18 15:37:25.000000000 +0200
+@@ -90,7 +90,7 @@
+ 	}
+ 
+ 	// HACK for skin creator
+-#ifdef dDOUBLE
++#if 1
+ 	// Use smaller tank skins for texture size 0
+ 	// Resize the bitmap
+ 	if (OptionsDisplay::instance()->getTexSize() == 0)
+--- scorched/configure.ac~	2007-04-18 15:39:52.000000000 +0200
++++ scorched/configure.ac	2007-04-18 15:39:52.000000000 +0200
+@@ -352,10 +352,6 @@
+ CFLAGS="$CFLAGS -DS3D_DOCDIR=\\\"${docdir}\\\" -DS3D_DATADIR=\\\"${datadir}\\\" -DS3D_BINDIR=\\\"${bindir}\\\""
+ CXXFLAGS="$CXXFLAGS -DS3D_DOCDIR=\\\"${docdir}\\\" -DS3D_DATADIR=\\\"${datadir}\\\" -DS3D_BINDIR=\\\"${bindir}\\\""
+ 
+-# extra fixed flags
+-CFLAGS="$CFLAGS -DdDOUBLE"
+-CXXFLAGS="$CXXFLAGS -DdDOUBLE"
+-
+ # put here at end because of sdl.m4 not defining
+ AC_LANG_CPLUSPLUS
+ 
+--- scorched/configure~	2007-04-18 15:39:55.000000000 +0200
++++ scorched/configure	2007-04-18 15:39:55.000000000 +0200
+@@ -6004,10 +6004,6 @@
+ CFLAGS="$CFLAGS -DS3D_DOCDIR=\\\"${docdir}\\\" -DS3D_DATADIR=\\\"${datadir}\\\" -DS3D_BINDIR=\\\"${bindir}\\\""
+ CXXFLAGS="$CXXFLAGS -DS3D_DOCDIR=\\\"${docdir}\\\" -DS3D_DATADIR=\\\"${datadir}\\\" -DS3D_BINDIR=\\\"${bindir}\\\""
+ 
+-# extra fixed flags
+-CFLAGS="$CFLAGS -DdDOUBLE"
+-CXXFLAGS="$CXXFLAGS -DdDOUBLE"
+-
+ # put here at end because of sdl.m4 not defining
+ ac_ext=cc
+ ac_cpp='$CXXCPP $CPPFLAGS'


Index: scorched3d.spec
===================================================================
RCS file: /cvs/extras/rpms/scorched3d/devel/scorched3d.spec,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- scorched3d.spec	22 Dec 2006 08:30:20 -0000	1.21
+++ scorched3d.spec	18 Apr 2007 13:46:04 -0000	1.22
@@ -1,6 +1,6 @@
 Name:           scorched3d
 Version:        40.1d
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Game based loosely on the classic DOS game Scorched Earth
 Group:          Amusements/Games
 License:        GPL
@@ -102,6 +102,13 @@
 
 
 %changelog
+* Wed Apr 18 2007 Hans de Goede <j.w.r.degoede at hhs.nl> 40.1d-3
+- Fix build with new ODE, scorched3d tries to force a double build of (its own
+  included version of) ODE, however we use the system version which is compiled
+  with single precision. With the new ODE the header files throw an #error
+  because this causes both dSINGLE and dDOUBLE to be defined. This is fixed by
+  patching scorched3d's configure to not add -DdDOUBLE to the CFLAGS
+
 * Wed Dec 20 2006 Hans de Goede <j.w.r.degoede at hhs.nl> 40.1d-2
 - Rebuild for new wxGTK 2.8