Fix building with glibc-2.10, bug #273590

Package-Manager: portage-2.2_rc33/cvs/Linux i686

4 files changed, 28 insertions, 9 deletions

diff --git a/games-emulation/mednafen/ChangeLog b/games-emulation/mednafen/ChangeLog
index c6af45d0a639..fe0187539861 100644
--- a/games-emulation/mednafen/ChangeLog
+++ b/games-emulation/mednafen/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for games-emulation/mednafen
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-emulation/mednafen/ChangeLog,v 1.16 2009/04/15 15:52:29 hanno Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-emulation/mednafen/ChangeLog,v 1.17 2009/06/17 22:57:30 nyhm Exp $
+
+  17 Jun 2009; Tristan Heaven <nyhm@gentoo.org> mednafen-0.8.11.ebuild,
+  +files/mednafen-0.8.11-glibc2.10.patch:
+  Fix building with glibc-2.10, bug #273590
 
 *mednafen-0.8.11 (15 Apr 2009)
 
diff --git a/games-emulation/mednafen/Manifest b/games-emulation/mednafen/Manifest
index 2f53ad21cf1a..5d61fe7c36ee 100644
--- a/games-emulation/mednafen/Manifest
+++ b/games-emulation/mednafen/Manifest
@@ -1,18 +1,19 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
+AUX mednafen-0.8.11-glibc2.10.patch 280 RMD160 86656fef88cf8c08be953e406870104e686c0d7e SHA1 18b0c36379e3d9ac31b82ab77505f9581ec1b901 SHA256 c0b1823eff89531494c205ae57a7f9fefada62a3f42d860f3e72e931c7505282
 DIST mednafen-0.8.9.tar.bz2 2419548 RMD160 333eebf28badd6780dff4cad5867f828c90a6283 SHA1 ae9285da64c534b6053bdd19b9da64a4a0c00b4f SHA256 a8a6f2e10928a2fd947d6e2716a2af9d8454239287b67bc2c83ea13fdb582df5
 DIST mednafen-0.8.A.tar.bz2 2550226 RMD160 7db3a393f8f991b62e74433431d3a6f04aaea3f9 SHA1 dafbfb1d83ec944ce8bab67eb1f1f0cfb4fb5f72 SHA256 cb76dab4d342225ceb3a0fc01d69fcfbd057d436933d155cc55e1620a73f9bb5
 DIST mednafen-0.8.B.tar.bz2 2414246 RMD160 ae4cff9bed326e71b288cf3f86163379a54607db SHA1 b19907df4620d1087d75a3f91382d0ea8dc6997d SHA256 d7f5122ddab321f971833733f20858e2300693b1b489cc78f06aa7fd08f0b892
 EBUILD mednafen-0.8.10.ebuild 1474 RMD160 9c02a552039f7b1ec27aab4b38fe2aace5a07278 SHA1 a8008723745a76785ba0a8732277136ba2097903 SHA256 3b5b38ebb91e44adb5deb509b71232485bb2cf40d778ce89f9b84dfd9cb2b63b
-EBUILD mednafen-0.8.11.ebuild 1470 RMD160 fec7b55f2dc6fa3bb1b9458ab3606d6514628220 SHA1 95b05444cb2ea77eb75b08f6732f1a9b852b10b2 SHA256 cae3c6feb2b3720ec6c6f565622a088d66105b646b6b8c3a34a0cf7dc4c862aa
+EBUILD mednafen-0.8.11.ebuild 1555 RMD160 9a4de2d4988bb0896d87ca47dd43dabc5ebdfca4 SHA1 c2c69fed99e7ed30e905c6c30797a25d5b5f9c86 SHA256 9b4a5927ef72c629d33b3d20965aa84743fbbce5be48bd34be238cdd2aa5bc19
 EBUILD mednafen-0.8.9.ebuild 1509 RMD160 30f6f41d8745698bfd8956b88714b611786c23da SHA1 81ee27ee16c5efea749f18c7edc63318d18bd9a9 SHA256 2e1c2bf379401d441a9453650ea2cae1a858c69d01db58827a763266e569f18a
-MISC ChangeLog 2378 RMD160 a52121219437e5b241b148c766d2e5e9b01ea11c SHA1 2b1cec1da3f491aaf970a4404912f896061e12a3 SHA256 909ac304d4fbeb8b145ca143064ed49440c69aa9da02c229903af39d2140482c
+MISC ChangeLog 2536 RMD160 10683931262d9b470feee9f2279c20f9a037c3cb SHA1 43fb6d95539b5558d4b2e5257c0cc76a6d5fbe1f SHA256 b0d009b247f48e3c962e36fa8e56cc708a4baf390673a6163301cbc699d3f584
 MISC metadata.xml 158 RMD160 cbd9984bb6b426c8c9cee5022fe0a26261612fea SHA1 be5251fa1dacef5c41b74761bb1c8c54fb633b9e SHA256 1423a4fdd4a79b1728a2056d9e300f7e1074253095d82726218d9e9b953888a3
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.11 (GNU/Linux)
 
-iEYEARECAAYFAknmAr8ACgkQr2QksT29OyCLTACfYaW3+iaIXpJDqUZ6xg1Nem0R
-0qcAn0gZtjqMLDeo4idKQkqDoBTOEEnv
-=FJES
+iEYEARECAAYFAko5dOAACgkQdz7hIScOURHi1ACbBSniLUSZi/KpoZd50WlKHkbL
+2BMAn35cVeEqJ21O9EkrK5EIDuG+engO
+=BTc+
 -----END PGP SIGNATURE-----
diff --git a/games-emulation/mednafen/files/mednafen-0.8.11-glibc2.10.patch b/games-emulation/mednafen/files/mednafen-0.8.11-glibc2.10.patch
new file mode 100644
index 000000000000..34fb4ba5ee3f
--- /dev/null
+++ b/games-emulation/mednafen/files/mednafen-0.8.11-glibc2.10.patch
@@ -0,0 +1,11 @@
+--- src/file.cpp
++++ src/file.cpp
+@@ -418,7 +418,7 @@
+    if(!(fceufp = MakeMemWrap(t, 0)))
+     return(0);
+ 
+-   char *ld = strrchr(path, '.');
++   const char *ld = strrchr(path, '.');
+    fceufp->ext = strdup(ld ? ld + 1 : "");
+   }
+   else                  /* Probably gzip */
diff --git a/games-emulation/mednafen/mednafen-0.8.11.ebuild b/games-emulation/mednafen/mednafen-0.8.11.ebuild
index e47ce72308f9..94fa191e7558 100644
--- a/games-emulation/mednafen/mednafen-0.8.11.ebuild
+++ b/games-emulation/mednafen/mednafen-0.8.11.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-emulation/mednafen/mednafen-0.8.11.ebuild,v 1.1 2009/04/15 15:52:29 hanno Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-emulation/mednafen/mednafen-0.8.11.ebuild,v 1.2 2009/06/17 22:57:30 nyhm Exp $
 
 EAPI=2
-inherit autotools games
+inherit autotools eutils games
 
 DESCRIPTION="An advanced NES, GB/GBC/GBA, TurboGrafx 16/CD, NGPC and Lynx emulator"
 HOMEPAGE="http://mednafen.sourceforge.net/"
@@ -35,8 +35,11 @@ src_prepare() {
 		$(find . -name 'Makefile.*') \
 		|| die 'sed failed'
 	sed -i \
-		-e '/-fomit-frame/d' configure.ac \
+		-e '/-fomit-frame-pointer/d' \
+		-e '/-ffast-math/d' \
+		configure.ac \
 		|| die "sed failed"
+	epatch "${FILESDIR}"/${P}-glibc2.10.patch
 	eautoreconf
 }