diff options
author | kristerw <kristerw@pkgsrc.org> | 2001-07-05 22:07:58 +0000 |
---|---|---|
committer | kristerw <kristerw@pkgsrc.org> | 2001-07-05 22:07:58 +0000 |
commit | bf8feba5f61b55e695092ab889bccebcc16fea27 (patch) | |
tree | 117d1c085f2899eb1754c9d1a8df9865028ec2ce /games | |
parent | 039063bc7a5cbb3ad7c650e6b1030635eee09613 (diff) | |
download | pkgsrc-bf8feba5f61b55e695092ab889bccebcc16fea27.tar.gz |
Update rocksndiamonds to version 2.0.0
Changes since version 1.4.0:
- major code redesign to maintain generic game functions in a separate
library and make it easier to port the game to new targets like SDL
- can be compiled with SDL library to build native Windows version
- DOS and Windows versions can be compiled with gcc cross-compiler
- trying to open already busy audio device does not block the game
- fixed network playing bug (patch from web site)
- SDL version can load and play music modules
- fixed element description in level editor for EM doors and keys
Diffstat (limited to 'games')
-rw-r--r-- | games/rocksndiamonds/Makefile | 6 | ||||
-rw-r--r-- | games/rocksndiamonds/distinfo | 16 | ||||
-rw-r--r-- | games/rocksndiamonds/patches/patch-aa | 13 | ||||
-rw-r--r-- | games/rocksndiamonds/patches/patch-ab | 32 | ||||
-rw-r--r-- | games/rocksndiamonds/patches/patch-ac | 11 | ||||
-rw-r--r-- | games/rocksndiamonds/patches/patch-ad | 55 | ||||
-rw-r--r-- | games/rocksndiamonds/patches/patch-ae | 22 | ||||
-rw-r--r-- | games/rocksndiamonds/patches/patch-af | 14 | ||||
-rw-r--r-- | games/rocksndiamonds/pkg/PLIST | 9 |
9 files changed, 112 insertions, 66 deletions
diff --git a/games/rocksndiamonds/Makefile b/games/rocksndiamonds/Makefile index 3de05047e77..5c3f140ed0e 100644 --- a/games/rocksndiamonds/Makefile +++ b/games/rocksndiamonds/Makefile @@ -1,9 +1,9 @@ -# $NetBSD: Makefile,v 1.4 2001/02/25 04:17:50 hubertf Exp $ +# $NetBSD: Makefile,v 1.5 2001/07/05 22:07:58 kristerw Exp $ # -DISTNAME= rocksndiamonds-1.4.0 +DISTNAME= rocksndiamonds-2.0.0 CATEGORIES= games x11 -MASTER_SITES= http://www.artsoft.org/rocksndiamonds/RELEASES/ +MASTER_SITES= http://www.artsoft.org/RELEASES/unix/rocksndiamonds/ MAINTAINER= wiz@netbsd.org HOMEPAGE= http://www.artsoft.org/rocksndiamonds/ diff --git a/games/rocksndiamonds/distinfo b/games/rocksndiamonds/distinfo index c543bcd6c55..23e1e801288 100644 --- a/games/rocksndiamonds/distinfo +++ b/games/rocksndiamonds/distinfo @@ -1,8 +1,10 @@ -$NetBSD: distinfo,v 1.2 2001/04/21 02:08:35 wiz Exp $ +$NetBSD: distinfo,v 1.3 2001/07/05 22:07:58 kristerw Exp $ -SHA1 (rocksndiamonds-1.4.0.tar.gz) = 3d05ca65838c8c1bcaeaeffd634ea5cc1a01e1e6 -Size (rocksndiamonds-1.4.0.tar.gz) = 1432092 bytes -SHA1 (patch-aa) = 5afb278251f04347bcd9459724fda0fc5c568ef3 -SHA1 (patch-ab) = 6b2673687cf9a38eb916a749513b44b76edfb5f2 -SHA1 (patch-ac) = 7911b05274ea0875441ba52438ffcf3d260ab6ef -SHA1 (patch-ad) = 6bc20cb7fede7677f87a044cd09eaf4358cc13cd +SHA1 (rocksndiamonds-2.0.0.tar.gz) = 50ce7b646187ce6e10a7e8ccf4c5ce16119f11ee +Size (rocksndiamonds-2.0.0.tar.gz) = 2476309 bytes +SHA1 (patch-aa) = 17cc33c87433eb05e640829210c2d612d4f43454 +SHA1 (patch-ab) = 0485825f11f3d82357effd84d911d164d13373f0 +SHA1 (patch-ac) = 646a586346cbc7ea566a9b001be8e96131f13679 +SHA1 (patch-ad) = 213cc8d169ed448657f96e0adee8623f90f50335 +SHA1 (patch-ae) = fe84a2cfb4bcef854a8f79655e64ee68f771effe +SHA1 (patch-af) = 30d4782a6345f52008955bd3d2bb3d705c7f28c0 diff --git a/games/rocksndiamonds/patches/patch-aa b/games/rocksndiamonds/patches/patch-aa index 81144d87bca..2363bed676a 100644 --- a/games/rocksndiamonds/patches/patch-aa +++ b/games/rocksndiamonds/patches/patch-aa @@ -1,8 +1,7 @@ -$NetBSD: patch-aa,v 1.2 2000/10/31 15:52:20 agc Exp $ - ---- Makefile.orig Wed Oct 27 02:07:38 1999 -+++ Makefile Mon Jan 3 03:31:03 2000 -@@ -18,15 +18,17 @@ +$NetBSD: patch-aa,v 1.3 2001/07/05 22:07:59 kristerw Exp $ +--- Makefile.orig Wed May 2 23:09:06 2001 ++++ Makefile Sun Jun 24 21:03:37 2001 +@@ -12,15 +12,17 @@ # specify path to X11 on your system # if undefined, use system defaults (works with Linux/gcc/libc5) @@ -21,11 +20,11 @@ $NetBSD: patch-aa,v 1.2 2000/10/31 15:52:20 agc Exp $ # uncomment this if your system has no joystick include file # JOYSTICK = -DNO_JOYSTICK -@@ -47,7 +49,6 @@ +@@ -42,7 +44,6 @@ .EXPORT_ALL_VARIABLES: -MAKE = make SRC_DIR = src - MAKE_CMD = @$(MAKE) -C $(SRC_DIR) + MAKE_CMD = $(MAKE) -C $(SRC_DIR) diff --git a/games/rocksndiamonds/patches/patch-ab b/games/rocksndiamonds/patches/patch-ab index 83d48abefb2..5f4a7dd5896 100644 --- a/games/rocksndiamonds/patches/patch-ab +++ b/games/rocksndiamonds/patches/patch-ab @@ -1,8 +1,7 @@ -$NetBSD: patch-ab,v 1.2 2000/12/20 01:23:05 wiz Exp $ - ---- src/Makefile.orig Sun Oct 24 18:51:53 1999 -+++ src/Makefile Mon Jan 3 13:52:45 2000 -@@ -15,7 +15,7 @@ +$NetBSD: patch-ab,v 1.3 2001/07/05 22:07:59 kristerw Exp $ +--- src/Makefile.orig Wed May 2 23:13:44 2001 ++++ src/Makefile Wed May 2 23:24:24 2001 +@@ -17,7 +17,7 @@ XINC_PATH = $(X11_PATH)/include XLIB_PATH = $(X11_PATH)/lib X11_INCL = -I$(XINC_PATH) @@ -10,22 +9,13 @@ $NetBSD: patch-ab,v 1.2 2000/12/20 01:23:05 wiz Exp $ +X11_LIBS = -L$(XLIB_PATH) -Wl,-R$(XLIB_PATH) endif + AR = ar +@@ -100,7 +100,7 @@ + # OPTIONS = -O3 + # OPTIONS = -DSYSV -Ae # may be needed for HP-UX -@@ -35,7 +35,7 @@ - endif - - INCL = $(X11_INCL) --LIBS = $(X11_LIBS) -lX11 -lm $(EXTRA_LIBS) -+LIBS = $(X11_LIBS) ${LDFLAGS} -lX11 -lm $(EXTRA_LIBS) - - endif - -@@ -65,7 +65,7 @@ - - # SYSTEM = -DSYSV -Ae # may be needed for HP-UX +-CFLAGS = $(OPTIONS) $(SYS_CFLAGS) $(CONFIG) ++CFLAGS = $(SYS_CFLAGS) $(CONFIG) + LDFLAGS = $(SYS_LDFLAGS) $(EXTRA_LDFLAGS) -lm --CFLAGS = $(OPTIONS) $(SYSTEM) $(INCL) $(CONFIG) -+CFLAGS += $(SYSTEM) $(INCL) $(CONFIG) - SRCS = main.c \ - init.c \ diff --git a/games/rocksndiamonds/patches/patch-ac b/games/rocksndiamonds/patches/patch-ac index f5e7dcf6545..4248fb0540f 100644 --- a/games/rocksndiamonds/patches/patch-ac +++ b/games/rocksndiamonds/patches/patch-ac @@ -1,10 +1,9 @@ -$NetBSD: patch-ac,v 1.1.1.1 2000/01/03 17:23:27 wiz Exp $ - ---- src/files.c.orig Sun Oct 10 14:53:01 1999 -+++ src/files.c Mon Jan 3 15:54:59 2000 -@@ -73,7 +73,7 @@ +$NetBSD: patch-ac,v 1.2 2001/07/05 22:07:59 kristerw Exp $ +--- src/files.c.orig Wed May 2 23:16:58 2001 ++++ src/files.c Wed May 2 23:17:29 2001 +@@ -90,7 +90,7 @@ + #define MODE_W_ALL (S_IWUSR | S_IWGRP | S_IWOTH) #define MODE_X_ALL (S_IXUSR | S_IXGRP | S_IXOTH) - #define USERDATA_DIR_MODE (MODE_R_ALL | MODE_X_ALL | S_IWUSR) #define LEVEL_PERMS (MODE_R_ALL | MODE_W_ALL) -#define SCORE_PERMS LEVEL_PERMS +#define SCORE_PERMS (MODE_R_ALL | S_IWUSR | S_IWGRP) diff --git a/games/rocksndiamonds/patches/patch-ad b/games/rocksndiamonds/patches/patch-ad index 7a44cdf638f..ba8684c5fe1 100644 --- a/games/rocksndiamonds/patches/patch-ad +++ b/games/rocksndiamonds/patches/patch-ad @@ -1,16 +1,43 @@ -$NetBSD: patch-ad,v 1.1 2000/12/20 01:23:05 wiz Exp $ - ---- src/network.c.orig Mon Oct 4 01:12:04 1999 -+++ src/network.c Tue Dec 19 13:26:26 2000 -@@ -237,9 +237,9 @@ - buffer[8] = (unsigned char)((new_random_seed >> 8) & 0xff); - buffer[9] = (unsigned char)((new_random_seed >> 0) & 0xff); +$NetBSD: patch-ad,v 1.2 2001/07/05 22:07:59 kristerw Exp $ +--- src/libgame/sound.c.orig Sun Dec 31 11:47:19 2000 ++++ src/libgame/sound.c Thu Jul 5 23:37:59 2001 +@@ -291,7 +291,30 @@ + - 2 buffers / 512 bytes (giving 1/16 second resolution for 8 kHz) + - (with stereo the effective buffer size will shrink to 256) + => fragment_size = 0x00020009 */ ++#if defined(PLATFORM_NETBSD) ++ { ++ audio_info_t a_info; -- strcpy((char *)&buffer[10], leveldir_current->name); -+ strcpy((char *)&buffer[10], leveldir_current->filename); ++ AUDIO_INITINFO(&a_info); ++ a_info.play.encoding = AUDIO_ENCODING_LINEAR8; ++ a_info.play.precision = 8; ++ a_info.play.channels = 2; ++ a_info.play.sample_rate = sample_rate; ++ a_info.blocksize = fragment_size; ++ if (ioctl(audio.device_fd, AUDIO_SETINFO, &a_info) < 0) ++ { ++ /* Try to disable stereo. */ ++ a_info.play.channels = 1; ++ stereo = FALSE; ++ if (ioctl(audio.device_fd, AUDIO_SETINFO, &a_info) < 0) ++ { ++ Error(ERR_EXIT_SOUND_SERVER, ++ "cannot set sample rate of /dev/audio - no sounds"); ++ playing_sounds = 0; ++ } ++ } ++ } ++#else + if (ioctl(audio.device_fd,SNDCTL_DSP_SETFRAGMENT,&fragment_spec) < 0) + Error(ERR_EXIT_SOUND_SERVER, + "cannot set fragment size of /dev/dsp - no sounds"); +@@ -319,7 +342,7 @@ + if (ioctl(audio.device_fd, SNDCTL_DSP_GETBLKSIZE,&fragment_size) < 0) + Error(ERR_EXIT_SOUND_SERVER, + "cannot get fragment size of /dev/dsp - no sounds"); +- ++#endif + max_sample_size = fragment_size / (stereo ? 2 : 1); + } -- SendBufferToServer(10 + strlen(leveldir_current->name) + 1); -+ SendBufferToServer(10 + strlen(leveldir_current->filename) + 1); - } - - void SendToServer_PausePlaying() diff --git a/games/rocksndiamonds/patches/patch-ae b/games/rocksndiamonds/patches/patch-ae new file mode 100644 index 00000000000..6c982559557 --- /dev/null +++ b/games/rocksndiamonds/patches/patch-ae @@ -0,0 +1,22 @@ +$NetBSD: patch-ae,v 1.1 2001/07/05 22:07:59 kristerw Exp $ +--- src/libgame/sound.h.orig Sat Dec 16 22:07:58 2000 ++++ src/libgame/sound.h Thu Jul 5 23:38:13 2001 +@@ -26,6 +26,9 @@ + #include <linux/soundcard.h> + #elif defined(PLATFORM_FREEBSD) + #include <machine/soundcard.h> ++#elif defined(PLATFORM_NETBSD) ++#include <sys/ioctl.h> ++#include <sys/audioio.h> + #elif defined(PLATFORM_HPUX) + #include <sys/audio.h> + #endif +@@ -33,7 +36,7 @@ + #include "system.h" + + +-#if defined(PLATFORM_LINUX) || defined(PLATFORM_FREEBSD) || defined(VOXWARE) ++#if defined(PLATFORM_LINUX) || defined(PLATFORM_FREEBSD) || defined(VOXWARE) || defined(PLATFORM_NETBSD) + #define AUDIO_STREAMING_DSP + #endif + diff --git a/games/rocksndiamonds/patches/patch-af b/games/rocksndiamonds/patches/patch-af new file mode 100644 index 00000000000..88953f0b0f0 --- /dev/null +++ b/games/rocksndiamonds/patches/patch-af @@ -0,0 +1,14 @@ +$NetBSD: patch-af,v 1.1 2001/07/05 22:08:00 kristerw Exp $ +--- src/libgame/platform.h.orig Mon Dec 4 22:07:57 2000 ++++ src/libgame/platform.h Thu Jul 5 23:38:26 2001 +@@ -56,6 +56,10 @@ + #define PLATFORM_FREEBSD + #endif + ++#if defined(__NetBSD__) ++#define PLATFORM_NETBSD ++#endif ++ + /* detecting HP-UX by the following compiler keyword definitions: + - in K&R mode (the default), the HP C compiler defines "hpux" + - in ANSI mode (-Aa or -Ae), the HP C compiler defines "__hpux" diff --git a/games/rocksndiamonds/pkg/PLIST b/games/rocksndiamonds/pkg/PLIST index b63ff1bd50b..ebe7bfa10af 100644 --- a/games/rocksndiamonds/pkg/PLIST +++ b/games/rocksndiamonds/pkg/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.3 2000/01/05 17:33:53 wiz Exp $ +@comment $NetBSD: PLIST,v 1.4 2001/07/05 22:08:00 kristerw Exp $ man/man1/rocksndiamonds.1 bin/rocksndiamonds share/rocksndiamonds/graphics/RocksDC.pcx @@ -15,7 +15,6 @@ share/rocksndiamonds/graphics/mouse.pcx share/rocksndiamonds/graphics/rocks_icon.xbm share/rocksndiamonds/graphics/rocks_iconmask.xbm @dirrm share/rocksndiamonds/graphics -share/rocksndiamonds/sounds/alchemy.wav share/rocksndiamonds/sounds/amoebe.wav share/rocksndiamonds/sounds/antigrav.wav share/rocksndiamonds/sounds/autsch.wav @@ -26,8 +25,6 @@ share/rocksndiamonds/sounds/boom.wav share/rocksndiamonds/sounds/booom.wav share/rocksndiamonds/sounds/bug.wav share/rocksndiamonds/sounds/buing.wav -share/rocksndiamonds/sounds/chase.wav -share/rocksndiamonds/sounds/czardasz.wav share/rocksndiamonds/sounds/deng.wav share/rocksndiamonds/sounds/empty.wav share/rocksndiamonds/sounds/exit.wav @@ -50,7 +47,6 @@ share/rocksndiamonds/sounds/krach.wav share/rocksndiamonds/sounds/lachen.wav share/rocksndiamonds/sounds/laser.wav share/rocksndiamonds/sounds/miep.wav -share/rocksndiamonds/sounds/network.wav share/rocksndiamonds/sounds/njam.wav share/rocksndiamonds/sounds/oeffnen.wav share/rocksndiamonds/sounds/pling.wav @@ -69,9 +65,6 @@ share/rocksndiamonds/sounds/schwirr.wav share/rocksndiamonds/sounds/sirr.wav share/rocksndiamonds/sounds/slurp.wav share/rocksndiamonds/sounds/sproing.wav -share/rocksndiamonds/sounds/twilight.wav -share/rocksndiamonds/sounds/tyger.wav -share/rocksndiamonds/sounds/voyager.wav share/rocksndiamonds/sounds/warnton.wav share/rocksndiamonds/sounds/whoosh.wav share/rocksndiamonds/sounds/zisch.wav |