diff options
| -rw-r--r-- | games-emulation/zsnes/ChangeLog | 6 | ||||
| -rw-r--r-- | games-emulation/zsnes/Manifest | 15 | ||||
| -rw-r--r-- | games-emulation/zsnes/files/zsnes-1.51-gcc43.patch | 48 | ||||
| -rw-r--r-- | games-emulation/zsnes/zsnes-1.51-r1.ebuild | 34 |
4 files changed, 79 insertions, 24 deletions
diff --git a/games-emulation/zsnes/ChangeLog b/games-emulation/zsnes/ChangeLog index 9c95b682fa5a..1d1105c06101 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.36 2008/02/29 19:08:22 carlo Exp $ +# $Header: /var/cvsroot/gentoo-x86/games-emulation/zsnes/ChangeLog,v 1.37 2008/05/02 13:52:31 nyhm Exp $ + + 02 May 2008; Tristan Heaven <nyhm@gentoo.org> + +files/zsnes-1.51-gcc43.patch, zsnes-1.51-r1.ebuild: + Fix building with gcc-4.3 29 Feb 2008; Carsten Lohrke <carlo@gentoo.org> zsnes-1.51-r1.ebuild: Remove icon extension from desktop entry to match Icon Theme Specification. diff --git a/games-emulation/zsnes/Manifest b/games-emulation/zsnes/Manifest index 31a1476904b2..62778a4e7dbb 100644 --- a/games-emulation/zsnes/Manifest +++ b/games-emulation/zsnes/Manifest @@ -1,6 +1,17 @@ +-----BEGIN PGP SIGNED MESSAGE----- +Hash: SHA1 + AUX zsnes-1.51-archopt-july-23-update.patch 12740 RMD160 e8004f97f795c13d51fa16c5bf386dfc8b12058f SHA1 4e59c16f0e5c57cfa6e5df2b50026598e77eab5a SHA256 4fc49ccafe46dafb1db57226e6989f6a5c97e826595df881d90bad1694a9906e +AUX zsnes-1.51-gcc43.patch 913 RMD160 95ab52f570dd1e5c7d0852dac17d56ada4939079 SHA1 9bbececf44cc48a4d6b48ebff66ba657ef409168 SHA256 9eb0aff2be2b303295b0d0a76240facd13dca170b97fe3ee827a6c26d89d53de 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 2185 RMD160 3eefa22896118dee4987536210fc48df7db86faf SHA1 97658943e9e41ed6c7a6467a824520097ec13238 SHA256 89cd4639bb14e6259f1dc57df4d21eaa37ddbd06a6d1b8b97e543b5e4ccc935f -MISC ChangeLog 8015 RMD160 a7b66551a8d9850acb83f83a84f020ad230cfa4f SHA1 814521c17cc973592ea401c26f1c703e273882bb SHA256 debb8874d0dd375ef44faed76425dcb8ec83dcb074f526bafdbdceda8ddfbfef +EBUILD zsnes-1.51-r1.ebuild 2012 RMD160 82f87fffa9bc3ebd12a931591545f4329d9fbe43 SHA1 05ae78603bc7665d691f37e8f9b80e113cac34b8 SHA256 2f37cc30db21effbcfebbaf6df16874cc1cceff814bd8627a7e3143e3c1fac6e +MISC ChangeLog 8146 RMD160 1afdda02ed4c461c992a2d06531f4d905ece7f09 SHA1 30b838c46c0a10fbff281fa26bbfd52853f2f337 SHA256 fae33e809d87799b52728357755dfdb4004e0deafea8bb450833e36d023c1ecc MISC metadata.xml 372 RMD160 0d0b2eeec56fca840beec662062dfa3961537649 SHA1 41d62af5e7cd389224135e8385b22355f2c7f2ac SHA256 043dd4fd85df344c5a335c1f3bc1a0f9ce9b169337060367f767b3e4be217bdb +-----BEGIN PGP SIGNATURE----- +Version: GnuPG v2.0.9 (GNU/Linux) + +iEYEARECAAYFAkgbHKQACgkQdz7hIScOUREiYACg8t2J0xoSQsdFxvH+GxqaKMzT +/M0AnRi9f3lqjtDIDpgzTkZXWxAJq3u+ +=qCA2 +-----END PGP SIGNATURE----- diff --git a/games-emulation/zsnes/files/zsnes-1.51-gcc43.patch b/games-emulation/zsnes/files/zsnes-1.51-gcc43.patch new file mode 100644 index 000000000000..4650bc12a7d1 --- /dev/null +++ b/games-emulation/zsnes/files/zsnes-1.51-gcc43.patch @@ -0,0 +1,48 @@ +--- src/parsegen.cpp ++++ src/parsegen.cpp +@@ -31,6 +31,7 @@ + #include <sstream> + #include <set> + #include <stack> ++#include <cstring> + using namespace std; + + #include <errno.h> +@@ -1828,7 +1829,7 @@ + } + } + +-int main(size_t argc, const char **argv) ++int main(int argc, const char **argv) + { + const char *cheader_file = 0; + bool compile = false; +--- src/tools/depbuild.cpp ++++ src/tools/depbuild.cpp +@@ -24,6 +24,7 @@ + #include <iostream> + #include <string> + #include <cstdio> ++#include <cstdlib> + using namespace std; + + #include "fileutil.h" +@@ -183,7 +184,7 @@ + } + } + +-int main(size_t argc, const char *const *const argv) ++int main(int argc, const char *const *const argv) + { + if (argc < 5) + { +--- src/tools/strutil.h ++++ src/tools/strutil.h +@@ -25,6 +25,7 @@ + #include <string> + #include <vector> + #include <cctype> ++#include <cstring> + + struct ci_char_traits : public std::char_traits<char> + { diff --git a/games-emulation/zsnes/zsnes-1.51-r1.ebuild b/games-emulation/zsnes/zsnes-1.51-r1.ebuild index 2fa10a16ae65..3b8d1c3606e6 100644 --- a/games-emulation/zsnes/zsnes-1.51-r1.ebuild +++ b/games-emulation/zsnes/zsnes-1.51-r1.ebuild @@ -1,8 +1,8 @@ # Copyright 1999-2008 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/games-emulation/zsnes/zsnes-1.51-r1.ebuild,v 1.6 2008/02/29 19:08:22 carlo Exp $ +# $Header: /var/cvsroot/gentoo-x86/games-emulation/zsnes/zsnes-1.51-r1.ebuild,v 1.7 2008/05/02 13:52:31 nyhm Exp $ -inherit eutils autotools flag-o-matic toolchain-funcs games +inherit eutils autotools flag-o-matic toolchain-funcs multilib games DESCRIPTION="SNES (Super Nintendo) emulator that uses x86 assembly" HOMEPAGE="http://www.zsnes.com/ http://ipherswipsite.com/zsnes/" @@ -33,41 +33,33 @@ src_unpack() { epatch "${FILESDIR}"/${P}-libpng.patch # Fix bug #186111 epatch "${FILESDIR}"/${P}-archopt-july-23-update.patch + epatch "${FILESDIR}"/${P}-gcc43.patch # Remove hardcoded CFLAGS and LDFLAGS - if use custom-cflags; then - sed -i -e '/^\s*CFLAGS=.* -fomit-frame-pointer /d' \ - configure.in || die - append-flags -fomit-frame-pointer -D__RELEASE__ - else - strip-flags - fi sed -i \ - -e 's:^\s*STRIP="-s":STRIP="":' \ - -e 's:^\s*CFLAGS=.* -I\/usr\/local\/include .*$:CFLAGS="${CFLAGS} -I.":' \ - -e '/^\s*LDFLAGS=.* -L\/usr\/local\/lib /d' \ - configure.in || die - + -e '/^CFLAGS=.*local/s:-pipe.*:-Wall -I.":' \ + -e '/^LDFLAGS=.*local/d' \ + -e '/\w*CFLAGS=.*fomit/s:-O3.*$STRIP::' \ + configure.in \ + || die "sed failed" eautoreconf } src_compile() { tc-export CC - use amd64 && multilib_toolchain_setup x86 - - local myconf="" - use custom-cflags && myconf="--disable-cpucheck force_arch=no" + use custom-cflags || strip-flags egamesconf \ $(use_enable ao libao) \ $(use_enable png libpng) \ $(use_enable opengl) \ --disable-debug \ + --disable-cpucheck \ --enable-release \ - ${myconf} \ + force_arch=no \ || die - emake makefile.dep || die "emake failed" + emake makefile.dep || die "emake makefile.dep failed" emake || die "emake failed" } @@ -77,7 +69,7 @@ src_install() { dodoc ../docs/{readme.1st,*.txt,README.LINUX} dodoc ../docs/readme.txt/* dohtml -r ../docs/readme.htm/* - make_desktop_entry zsnes ZSNES zsnes + make_desktop_entry zsnes ZSNES newicon icons/48x48x32.png ${PN}.png prepgamesdirs } |