From 3e4b8701eddd93c670531b8b7cf71277ad231beb Mon Sep 17 00:00:00 2001 From: adam Date: Fri, 20 Jan 2006 07:38:12 +0000 Subject: Changes 2.0.1: Just a quick UI bugfixes release. Changes 2.0.0: This release brings major source code clean up, numerous bug fixes and many great new features and important improvements. 98% of changes since last release have been made by Piotr Fusik - admire his dedication to Atari800 project while you will be browsing through the impressive list of changes below. Run-time configuration (via the .atari800.cfg file) has been improved. All configuration options are now available in the User Interface. Remember to use "Save configuration file" when necessary. If you are new to Atari800, press F1 and select "Emulator Configuration" to configure the ROM images. This can be easily done with "Find ROM images in a directory". DISK_DIR, ROM_DIR, EXE_DIR and STATE_DIR configuration options are no longer supported in this version. You need to re-select your directories using "Emulator Configuration" -> "Configure directories". --- emulators/atari800/Makefile | 7 +++---- emulators/atari800/distinfo | 13 ++++++------- emulators/atari800/patches/patch-aa | 20 ++++++++++---------- emulators/atari800/patches/patch-ab | 12 ++++++------ emulators/atari800/patches/patch-ad | 36 ------------------------------------ 5 files changed, 25 insertions(+), 63 deletions(-) delete mode 100644 emulators/atari800/patches/patch-ad (limited to 'emulators') diff --git a/emulators/atari800/Makefile b/emulators/atari800/Makefile index 64bcd065d9f..8cb3c577e76 100644 --- a/emulators/atari800/Makefile +++ b/emulators/atari800/Makefile @@ -1,7 +1,6 @@ -# $NetBSD: Makefile,v 1.33 2005/12/11 09:40:39 wiz Exp $ +# $NetBSD: Makefile,v 1.34 2006/01/20 07:38:12 adam Exp $ -DISTNAME= atari800-1.3.6 -PKGREVISION= 1 +DISTNAME= atari800-2.0.1 CATEGORIES= emulators MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=atari800/} DISTFILES= ${DISTNAME}${EXTRACT_SUFX} xf25.zip @@ -10,7 +9,7 @@ MAINTAINER= adam@NetBSD.org HOMEPAGE= http://atari800.sourceforge.net/ COMMENT= Atari 800, 800XL, 130XE and 5200 emulator -RESTRICTED= "copyrighted ROM images" +RESTRICTED= copyrighted ROM images NO_SRC_ON_FTP= ${RESTRICTED} NO_SRC_ON_CDROM= ${RESTRICTED} NO_BIN_ON_FTP= ${RESTRICTED} diff --git a/emulators/atari800/distinfo b/emulators/atari800/distinfo index 29cd2461725..4632fee2250 100644 --- a/emulators/atari800/distinfo +++ b/emulators/atari800/distinfo @@ -1,12 +1,11 @@ -$NetBSD: distinfo,v 1.11 2005/05/17 15:08:57 adam Exp $ +$NetBSD: distinfo,v 1.12 2006/01/20 07:38:12 adam Exp $ -SHA1 (atari800-1.3.6.tar.gz) = 60a33ac3a57b31e5614d34e8eb1ece354c7f1bc4 -RMD160 (atari800-1.3.6.tar.gz) = 943b5ab6beae25228c85f728462c8e8f68ce5027 -Size (atari800-1.3.6.tar.gz) = 1012231 bytes +SHA1 (atari800-2.0.1.tar.gz) = ba4202e01092ee656548e083e6092e450fa3372f +RMD160 (atari800-2.0.1.tar.gz) = 42b5f94dfe396cb8d62b7e4fe83958c385e14b4e +Size (atari800-2.0.1.tar.gz) = 939745 bytes SHA1 (xf25.zip) = e65923fd3a4845c1c72d1677db0fda969187eb42 RMD160 (xf25.zip) = e3960898223dd4d1b9a9cc5cfb1251bd726ea5a7 Size (xf25.zip) = 188942 bytes -SHA1 (patch-aa) = cf2122ef21bb8a8e27f9aa723ed11f16630bfbef -SHA1 (patch-ab) = 15b45d358ce200bb13d8ed35eed97dd7745e4b51 +SHA1 (patch-aa) = 6b610bab5957474e0eb63ec67f04c6cc3bc5287c +SHA1 (patch-ab) = 685a706cd9062543f8716a360052422925af4f6f SHA1 (patch-ac) = 1815c2f531a8bdba6e12d5cf062206e8eb2740d9 -SHA1 (patch-ad) = f5046d850bc3a6f0da044fd7cca78938d715a8bb diff --git a/emulators/atari800/patches/patch-aa b/emulators/atari800/patches/patch-aa index 107b60b541a..6c5241e2c01 100644 --- a/emulators/atari800/patches/patch-aa +++ b/emulators/atari800/patches/patch-aa @@ -1,13 +1,13 @@ -$NetBSD: patch-aa,v 1.4 2004/01/08 15:24:42 adam Exp $ +$NetBSD: patch-aa,v 1.5 2006/01/20 07:38:13 adam Exp $ ---- sound.c.orig 2003-02-24 09:33:10.000000000 +0000 -+++ sound.c -@@ -44,7 +44,7 @@ +--- sound_oss.c.orig 2005-12-28 19:22:06.000000000 +0100 ++++ sound_oss.c +@@ -39,7 +39,7 @@ + #include "pokeysnd.h" + #include "util.h" - #define DEFDSPRATE 22050 +-static const char * const dspname = "/dev/dsp"; ++static const char * const dspname = DEVOSSAUDIO; + static int dsprate = 22050; --static char *dspname = "/dev/dsp"; -+static char *dspname = DEVOSSAUDIO; - static int dsprate = DEFDSPRATE; - static int fragstofill = 0; - static int snddelay = 60; /* delay in milliseconds */ + static int sound_enabled = TRUE; diff --git a/emulators/atari800/patches/patch-ab b/emulators/atari800/patches/patch-ab index a9732e2ce67..b723d8cd7c3 100644 --- a/emulators/atari800/patches/patch-ab +++ b/emulators/atari800/patches/patch-ab @@ -1,13 +1,13 @@ -$NetBSD: patch-ab,v 1.5 2005/01/05 11:00:26 adam Exp $ +$NetBSD: patch-ab,v 1.6 2006/01/20 07:38:13 adam Exp $ ---- rt-config.c.orig 2004-11-26 18:10:29.000000000 +0000 -+++ rt-config.c -@@ -81,7 +81,7 @@ int stereo_enabled; +--- atari.c.orig 2005-11-26 21:11:19.000000000 +0100 ++++ atari.c +@@ -635,7 +635,7 @@ void Atari800_FindROMImages(const char * #endif #ifndef SYSTEM_WIDE_CFG_FILE --#define SYSTEM_WIDE_CFG_FILE "/etc/atari800.cfg" -+#define SYSTEM_WIDE_CFG_FILE PREFIX "/share/atari800/atari800.cfg" +-#define SYSTEM_WIDE_CFG_FILE "/etc/atari800.cfg" ++#define SYSTEM_WIDE_CFG_FILE PREFIX "/share/atari800/atari800.cfg" #endif static char rtconfig_filename[FILENAME_MAX]; diff --git a/emulators/atari800/patches/patch-ad b/emulators/atari800/patches/patch-ad deleted file mode 100644 index 93f09c0362c..00000000000 --- a/emulators/atari800/patches/patch-ad +++ /dev/null @@ -1,36 +0,0 @@ -$NetBSD: patch-ad,v 1.3 2005/05/17 15:08:57 adam Exp $ - ---- configure.orig 2005-04-30 14:18:04.000000000 +0000 -+++ configure -@@ -1369,7 +1369,7 @@ case "$target" in - a8_target="UNKNOWN" - ;; - esac --if [ "$a8_target" == "UNKNOWN" ]; then -+if [ "$a8_target" = "UNKNOWN" ]; then - echo - echo "Usage: configure --target= " - echo -@@ -1569,11 +1569,11 @@ _ACEOF - ;; - esac - --if [ "X_$CFLAGS" == "X_" ]; then -+if [ "X_$CFLAGS" = "X_" ]; then - CFLAGS="-O2 -Wall" - fi - --if [ "X_$LDFLAGS" == "X_" ]; then -+if [ "X_$LDFLAGS" = "X_" ]; then - LDFLAGS="-s" - fi - -@@ -4386,7 +4386,7 @@ fi - - - OBJS= --if [ "$a8_host" == "win" ]; then -+if [ "$a8_host" = "win" ]; then - - as_ac_Lib=`echo "ac_cv_lib_gdi32''_main" | $as_tr_sh` - echo "$as_me:$LINENO: checking for main in -lgdi32" >&5 -- cgit v1.2.3