Patch for gcc-4.2

Package-Manager: portage-2.1.2.9

5 files changed, 52 insertions, 21 deletions

diff --git a/games-emulation/mupen64/ChangeLog b/games-emulation/mupen64/ChangeLog
index afcdf90fe58f..73914f40dd4b 100644
--- a/games-emulation/mupen64/ChangeLog
+++ b/games-emulation/mupen64/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for games-emulation/mupen64
 # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-emulation/mupen64/ChangeLog,v 1.25 2007/03/28 00:58:24 joker Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-emulation/mupen64/ChangeLog,v 1.26 2007/06/13 21:31:11 nyhm Exp $
+
+  13 Jun 2007; Tristan Heaven <nyhm@gentoo.org>
+  +files/mupen64-0.5-gcc42.patch, mupen64-0.5-r4.ebuild:
+  Patch for gcc-4.2
 
 *mupen64-0.5-r4 (28 Mar 2007)
 
diff --git a/games-emulation/mupen64/Manifest b/games-emulation/mupen64/Manifest
index 12fd1cdb3729..2c6feb13cadf 100644
--- a/games-emulation/mupen64/Manifest
+++ b/games-emulation/mupen64/Manifest
@@ -5,10 +5,14 @@ AUX mupen64-0.5-anisotropic.patch 5322 RMD160 7e3f27579118cf925611c8d2e892b2bc44
 MD5 6699bb75844089112962119f37641928 files/mupen64-0.5-anisotropic.patch 5322
 RMD160 7e3f27579118cf925611c8d2e892b2bc44a28ce3 files/mupen64-0.5-anisotropic.patch 5322
 SHA256 348b4dd68cd8408cec0f4293b9a0a6079098044029a20536561048c326c36c33 files/mupen64-0.5-anisotropic.patch 5322
-AUX mupen64-0.5-gentoo3.patch 9728 RMD160 97777a87ebf3f41391e46c1b5d9c685cbf455d90 SHA1 beab9d80f1bca57335a24f7ec40ebd65baa96bc4 SHA256 40134e02ddd5abf8fcfa6d62a63d14f059e8eafc76edea565d3d75458baa46d8
-MD5 4f9049dc56c46096e3ef5149884aed6d files/mupen64-0.5-gentoo3.patch 9728
-RMD160 97777a87ebf3f41391e46c1b5d9c685cbf455d90 files/mupen64-0.5-gentoo3.patch 9728
-SHA256 40134e02ddd5abf8fcfa6d62a63d14f059e8eafc76edea565d3d75458baa46d8 files/mupen64-0.5-gentoo3.patch 9728
+AUX mupen64-0.5-gcc42.patch 1451 RMD160 3e2bb2609b6566ac141750eecc292ba525f46f0b SHA1 6949337e313296e716d054c4f4be7a5f6ccdd004 SHA256 87694cefad2da7328d66c964fd205f7a5b4d7025dbc9a0b683121df6c33c0550
+MD5 6e00f00622c9c26595719215e2728d37 files/mupen64-0.5-gcc42.patch 1451
+RMD160 3e2bb2609b6566ac141750eecc292ba525f46f0b files/mupen64-0.5-gcc42.patch 1451
+SHA256 87694cefad2da7328d66c964fd205f7a5b4d7025dbc9a0b683121df6c33c0550 files/mupen64-0.5-gcc42.patch 1451
+AUX mupen64-0.5-gentoo3.patch 9770 RMD160 f81fdac8fad1e5d61316819cbd045e98a5d5e67c SHA1 0d743cb7aeb8e7e6ccce44f5691faccca149d59c SHA256 f4ff8352bcebc08fe3068c157685f98a348724c2acb686bfcd5cdc0c7a3e93cf
+MD5 ee88d4b74517f326cbcd6b8b324253cd files/mupen64-0.5-gentoo3.patch 9770
+RMD160 f81fdac8fad1e5d61316819cbd045e98a5d5e67c files/mupen64-0.5-gentoo3.patch 9770
+SHA256 f4ff8352bcebc08fe3068c157685f98a348724c2acb686bfcd5cdc0c7a3e93cf files/mupen64-0.5-gentoo3.patch 9770
 AUX mupen64-glN64-noasmfix.patch 434 RMD160 ad05e4ec5b2be7e6cd62d9ed6bbf6ff0f53a0b7f SHA1 fca5d07a155a77d65348e29d98d9383a1f8a5510 SHA256 5efc2720f222bdd1cb8980633719d653c31ad8ca892cd785906b316ceca49a40
 MD5 b0c33e3753683fb114b88170723aad42 files/mupen64-glN64-noasmfix.patch 434
 RMD160 ad05e4ec5b2be7e6cd62d9ed6bbf6ff0f53a0b7f files/mupen64-glN64-noasmfix.patch 434
@@ -18,14 +22,14 @@ MD5 e0727b9a7c6d622eb66ecd5ea6d4ab1e files/mupen64-glN64-ucode.patch 3343
 RMD160 1a9070c59b56e89579f0695d3da5503f80f5cd71 files/mupen64-glN64-ucode.patch 3343
 SHA256 e54108cddf3e92f863e672e458b9bf776cbce672a34eee367032fcbd9ec5a9d5 files/mupen64-glN64-ucode.patch 3343
 DIST mupen64_src-0.5.tar.bz2 1981046 RMD160 da916bc77f2f06ed92630332545dc3ee5ae1ff51 SHA1 fe1c9999fca780f2f8243d36ea7d8c42eca5659b SHA256 1b8e4188ab7a94d8125b77aed8725ee348c24818622b881adfe16be510487dfd
-EBUILD mupen64-0.5-r4.ebuild 2147 RMD160 64299bca8c378df19d49730e06956014dfa95c02 SHA1 3930052f5130603767196f448393ea672745498c SHA256 76690a45b0c6a7d97c8993fb522c32ad6abdefe717abf73e2f507d695b70313a
-MD5 f2a9d9b22a033e1fd3993d1a6993c54d mupen64-0.5-r4.ebuild 2147
-RMD160 64299bca8c378df19d49730e06956014dfa95c02 mupen64-0.5-r4.ebuild 2147
-SHA256 76690a45b0c6a7d97c8993fb522c32ad6abdefe717abf73e2f507d695b70313a mupen64-0.5-r4.ebuild 2147
-MISC ChangeLog 4746 RMD160 e24ee40b8da01e72cdc969449cc81a6c8fe1308b SHA1 958069a26c536e66e5465a095cc03f0f21f885be SHA256 29bff17d341a2488e4ff228364eb63a8fdef4441f7af5e23549c7508d2cac342
-MD5 3e297af7d7c20d9025ebc898a11aeb02 ChangeLog 4746
-RMD160 e24ee40b8da01e72cdc969449cc81a6c8fe1308b ChangeLog 4746
-SHA256 29bff17d341a2488e4ff228364eb63a8fdef4441f7af5e23549c7508d2cac342 ChangeLog 4746
+EBUILD mupen64-0.5-r4.ebuild 2182 RMD160 89b2f414beb5b7f06b9463bb246be517439a47e4 SHA1 7e631f82e2a930ed7fc0f811f2fb98ebf44d9e1e SHA256 0ebb13de2db101328482e4e60f0c089e1312a3d764ddab15332d2d3a39903e83
+MD5 80fb13a95cd6e643f21f224ad20d044e mupen64-0.5-r4.ebuild 2182
+RMD160 89b2f414beb5b7f06b9463bb246be517439a47e4 mupen64-0.5-r4.ebuild 2182
+SHA256 0ebb13de2db101328482e4e60f0c089e1312a3d764ddab15332d2d3a39903e83 mupen64-0.5-r4.ebuild 2182
+MISC ChangeLog 4871 RMD160 0f0251eedb7f5b097aacd7b47a7310e07db9af80 SHA1 900878523853679ac3af89ef06d6c1667b2423e4 SHA256 15037689aff1025bfd589129010e65012b5ebf688cf6082eec9deea54b3717ef
+MD5 009bc1869cfcabc085bf93dd6642e705 ChangeLog 4871
+RMD160 0f0251eedb7f5b097aacd7b47a7310e07db9af80 ChangeLog 4871
+SHA256 15037689aff1025bfd589129010e65012b5ebf688cf6082eec9deea54b3717ef ChangeLog 4871
 MISC metadata.xml 251 RMD160 34b81b2f432154df8884235405a1ee197c99341d SHA1 6fe636d53a3c5939cca378223f1eb653976e5663 SHA256 e2b320a1c73bb9401f423703e2320fb4d80aeca04cb6cb4bb13584b0b6740043
 MD5 f5546c1006097671a46b1b8c9135c766 metadata.xml 251
 RMD160 34b81b2f432154df8884235405a1ee197c99341d metadata.xml 251
@@ -34,9 +38,9 @@ MD5 0cdd256b3d2df86cac038aa9d538aedf files/digest-mupen64-0.5-r4 253
 RMD160 f626935bb3e16eb360edde7e315583121ad7652c files/digest-mupen64-0.5-r4 253
 SHA256 d3dbd70b6d9bca726be6e4b697f985cd7a83e1bd494f7074e11052da1f3b07d9 files/digest-mupen64-0.5-r4 253
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.3 (GNU/Linux)
+Version: GnuPG v2.0.4 (GNU/Linux)
 
-iD8DBQFGLJ4adz7hIScOURERAisHAJ0ezckSTQtICEVVz8NfzHzwmXhUAwCg8kd7
-hKjEvOnO+E4UQUBKRaAkX44=
-=ZGKY
+iD8DBQFGcGIldz7hIScOURERAmc7AKCj4lCXmS6azW+Dtx6hbGOzxmTArQCgn15T
+sF6cU7h++s5WP08CJw/WEeM=
+=PG61
 -----END PGP SIGNATURE-----
diff --git a/games-emulation/mupen64/files/mupen64-0.5-gcc42.patch b/games-emulation/mupen64/files/mupen64-0.5-gcc42.patch
new file mode 100644
index 000000000000..b2d2fdb2fcc1
--- /dev/null
+++ b/games-emulation/mupen64/files/mupen64-0.5-gcc42.patch
@@ -0,0 +1,22 @@
+--- glN64/glATI.h
++++ glN64/glATI.h
+@@ -864,8 +864,8 @@
+ typedef GLuint (APIENTRY *PFNGLGENFRAGMENTSHADERSATIPROC)(GLuint range);
+ typedef GLvoid (APIENTRY *PFNGLBINDFRAGMENTSHADERATIPROC)(GLuint id);
+ typedef GLvoid (APIENTRY *PFNGLDELETEFRAGMENTSHADERATIPROC)(GLuint id);
+-typedef GLvoid (APIENTRY *PFNGLBEGINFRAGMENTSHADERATIPROC)(GLvoid);
+-typedef GLvoid (APIENTRY *PFNGLENDFRAGMENTSHADERATIPROC)(GLvoid);
++typedef GLvoid (APIENTRY *PFNGLBEGINFRAGMENTSHADERATIPROC)(void);
++typedef GLvoid (APIENTRY *PFNGLENDFRAGMENTSHADERATIPROC)(void);
+ typedef GLvoid (APIENTRY *PFNGLPASSTEXCOORDATIPROC)(GLuint dst, GLuint coord, GLenum swizzle);
+ typedef GLvoid (APIENTRY *PFNGLSAMPLEMAPATIPROC)(GLuint dst, GLuint interp, GLenum swizzle);
+ typedef GLvoid (APIENTRY *PFNGLCOLORFRAGMENTOP1ATIPROC)(GLenum op, GLuint dst, GLuint dstMask,
+@@ -2194,7 +2194,7 @@
+ typedef GLvoid    (APIENTRY * PFNGLDELETEOCCLUSIONQUERIESNVPROC) (GLsizei n, const GLuint *ids);
+ typedef GLboolean (APIENTRY * PFNGLISOCCLUSIONQUERYNVPROC) (GLuint id);
+ typedef GLvoid    (APIENTRY * PFNGLBEGINOCCLUSIONQUERYNVPROC) (GLuint id);
+-typedef GLvoid    (APIENTRY * PFNGLENDOCCLUSIONQUERYNVPROC) (GLvoid);
++typedef GLvoid    (APIENTRY * PFNGLENDOCCLUSIONQUERYNVPROC) (void);
+ typedef GLvoid    (APIENTRY * PFNGLGETOCCLUSIONQUERYIVNVPROC) (GLuint id, GLenum pname, GLint *params);
+ typedef GLvoid    (APIENTRY * PFNGLGETOCCLUSIONQUERYUIVNVPROC) (GLuint id, GLenum pname, GLuint *params);
+ 
diff --git a/games-emulation/mupen64/files/mupen64-0.5-gentoo3.patch b/games-emulation/mupen64/files/mupen64-0.5-gentoo3.patch
index 047fe8c13119..75a17a04b209 100644
--- a/games-emulation/mupen64/files/mupen64-0.5-gentoo3.patch
+++ b/games-emulation/mupen64/files/mupen64-0.5-gentoo3.patch
@@ -18,8 +18,8 @@ diff -ruN mupen64_src-0.5.orig/Makefile mupen64_src-0.5/Makefile
  #CFLAGS		=-DX86 -Wall -pipe -g
  
 -CXXFLAGS	=$(CFLAGS)
-+CFLAGS		+= -fPIC
-+CXXFLAGS	+= -fPIC
++CFLAGS		+= -fPIC -fno-strict-aliasing
++CXXFLAGS	+= -fPIC -fno-strict-aliasing
 +
 +CXXFLAGS	?=$(CFLAGS)
  
diff --git a/games-emulation/mupen64/mupen64-0.5-r4.ebuild b/games-emulation/mupen64/mupen64-0.5-r4.ebuild
index accf6445c897..3ecfcc480dfe 100644
--- a/games-emulation/mupen64/mupen64-0.5-r4.ebuild
+++ b/games-emulation/mupen64/mupen64-0.5-r4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-emulation/mupen64/mupen64-0.5-r4.ebuild,v 1.3 2007/04/23 11:52:52 nyhm Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-emulation/mupen64/mupen64-0.5-r4.ebuild,v 1.4 2007/06/13 21:31:11 nyhm Exp $
 
 inherit eutils multilib games
 
@@ -41,7 +41,8 @@ src_unpack() {
 		"${FILESDIR}"/${P}-anisotropic.patch \
 		"${FILESDIR}"/${P}-gentoo3.patch \
 		"${FILESDIR}"/${PN}-glN64-ucode.patch \
-		"${FILESDIR}"/${PN}-glN64-noasmfix.patch
+		"${FILESDIR}"/${PN}-glN64-noasmfix.patch \
+		"${FILESDIR}"/${P}-gcc42.patch
 
 	sed -i \
 		-e "s:#undef WITH_HOME:#define WITH_HOME \"$(games_get_libdir)/\":" \