update to 1.4.

Changes:
* Codebase ported to SDL. X11/OSS ports have been discontinued.
* Added OpenGL rendering support. (not enabled in pkgsrc)
* Added more refined in-game GUI.
* Added event remapping. Emulation keys can now be remapped to the
  keyboard or up to 4 joysticks.
* Added native Stelladaptor support. Joysticks, paddles, and driving
  controllers have been tested.
* Digital sound support has been greatly improved.
* Added support for switchable palettes.
* Added support for UA Limited style bankswitching (Funky Fish and Pleiades).
* Switched to using high compatibility M6502 mode by default. This
  means old state saves from previous Stella versions will no longer
  work.

7 files changed, 90 insertions, 250 deletions

diff --git a/emulators/stella/Makefile b/emulators/stella/Makefile
index 55aa6cb7b47..8a085caf856 100644
--- a/emulators/stella/Makefile
+++ b/emulators/stella/Makefile
@@ -1,14 +1,47 @@
-# $NetBSD: Makefile,v 1.17 2004/06/05 11:56:31 dillo Exp $
+# $NetBSD: Makefile,v 1.18 2004/08/13 16:12:25 dillo Exp $
 
+STELLA_VERSION=	1.4
+DISTNAME=	stella-${STELLA_VERSION}-src
 PKGNAME=	stella-${STELLA_VERSION}
-CONFLICTS=	stella-sdl-[0-9]*
+CATEGORIES=	emulators
+MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=stella/}
 
-.include "Makefile.common"
+MAINTAINER=	dillo@NetBSD.org
+HOMEPAGE=	http://stella.sourceforge.net/
+COMMENT=	Multi-platform Atari 2600 VCS emulator
 
-USE_X11=	yes
-MAKE_ENV+=	SOUND_OSS=1
-ALL_TARGET=	unix-x
-STELLA=		stella.x11
+PATCHDIR=               ${.CURDIR}/../stella/patches
+DISTINFO_FILE=          ${.CURDIR}/../stella/distinfo
+
+WRKSRC=		${WRKDIR}/stella-${STELLA_VERSION}/src/build
+USE_LANGUAGES=	c c++
+USE_GNU_TOOLS+=	make
+USE_BUILDLINK3=	YES
+USE_INSTALL=	YES
+UNLIMIT_RESOURCES=datasize
+
+MAKEFILE=	makefile
+ALL_TARGET=	linux
+
+.if ${MACHINE_ARCH} == "arm" || ${MACHINE_ARCH} == "arm32"
+GCC_REQD+=	3.0
+.endif
+
+MAKE_ENV=	CXXFLAGS="${CXXFLAGS} -fno-rtti"
+
+DOCDIR=${PREFIX}/share/doc/html/stella
+DATADIR=${PREFIX}/share/stella
+
+.include "../../devel/SDL/buildlink3.mk"
+.include "../../graphics/png/buildlink3.mk"
+
+do-install:
+	${INSTALL_PROGRAM} ${WRKSRC}/stella ${PREFIX}/bin
+	${INSTALL_DATA_DIR} ${DOCDIR}
+	${INSTALL_DATA_DIR} ${DOCDIR}/graphics
+	${INSTALL_DATA} ${WRKSRC}/../../docs/stella.html ${DOCDIR}
+	${INSTALL_DATA} ${WRKSRC}/../../docs/graphics/* ${DOCDIR}/graphics
+	${INSTALL_DATA_DIR} ${DATADIR}
+	${INSTALL_DATA} ${WRKSRC}/../emucore/stella.pro ${DATADIR}
 
-.include "../../mk/ossaudio.buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/emulators/stella/Makefile.common b/emulators/stella/Makefile.common
deleted file mode 100644
index 93ff0f9004d..00000000000
--- a/emulators/stella/Makefile.common
+++ /dev/null
@@ -1,47 +0,0 @@
-# $NetBSD: Makefile.common,v 1.2 2004/06/16 01:14:33 dillo Exp $
-
-STELLA_VERSION=	1.3
-DISTNAME=	stella-${STELLA_VERSION}-src
-CATEGORIES=	emulators
-MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=stella/}
-
-MAINTAINER=	dillo@NetBSD.org
-HOMEPAGE=	http://stella.sourceforge.org/
-COMMENT=	Multi-platform Atari 2600 VCS emulator
-
-PATCHDIR=               ${.CURDIR}/../stella/patches
-DISTINFO_FILE=          ${.CURDIR}/../stella/distinfo
-
-WRKSRC=		${WRKDIR}/stella-${STELLA_VERSION}/src/build
-USE_LANGUAGES=	c c++
-USE_GNU_TOOLS+=	make
-USE_BUILDLINK3=	YES
-USE_INSTALL=	YES
-UNLIMIT_RESOURCES=datasize
-
-MAKEFILE=	makefile
-
-.if ${MACHINE_ARCH} == "arm" || ${MACHINE_ARCH} == "arm32"
-GCC_REQD+=	3.0
-.endif
-
-MAKE_ENV=	CXXFLAGS="${CXXFLAGS} -fno-rtti"
-
-DOCDIR=${PREFIX}/share/doc/html/stella
-EGDIR=${PREFIX}/share/examples/stella
-DATADIR=${PREFIX}/share/stella
-
-CONF_FILES=     ${EGDIR}/stellarc.default ${PKG_SYSCONFDIR}/stellarc
-
-do-install:
-	${INSTALL_PROGRAM} ${WRKSRC}/${STELLA} ${PREFIX}/bin/stella
-	${INSTALL_DATA_DIR} ${DOCDIR}
-	${INSTALL_DATA_DIR} ${DOCDIR}/graphics
-	${INSTALL_DATA} ${WRKSRC}/../../docs/stella.html ${DOCDIR}
-	${INSTALL_DATA} ${WRKSRC}/../../docs/graphics/* ${DOCDIR}/graphics
-	${INSTALL_DATA_DIR} ${DATADIR}
-	${INSTALL_DATA} ${WRKSRC}/../emucore/stella.pro ${DATADIR}
-	${INSTALL_DATA_DIR} ${EGDIR}
-	${INSTALL_DATA} ${WRKSRC}/../stellarc ${EGDIR}/stellarc.default
-
-.include "../../graphics/png/buildlink3.mk"
diff --git a/emulators/stella/PLIST b/emulators/stella/PLIST
index a4692a967b1..56de74177e4 100644
--- a/emulators/stella/PLIST
+++ b/emulators/stella/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.2 2004/06/05 11:56:31 dillo Exp $
+@comment $NetBSD: PLIST,v 1.3 2004/08/13 16:12:25 dillo Exp $
 bin/stella
 share/doc/html/stella/graphics/chucky_cheese.png
 share/doc/html/stella/graphics/circuit.png
@@ -8,7 +8,6 @@ share/doc/html/stella/graphics/pacman.png
 share/doc/html/stella/graphics/secret_quest.png
 share/doc/html/stella/graphics/space_invaders.png
 share/doc/html/stella/stella.html
-share/examples/stella/stellarc.default
 share/stella/stella.pro
 @dirrm share/doc/html/stella/graphics
 @dirrm share/doc/html/stella
diff --git a/emulators/stella/distinfo b/emulators/stella/distinfo
index 475ea938348..8066493c482 100644
--- a/emulators/stella/distinfo
+++ b/emulators/stella/distinfo
@@ -1,7 +1,6 @@
-$NetBSD: distinfo,v 1.3 2004/06/05 11:56:31 dillo Exp $
+$NetBSD: distinfo,v 1.4 2004/08/13 16:12:25 dillo Exp $
 
-SHA1 (stella-1.3-src.tar.gz) = ed4d12890f734eaa23b6ebbb17a4f14640c65d35
-Size (stella-1.3-src.tar.gz) = 433201 bytes
-SHA1 (patch-aa) = 3c194bb611192330cfcd7f48e3ce75d350e8daf6
-SHA1 (patch-ab) = 10d3430cb5ac29be284f84bc50d1b5aeffe7ef26
-SHA1 (patch-ac) = 74d58b272d82d83567cd1883040445927720c615
+SHA1 (stella-1.4-src.tar.gz) = 3dd22f47d421fd425c795edce09e4e7bf99b1a8e
+Size (stella-1.4-src.tar.gz) = 670366 bytes
+SHA1 (patch-aa) = 893d5ad5165f02c2dfde5d07c348362aba36d340
+SHA1 (patch-ab) = 5fd5d2c911e22827faa9b7c550750adbf50ed228
diff --git a/emulators/stella/patches/patch-aa b/emulators/stella/patches/patch-aa
index c9b1c23a317..959426743b9 100644
--- a/emulators/stella/patches/patch-aa
+++ b/emulators/stella/patches/patch-aa
@@ -1,20 +1,32 @@
-$NetBSD: patch-aa,v 1.3 2004/06/05 11:56:31 dillo Exp $
+$NetBSD: patch-aa,v 1.4 2004/08/13 16:12:25 dillo Exp $
 
---- ../ui/sound/SoundOSS.cxx.orig	2003-02-18 02:19:44.000000000 +0100
-+++ ../ui/sound/SoundOSS.cxx
-@@ -22,13 +22,9 @@
- #include <sys/ioctl.h>
- #include <sys/types.h>
+--- makefile.orig	2004-07-14 18:49:45.000000000 +0200
++++ makefile
+@@ -48,13 +48,13 @@ OPTIMIZATIONS  = 
+ ## No configurable options below this line ...
+ ##============================================================================
  
--#ifdef __FreeBSD__
--  #include <machine/soundcard.h>
--#else
--  #include <sys/soundcard.h>
--#endif
-+#include <soundcard.h>
+-CXX	= g++
+-LD	= g++
++#CXX	= g++
++#LD	= g++
  
--#define DSP_DEVICE "/dev/dsp"
-+/* #define DSP_DEVICE "/dev/dsp" */
- #define MIXER_DEVICE "/dev/mixer"
+-LDFLAGS  = `sdl-config --cflags`
++LDFLAGS  += `sdl-config --cflags`
+ LDLIBS   = `sdl-config --libs`
+ OBJECTS  =  mainSDL.o SoundSDL.o FrameBufferSDL.o FrameBufferSoft.o
+-OPTIONS  =
++OPTIONS  = -DPKG_SYSCONFDIR=\\\"${PKG_SYSCONFDIR}\\\" -DDATADIR=\\\"${PREFIX}/share/stella\\\"
+ EXE_NAME =
+ SMP      =
  
- #include "SoundOSS.hxx"
+@@ -155,8 +155,7 @@ CORE_OBJS = Booster.o Cart.o Cart2K.o Ca
+             $(M6502_OBJS)
+ 
+ stella: $(CORE_OBJS) $(OBJS)
+-	$(LD) -o $(EXE_NAME) $(CORE_OBJS) $(OBJS) $(LDFLAGS) $(LDLIBS)
+-	strip $(EXE_NAME)
++	$(CXX) -o $(EXE_NAME) $(CORE_OBJS) $(OBJS) $(LDLIBS)
+ 
+ M6502Low.ins: $(CORE)/m6502/src/M6502Low.m4 $(CORE)/m6502/src/M6502.m4
+ 	m4 $(CORE)/m6502/src/M6502Low.m4 $(CORE)/m6502/src/M6502.m4 > $(CORE)/m6502/src/M6502Low.ins
diff --git a/emulators/stella/patches/patch-ab b/emulators/stella/patches/patch-ab
index d2f465620f1..33e77b3cf7f 100644
--- a/emulators/stella/patches/patch-ab
+++ b/emulators/stella/patches/patch-ab
@@ -1,159 +1,16 @@
-$NetBSD: patch-ab,v 1.2 2004/06/05 11:56:31 dillo Exp $
+$NetBSD: patch-ab,v 1.3 2004/08/13 16:12:25 dillo Exp $
 
---- makefile.orig	2003-02-18 02:19:44.000000000 +0100
-+++ makefile
-@@ -43,7 +43,7 @@ OPTIMIZATIONS    = -O2 -Wall -Wno-unused
- ### comment out all lines to completely disable sound
- ###
- #SOUND_ALSA = 1
--SOUND_OSS  = 1
-+#SOUND_OSS  = 1
- #SOUND_SDL  = 1
- 
- ### if your C++ compiler doesn't support the bool type
-@@ -61,7 +61,7 @@ SOUND_OSS  = 1
- ### to include support for saving snapshots in png format
- ### (requires PNG library)
- ### Only X11 and SDL ports supported for now
--# SNAPSHOT_SUPPORT = 1
-+SNAPSHOT_SUPPORT = 1
- 
- ### comment this out if your system doesn't
- ### have the gettimeofday function
-@@ -72,23 +72,26 @@ HAVE_GETTIMEOFDAY = 1
- ### enables some extra commandline options that allow the user
- ### to override some emulation defaults
- ### Only X11 and SDL ports supported for now
--# DEVELOPER_SUPPORT = 1
-+DEVELOPER_SUPPORT = 1
- 
- ##============================================================================
- ## All done, type make to get a list of frontends
- ## No configurable options below this line ...
- ##============================================================================
- 
--CXX	= g++
--LD	= g++
-+#CXX	= g++
-+#LD	= g++
- 
--LDFLAGS = 
-+#LDFLAGS = 
- LDLIBS	= 
- 
-+CFLAGS+=	-DPKG_SYSCONFDIR=\"${PKG_SYSCONFDIR}\" \
-+		-DDATADIR=\"${PREFIX}/share/stella\"
-+
- OBJS.X11   =
- OPTS.X11   =
--LIBS.X11   =
--CFLAGS.X11 =
-+LIBS.X11   = 
-+CFLAGS.X11 = 
- 
- OBJS.SDL   =
- OPTS.SDL   =
-@@ -152,8 +155,11 @@ endif
- ifeq ($(SOUND_OSS), 1)
-   OPTS.X11 += -DSOUND_OSS=1
-   OBJS.X11 += SoundOSS.o
-+  LIBS.X11 += ${LIBOSSAUDIO}
-   OPTS.SDL += -DSOUND_OSS=1
-   OBJS.SDL += SoundOSS.o
-+  LIBS.SDL += ${LIBOSSAUDIO}
-+  CFLAGS   += -DDSP_DEVICE=\"${DEVOSSSOUND}\"
- endif
- 
- ifeq ($(SOUND_SDL), 1)
-@@ -207,11 +213,10 @@ unix-x:
-           SYS_INCLUDES="" \
-           OPTIONS="-DBSPF_UNIX=1" \
-           OPTIONS+="$(OPTS.X11)" \
--          LDFLAGS="-L/usr/X11R6/lib" \
--          LDFLAGS+="$(CFLAGS.X11)" \
-+          CFLAGS+="$(CFLAGS.X11)" \
-           LDLIBS="-lX11 -lXext" \
-           LDLIBS+="$(LIBS.X11)" \
--          OBJS="mainX11.o"
-+          OBJS="mainX11.o" \
-           OBJS+="$(OBJS.X11)"
- 
- linux-x:
-@@ -233,9 +238,7 @@ linux-sdl:
-           SYS_INCLUDES="" \
-           OPTIONS="-DBSPF_UNIX=1" \
-           OPTIONS+="$(OPTS.SDL)" \
--          LDFLAGS="-L/usr/X11R6/lib" \
--          LDFLAGS+="$(CFLAGS.SDL)" \
--          LDLIBS="-lX11 -lXext" \
-+          CFLAGS+="$(CFLAGS.SDL)" \
-           LDLIBS+="$(LIBS.SDL)" \
-           OBJS="mainSDL.o RectList.o" \
-           OBJS+="$(OBJS.SDL)"
-@@ -290,10 +293,10 @@ stella.exe: $(CORE_OBJS) $(OBJS)
- 	del a.exe
- 
- stella.x11: $(CORE_OBJS) $(OBJS)
--	$(LD) -o stella.x11 $(CORE_OBJS) $(OBJS) $(LDFLAGS) $(LDLIBS)
-+	$(CXX) -o stella.x11 $(CORE_OBJS) $(OBJS) $(LDFLAGS) $(LDLIBS)
- 
- stella.sdl: $(CORE_OBJS) $(OBJS)
--	$(LD) -o stella.sdl $(CORE_OBJS) $(OBJS) $(LDFLAGS) $(LDLIBS)
-+	$(CXX) -o stella.sdl $(CORE_OBJS) $(OBJS) $(LDFLAGS) $(LDLIBS)
- 
- M6502Low.ins: $(CORE)/m6502/src/M6502Low.m4 $(CORE)/m6502/src/M6502.m4
- 	m4 $(CORE)/m6502/src/M6502Low.m4 $(CORE)/m6502/src/M6502.m4 > M6502Low.ins
-@@ -422,7 +425,7 @@ Random.o: $(CORE)/Random.cxx
- 	$(CXX) -c $(CXXFLAGS) $(OPTIONS) $(CORE)/Random.cxx
- 
- Sound.o: $(CORE)/Sound.cxx $(CORE)/Sound.hxx
--	$(CXX) -c $(CXXFLAGS) $(OPTIONS) $(LDFLAGS) $(CORE)/Sound.cxx
-+	$(CXX) -c $(CXXFLAGS) $(OPTIONS) $(CFLAGS) $(CORE)/Sound.cxx
- 
- Switches.o: $(CORE)/Switches.cxx
- 	$(CXX) -c $(CXXFLAGS) $(OPTIONS) $(CORE)/Switches.cxx
-@@ -434,7 +437,7 @@ Deserializer.o: $(CORE)/Deserializer.cxx
- 	$(CXX) -c $(CXXFLAGS) $(OPTIONS) $(CORE)/Deserializer.cxx
- 
- Settings.o: $(UI)/common/Settings.cxx $(UI)/common/Settings.hxx
--	$(CXX) -c $(CXXFLAGS) $(OPTIONS) $(LDFLAGS) $(UI)/common/Settings.cxx
-+	$(CXX) -c $(CXXFLAGS) $(OPTIONS) $(CFLAGS) $(UI)/common/Settings.cxx
- 
- Terminal.o: $(UI)/x11/Terminal.cxx
- 	$(CXX) -c $(CXXFLAGS) $(OPTIONS) $(UI)/x11/Terminal.cxx
-@@ -455,28 +458,28 @@ vga.o: $(UI)/dos/vga.cxx
- 	$(CXX) -c $(CXXFLAGS) $(OPTIONS) $(UI)/dos/vga.cxx
- 
- SoundALSA.o: $(UI)/sound/SoundALSA.cxx $(UI)/sound/SoundALSA.hxx
--	$(CXX) -c $(CXXFLAGS) $(OPTIONS) $(LDFLAGS) $(UI)/sound/SoundALSA.cxx
-+	$(CXX) -c $(CXXFLAGS) $(OPTIONS) $(CFLAGS) $(UI)/sound/SoundALSA.cxx
- 
- SoundOSS.o: $(UI)/sound/SoundOSS.cxx $(UI)/sound/SoundOSS.hxx
--	$(CXX) -c $(CXXFLAGS) $(OPTIONS) $(LDFLAGS) $(UI)/sound/SoundOSS.cxx
-+	$(CXX) -c $(CXXFLAGS) $(OPTIONS) $(CFLAGS) $(UI)/sound/SoundOSS.cxx
- 
- SoundSDL.o: $(UI)/sound/SoundSDL.cxx $(UI)/sound/SoundSDL.hxx
--	$(CXX) -c $(CXXFLAGS) $(OPTIONS) $(LDFLAGS) $(UI)/sound/SoundSDL.cxx
-+	$(CXX) -c $(CXXFLAGS) $(OPTIONS) $(CFLAGS) $(UI)/sound/SoundSDL.cxx
- 
- TermX11.o: $(UI)/x11/TermX11.cxx
- 	$(CXX) -c $(CXXFLAGS) $(OPTIONS) $(UI)/x11/TermX11.cxx
- 
- mainX11.o: $(UI)/x11/mainX11.cxx
--	$(CXX) -c $(CXXFLAGS) $(OPTIONS) $(LDFLAGS) $(UI)/x11/mainX11.cxx
-+	$(CXX) -c $(CXXFLAGS) $(OPTIONS) $(CFLAGS) $(UI)/x11/mainX11.cxx
- 
- mainSDL.o: $(UI)/sdl/mainSDL.cxx
--	$(CXX) -c $(CXXFLAGS) $(OPTIONS) $(LDFLAGS) $(UI)/sdl/mainSDL.cxx
-+	$(CXX) -c $(CXXFLAGS) $(OPTIONS) $(CFLAGS) $(UI)/sdl/mainSDL.cxx
- 
- RectList.o: $(UI)/sdl/RectList.cxx $(UI)/sdl/RectList.hxx
--	$(CXX) -c $(CXXFLAGS) $(OPTIONS) $(LDFLAGS) $(UI)/sdl/RectList.cxx
-+	$(CXX) -c $(CXXFLAGS) $(OPTIONS) $(CFLAGS) $(UI)/sdl/RectList.cxx
- 
- Snapshot.o: $(UI)/common/Snapshot.cxx $(UI)/common/Snapshot.hxx
--	$(CXX) -c $(CXXFLAGS) $(OPTIONS) $(LDFLAGS) $(UI)/common/Snapshot.cxx
-+	$(CXX) -c $(CXXFLAGS) $(OPTIONS) $(CFLAGS) $(UI)/common/Snapshot.cxx
- 
- D6502.o: $(CORE)/m6502/src/D6502.cxx
- 	$(CXX) -c $(CXXFLAGS) $(OPTIONS) $(CORE)/m6502/src/D6502.cxx
+--- ../unix/SettingsUNIX.cxx.orig	2004-07-05 02:53:48.000000000 +0200
++++ ../unix/SettingsUNIX.cxx
+@@ -43,9 +43,9 @@ SettingsUNIX::SettingsUNIX()
+     mkdir(myStateDir.c_str(), 0777);
+ 
+   myUserPropertiesFile   = stelladir + "/stella.pro";
+-  mySystemPropertiesFile = "/etc/stella.pro";
++  mySystemPropertiesFile = DATADIR "/stella.pro";
+   myUserConfigFile       = stelladir + "/stellarc";
+-  mySystemConfigFile     = "/etc/stellarc";
++  mySystemConfigFile     = PKG_SYSCONFDIR "/stellarc";
+ 
+   // Set up the names of the input and output config files
+   mySettingsOutputFilename = myUserConfigFile;
diff --git a/emulators/stella/patches/patch-ac b/emulators/stella/patches/patch-ac
deleted file mode 100644
index c6fcafaf156..00000000000
--- a/emulators/stella/patches/patch-ac
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ac,v 1.5 2004/06/05 11:56:31 dillo Exp $
-
---- ../ui/x11/mainX11.cxx.orig	2003-02-18 02:19:45.000000000 +0100
-+++ ../ui/x11/mainX11.cxx
-@@ -1536,7 +1536,7 @@ bool setupDirs()
-   homePropertiesFile   = homeDir + "/.stella/stella.pro";
-   systemPropertiesFile = "/etc/stella.pro";
-   homeRCFile           = homeDir + "/.stella/stellarc";
--  systemRCFile         = "/etc/stellarc";
-+  systemRCFile         = PKG_SYSCONFDIR "/stellarc";
- 
-   return true;
- }