Fix crash at startup, bug #58289 . gcc-4.1 compiling, bug #120747

(Portage version: 2.1_pre7-r3)

9 files changed, 114 insertions, 115 deletions

diff --git a/games-action/glaxium/ChangeLog b/games-action/glaxium/ChangeLog
index ffcc3511a044..fd19094e3677 100644
--- a/games-action/glaxium/ChangeLog
+++ b/games-action/glaxium/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for games-action/glaxium
 # Copyright 2000-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-action/glaxium/ChangeLog,v 1.11 2006/01/28 21:19:10 joshuabaergen Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-action/glaxium/ChangeLog,v 1.12 2006/04/02 11:14:32 tupone Exp $
+
+  02 Apr 2006; <Tupone@gentoo.org> +files/glaxium-0.5-glx.patch,
+  -files/0.5-another-glx.patch, -files/0.5-glx.patch,
+  +files/glaxium-0.5-gcc41.patch, -files/glx-test.c, glaxium-0.5.ebuild:
+  Fixing crash on startup, bug #58289 by Loz Hygate.
+  Thanks go to Sam Mertens and Jim Ramsay too.
+  Fix compiling with gcc-4.1, bug #120747 by joshuabaergen
 
   28 Jan 2006; Joshua Baergen <joshuabaergen@gentoo.org> glaxium-0.5.ebuild:
   Add modular X dependencies.
diff --git a/games-action/glaxium/Manifest b/games-action/glaxium/Manifest
index c9de50bafaeb..0e502afc4e0d 100644
--- a/games-action/glaxium/Manifest
+++ b/games-action/glaxium/Manifest
@@ -1,24 +1,21 @@
-MD5 3e31eba82b2d8558f5f96b2c7c0a3a05 ChangeLog 1253
-RMD160 e19aa5adc51c678c7a15483d380456767c445ec6 ChangeLog 1253
-SHA256 203863c7aad99c21bacaa595c12ad8e3e0bb3e770f59c17bfab076d0dd223a8e ChangeLog 1253
-MD5 143ef6a6f05c1f89830306e8c34550df files/0.5-another-glx.patch 776
-RMD160 451ffa33e91f1274507648cc8cbc729d3f34e7a8 files/0.5-another-glx.patch 776
-SHA256 2afc1a6981a905832160851e2a912b927a6bbd57cb6ba89a782994c1c21af9e5 files/0.5-another-glx.patch 776
-MD5 ef110a66a7eac137dd399eca0a4aede3 files/0.5-glx.patch 2299
-RMD160 794ecee8c79706200206dd27f4b8a682fc6fedf1 files/0.5-glx.patch 2299
-SHA256 30ed41dd218a48035d60c676847c654041bbc404ecac39ef52756061b9e2a152 files/0.5-glx.patch 2299
+MD5 63247f8330a0af87bd9a3a65773c0ecc ChangeLog 1605
+RMD160 0df2e6f00a3262741ce292aadb7c55f4e6d46464 ChangeLog 1605
+SHA256 17bfedb97a4ac41f75fb112896938eb0bad3afb8c446cb245ff44aecca4dcc31 ChangeLog 1605
 MD5 ab479510f01767b032042d1d964670cd files/0.5-rc.patch 277
 RMD160 fbbd6975b020d0220a96be5e23d95b6592976acc files/0.5-rc.patch 277
 SHA256 a099ebd966a87adba98d6495533e3f2323020b6078e4f09ad66318d96521a815 files/0.5-rc.patch 277
-MD5 0ab557289a7610d1984e43634d0be398 files/digest-glaxium-0.5 64
-RMD160 313c68cb98d336e5c7b4e032e9304622a1feee54 files/digest-glaxium-0.5 64
-SHA256 0fb900e94a641d97dff120e6f618c8baac0c67b43e077183a0f99a7e96d67af5 files/digest-glaxium-0.5 64
-MD5 ccccdc44cf5870eff196d3409b1a9f30 files/glx-test.c 98
-RMD160 c052f0c3094641d6dab89f288e1d4df9ffd3c8e4 files/glx-test.c 98
-SHA256 0a0ce9768751d52a74909fcc89ed166b6f8d0132a4065fbd6bc71ef53d13f652 files/glx-test.c 98
-MD5 731e1fb94bd20af39a644616273a3ed7 glaxium-0.5.ebuild 1377
-RMD160 773ef3b5698577d467a80c7ab8a485a54b279398 glaxium-0.5.ebuild 1377
-SHA256 58915a26e600b41ebe6be0b2fa160fde429aa1011884672b42b6cba0e9cc1656 glaxium-0.5.ebuild 1377
+MD5 bc92909e8ed1a74fc951d2ce7aedc9f3 files/digest-glaxium-0.5 238
+RMD160 0f80f6f684cb2603fb09e51864cc98e80a081757 files/digest-glaxium-0.5 238
+SHA256 4e59f1b6657fbd4ddec5ef58522bb6c5b37a33657975939d9242020f3313344a files/digest-glaxium-0.5 238
+MD5 57c59919852db441f8cdd5a0c38a682f files/glaxium-0.5-gcc41.patch 808
+RMD160 1943be88713d73836b32704b27a25473d94dec63 files/glaxium-0.5-gcc41.patch 808
+SHA256 9e1ab3e231d583db0a8187dd86c6457ba80eef2ac3c539143229d11d75a86625 files/glaxium-0.5-gcc41.patch 808
+MD5 bc74f1b2de241e6004a792b1e18cc457 files/glaxium-0.5-glx.patch 2017
+RMD160 e2e282f57c23de04c30d1d551efc30a937679812 files/glaxium-0.5-glx.patch 2017
+SHA256 e9875901eae693bb62c3fe3871dce796b4a5325131d022e40779cb47bf3a3319 files/glaxium-0.5-glx.patch 2017
+MD5 35bfb6bf63a2821c9fd6f6e43a1e00f8 glaxium-0.5.ebuild 1253
+RMD160 c9dab14f80952999f1d6a76a48dc128feaf43716 glaxium-0.5.ebuild 1253
+SHA256 7d88a3e350048601a9d5dcc58e1729cfbaa9bc4b683084f0d610f518ec8ace3b glaxium-0.5.ebuild 1253
 MD5 f17b9b8fa07a38914fe1c03268f51678 metadata.xml 158
 RMD160 cbd9984bb6b426c8c9cee5022fe0a26261612fea metadata.xml 158
 SHA256 1423a4fdd4a79b1728a2056d9e300f7e1074253095d82726218d9e9b953888a3 metadata.xml 158
diff --git a/games-action/glaxium/files/0.5-another-glx.patch b/games-action/glaxium/files/0.5-another-glx.patch
deleted file mode 100644
index 8900c1b7c891..000000000000
--- a/games-action/glaxium/files/0.5-another-glx.patch
+++ /dev/null
@@ -1,25 +0,0 @@
---- myship.cpp.orig	2004-01-12 15:22:58.893377848 -0500
-+++ myship.cpp	2004-01-12 15:23:07.262105608 -0500
-@@ -39,9 +39,7 @@
- extern PFNGLCOMBINERINPUTNVPROC glCombinerInputNV;

- extern PFNGLCOMBINEROUTPUTNVPROC glCombinerOutputNV;

- extern PFNGLFINALCOMBINERINPUTNVPROC glFinalCombinerInputNV;

--#ifdef WIN32

- extern PFNGLACTIVETEXTUREARBPROC glActiveTextureARB;

--#endif

- int MyShip::list_;

- 

- 

---- scene.cpp.orig	2004-01-12 15:23:17.217592144 -0500
-+++ scene.cpp	2004-01-12 15:23:25.009407608 -0500
-@@ -63,10 +63,8 @@
- PFNGLTRACKMATRIXNVPROC glTrackMatrixNV;

- PFNGLPROGRAMPARAMETER4FNVPROC glProgramParameter4fNV;

- 

--#ifdef WIN32

- PFNGLACTIVETEXTUREARBPROC glActiveTextureARB;

- PFNGLMULTITEXCOORD2FARBPROC glMultiTexCoord2fARB; 

--#endif

- 

- GLenum glError;

- 

diff --git a/games-action/glaxium/files/0.5-glx.patch b/games-action/glaxium/files/0.5-glx.patch
deleted file mode 100644
index c36355f62023..000000000000
--- a/games-action/glaxium/files/0.5-glx.patch
+++ /dev/null
@@ -1,59 +0,0 @@
---- ./scene.cpp.gege	2002-10-10 14:57:58.000000000 +0200
-+++ ./scene.cpp	2003-04-25 12:30:01.000000000 +0200
-@@ -51,6 +51,7 @@
- extern bool bKeyDown;    

- 

- 

-+/*
- PFNGLCOMBINERPARAMETERINVPROC glCombinerParameteriNV;

- PFNGLCOMBINERINPUTNVPROC glCombinerInputNV;

- PFNGLCOMBINEROUTPUTNVPROC glCombinerOutputNV;

-@@ -67,6 +68,7 @@
- PFNGLACTIVETEXTUREARBPROC glActiveTextureARB;

- PFNGLMULTITEXCOORD2FARBPROC glMultiTexCoord2fARB; 

- #endif

-+*/
- 

- GLenum glError;

- 

-@@ -1511,6 +1511,7 @@
- 		glTrackMatrixNV=(PFNGLTRACKMATRIXNVPROC)wglGetProcAddress("glTrackMatrixNV");

- 		glProgramParameter4fNV=(PFNGLPROGRAMPARAMETER4FNVPROC)wglGetProcAddress("glProgramParameter4fNV");

- #else 

-+/*
- 		glCombinerParameteriNV=(PFNGLCOMBINERPARAMETERINVPROC)glXGetProcAddressARB((const GLubyte *)"glCombinerParameteriNV");

- 		glCombinerInputNV=(PFNGLCOMBINERINPUTNVPROC)glXGetProcAddressARB((const GLubyte *)"glCombinerInputNV");

- 		glCombinerOutputNV=(PFNGLCOMBINEROUTPUTNVPROC)glXGetProcAddressARB((const GLubyte *)"glCombinerOutputNV");

-@@ -1520,6 +1521,7 @@
- 		glBindProgramNV=(PFNGLBINDPROGRAMNVPROC)glXGetProcAddressARB((const GLubyte *)"glBindProgramNV");

- 		glTrackMatrixNV=(PFNGLTRACKMATRIXNVPROC)glXGetProcAddressARB((const GLubyte *)"glTrackMatrixNV");

- 		glProgramParameter4fNV=(PFNGLPROGRAMPARAMETER4FNVPROC)glXGetProcAddressARB((const GLubyte *)"glProgramParameter4fNV");

-+*/
- #endif

- 		// enabled in when required

- 		glDisable(GL_VERTEX_PROGRAM_NV);

---- ./myship.cpp.gege	2002-10-12 23:16:16.000000000 +0200
-+++ ./myship.cpp	2003-04-25 12:26:58.000000000 +0200
-@@ -19,6 +19,7 @@
- 

- 

- 

-+#define GL_GLEXT_PROTOTYPES 1

- #include <GL/glut.h>

- #include <GL/glext.h>

- 

-@@ -35,10 +36,10 @@
- #include "modeles/protection.c"

- 

- 

--extern PFNGLCOMBINERPARAMETERINVPROC glCombinerParameteriNV;

--extern PFNGLCOMBINERINPUTNVPROC glCombinerInputNV;

--extern PFNGLCOMBINEROUTPUTNVPROC glCombinerOutputNV;

--extern PFNGLFINALCOMBINERINPUTNVPROC glFinalCombinerInputNV;

-+//extern PFNGLCOMBINERPARAMETERINVPROC glCombinerParameteriNV;

-+//extern PFNGLCOMBINERINPUTNVPROC glCombinerInputNV;

-+//extern PFNGLCOMBINEROUTPUTNVPROC glCombinerOutputNV;

-+//extern PFNGLFINALCOMBINERINPUTNVPROC glFinalCombinerInputNV;

- #ifdef WIN32

- extern PFNGLACTIVETEXTUREARBPROC glActiveTextureARB;

- #endif

diff --git a/games-action/glaxium/files/digest-glaxium-0.5 b/games-action/glaxium/files/digest-glaxium-0.5
index c382f2d9ccbb..0a4cbb8d38a6 100644
--- a/games-action/glaxium/files/digest-glaxium-0.5
+++ b/games-action/glaxium/files/digest-glaxium-0.5
@@ -1 +1,3 @@
 MD5 ea6d6f8b4ebb7c73b74af64d83f45cb7 glaxium_0.5.tar.gz 1692219
+RMD160 5c988c53d4205ac80e0011a893a80daecf096c1f glaxium_0.5.tar.gz 1692219
+SHA256 78f5a9e1785e9e39f6dcb32134a3bd224372f572f191e7ed77bf50b109afb5f7 glaxium_0.5.tar.gz 1692219
diff --git a/games-action/glaxium/files/glaxium-0.5-gcc41.patch b/games-action/glaxium/files/glaxium-0.5-gcc41.patch
new file mode 100644
index 000000000000..eb0d579c0de8
--- /dev/null
+++ b/games-action/glaxium/files/glaxium-0.5-gcc41.patch
@@ -0,0 +1,22 @@
+--- tank.hpp.old	2006-01-28 11:27:16.000000000 -0700
++++ tank.hpp	2006-01-28 11:27:26.000000000 -0700
+@@ -61,7 +61,7 @@
+ 

+ class TankFire : public Sprite {

+ public:

+-    TankFire::TankFire(List *list, Tank *tank, float x, float y, float z,float dx, float dz,float rotated);

++    TankFire(List *list, Tank *tank, float x, float y, float z,float dx, float dz,float rotated);

+     void draw();

+ 	void drawShadowable();

+     void move();

+--- scratcher.hpp.old	2006-01-28 11:29:22.000000000 -0700
++++ scratcher.hpp	2006-01-28 11:29:31.000000000 -0700
+@@ -34,7 +34,7 @@
+             UNDEF

+     } ;

+     

+-    Scratcher:: Scratcher(List *list, float x, float z, int bench=0);

++    Scratcher(List *list, float x, float z, int bench=0);

+     void draw();

+     void drawShadowable();

+     void move();

diff --git a/games-action/glaxium/files/glaxium-0.5-glx.patch b/games-action/glaxium/files/glaxium-0.5-glx.patch
new file mode 100644
index 000000000000..5b6d381443cf
--- /dev/null
+++ b/games-action/glaxium/files/glaxium-0.5-glx.patch
@@ -0,0 +1,63 @@
+--- glaxium_0.5/myship.cpp.orig	2002-10-12 15:16:16.000000000 -0600
++++ glaxium_0.5/myship.cpp	2005-08-27 10:32:48.000000000 -0600
+@@ -20,6 +20,8 @@
+ 

+ 

+ #include <GL/glut.h>

++#define GL_GLEXT_PROTOTYPES

++#include <GL/gl.h>

+ #include <GL/glext.h>

+ 

+ #include "sprite.hpp"

+@@ -41,6 +43,9 @@
+ extern PFNGLFINALCOMBINERINPUTNVPROC glFinalCombinerInputNV;

+ #ifdef WIN32

+ extern PFNGLACTIVETEXTUREARBPROC glActiveTextureARB;

++#else

++#define glActiveTexture(x) glActiveTextureARB(x)

++extern PFNGLACTIVETEXTUREARBPROC glActiveTextureARB;

+ #endif

+ int MyShip::list_;

+ 

+--- glaxium_0.5/scene.cpp.orig	2002-10-10 06:57:58.000000000 -0600
++++ glaxium_0.5/scene.cpp	2005-08-27 10:34:45.000000000 -0600
+@@ -41,6 +41,8 @@
+ #else

+ // #define GLX_GLXEXT_LEGACY

+ #define GLX_GLXEXT_PROTOTYPES 1

++#define GL_GLXEXT_PROTOTYPES 1

++#include <GL/gl.h>

+ #include <GL/glx.h>

+ // #include <GL/glxext.h>

+ #endif

+@@ -66,6 +68,11 @@
+ #ifdef WIN32

+ PFNGLACTIVETEXTUREARBPROC glActiveTextureARB;

+ PFNGLMULTITEXCOORD2FARBPROC glMultiTexCoord2fARB; 

++#else

++#define glActiveTexture(x) glActiveTextureARB(x)

++#define glMultiTexCoord2f(x,y,z) glMultiTexCoord2fARB(x,y,z)

++PFNGLACTIVETEXTUREARBPROC glActiveTextureARB;

++PFNGLMULTITEXCOORD2FARBPROC glMultiTexCoord2fARB;
 
+ #endif

+ 

+ GLenum glError;

+@@ -1498,6 +1505,9 @@
+ #ifdef WIN32

+ 	glActiveTextureARB=(PFNGLACTIVETEXTUREARBPROC)wglGetProcAddress("glActiveTextureARB"); 

+ 	glMultiTexCoord2fARB=(PFNGLMULTITEXCOORD2FARBPROC)wglGetProcAddress("glMultiTexCoord2fARB"); 

++#else

++	glActiveTextureARB=(PFNGLACTIVETEXTUREARBPROC)glXGetProcAddressARB((const GLubyte*)"glActiveTextureARB");

++	glMultiTexCoord2fARB=(PFNGLMULTITEXCOORD2FARBPROC)glXGetProcAddressARB((const GLubyte*)"glMultiTexCoord2fARB");

+ #endif

+ 

+ #if defined( GL_REGISTER_COMBINERS_NV) && defined(GL_VERTEX_PROGRAM_NV)

+@@ -2018,7 +2028,7 @@
+ 	oldTimer = newTimer;

+ 	globalList->move()	;

+ #ifndef PI

+-#define PI=3.151592653589793

++#define PI=3.141592653589793

+ #endif

+ 	benchFrames++;

+ 

diff --git a/games-action/glaxium/files/glx-test.c b/games-action/glaxium/files/glx-test.c
deleted file mode 100644
index 4919a0f87b68..000000000000
--- a/games-action/glaxium/files/glx-test.c
+++ /dev/null
@@ -1,4 +0,0 @@
-#include <GL/glut.h>
-#include <GL/glext.h>
-PFNGLCOMBINERPARAMETERINVPROC t;
-int main(){return 0;}
diff --git a/games-action/glaxium/glaxium-0.5.ebuild b/games-action/glaxium/glaxium-0.5.ebuild
index b892341815c7..04e90006221c 100644
--- a/games-action/glaxium/glaxium-0.5.ebuild
+++ b/games-action/glaxium/glaxium-0.5.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-action/glaxium/glaxium-0.5.ebuild,v 1.13 2006/01/28 21:19:10 joshuabaergen Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-action/glaxium/glaxium-0.5.ebuild,v 1.14 2006/04/02 11:14:32 tupone Exp $
 
 inherit eutils flag-o-matic toolchain-funcs games
 
@@ -29,14 +29,10 @@ S="${WORKDIR}/${PN}_${PV}"
 src_unpack() {
 	unpack ${A}
 	cd ${S}
-	$(tc-getCXX) ${FILESDIR}/glx-test.c >& /dev/null
-	if [ $? -ne 0 ] ; then
-		epatch "${FILESDIR}/${PV}-glx.patch"
-		append-flags -DGL_GLEXT_LEGACY
-	fi
 	has_version '>=media-video/nvidia-glx-1.0.5328' \
-		&& epatch "${FILESDIR}/${PV}-another-glx.patch"
-	epatch "${FILESDIR}/${PV}-rc.patch"
+		&& epatch "${FILESDIR}/${P}-glx.patch"
+	epatch "${FILESDIR}/${PV}-rc.patch" \
+		"${FILESDIR}/${P}-gcc41.patch"
 }
 
 src_compile() {