Revision bump wrt bug #214697

Package-Manager: portage-2.1.4.4

4 files changed, 116 insertions, 6 deletions

diff --git a/games-emulation/zsnes/ChangeLog b/games-emulation/zsnes/ChangeLog
index 1d1105c06101..c522cc046871 100644
--- a/games-emulation/zsnes/ChangeLog
+++ b/games-emulation/zsnes/ChangeLog
@@ -1,6 +1,12 @@
 # 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.37 2008/05/02 13:52:31 nyhm Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-emulation/zsnes/ChangeLog,v 1.38 2008/05/09 19:14:57 drizzt Exp $
+
+*zsnes-1.51-r2 (09 May 2008)
+
+  09 May 2008; Timothy Redaelli <drizzt@gentoo.org>
+  +files/zsnes-1.51-libao-thread.patch, +zsnes-1.51-r2.ebuild:
+  Revision bump wrt bug #214697
 
   02 May 2008; Tristan Heaven <nyhm@gentoo.org>
   +files/zsnes-1.51-gcc43.patch, zsnes-1.51-r1.ebuild:
diff --git a/games-emulation/zsnes/Manifest b/games-emulation/zsnes/Manifest
index 62778a4e7dbb..88c67db9e4cd 100644
--- a/games-emulation/zsnes/Manifest
+++ b/games-emulation/zsnes/Manifest
@@ -3,15 +3,17 @@ 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-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
-MISC ChangeLog 8146 RMD160 1afdda02ed4c461c992a2d06531f4d905ece7f09 SHA1 30b838c46c0a10fbff281fa26bbfd52853f2f337 SHA256 fae33e809d87799b52728357755dfdb4004e0deafea8bb450833e36d023c1ecc
+EBUILD zsnes-1.51-r2.ebuild 2081 RMD160 8bf412d323f5a4add507a99816e4f18915008c2b SHA1 bc7861c3c76f3d05d2d1c842b24082a40fb05e0f SHA256 ba48da444b54e022e34deae6b513ae45750fef0f62b598d084209b2d455a998c
+MISC ChangeLog 8326 RMD160 7db8f1e793cc5d33015ed0936a1ca510e57910d5 SHA1 643fc6d811e416d110868a23332381c2608fc17d SHA256 af759ca41176cca98e124af457835972da5c45f7f760360de66a173e57b4d95a
 MISC metadata.xml 372 RMD160 0d0b2eeec56fca840beec662062dfa3961537649 SHA1 41d62af5e7cd389224135e8385b22355f2c7f2ac SHA256 043dd4fd85df344c5a335c1f3bc1a0f9ce9b169337060367f767b3e4be217bdb
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.9 (GNU/Linux)
+Version: GnuPG v2.0.7 (GNU/Linux)
 
-iEYEARECAAYFAkgbHKQACgkQdz7hIScOUREiYACg8t2J0xoSQsdFxvH+GxqaKMzT
-/M0AnRi9f3lqjtDIDpgzTkZXWxAJq3u+
-=qCA2
+iD8DBQFIJKK3faz7Jd2SSKIRAkQnAJ9870zSQm72asDXWRLg8WizA4l5ywCgounc
+/IZXL7kXwAidbjE6rou6ZdE=
+=oKk+
 -----END PGP SIGNATURE-----
diff --git a/games-emulation/zsnes/files/zsnes-1.51-libao-thread.patch b/games-emulation/zsnes/files/zsnes-1.51-libao-thread.patch
new file mode 100644
index 000000000000..880e08c698fe
--- /dev/null
+++ b/games-emulation/zsnes/files/zsnes-1.51-libao-thread.patch
@@ -0,0 +1,25 @@
+--- linux/audio.c.old   2007-01-09 20:19:12.000000000 -0500 
++++ linux/audio.c   2007-12-30 20:33:07.000000000 -0500 
+@@ -177,11 +177,7 @@ 
+   }
+   else
+   {
+-    if (pthread_create(&audio_thread, 0, SoundThread_ao, 0))
+-    {
+-      puts("pthread_create() failed.");
+-    }
+-    else if (pthread_mutex_init(&audio_mutex, 0))
++    if (pthread_mutex_init(&audio_mutex, 0))
+     {
+       puts("pthread_mutex_init() failed.");
+     }
+@@ -189,6 +185,10 @@
+     {
+       puts("pthread_cond_init() failed.");
+     }
++    else if (pthread_create(&audio_thread, 0, SoundThread_ao, 0))
++    {
++      puts("pthread_create() failed.");
++    }
+     InitSampleControl();
+   }
diff --git a/games-emulation/zsnes/zsnes-1.51-r2.ebuild b/games-emulation/zsnes/zsnes-1.51-r2.ebuild
new file mode 100644
index 000000000000..f251fd8a8a7a
--- /dev/null
+++ b/games-emulation/zsnes/zsnes-1.51-r2.ebuild
@@ -0,0 +1,77 @@
+# 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-r2.ebuild,v 1.1 2008/05/09 19:14:57 drizzt Exp $
+
+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/"
+SRC_URI="mirror://sourceforge/zsnes/${PN}${PV//./}src.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="-* ~amd64 ~x86 ~x86-fbsd"
+IUSE="ao custom-cflags opengl png"
+
+RDEPEND="media-libs/libsdl
+	>=sys-libs/zlib-1.2.3-r1
+	amd64? ( >=app-emulation/emul-linux-x86-sdl-10.1 )
+	ao? ( media-libs/libao )
+	opengl? ( virtual/opengl )
+	png? ( media-libs/libpng )"
+DEPEND="${RDEPEND}
+	dev-lang/nasm
+	amd64? ( >=sys-apps/portage-2.1 )"
+
+S=${WORKDIR}/${PN}_${PV//./_}/src
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+
+	# Fixing compilation without libpng installed
+	epatch "${FILESDIR}"/${P}-libpng.patch
+	# Fix bug #186111
+	epatch "${FILESDIR}"/${P}-archopt-july-23-update.patch
+	epatch "${FILESDIR}"/${P}-gcc43.patch
+	# Fix bug #214697
+	epatch "${FILESDIR}"/${P}-libao-thread.patch
+
+	# Remove hardcoded CFLAGS and LDFLAGS
+	sed -i \
+		-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
+	use custom-cflags || strip-flags
+
+	egamesconf \
+		$(use_enable ao libao) \
+		$(use_enable png libpng) \
+		$(use_enable opengl) \
+		--disable-debug \
+		--disable-cpucheck \
+		--enable-release \
+		force_arch=no \
+		|| die
+	emake makefile.dep || die "emake makefile.dep failed"
+	emake || die "emake failed"
+}
+
+src_install() {
+	dogamesbin zsnes || die "dogamesbin failed"
+	newman linux/zsnes.1 zsnes.6
+	dodoc ../docs/{readme.1st,*.txt,README.LINUX}
+	dodoc ../docs/readme.txt/*
+	dohtml -r ../docs/readme.htm/*
+	make_desktop_entry zsnes ZSNES
+	newicon icons/48x48x32.png ${PN}.png
+	prepgamesdirs
+}