version bump

5 files changed, 182 insertions, 3 deletions

diff --git a/games-emulation/fceultra/ChangeLog b/games-emulation/fceultra/ChangeLog
index de24a8377bae..30d1a9a78a62 100644
--- a/games-emulation/fceultra/ChangeLog
+++ b/games-emulation/fceultra/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for games-emulation/fceultra
 # Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-emulation/fceultra/ChangeLog,v 1.4 2003/11/10 05:05:25 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-emulation/fceultra/ChangeLog,v 1.5 2003/11/13 06:59:13 mr_bones_ Exp $
+
+*fceultra-0.97.5 (12 Nov 2003)
+
+  12 Nov 2003; Michael Sterrett <mr_bones_@gentoo.org> fceultra-0.97.5.ebuild,
+  files/0.97.5-joystick.patch:
+  version bump
 
 *fceultra-0.97.4 (10 Nov 2003)
 
diff --git a/games-emulation/fceultra/Manifest b/games-emulation/fceultra/Manifest
index 7e56a2387a20..fbd5d2698c1d 100644
--- a/games-emulation/fceultra/Manifest
+++ b/games-emulation/fceultra/Manifest
@@ -1,10 +1,11 @@
-MD5 98da51ceec403e39e7a29e9ba68d5a55 ChangeLog 2513
-MD5 ee41e18971481ffb1f8b290c307e5290 fceultra-0.97.5.ebuild 1746
+MD5 4b81f7bbb2eaf838d4467297b6d54406 ChangeLog 2674
+MD5 bc6a7b626cd95a4f6a932fb9da975e70 fceultra-0.97.5.ebuild 2104
 MD5 ceb341b1badd855c20e397eea7ab07d8 fceultra-0.97.4.ebuild 1555
 MD5 50b406eb50379b5249f5af61684079b1 fceultra-0.81-r1.ebuild 1535
 MD5 41f339a20029a821edbe0cd15540caf1 fceultra-0.93.ebuild 1332
 MD5 989c1ea4e153af3a92e18611f719f4aa files/digest-fceultra-0.81-r1 62
 MD5 ef07ca0ea89b4e4911e5d579502d2fa4 files/digest-fceultra-0.97.5 67
+MD5 637fe6dcdb2eddde6cc6d155954d6254 files/0.97.5-joystick.patch 2858
 MD5 637fe6dcdb2eddde6cc6d155954d6254 files/0.97.4-joystick.patch 2858
 MD5 59fb294c28c810a13330d1039fe654f0 files/0.97.4-stereo.patch 2228
 MD5 da6ce0bfb1f581e29d8a78077da1aafc files/digest-fceultra-0.97.4 67
diff --git a/games-emulation/fceultra/fceultra-0.97.5.ebuild b/games-emulation/fceultra/fceultra-0.97.5.ebuild
new file mode 100644
index 000000000000..1e432e425e5e
--- /dev/null
+++ b/games-emulation/fceultra/fceultra-0.97.5.ebuild
@@ -0,0 +1,72 @@
+# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/games-emulation/fceultra/fceultra-0.97.5.ebuild,v 1.1 2003/11/13 06:59:13 mr_bones_ Exp $
+
+inherit games gcc eutils
+
+S="${WORKDIR}/fceu"
+DESCRIPTION="A portable NES/Famicom emulator"
+HOMEPAGE="http://fceultra.sourceforge.net/"
+SRC_URI="http://xodnizel.net/fceultra/downloads/fceu-${PV}.src.tar.gz"
+
+KEYWORDS="-* ~x86"
+LICENSE="GPL-2"
+SLOT="0"
+
+IUSE="sdl svga"
+
+# Because of code generation bugs, FCEUltra now depends on a version
+# of gcc greater than or equal to GCC 3.2.2.
+RDEPEND="|| (
+		svga? ( media-libs/svgalib )
+		sdl? ( media-libs/libsdl )
+		media-libs/libsdl
+	)
+	>=sys-devel/gcc-3.2.2
+	sys-libs/zlib"
+DEPEND="${RDEPEND}
+	>=sys-apps/sed-4"
+
+src_unpack() {
+	unpack ${A}
+
+	cd ${S}
+	epatch "${FILESDIR}/${PV}-joystick.patch"
+	sed -i \
+		-e 's:-mcpu=i686 -O2::' \
+		-e 's:-fomit-frame-pointer::' \
+		Makefile.linuxvga Makefile.unixsdl Makefile.unixsdl.gtk || \
+			die "sed Makefiles failed"
+	sed -i \
+		-e "s:\${TFLAGS}:\${TFLAGS} ${CFLAGS}:" Makefile.base || \
+			die "sed Makefile.base failed"
+}
+
+src_compile() {
+	if [ `use sdl` ] || [ -z "`use sdl``use svga`" ] ; then
+		emake -f Makefile.unixsdl || die "sdl make failed"
+		mv fceu fceu-sdl
+		make -f Makefile.unixsdl clean
+	fi
+	if [ `use svga` ] ; then
+		emake -f Makefile.linuxvga || die "svga make failed"
+		mv fceu fceu-svga
+	fi
+}
+
+src_install() {
+	if [ `use sdl` ] || [ -z "`use sdl``use svga`" ] ; then
+		dogamesbin fceu-sdl     || die "dogamesbin failed (sdl)"
+		doman Documentation/*.6 || die "doman failed (sdl)"
+	fi
+	if use svga ; then
+		dogamesbin fceu-svga    || die "dogamesbin failed (svga)"
+		doman Documentation/*.6 || die "doman failed (svga)"
+	fi
+	dodoc Documentation/{*.txt,AUTHORS,FAQ,README,TODO} || die "dodoc failed"
+	cp -r Documentation/tech "${D}/usr/share/doc/${P}/" || die "cp failed"
+	find ${D}/usr/share/doc/${P}/tech -type f -exec gzip -9 \{\} \; || \
+		die "find failed"
+	dohtml Documentation/*                              || die "dohtml failed"
+	prepgamesdirs
+}
diff --git a/games-emulation/fceultra/files/0.97.5-joystick.patch b/games-emulation/fceultra/files/0.97.5-joystick.patch
new file mode 100644
index 000000000000..40bb7457a1b0
--- /dev/null
+++ b/games-emulation/fceultra/files/0.97.5-joystick.patch
@@ -0,0 +1,99 @@
+--- drivers/cli/sdl-joystick.c.orig	2003-06-21 22:49:24.000000000 -0500
++++ drivers/cli/sdl-joystick.c	2003-07-10 19:10:38.000000000 -0500
+@@ -143,20 +143,12 @@
+ /* Configure a joystick axis. */
+ void AConfig (int n, int a)
+ {
+-        Sint16 lastaxe[64];
+-        int numaxes;
+-        int axis;
++	SDL_Event event;
+ 
+ 	WNoInput();
+ 
+         joyAMap[n][a] = a;
+ 
+-        numaxes=SDL_JoystickNumAxes(jo[n]);
+-        if(numaxes>64) numaxes=64;
+-
+-        for(axis=0;axis<numaxes;axis++)	/* Pre-load. */
+-		lastaxe[axis]=SDL_JoystickGetAxis(jo[n], axis);
+-
+ 	while (1)
+         {
+                 uint8 t;
+@@ -167,31 +159,26 @@
+                 }
+                 else
+                         break;
+-               
+-                SDL_JoystickUpdate();
+-
+-                for (axis=0;axis<numaxes;axis++) {
+-                	if (abs((Sint32)SDL_JoystickGetAxis(jo[n],axis)-lastaxe[axis]) > 8192) {
+-               			joyAMap[n][a] = axis;
+-					/* 4096 should be good enough to account for any jitter. */
+-                                	while (abs((Sint32)SDL_JoystickGetAxis(jo[n],axis)-lastaxe[axis]) > 4096) {
+-                                        	SDL_JoystickUpdate();
+-                                        	SDL_Delay(50);
+-                      			}
+-                                        goto endaconfig;
+-                	}
+-                }
+-                SDL_Delay(100);
+-        }
+-
+-	endaconfig:
+-	WNoInput();
++	
++		SDL_JoystickUpdate();
++		if (SDL_PollEvent(&event) && (event.type == SDL_JOYAXISMOTION))
++		{
++			// Make sure the joystick was moved by some significant amount
++			if ((event.jaxis.value < -3000) || (event.jaxis.value > 3000))
++			{
++	         		joyAMap[n][a] = event.jaxis.axis;
++			 	WNoInput();
++				return;
++			}
++		}
++	}
+ 	return;
+ }
+ 
+ /* Configure a joystick button. */
+ void BConfig (int n, int b)
+ {
++	SDL_Event event;
+ 	WNoInput();
+ 	joyBMap[n][b] = 0;
+ 	while (1)
+@@ -206,23 +193,15 @@
+ 			break;
+ 		
+ 		SDL_JoystickUpdate();
++
++		if (SDL_PollEvent(&event) && event.type == SDL_JOYBUTTONDOWN)
+ 		{
+-                       int buttons;
+-                       for (buttons = SDL_JoystickNumButtons(jo[n])-1;buttons >= 0;buttons--) {
+-                               if (SDL_JoystickGetButton(jo[n],buttons)) {
+-                                       joyBMap[n][b] = buttons+1;
+-                                       while (SDL_JoystickGetButton(jo[n], buttons)) {
+-                                               SDL_JoystickUpdate();
+-                                               SDL_Delay(50);
+-                                       }
+-                                       goto endbconfig;
+-                               }
+-                       }
++			joyBMap[n][b] = event.jbutton.button+1;
++			WNoInput();
++			return;
+ 		}
+-	   	SDL_Delay(100);
+ 	}
+ 
+-	endbconfig:
+ 	WNoInput();
+ 	return;
+ }
diff --git a/games-emulation/fceultra/files/digest-fceultra-0.97.5 b/games-emulation/fceultra/files/digest-fceultra-0.97.5
new file mode 100644
index 000000000000..4c1952e5486b
--- /dev/null
+++ b/games-emulation/fceultra/files/digest-fceultra-0.97.5
@@ -0,0 +1 @@
+MD5 a3a3732d58ddb66ae9a78b2bac1d6a1f fceu-0.97.5.src.tar.gz 551337