pkgsrc-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[pkgsrc/trunk]: pkgsrc/emulators/stella update to 1.3, prepare for forthcomin...
details: https://anonhg.NetBSD.org/pkgsrc/rev/770e97db7071
branches: trunk
changeset: 476215:770e97db7071
user: dillo <dillo%pkgsrc.org@localhost>
date: Sat Jun 05 11:56:31 2004 +0000
description:
update to 1.3, prepare for forthcoming stella-sdl, take maintanership
Changes since 1.1:
* Improved TIA sound system so that games with digitized audio work
* Added saving and loading of game state to the core; X11, SDL,
and DOS versions current support saving and loading game state
* Added support for F4 bankswitching method
* Pitfall II DPC sound emulation completed
* Support added for the Commavid (CV) bankswitching method.
* Support added for the Megaboy cartridge.
* Improved Supercharger emulation including a new BIOS that shows
the vertical blue progress bars like the real thing.
* Added snapshot support to the X11 and SDL versions. Pressing F12
saves the current screen in PNG format. Requires PNG library.
* Added pause functionality to the core. Implemented in DOS, X11,
and SDL versions for now.
diffstat:
emulators/stella/Makefile | 40 ++------
emulators/stella/Makefile.common | 46 ++++++++++
emulators/stella/PLIST | 28 +++---
emulators/stella/distinfo | 12 +-
emulators/stella/patches/patch-aa | 27 ++----
emulators/stella/patches/patch-ab | 171 ++++++++++++++++++++++++++++++++++----
emulators/stella/patches/patch-ac | 54 ++---------
7 files changed, 248 insertions(+), 130 deletions(-)
diffs (truncated from 431 to 300 lines):
diff -r c30ea14fec95 -r 770e97db7071 emulators/stella/Makefile
--- a/emulators/stella/Makefile Sat Jun 05 11:28:11 2004 +0000
+++ b/emulators/stella/Makefile Sat Jun 05 11:56:31 2004 +0000
@@ -1,36 +1,14 @@
-# $NetBSD: Makefile,v 1.16 2004/02/01 01:43:29 jlam Exp $
-
-DISTNAME= stella-1.1-src
-PKGNAME= stella-1.1
-CATEGORIES= emulators
-MASTER_SITES= ftp://ftp.eos.ncsu.edu/pub/bsvc/stella/1.1/
+# $NetBSD: Makefile,v 1.17 2004/06/05 11:56:31 dillo Exp $
-MAINTAINER= tech-pkg%NetBSD.org@localhost
-HOMEPAGE= http://stella.atari.org/
-COMMENT= Multi-platform Atari 2600 VCS emulator
+PKGNAME= stella-${STELLA_VERSION}
+CONFLICTS= stella-sdl-[0-9]*
-WRKSRC= ${WRKDIR}/${PKGNAME_NOREV}/src/build
-USE_X11= yes
-
-MAKEFILE= makefile
-ALL_TARGET= unix-x
+.include "Makefile.common"
-.if ${MACHINE_ARCH} == "arm" || ${MACHINE_ARCH} == "arm32"
-GCC_REQD+= 3.0
-.endif
-
-MAKE_ENV= CXXFLAGS="${CXXFLAGS} -fno-rtti"
-
-post-build:
- @cd ${WRKSRC}/../ui/sound && ${MAKE} oss
+USE_X11= yes
+MAKE_ENV+= SOUND_OSS=1
+ALL_TARGET= unix-x
+STELLA= stella.x11
-do-install:
- ${INSTALL_DATA_DIR} ${PREFIX}/share/stella
- ${INSTALL_DATA_DIR} ${PREFIX}/share/doc/stella
- ${INSTALL_PROGRAM} ${WRKSRC}/xstella ${PREFIX}/bin
- ${INSTALL_PROGRAM} ${WRKSRC}/../ui/sound/stella-sound ${PREFIX}/bin
- ${INSTALL_DATA} ${WRKSRC}/../../games/ROMS/* ${PREFIX}/share/stella
- ${INSTALL_DATA} ${WRKSRC}/../../games/docs/* ${PREFIX}/share/doc/stella
- ${INSTALL_DATA} ${WRKSRC}/../../docs/Stella.pdf ${PREFIX}/share/doc/stella/stella.pdf
-
+.include "../../mk/ossaudio.buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
diff -r c30ea14fec95 -r 770e97db7071 emulators/stella/Makefile.common
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/emulators/stella/Makefile.common Sat Jun 05 11:56:31 2004 +0000
@@ -0,0 +1,46 @@
+# $NetBSD: Makefile.common,v 1.1 2004/06/05 11:56:31 dillo Exp $
+
+STELLA_VERSION= 1.3
+DISTNAME= stella-${STELLA_VERSION}-src
+CATEGORIES= emulators
+MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=stella/}
+
+MAINTAINER= dillo%NetBSD.org@localhost
+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
+
+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 -r c30ea14fec95 -r 770e97db7071 emulators/stella/PLIST
--- a/emulators/stella/PLIST Sat Jun 05 11:28:11 2004 +0000
+++ b/emulators/stella/PLIST Sat Jun 05 11:56:31 2004 +0000
@@ -1,15 +1,15 @@
-@comment $NetBSD: PLIST,v 1.1 2001/10/31 23:53:28 zuntum Exp $
-bin/xstella
-bin/stella-sound
-share/doc/stella/elk.doc
-share/doc/stella/okiedoke.doc
-share/doc/stella/oystron.doc
-share/doc/stella/stella.pdf
-share/doc/stella/tps.doc
-share/stella/ELK.BIN
-share/stella/OKIEDOKE.BIN
-share/stella/OYSTR29.BIN
-share/stella/TEST.BIN
-share/stella/TPS.BIN
-@dirrm share/doc/stella
+@comment $NetBSD: PLIST,v 1.2 2004/06/05 11:56:31 dillo Exp $
+bin/stella
+share/doc/html/stella/graphics/chucky_cheese.png
+share/doc/html/stella/graphics/circuit.png
+share/doc/html/stella/graphics/console.png
+share/doc/html/stella/graphics/jr_pacman.png
+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
@dirrm share/stella
diff -r c30ea14fec95 -r 770e97db7071 emulators/stella/distinfo
--- a/emulators/stella/distinfo Sat Jun 05 11:28:11 2004 +0000
+++ b/emulators/stella/distinfo Sat Jun 05 11:56:31 2004 +0000
@@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.2 2001/04/20 10:49:57 agc Exp $
+$NetBSD: distinfo,v 1.3 2004/06/05 11:56:31 dillo Exp $
-SHA1 (stella-1.1-src.tar.gz) = 390b030f6dd16a1190384a9ca3d5dda8d93625a8
-Size (stella-1.1-src.tar.gz) = 587688 bytes
-SHA1 (patch-aa) = aa0f107df517d3742788914f911623e5d63cf7f3
-SHA1 (patch-ab) = fe07dc20efc96931f77df84c4ce66ad7e81d3805
-SHA1 (patch-ac) = 49894b9e667f0d82bf33c74907db27e1301de8db
+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
diff -r c30ea14fec95 -r 770e97db7071 emulators/stella/patches/patch-aa
--- a/emulators/stella/patches/patch-aa Sat Jun 05 11:28:11 2004 +0000
+++ b/emulators/stella/patches/patch-aa Sat Jun 05 11:56:31 2004 +0000
@@ -1,10 +1,10 @@
-$NetBSD: patch-aa,v 1.2 2000/01/22 23:44:31 tron Exp $
+$NetBSD: patch-aa,v 1.3 2004/06/05 11:56:31 dillo Exp $
---- ../ui/sound/OSS.c.orig Tue May 18 10:19:45 1999
-+++ ../ui/sound/OSS.c Tue May 18 10:24:03 1999
-@@ -32,11 +32,7 @@
+--- ../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>
- #include <unistd.h>
-#ifdef __FreeBSD__
- #include <machine/soundcard.h>
@@ -13,17 +13,8 @@
-#endif
+#include <soundcard.h>
- #include "TIASound.h"
-
-@@ -61,9 +57,9 @@
- int mute = 0;
+-#define DSP_DEVICE "/dev/dsp"
++/* #define DSP_DEVICE "/dev/dsp" */
+ #define MIXER_DEVICE "/dev/mixer"
- /* Open the sound device for writing */
-- if((fd = open("/dev/dsp", O_WRONLY, 0)) == -1)
-+ if((fd = open("/dev/sound", O_WRONLY, 0)) == -1)
- {
-- printf("stella-sound: Unable to open /dev/dsp device!\n");
-+ printf("stella-sound: Unable to open /dev/sound device!\n");
- return 1;
- }
-
+ #include "SoundOSS.hxx"
diff -r c30ea14fec95 -r 770e97db7071 emulators/stella/patches/patch-ab
--- a/emulators/stella/patches/patch-ab Sat Jun 05 11:28:11 2004 +0000
+++ b/emulators/stella/patches/patch-ab Sat Jun 05 11:56:31 2004 +0000
@@ -1,24 +1,159 @@
-$NetBSD: patch-ab,v 1.1.1.1 1999/05/18 23:14:16 tv Exp $
+$NetBSD: patch-ab,v 1.2 2004/06/05 11:56:31 dillo Exp $
---- ../ui/sound/makefile.orig Tue May 18 10:25:27 1999
-+++ ../ui/sound/makefile Tue May 18 10:26:05 1999
-@@ -1,9 +1,8 @@
- ###############################################################################
- ## C compiler to use
- ###############################################################################
--CC = gcc
+--- 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)"
--CFLAGS = -DWIN32 -O -ansi -Wall
-+CPPFLAGS = -DWIN32
+ 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
- OBJS = TIASound.o
Home |
Main Index |
Thread Index |
Old Index