Wed Nov 4 11:44:15 2009 UTC ()
Changes 2.1.0:
* added Axlon and Mosaic RAM expansions for Atari 400/800
* added emulation of 1400XL, 1450XLD, MIO and Black Box
* added support of .PRO copy-protected disk images
* implemented tape loading with variable bitrates
* implemented cassette writing via hardware registers
* added switching between NTSC and PAL color palettes
* added emulation of XEP80 and a prototype 80 column card
  for the Atari 1090 (SDL only currently)
* added emulation of CX85 numeric keyboard (Java and SDL only)
* event recording added (-record, -playback): save your game walkthrough
  using the "-record mygame.dat" and later impress your friends by
  your game skills or highest score using the "-playback mygame.dat"
* NTSC Filter option added to UI
* -directmouse added to SDL and X11 (used for -mouse pad or koala)
* monitor supports arrow keys - e.g. up-arrow for history
* SDL: interpolated scanlines (use -scanlinesnoint to disable)
* SDL: added -mouse, -mousespeed, -grabmouse (also Alt+M)
* SDL: visual configuration of keyboard joysticks layout in the UI
       (F1 -> Controller Configuration -> Define layout)
       default mapping changed to 4,8,6,5 (joy0) and A,W,D,S (joy1)
* R: device can be serial-only, network-only or both (selectable)
* R: device now supported on MS Windows and Dreamcast as well
* a completely new port to Java using NestedVM, running also as an applet
* Falcon/TT: removed Devpac dependency in asm files (now gcc friendly)


(adam)
diff -r1.42 -r1.43 pkgsrc/emulators/atari800/Makefile
diff -r1.14 -r1.15 pkgsrc/emulators/atari800/distinfo
diff -r1.6 -r1.7 pkgsrc/emulators/atari800/patches/patch-ab
diff -r1.4 -r1.5 pkgsrc/emulators/atari800/patches/patch-ac
diff -r0 -r1.5 pkgsrc/emulators/atari800/patches/patch-ad
cvs diff -r1.42 -r1.43 pkgsrc/emulators/atari800/Makefile (expand / switch to unified diff)

--- pkgsrc/emulators/atari800/Makefile 2008/06/20 01:09:18 1.42
+++ pkgsrc/emulators/atari800/Makefile 2009/11/04 11:44:15 1.43
@@ -1,42 +1,43 @@ @@ -1,42 +1,43 @@
1# $NetBSD: Makefile,v 1.42 2008/06/20 01:09:18 joerg Exp $ 1# $NetBSD: Makefile,v 1.43 2009/11/04 11:44:15 adam Exp $
2 2
3DISTNAME= atari800-2.0.3 3DISTNAME= atari800-2.1.0
4CATEGORIES= emulators 4CATEGORIES= emulators
5MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=atari800/} 5MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=atari800/}
6DISTFILES= ${DISTNAME}${EXTRACT_SUFX} xf25.zip 6DISTFILES= ${DISTNAME}${EXTRACT_SUFX} xf25.zip
7 7
8MAINTAINER= adam@NetBSD.org 8MAINTAINER= adam@NetBSD.org
9HOMEPAGE= http://atari800.sourceforge.net/ 9HOMEPAGE= http://atari800.sourceforge.net/
10COMMENT= Atari 800, 800XL, 130XE and 5200 emulator 10COMMENT= Atari 800, 800XL, 130XE and 5200 emulator
 11LICENSE= gnu-gpl-v2
11 12
12PKG_DESTDIR_SUPPORT= user-destdir 13PKG_DESTDIR_SUPPORT= user-destdir
13 14
14RESTRICTED= copyrighted ROM images 15RESTRICTED= copyrighted ROM images
15NO_BIN_ON_CDROM= ${RESTRICTED} 16NO_BIN_ON_CDROM= ${RESTRICTED}
16NO_BIN_ON_FTP= ${RESTRICTED} 17NO_BIN_ON_FTP= ${RESTRICTED}
17NO_SRC_ON_CDROM= ${RESTRICTED} 18NO_SRC_ON_CDROM= ${RESTRICTED}
18NO_SRC_ON_FTP= ${RESTRICTED} 19NO_SRC_ON_FTP= ${RESTRICTED}
19 20
20WRKSRC= ${WRKDIR}/${DISTNAME}/src 21WRKSRC= ${WRKDIR}/${DISTNAME}/src
21USE_TOOLS+= gmake unzip 22USE_TOOLS+= gmake unzip
22GNU_CONFIGURE= yes 23GNU_CONFIGURE= yes
23 24
24INSTALLATION_DIRS+= ${PREFIX}/share/atari800 25INSTALLATION_DIRS+= ${PREFIX}/share/atari800
25 26
26.include "options.mk" 27.include "options.mk"
27 28
28# override HOME to avoid picking up a bad ${HOME}/.atari800 during the build 29# override HOME to avoid picking up a bad ${HOME}/.atari800 during the build
29MAKE_FLAGS+= HOME=${WRKSRC:Q} 30MAKE_FLAGS+= HOME=${WRKSRC}
30 31
31post-extract: 32post-extract:
32 cd ${WRKDIR} && unzip -Lqo ${DISTDIR}/xf25.zip 33 cd ${WRKDIR} && unzip -Lqo ${DISTDIR}/xf25.zip
33 sed -e 's,@PREFIX@,${PREFIX},g' <${FILESDIR}/atari800.cfg \ 34 sed -e 's,@PREFIX@,${PREFIX},g' <${FILESDIR}/atari800.cfg \
34 >${WRKSRC}/atari800.cfg 35 >${WRKSRC}/atari800.cfg
35 36
36post-install: 37post-install:
37 ${INSTALL_DATA} ${WRKDIR}/*.rom ${WRKDIR}/*.xfd ${WRKDIR}/*.atr \ 38 ${INSTALL_DATA} ${WRKDIR}/*.rom ${WRKDIR}/*.xfd ${WRKDIR}/*.atr \
38 ${WRKSRC}/atari800.cfg ${DESTDIR}${PREFIX}/share/atari800/ 39 ${WRKSRC}/atari800.cfg ${DESTDIR}${PREFIX}/share/atari800/
39 40
40.include "../../graphics/png/buildlink3.mk" 41.include "../../graphics/png/buildlink3.mk"
41.include "../../mk/oss.buildlink3.mk" 42.include "../../mk/oss.buildlink3.mk"
42.include "../../mk/bsd.pkg.mk" 43.include "../../mk/bsd.pkg.mk"
cvs diff -r1.14 -r1.15 pkgsrc/emulators/atari800/distinfo (expand / switch to unified diff)

--- pkgsrc/emulators/atari800/distinfo 2007/07/20 17:45:54 1.14
+++ pkgsrc/emulators/atari800/distinfo 2009/11/04 11:44:15 1.15
@@ -1,11 +1,12 @@ @@ -1,11 +1,12 @@
1$NetBSD: distinfo,v 1.14 2007/07/20 17:45:54 adam Exp $ 1$NetBSD: distinfo,v 1.15 2009/11/04 11:44:15 adam Exp $
2 2
3SHA1 (atari800-2.0.3.tar.gz) = e6cfcd22b79874239bd664a476ff287c2d708924 3SHA1 (atari800-2.1.0.tar.gz) = 3888ad49718bb5e1232fb544375bb635654b5ca5
4RMD160 (atari800-2.0.3.tar.gz) = 408fec88e001a234786e689d0875d820e2036d46 4RMD160 (atari800-2.1.0.tar.gz) = c793855b27843975fcf04fea47c49499909b49ee
5Size (atari800-2.0.3.tar.gz) = 998685 bytes 5Size (atari800-2.1.0.tar.gz) = 1214047 bytes
6SHA1 (xf25.zip) = e65923fd3a4845c1c72d1677db0fda969187eb42 6SHA1 (xf25.zip) = e65923fd3a4845c1c72d1677db0fda969187eb42
7RMD160 (xf25.zip) = e3960898223dd4d1b9a9cc5cfb1251bd726ea5a7 7RMD160 (xf25.zip) = e3960898223dd4d1b9a9cc5cfb1251bd726ea5a7
8Size (xf25.zip) = 188942 bytes 8Size (xf25.zip) = 188942 bytes
9SHA1 (patch-aa) = 6b610bab5957474e0eb63ec67f04c6cc3bc5287c 9SHA1 (patch-aa) = 6b610bab5957474e0eb63ec67f04c6cc3bc5287c
10SHA1 (patch-ab) = 685a706cd9062543f8716a360052422925af4f6f 10SHA1 (patch-ab) = ff02962059156632dc72d750ae82d91c012ab178
11SHA1 (patch-ac) = 1815c2f531a8bdba6e12d5cf062206e8eb2740d9 11SHA1 (patch-ac) = 69d0ec42303b04a38b8d6b2bd7c1311d42060a11
 12SHA1 (patch-ad) = d4d17fd8c505b170ff45e4c432f8fc6c37843275
cvs diff -r1.6 -r1.7 pkgsrc/emulators/atari800/patches/Attic/patch-ab (expand / switch to unified diff)

--- pkgsrc/emulators/atari800/patches/Attic/patch-ab 2006/01/20 07:38:13 1.6
+++ pkgsrc/emulators/atari800/patches/Attic/patch-ab 2009/11/04 11:44:15 1.7
@@ -1,13 +1,13 @@ @@ -1,13 +1,13 @@
1$NetBSD: patch-ab,v 1.6 2006/01/20 07:38:13 adam Exp $ 1$NetBSD: patch-ab,v 1.7 2009/11/04 11:44:15 adam Exp $
2 2
3--- atari.c.orig 2005-11-26 21:11:19.000000000 +0100 3--- cfg.c.orig 2008-12-27 23:04:53.000000000 +0100
4+++ atari.c 4+++ cfg.c
5@@ -635,7 +635,7 @@ void Atari800_FindROMImages(const char * 5@@ -92,7 +92,7 @@ void CFG_FindROMImages(const char *direc
6 #endif 6 #endif
7  7
8 #ifndef SYSTEM_WIDE_CFG_FILE 8 #ifndef SYSTEM_WIDE_CFG_FILE
9-#define SYSTEM_WIDE_CFG_FILE "/etc/atari800.cfg" 9-#define SYSTEM_WIDE_CFG_FILE "/etc/atari800.cfg"
10+#define SYSTEM_WIDE_CFG_FILE PREFIX "/share/atari800/atari800.cfg" 10+#define SYSTEM_WIDE_CFG_FILE PREFIX "/share/atari800/atari800.cfg"
11 #endif 11 #endif
12  12
13 static char rtconfig_filename[FILENAME_MAX]; 13 static char rtconfig_filename[FILENAME_MAX];
cvs diff -r1.4 -r1.5 pkgsrc/emulators/atari800/patches/Attic/patch-ac (expand / switch to unified diff)

--- pkgsrc/emulators/atari800/patches/Attic/patch-ac 2004/01/08 15:24:42 1.4
+++ pkgsrc/emulators/atari800/patches/Attic/patch-ac 2009/11/04 11:44:15 1.5
@@ -1,20 +1,20 @@ @@ -1,20 +1,20 @@
1$NetBSD: patch-ac,v 1.4 2004/01/08 15:24:42 adam Exp $ 1$NetBSD: patch-ac,v 1.5 2009/11/04 11:44:15 adam Exp $
2 2
3--- Makefile.in.orig 2004-01-08 15:57:43.000000000 +0000 3--- Makefile.in.orig 2008-10-30 01:13:48.000000000 +0100
4+++ Makefile.in 4+++ Makefile.in
5@@ -5,15 +5,15 @@ DEFS = @DEFS@ 5@@ -16,15 +16,15 @@ else
6 LIBS = @LIBS@ 6 FINALTARGET = $(TARGET)
7 TARGET = atari800@EXEEXT@ 7 endif
8  8
9-CFLAGS = @CFLAGS@ 9-CFLAGS = @CFLAGS@
10-LDFLAGS = @LDFLAGS@ 10-LDFLAGS = @LDFLAGS@
11+CFLAGS = @CFLAGS@ -DPREFIX=\"${PREFIX}\" -DDEVOSSAUDIO=\"${DEVOSSAUDIO}\" 11+CFLAGS = @CFLAGS@ -DPREFIX=\"${PREFIX}\" -DDEVOSSAUDIO=\"${DEVOSSAUDIO}\"
12+LDFLAGS = @LDFLAGS@ ${LIBOSSAUDIO} 12+LDFLAGS = @LDFLAGS@ ${LIBOSSAUDIO}
13  13
14 INSTALL = @INSTALL@ 14 INSTALL = @INSTALL@
15 INSTALL_PROGRAM = @INSTALL_PROGRAM@ -s 15 INSTALL_PROGRAM = @INSTALL_PROGRAM@ -s
16 INSTALL_DATA = @INSTALL_DATA@ 16 INSTALL_DATA = @INSTALL_DATA@
17  17
18 BIN_DIR = @prefix@/bin 18 BIN_DIR = @prefix@/bin
19-MAN_DIR = @prefix@/share/man/man1 19-MAN_DIR = @prefix@/share/man/man1
20+MAN_DIR = @prefix@/man/man1 20+MAN_DIR = @prefix@/man/man1
File Added: pkgsrc/emulators/atari800/patches/Attic/patch-ad
$NetBSD: patch-ad,v 1.5 2009/11/04 11:44:15 adam Exp $

--- configure.orig	2009-03-27 10:13:51.000000000 +0100
+++ configure
@@ -3507,7 +3507,6 @@ case "$a8_target" in
         if [ "$sdlcheck" != "X_" ]; then
             CFLAGS="$CFLAGS `sdl-config --cflags`"
             if [ "$a8_host" = "win" ]; then
-                CFLAGS=${CFLAGS/-Dmain=SDL_main/}
             fi
         else
             { { echo "$as_me:$LINENO: error: \"No output from sdl-config!  Is sdl-config installed?\"" >&5
@@ -6558,10 +6557,8 @@ _ACEOF
         OBJS="atari_sdl.o"
         CFLAGS="$CFLAGS -ansi -pedantic -Waggregate-return -Wmissing-declarations -Wmissing-prototypes -Wredundant-decls -Wstrict-prototypes -Winline"
         if [ "$a8_host" = "win" ]; then
-            LIBS=${LIBS/-lSDLmain/}
             OBJS="$OBJS SDL_win32_main.o"
             CFLAGS="$CFLAGS -DNO_STDIO_REDIRECT"
-            LIBS=${LIBS/-mwindows/}
         fi
 
 cat >>confdefs.h <<\_ACEOF