From 9e26039ae90a61c541709f34a36e5781d5dc9430 Mon Sep 17 00:00:00 2001 From: kristerw Date: Fri, 14 Oct 2005 22:15:49 +0000 Subject: Update uae to version 0.8.25. Changes since version 0.22: - Moved over some features from WinUAE: * better m68k exception handling * better m68k prefetch emulation * better debugger - More merging with WinUAE; a lot of the input device code has changed - GUI cleaned up. - Quest to eliminate useless options continues: 68000 mode is always "slow but compatible"; it's not that slow after all. - Now uses GTK2 for the GUI. - Added ALSA sound support from Heikki Orsila --- emulators/uae/Makefile | 19 +++++-------------- emulators/uae/distinfo | 14 +++++++------- emulators/uae/patches/patch-aa | 7 ++++--- emulators/uae/patches/patch-ab | 13 +++++++------ emulators/uae/patches/patch-ac | 37 +++++++++++++++++++++++++------------ 5 files changed, 48 insertions(+), 42 deletions(-) diff --git a/emulators/uae/Makefile b/emulators/uae/Makefile index 00b848b2add..3bc10861608 100644 --- a/emulators/uae/Makefile +++ b/emulators/uae/Makefile @@ -1,7 +1,6 @@ -# $NetBSD: Makefile,v 1.37 2005/06/16 06:57:51 jlam Exp $ +# $NetBSD: Makefile,v 1.38 2005/10/14 22:15:49 kristerw Exp $ -DISTNAME= uae-0.8.22 -PKGREVISION= 2 +DISTNAME= uae-0.8.25 PKGNAME= ${DISTNAME} CATEGORIES= emulators MASTER_SITES= http://www.freiburg.linux.de/~uae/bin/sources/develop/ @@ -10,7 +9,7 @@ MAINTAINER= kristerw@NetBSD.org HOMEPAGE= http://www.freiburg.linux.de/~uae/ COMMENT= The UAE Amiga Emulator -DEPENDS= unzip>=5.40:../../archivers/unzip +DEPENDS+= unzip>=5.40:../../archivers/unzip USE_TOOLS+= gmake GNU_CONFIGURE= yes @@ -19,20 +18,11 @@ CONFIGURE_ARGS+= --enable-dga --enable-vidmode .include "../../mk/pthread.buildlink3.mk" .if defined(PTHREAD_TYPE) && ${PTHREAD_TYPE} == "native" -.include "../../x11/gtk/buildlink3.mk" +.include "../../x11/gtk2/buildlink3.mk" .else CONFIGURE_ARGS+= --disable-ui .endif -.include "../../mk/compiler.mk" -.include "../../mk/x11.buildlink3.mk" - -.if !empty(CC_VERSION:Mgcc-3.*) -post-configure: - ${TOUCH} ${WRKSRC}/src/tools/cpuopti.o - ${CP} ${CAT} ${WRKSRC}/src/tools/cpuopti -.endif - .if ${OPSYS} == NetBSD && exists(/usr/include/sys/statvfs.h) CONFIGURE_ENV+= cv_func_getmntinfo=yes fu_cv_sys_mounted_getmntinfo=yes .endif @@ -45,4 +35,5 @@ do-install: cd ${WRKSRC}/docs && ${INSTALL_DATA} FAQ README \ ${PREFIX}/share/doc/uae +.include "../../mk/x11.buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/emulators/uae/distinfo b/emulators/uae/distinfo index 728983e2ca0..97c1a42e358 100644 --- a/emulators/uae/distinfo +++ b/emulators/uae/distinfo @@ -1,8 +1,8 @@ -$NetBSD: distinfo,v 1.12 2005/02/23 18:49:21 agc Exp $ +$NetBSD: distinfo,v 1.13 2005/10/14 22:15:49 kristerw Exp $ -SHA1 (uae-0.8.22.tar.gz) = fc79f9bdc93879447fa2295acbe216e433671315 -RMD160 (uae-0.8.22.tar.gz) = 1a78e7f5e2ea4aa639bbfa32dffb89797a054a2a -Size (uae-0.8.22.tar.gz) = 937486 bytes -SHA1 (patch-aa) = 6045d32ce2b123410b20bbd410111400766834f9 -SHA1 (patch-ab) = 7a174709e599b252d82ec9ef949aa8feab2f279e -SHA1 (patch-ac) = 117ddc9b29398f9ab086555e25daa2aba6a2b918 +SHA1 (uae-0.8.25.tar.gz) = 41b7a70cf672d3cc516bd3856a051459a95a6517 +RMD160 (uae-0.8.25.tar.gz) = 6990dc7aaf43c8bda0d7b86e6d0ae164209d1eb1 +Size (uae-0.8.25.tar.gz) = 970727 bytes +SHA1 (patch-aa) = c185427ad9042e0e81ec4990c0ae4b5e6977a74e +SHA1 (patch-ab) = 4dc5d66008a9c056c7a93f74d25c4778d4f1b6cb +SHA1 (patch-ac) = 1176273248965a36a022399e83ab53cf0c065b9f diff --git a/emulators/uae/patches/patch-aa b/emulators/uae/patches/patch-aa index a18facbd41d..94a4a1c50f9 100644 --- a/emulators/uae/patches/patch-aa +++ b/emulators/uae/patches/patch-aa @@ -1,6 +1,7 @@ -$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 +$NetBSD: patch-aa,v 1.6 2005/10/14 22:15:49 kristerw Exp $ + +--- src/zfile.c.orig 2005-08-12 20:46:41.000000000 +0200 ++++ src/zfile.c 2005-08-12 20:47:10.000000000 +0200 @@ -125,10 +125,8 @@ char cmd[1024]; if (!dst) diff --git a/emulators/uae/patches/patch-ab b/emulators/uae/patches/patch-ab index 18410c21d21..ea0da3f7cdd 100644 --- a/emulators/uae/patches/patch-ab +++ b/emulators/uae/patches/patch-ab @@ -1,7 +1,8 @@ -$NetBSD: patch-ab,v 1.4 2001/08/01 20:44:04 kristerw Exp $ ---- src/disk.c.bak Sat Jul 28 15:44:50 2001 -+++ src/disk.c Wed Aug 1 22:24:13 2001 -@@ -1152,6 +1152,8 @@ +$NetBSD: patch-ab,v 1.5 2005/10/14 22:15:49 kristerw Exp $ + +--- src/disk.c.orig 2005-08-12 20:48:07.000000000 +0200 ++++ src/disk.c 2005-08-12 20:48:56.000000000 +0200 +@@ -1178,6 +1178,8 @@ also it seems some copy protections require this fix */ DISK_start (); @@ -10,11 +11,11 @@ $NetBSD: patch-ab,v 1.4 2001/08/01 20:44:04 kristerw Exp $ /* Try to make floppy access from Kickstart faster. */ if (dskdmaen != 2) return; -@@ -1196,6 +1198,7 @@ +@@ -1222,6 +1224,7 @@ } } } +#endif } - /* this is very unoptimized. DSKBYTR is used very rarely, so it should not matter. */ + /* not a real hardware register */ diff --git a/emulators/uae/patches/patch-ac b/emulators/uae/patches/patch-ac index 11e9deb1fe5..32aa078ee06 100644 --- a/emulators/uae/patches/patch-ac +++ b/emulators/uae/patches/patch-ac @@ -1,13 +1,26 @@ -$NetBSD: patch-ac,v 1.8 2004/03/26 22:24:36 kristerw Exp $ +$NetBSD: patch-ac,v 1.9 2005/10/14 22:15:49 kristerw Exp $ ---- configure.orig 2004-03-26 21:52:11.000000000 +0000 -+++ configure 2004-03-26 21:52:55.000000000 +0000 -@@ -6400,7 +6400,7 @@ - int soundfd; ioctl (soundfd, SNDCTL_DSP_GETFMTS, 0); - ; return 0; } - EOF --if { (eval echo configure:6404: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then -+if { (eval echo configure:6404: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - echo "$ac_t""yes" 1>&6 - HAVE_USS_SOUND=yes +--- configure.orig 2005-08-12 20:14:06.000000000 +0200 ++++ configure 2005-08-12 20:14:58.000000000 +0200 +@@ -14385,16 +14385,16 @@ + echo "${ECHO_T}ALSA" >&6 + SOUNDDEP=sd-alsa + USE_SOUND=yes +-else if [ "x$HAVE_USS_SOUND" = "xyes" ]; then +- echo "$as_me:$LINENO: result: USS" >&5 +-echo "${ECHO_T}USS" >&6 +- SOUNDDEP=sd-uss +- USE_SOUND=yes + else if [ "x$ac_cv_header_sys_audioio_h" = "xyes" -o "x$ac_cv_header_sun_audioio_h" = "xyes" ]; then + echo "$as_me:$LINENO: result: Solaris/NetBSD" >&5 + echo "${ECHO_T}Solaris/NetBSD" >&6 + SOUNDDEP=sd-solaris + USE_SOUND=yes ++else if [ "x$HAVE_USS_SOUND" = "xyes" ]; then ++ echo "$as_me:$LINENO: result: USS" >&5 ++echo "${ECHO_T}USS" >&6 ++ SOUNDDEP=sd-uss ++ USE_SOUND=yes + else if [ "x$HAVE_AF_LIB" = "xyes" ]; then + echo "$as_me:$LINENO: result: AF sound" >&5 + echo "${ECHO_T}AF sound" >&6 -- cgit v1.2.3