summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTimothy Redaelli <drizzt@gentoo.org>2009-02-02 16:41:45 +0000
committerTimothy Redaelli <drizzt@gentoo.org>2009-02-02 16:41:45 +0000
commitfc67e111078afa3820a7ad1b427805623a33fb58 (patch)
tree728d3d9071dc393abc7511eae6d6bf7533a000bd /games-emulation
parentVersion bump and fix for kernel 2.6.28 (diff)
downloadhistorical-fc67e111078afa3820a7ad1b427805623a33fb58.tar.gz
historical-fc67e111078afa3820a7ad1b427805623a33fb58.tar.bz2
historical-fc67e111078afa3820a7ad1b427805623a33fb58.zip
Fix a (possible) compilation problem wrt bug #170108
Package-Manager: portage-2.2_rc23/cvs/Linux x86_64
Diffstat (limited to 'games-emulation')
-rw-r--r--games-emulation/zsnes/ChangeLog8
-rw-r--r--games-emulation/zsnes/Manifest5
-rw-r--r--games-emulation/zsnes/files/zsnes-1.51-depbuild.patch24
-rw-r--r--games-emulation/zsnes/zsnes-1.51-r2.ebuild6
4 files changed, 37 insertions, 6 deletions
diff --git a/games-emulation/zsnes/ChangeLog b/games-emulation/zsnes/ChangeLog
index c522cc046871..bbc23d1c1c1d 100644
--- a/games-emulation/zsnes/ChangeLog
+++ b/games-emulation/zsnes/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for games-emulation/zsnes
-# Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-emulation/zsnes/ChangeLog,v 1.38 2008/05/09 19:14:57 drizzt Exp $
+# Copyright 2002-2009 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/games-emulation/zsnes/ChangeLog,v 1.39 2009/02/02 16:41:45 drizzt Exp $
+
+ 02 Feb 2009; <drizzt@gentoo.org> +files/zsnes-1.51-depbuild.patch,
+ zsnes-1.51-r2.ebuild:
+ Fix a (possible) compilation problem wrt bug #170108
*zsnes-1.51-r2 (09 May 2008)
diff --git a/games-emulation/zsnes/Manifest b/games-emulation/zsnes/Manifest
index 3f919597c0b8..03631c6bfa3c 100644
--- a/games-emulation/zsnes/Manifest
+++ b/games-emulation/zsnes/Manifest
@@ -1,9 +1,10 @@
AUX zsnes-1.51-archopt-july-23-update.patch 12740 RMD160 e8004f97f795c13d51fa16c5bf386dfc8b12058f SHA1 4e59c16f0e5c57cfa6e5df2b50026598e77eab5a SHA256 4fc49ccafe46dafb1db57226e6989f6a5c97e826595df881d90bad1694a9906e
+AUX zsnes-1.51-depbuild.patch 631 RMD160 bd17f4dc521fb186a62e91350c9dcdc97c1c3256 SHA1 20568092a34c60f94038d3cc5b107e36269b4df2 SHA256 ab22b2fd1dfda5f377cafa0df19269259305aeab15d3c3ae6bf511b222dc6359
AUX zsnes-1.51-gcc43.patch 913 RMD160 95ab52f570dd1e5c7d0852dac17d56ada4939079 SHA1 9bbececf44cc48a4d6b48ebff66ba657ef409168 SHA256 9eb0aff2be2b303295b0d0a76240facd13dca170b97fe3ee827a6c26d89d53de
AUX zsnes-1.51-libao-thread.patch 663 RMD160 10b0ce28577e39187f98d8f392462585148d34eb SHA1 67a34c9a5f8c6abb2881007d47ba10647ca4503a SHA256 71be0bbb8b683edc7c7780b68a43e54be7a8c341bf9b2a01e5cceb53834b1a73
AUX zsnes-1.51-libpng.patch 974 RMD160 36bdb059c6641376bee6ea5040a7045420c02870 SHA1 a4f7960de8eece5ac1c51cc8b58f6fb8964bca40 SHA256 9e5ba014ba847f7e10075dfd51b0ca42b86aa2dcc47952d569c304f3e8e15470
DIST zsnes151src.tar.bz2 1071712 RMD160 337407bf7e5516bcd7bf310c7b17d6d12a948750 SHA1 03df35490870c9950d7010747d0546c8525c0362 SHA256 eb013f824f5a9814a714cf0daaea3ea68a1c74fd741e5b0979fcb7964236a866
EBUILD zsnes-1.51-r1.ebuild 2012 RMD160 82f87fffa9bc3ebd12a931591545f4329d9fbe43 SHA1 05ae78603bc7665d691f37e8f9b80e113cac34b8 SHA256 2f37cc30db21effbcfebbaf6df16874cc1cceff814bd8627a7e3143e3c1fac6e
-EBUILD zsnes-1.51-r2.ebuild 2081 RMD160 8bf412d323f5a4add507a99816e4f18915008c2b SHA1 bc7861c3c76f3d05d2d1c842b24082a40fb05e0f SHA256 ba48da444b54e022e34deae6b513ae45750fef0f62b598d084209b2d455a998c
-MISC ChangeLog 8326 RMD160 7db8f1e793cc5d33015ed0936a1ca510e57910d5 SHA1 643fc6d811e416d110868a23332381c2608fc17d SHA256 af759ca41176cca98e124af457835972da5c45f7f760360de66a173e57b4d95a
+EBUILD zsnes-1.51-r2.ebuild 2142 RMD160 4ae877b9fe1261af60cbc3e509b0298e9a0853f5 SHA1 505bbacba9185c7618259d08415d87062faec7b8 SHA256 ff7fc9053470d9bb14ef5013471f2d6fdf2967047197cafb2d66a71e43ae1efe
+MISC ChangeLog 8475 RMD160 b257bbf768a0c4a3b64c76d68cecfb4ad8bae222 SHA1 eec3e5246644f9b16363844ffae06a1a2c90ca2a SHA256 ec3a0c9e1b0924e442b449b9e80991ae7350671544bb4edca12ee04a0811317c
MISC metadata.xml 480 RMD160 86136547af2c3cfc61f8b8bbc5b1d4877a8a5396 SHA1 5bf2431d4deabdf80e813fb8410a362f8429520a SHA256 a649667db5f179b2b7c914d0e13ba3e11fb5b43fd1bbd7bc4e2a2f6a07b42692
diff --git a/games-emulation/zsnes/files/zsnes-1.51-depbuild.patch b/games-emulation/zsnes/files/zsnes-1.51-depbuild.patch
new file mode 100644
index 000000000000..737d0c0100fb
--- /dev/null
+++ b/games-emulation/zsnes/files/zsnes-1.51-depbuild.patch
@@ -0,0 +1,24 @@
+--- src/tools/depbuild.cpp.orig 2006-12-27 12:04:05.000000000 +0100
++++ src/tools/depbuild.cpp 2009-02-02 17:24:17.980006252 +0100
+@@ -130,7 +130,20 @@
+ void dependency_calculate_asm(const char *filename)
+ {
+ string command = nasm + " " + nflags + " -M " + filename;
+- system(command.c_str());
++ FILE *fp = popen(command.c_str(), "r");
++ if (fp)
++ {
++ char line[256];
++ while (fgets(line, sizeof(line), fp)) //Process all lines of output
++ {
++ cout << line;
++ }
++ pclose(fp);
++ }
++ else
++ {
++ cerr << "Failed on: " << filename << "\n";
++ }
+ }
+
+ void dependency_calculate_psr(const char *filename)
diff --git a/games-emulation/zsnes/zsnes-1.51-r2.ebuild b/games-emulation/zsnes/zsnes-1.51-r2.ebuild
index f251fd8a8a7a..55bdddbded41 100644
--- a/games-emulation/zsnes/zsnes-1.51-r2.ebuild
+++ b/games-emulation/zsnes/zsnes-1.51-r2.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2008 Gentoo Foundation
+# Copyright 1999-2009 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-emulation/zsnes/zsnes-1.51-r2.ebuild,v 1.1 2008/05/09 19:14:57 drizzt Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-emulation/zsnes/zsnes-1.51-r2.ebuild,v 1.2 2009/02/02 16:41:45 drizzt Exp $
inherit eutils autotools flag-o-matic toolchain-funcs multilib games
@@ -36,6 +36,8 @@ src_unpack() {
epatch "${FILESDIR}"/${P}-gcc43.patch
# Fix bug #214697
epatch "${FILESDIR}"/${P}-libao-thread.patch
+ # Fix bug #170108
+ epatch "${FILESDIR}"/${P}-depbuild.patch
# Remove hardcoded CFLAGS and LDFLAGS
sed -i \