rpms/vegastrike/devel vegastrike-0.4.3-gcc43.patch, NONE, 1.1 vegastrike.spec, 1.7, 1.8

Thu Feb 14 18:31:57 UTC 2008

Author: jwrdegoede

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

Modified Files:
	vegastrike.spec 
Added Files:
	vegastrike-0.4.3-gcc43.patch 
Log Message:
* Thu Feb 14 2008 Hans de Goede <j.w.r.degoede at hhs.nl> 0.4.3-8
- Fix building with gcc 4.3
- Rebuild for gcc 4.3


vegastrike-0.4.3-gcc43.patch:

--- NEW FILE vegastrike-0.4.3-gcc43.patch ---
diff -urp vegastrike-0.4.3/objconv/asteroidgen.cpp vegastrike-0.4.3-pm/objconv/asteroidgen.cpp
--- vegastrike-0.4.3/objconv/asteroidgen.cpp	2003-06-06 02:51:07.000000000 +0200
+++ vegastrike-0.4.3-pm/objconv/asteroidgen.cpp	2008-02-14 20:49:06.000000000 +0100
@@ -2,6 +2,7 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <math.h>
+#include <time.h>
 #ifndef M_PI
 #define M_PI 3.14159265358979323846264338328
 #endif
diff -urp vegastrike-0.4.3/objconv/mesher/converter.cpp vegastrike-0.4.3-pm/objconv/mesher/converter.cpp
--- vegastrike-0.4.3/objconv/mesher/converter.cpp	2005-01-29 11:40:56.000000000 +0100
+++ vegastrike-0.4.3-pm/objconv/mesher/converter.cpp	2008-02-14 20:45:39.000000000 +0100
@@ -1,3 +1,4 @@
+#include <string.h>
 #include "from_obj.h"
 #include "from_BFXM.h"
 void usage();
diff -urp vegastrike-0.4.3/objconv/mesher/hashtable.h vegastrike-0.4.3-pm/objconv/mesher/hashtable.h
--- vegastrike-0.4.3/objconv/mesher/hashtable.h	2004-02-06 10:16:13.000000000 +0100
+++ vegastrike-0.4.3-pm/objconv/mesher/hashtable.h	2008-02-14 20:46:29.000000000 +0100
@@ -26,6 +26,8 @@
 #include <list>
 #include <string>
 #include <vector>
+#include <string.h>
+#include <stdlib.h>
 
 using namespace std;
 //const int hashsize = 1001;
diff -urp vegastrike-0.4.3/src/gfx/quadsquare.h vegastrike-0.4.3-pm/src/gfx/quadsquare.h
--- vegastrike-0.4.3/src/gfx/quadsquare.h	2004-02-07 11:41:28.000000000 +0100
+++ vegastrike-0.4.3-pm/src/gfx/quadsquare.h	2008-02-14 20:26:56.000000000 +0100
@@ -15,6 +15,7 @@
 #include "vec.h"
 #include "gfxlib.h"
 #include <vector>
+#include <stdlib.h>
 #include "resizable.h"
 #include "nonlinear_transform.h"
 class Texture;
diff -urp vegastrike-0.4.3/src/gfx/stream_texture.cpp vegastrike-0.4.3-pm/src/gfx/stream_texture.cpp
--- vegastrike-0.4.3/src/gfx/stream_texture.cpp	2004-09-05 11:34:25.000000000 +0200
+++ vegastrike-0.4.3-pm/src/gfx/stream_texture.cpp	2008-02-14 20:31:28.000000000 +0100
@@ -1,5 +1,7 @@
 #include "stream_texture.h"
 
+#include <stdlib.h>
+
 StreamTexture* StreamTexture::Clone(){
   unsigned char * x = Map();
   StreamTexture * ret = new StreamTexture(sizeX,sizeY,filtertype,x);
diff -urp vegastrike-0.4.3/src/gfx/tex_transform.cpp vegastrike-0.4.3-pm/src/gfx/tex_transform.cpp
--- vegastrike-0.4.3/src/gfx/tex_transform.cpp	2003-10-02 09:29:32.000000000 +0200
+++ vegastrike-0.4.3-pm/src/gfx/tex_transform.cpp	2008-02-14 20:30:58.000000000 +0100
@@ -1,5 +1,6 @@
 #include "vsimage.h"
 
+#include <stdlib.h>
 #include <png.h>
 
 unsigned char * texTransform (int &bpp, int &color_type, unsigned long &width, unsigned long &height, unsigned char ** rp){
diff -urp vegastrike-0.4.3/src/gldrv/gl_light_state.cpp vegastrike-0.4.3-pm/src/gldrv/gl_light_state.cpp
--- vegastrike-0.4.3/src/gldrv/gl_light_state.cpp	2003-12-02 18:37:27.000000000 +0100
+++ vegastrike-0.4.3-pm/src/gldrv/gl_light_state.cpp	2008-02-14 20:34:07.000000000 +0100
@@ -1,4 +1,5 @@
 #include <assert.h>
+#include <string.h>
 //#include <vegastrike.h>
 #include "gl_globals.h"
 #include "hashtable_3d.h"
diff -urp vegastrike-0.4.3/src/gldrv/gl_material.cpp vegastrike-0.4.3-pm/src/gldrv/gl_material.cpp
--- vegastrike-0.4.3/src/gldrv/gl_material.cpp	2004-08-05 06:06:00.000000000 +0200
+++ vegastrike-0.4.3-pm/src/gldrv/gl_material.cpp	2008-02-14 20:34:35.000000000 +0100
@@ -21,6 +21,7 @@
 
 #include "gfxlib.h"
 #include "gl_globals.h"
+#include <string.h>
 //#include "gl_globals.h"
 //#include "gfx_transform_vector.h"
 
diff -urp vegastrike-0.4.3/src/networking/lowlevel/vsnet_debug.cpp vegastrike-0.4.3-pm/src/networking/lowlevel/vsnet_debug.cpp
--- vegastrike-0.4.3/src/networking/lowlevel/vsnet_debug.cpp	2004-04-13 16:52:05.000000000 +0200
+++ vegastrike-0.4.3-pm/src/networking/lowlevel/vsnet_debug.cpp	2008-02-14 20:37:19.000000000 +0100
@@ -1,4 +1,5 @@
 #include "vsnet_debug.h"
+#include <string.h>
 
 using namespace std;
 
diff -urp vegastrike-0.4.3/src/pk3.cpp vegastrike-0.4.3-pm/src/pk3.cpp
--- vegastrike-0.4.3/src/pk3.cpp	2004-11-29 09:08:13.000000000 +0100
+++ vegastrike-0.4.3-pm/src/pk3.cpp	2008-02-14 20:41:15.000000000 +0100
@@ -43,6 +43,7 @@
 
 #include "pk3.h"
 #include <iostream>
+#include <stdlib.h>
 #include "posh.h"
 using std::cerr;
 using std::endl;
diff -urp vegastrike-0.4.3/tools/vsrmake.cpp vegastrike-0.4.3-pm/tools/vsrmake.cpp
--- vegastrike-0.4.3/tools/vsrmake.cpp	2003-09-21 03:15:43.000000000 +0200
+++ vegastrike-0.4.3-pm/tools/vsrmake.cpp	2008-02-14 20:49:39.000000000 +0100
@@ -28,6 +28,7 @@
 
   @todo Allow packaging of files named to the standard input.
  */
+#include <string.h>
 #include "vsrtools.h"
 #include "common.h"
 #include <stdlib.h>


Index: vegastrike.spec
===================================================================
RCS file: /cvs/extras/rpms/vegastrike/devel/vegastrike.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- vegastrike.spec	24 Sep 2007 20:23:55 -0000	1.7
+++ vegastrike.spec	14 Feb 2008 18:31:21 -0000	1.8
@@ -1,6 +1,6 @@
 Name:           vegastrike
 Version:        0.4.3
-Release:        7%{?dist}
+Release:        8%{?dist}
 Summary:        3D OpenGL spaceflight simulator
 Group:          Amusements/Games
 License:        GPLv2+
@@ -45,6 +45,7 @@
 Patch14:        vegastrike-0.4.3-openal.patch
 Patch15:        vegastrike-0.4.3-sys-python.patch
 Patch16:        vegastrike-0.4.3-ppc.patch
+Patch17:        vegastrike-0.4.3-gcc43.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:  libGLU-devel freeglut-devel libXi-devel libXmu-devel gtk2-devel
 BuildRequires:  libjpeg-devel libpng-devel boost-devel expat-devel python-devel
@@ -76,6 +77,7 @@
 %patch14 -p1 -b .openal
 %patch15 -p1 -b .sys-py
 %patch16 -p1 -b .ppc
+%patch17 -p1 -b .gcc43
 chmod -x `find src -type f`
 sed -i 's|lib/python|%{_lib}/python|g' configure.in
 sed -i 's/\r//g' README
@@ -154,6 +156,10 @@
 
 
 %changelog
+* Thu Feb 14 2008 Hans de Goede <j.w.r.degoede at hhs.nl> 0.4.3-8
+- Fix building with gcc 4.3
+- Rebuild for gcc 4.3
+
 * Mon Sep 24 2007 Hans de Goede <j.w.r.degoede at hhs.nl> 0.4.3-7
 - Use opengl-games-utils wrapper to show error dialog when DRI is missing
 


