[pkgsrc/trunk]: pkgsrc/emulators/fceu Enable joystick input by default. PKGR...

[dillo <dillo%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/610736eeec13
branches:  trunk
changeset: 478574:610736eeec13
user:      dillo <dillo%pkgsrc.org@localhost>
date:      Mon Jul 26 18:00:17 2004 +0000

description:
Enable joystick input by default.  PKGREVISION++
If you ran fceu before, you have to delete ~/.fceultra/fceu98.cfg
for the changes to take effect.

diffstat:

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

diffs (68 lines):

diff -r 7b039517464c -r 610736eeec13 emulators/fceu/Makefile
--- a/emulators/fceu/Makefile   Mon Jul 26 17:38:28 2004 +0000
+++ b/emulators/fceu/Makefile   Mon Jul 26 18:00:17 2004 +0000
@@ -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 -r 7b039517464c -r 610736eeec13 emulators/fceu/distinfo
--- a/emulators/fceu/distinfo   Mon Jul 26 17:38:28 2004 +0000
+++ b/emulators/fceu/distinfo   Mon Jul 26 18:00:17 2004 +0000
@@ -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 -r 7b039517464c -r 610736eeec13 emulators/fceu/patches/patch-aa
--- a/emulators/fceu/patches/patch-aa   Mon Jul 26 17:38:28 2004 +0000
+++ b/emulators/fceu/patches/patch-aa   Mon Jul 26 18:00:17 2004 +0000
@@ -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 */