From f31766f12509a5746a38ea7166ca00e3152ca934 Mon Sep 17 00:00:00 2001 From: kristerw Date: Thu, 31 May 2001 21:38:51 +0000 Subject: Updated the version to uae-0.8.16nb1 after fixing some bugs: * Handle zipped disk files * Disable a floppy speed hack that breaks some versions of Kickstart * Made joysticks work --- emulators/uae/Makefile | 5 ++++- emulators/uae/distinfo | 6 +++++- emulators/uae/patches/patch-aa | 14 ++++++++++++++ emulators/uae/patches/patch-ab | 20 ++++++++++++++++++++ emulators/uae/patches/patch-ac | 28 ++++++++++++++++++++++++++++ emulators/uae/patches/patch-ad | 31 +++++++++++++++++++++++++++++++ 6 files changed, 102 insertions(+), 2 deletions(-) create mode 100644 emulators/uae/patches/patch-aa create mode 100644 emulators/uae/patches/patch-ab create mode 100644 emulators/uae/patches/patch-ac create mode 100644 emulators/uae/patches/patch-ad (limited to 'emulators') diff --git a/emulators/uae/Makefile b/emulators/uae/Makefile index a20bc1ed36b..ea473f1ec09 100644 --- a/emulators/uae/Makefile +++ b/emulators/uae/Makefile @@ -1,6 +1,7 @@ -# $NetBSD: Makefile,v 1.13 2001/03/17 19:37:14 kristerw Exp $ +# $NetBSD: Makefile,v 1.14 2001/05/31 21:38:51 kristerw Exp $ DISTNAME= uae-0.8.16 +PKGNAME= ${DISTNAME}nb1 CATEGORIES= emulators MASTER_SITES= ftp://ftp.freiburg.linux.de/pub/uae/sources/develop/ @@ -8,6 +9,8 @@ MAINTAINER= kristerw@netbsd.org HOMEPAGE= http://www.freiburg.linux.de/~uae/ COMMENT= The UAE Amiga Emulator +DEPENDS= unzip>=5.40:../../archivers/unzip + USE_GMAKE= yes USE_X11= yes GNU_CONFIGURE= yes diff --git a/emulators/uae/distinfo b/emulators/uae/distinfo index 72d41e32f28..6cb8e11b717 100644 --- a/emulators/uae/distinfo +++ b/emulators/uae/distinfo @@ -1,4 +1,8 @@ -$NetBSD: distinfo,v 1.2 2001/04/20 10:49:59 agc Exp $ +$NetBSD: distinfo,v 1.3 2001/05/31 21:38:51 kristerw Exp $ SHA1 (uae-0.8.16.tar.gz) = 98d182f256e935669169791595813e9b53b35b94 Size (uae-0.8.16.tar.gz) = 805553 bytes +SHA1 (patch-aa) = 6045d32ce2b123410b20bbd410111400766834f9 +SHA1 (patch-ab) = b55b6eb64590240a4ddaba898637090212f6ca24 +SHA1 (patch-ac) = e7c7af562a42aab161bc93de7bf360fe27ce038b +SHA1 (patch-ad) = a09d1f291d3cae46a92116c512a21601806f874e diff --git a/emulators/uae/patches/patch-aa b/emulators/uae/patches/patch-aa new file mode 100644 index 00000000000..a18facbd41d --- /dev/null +++ b/emulators/uae/patches/patch-aa @@ -0,0 +1,14 @@ +$NetBSD: patch-aa,v 1.5 2001/05/31 21:38:51 kristerw Exp $ +--- src/zfile.c.bak Mon Feb 28 16:29:55 2000 ++++ src/zfile.c Thu May 31 21:27:21 2001 +@@ -125,10 +125,8 @@ + char cmd[1024]; + if (!dst) + return 1; +-#if defined AMIGA || defined __unix + sprintf (cmd, "unzip -p %s '*.adf' >%s", src, dst); + return !system (cmd); +-#endif + } + + /* diff --git a/emulators/uae/patches/patch-ab b/emulators/uae/patches/patch-ab new file mode 100644 index 00000000000..a9e34a9aa79 --- /dev/null +++ b/emulators/uae/patches/patch-ab @@ -0,0 +1,20 @@ +$NetBSD: patch-ab,v 1.3 2001/05/31 21:38:52 kristerw Exp $ +--- src/disk.c.bak Mon Feb 19 21:59:10 2001 ++++ src/disk.c Thu May 31 21:32:05 2001 +@@ -1037,6 +1037,8 @@ + also it seems some copy protections require this fix */ + DISK_start (); + ++ /* The following fails with some versions of Kickstart. Disable it. */ ++#if 0 + /* Try to make floppy access from Kickstart faster. */ + if (dskdmaen != 2) + return; +@@ -1076,6 +1078,7 @@ + } + } + } ++#endif + } + + /* this unoptimized code should be enough (DSKBYTR and DSKDATR are used very rarely) */ diff --git a/emulators/uae/patches/patch-ac b/emulators/uae/patches/patch-ac new file mode 100644 index 00000000000..45ebfcf4f96 --- /dev/null +++ b/emulators/uae/patches/patch-ac @@ -0,0 +1,28 @@ +$NetBSD: patch-ac,v 1.1 2001/05/31 21:38:52 kristerw Exp $ +--- configure.bak Tue Aug 15 22:01:31 2000 ++++ configure Thu May 31 22:46:00 2001 +@@ -6396,9 +6396,8 @@ + fi + + +-if [ "x$HAVE_MACHINE_JOYSTICK_H" = "xyes" ]; then +- cat > conftest.$ac_ext < conftest.$ac_ext < + int main() { +@@ -6411,11 +6410,10 @@ + else + echo "configure: failed program was:" >&5 + cat conftest.$ac_ext >&5 +-fi +-rm -f conftest* +-else ++ rm -rf conftest* + OD_JOYSTICK=$OSDEP/joystick.c + fi ++rm -f conftest* + + rm -f src/machdep + rm -f src/osdep diff --git a/emulators/uae/patches/patch-ad b/emulators/uae/patches/patch-ad new file mode 100644 index 00000000000..86916b18c48 --- /dev/null +++ b/emulators/uae/patches/patch-ad @@ -0,0 +1,31 @@ +$NetBSD: patch-ad,v 1.1 2001/05/31 21:38:52 kristerw Exp $ +--- src/od-linux/joystick.c.bak Wed Apr 15 21:30:16 1998 ++++ src/od-linux/joystick.c Thu May 31 23:19:06 2001 +@@ -17,12 +17,12 @@ + #include "custom.h" + #include "joystick.h" + +-#ifdef HAVE_MACHINE_SOUNDCARD_H ++#ifdef HAVE_MACHINE_JOYSTICK_H + + /* The BSD way. */ + +-# include +-typedef struct joystick uae_joystick_t ++# include ++typedef struct joystick uae_joystick_t; + + #define JS_DEVNAME_PREFIX "joy" + +@@ -84,7 +84,11 @@ + if (left) top = !top; + if (right) bot = !bot; + *dir = bot | (right << 1) | (top << 8) | (left << 9); ++#ifdef HAVE_MACHINE_JOYSTICK_H ++ *button = buffer.b1 || buffer.b2; ++#else + *button = buffer.buttons & 3; ++#endif + } + + void init_joystick(void) -- cgit v1.2.3