From 82b35577fabbea3d5242dfb1a4b2a32031bda121 Mon Sep 17 00:00:00 2001
From: dillo <dillo@pkgsrc.org>
Date: Mon, 26 Jul 2004 18:00:17 +0000
Subject: Enable joystick input by default.  PKGREVISION++ If you ran fceu
 before, you have to delete ~/.fceultra/fceu98.cfg for the changes to take
 effect.

---
 emulators/fceu/Makefile         |  3 ++-
 emulators/fceu/distinfo         |  4 ++--
 emulators/fceu/patches/patch-aa | 21 +++++++++++++++++++--
 3 files changed, 23 insertions(+), 5 deletions(-)

(limited to 'emulators')

diff --git a/emulators/fceu/Makefile b/emulators/fceu/Makefile
index 27e4cbd308b..9c197ade8fa 100644
--- a/emulators/fceu/Makefile
+++ b/emulators/fceu/Makefile
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.1.1.1 2004/07/19 18:37:14 wiz Exp $
+# $NetBSD: Makefile,v 1.2 2004/07/26 18:00:17 dillo Exp $
 #
 
 DISTNAME=		fceu-0.98.10.src
 PKGNAME=		${DISTNAME:S/.src//}
+PKGREVISION=		1
 CATEGORIES=		emulators
 MASTER_SITES=		http://fceultra.sourceforge.net/releases/
 EXTRACT_SUFX=		.tar.bz2
diff --git a/emulators/fceu/distinfo b/emulators/fceu/distinfo
index 5c0f23136b1..e28f421ae61 100644
--- a/emulators/fceu/distinfo
+++ b/emulators/fceu/distinfo
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.2 2004/07/24 01:11:41 kristerw Exp $
+$NetBSD: distinfo,v 1.3 2004/07/26 18:00:17 dillo Exp $
 
 SHA1 (fceu-0.98.10.src.tar.bz2) = 578e25792f42e8fd640f0bd070241c43a63bbda2
 Size (fceu-0.98.10.src.tar.bz2) = 559750 bytes
-SHA1 (patch-aa) = e2e32735e52963f456ae9f74ed94b30d22468394
+SHA1 (patch-aa) = df9e098102d4c22c2699d5c5bdec79d72b8bac0c
 SHA1 (patch-ab) = 593c40bfe03e8ae8835113972a58a1cf46e882a9
 SHA1 (patch-ac) = 8a5297b11484c6eaf5d70a391bb486ff58475f35
 SHA1 (patch-ad) = 2a253539f9103b75a09f31d51427e8849a3b0249
diff --git a/emulators/fceu/patches/patch-aa b/emulators/fceu/patches/patch-aa
index 12a6bbe1501..15684a58a76 100644
--- a/emulators/fceu/patches/patch-aa
+++ b/emulators/fceu/patches/patch-aa
@@ -1,17 +1,34 @@
-$NetBSD: patch-aa,v 1.1.1.1 2004/07/19 18:37:15 wiz Exp $
+$NetBSD: patch-aa,v 1.2 2004/07/26 18:00:17 dillo Exp $
 
 Make default keys match documentation.
+Also, add settings for joystick.
 
 --- src/drivers/pc/input.c.orig	2004-05-17 01:48:26.000000000 +0200
 +++ src/drivers/pc/input.c
-@@ -286,8 +286,8 @@ static void KeyboardCommands(void)
+@@ -278,6 +278,10 @@ static void KeyboardCommands(void)
+ 
+ #define MK(x)   {{BUTTC_KEYBOARD},{0},{MKK(x)},1}
+ #define MK2(x1,x2)	{{BUTTC_KEYBOARD},{0},{MKK(x1),MKK(x2)},2}
++#define MKJA(x, a, d)	{{BUTTC_KEYBOARD, BUTTC_JOYSTICK},	\
++			 {0, 0},{MKK(x),0x8000|((d)<<14)|(a)},2}
++#define MKJB(x, a)	{{BUTTC_KEYBOARD, BUTTC_JOYSTICK},	\
++			 {0, 0},{MKK(x),(a)},2}
+ 
+ #define MKZ()   {{0},{0},{0},0}
+ 
+@@ -286,8 +290,13 @@ static void KeyboardCommands(void)
  ButtConfig GamePadConfig[4][10]={
          /* Gamepad 1 */
          { 
 -	 MK(KP3), MK(KP2), MK(TAB), MK(ENTER), MK(W),MK(Z),
 -                MK(A), MK(S), MKZ(), MKZ()
++	 MKJB(LEFTALT, 0), MKJB(LEFTCONTROL, 1), MKJB(TAB, 5), MKJB(ENTER, 7),
++	 MKJA(CURSORUP, 1, 1), MKJA(CURSORDOWN, 1, 0),
++	 MKJA(CURSORLEFT, 0, 1), MKJA(CURSORRIGHT, 0, 0), MKZ(), MKZ()
++#if 0
 +         MK(LEFTALT), MK(LEFTCONTROL), MK(TAB), MK(ENTER), MK(CURSORUP),
 +	 MK(CURSORDOWN), MK(CURSORLEFT), MK(CURSORRIGHT), MKZ(), MKZ()
++#endif
  	},
  
          /* Gamepad 2 */
-- 
cgit v1.2.3