summaryrefslogtreecommitdiff
path: root/games/mirrormagic/patches
diff options
context:
space:
mode:
authorwiz <wiz>2002-09-11 23:43:41 +0000
committerwiz <wiz>2002-09-11 23:43:41 +0000
commit0df7fe2250a957375b90e6538c9f51a4390ae7fd (patch)
tree5991c635c6dd218365a76b1fd43ec2939871432c /games/mirrormagic/patches
parent37eae5ad926fff7db811ddeadc80f56cfc14f2f0 (diff)
downloadpkgsrc-0df7fe2250a957375b90e6538c9f51a4390ae7fd.tar.gz
Update to 2.0.1, provided by Adam Ciarcinski, with minor fixes.
Changes: - icon for Windows executable added - bug when selecting default level series fixed - new IFF style file format for level files - fullscreen mode now works with Windows (workaround for bug in SDL) - /dev/dsp support for NetBSD added (thanks to Krister Walfridsson) - file permissions when saving files and creating directories changed - some small sound bugs fixed
Diffstat (limited to 'games/mirrormagic/patches')
-rw-r--r--games/mirrormagic/patches/patch-aa3
-rw-r--r--games/mirrormagic/patches/patch-ab15
-rw-r--r--games/mirrormagic/patches/patch-ac12
-rw-r--r--games/mirrormagic/patches/patch-ad43
-rw-r--r--games/mirrormagic/patches/patch-ae22
-rw-r--r--games/mirrormagic/patches/patch-af14
6 files changed, 10 insertions, 99 deletions
diff --git a/games/mirrormagic/patches/patch-aa b/games/mirrormagic/patches/patch-aa
index d509933ad63..5ce856af013 100644
--- a/games/mirrormagic/patches/patch-aa
+++ b/games/mirrormagic/patches/patch-aa
@@ -1,4 +1,5 @@
-$NetBSD: patch-aa,v 1.5 2001/07/05 22:13:07 kristerw Exp $
+$NetBSD: patch-aa,v 1.6 2002/09/11 23:43:42 wiz Exp $
+
--- Makefile.orig Wed May 2 23:09:06 2001
+++ Makefile Sun Jun 24 21:03:37 2001
@@ -12,15 +12,17 @@
diff --git a/games/mirrormagic/patches/patch-ab b/games/mirrormagic/patches/patch-ab
index 37eb5385d6b..b140205d253 100644
--- a/games/mirrormagic/patches/patch-ab
+++ b/games/mirrormagic/patches/patch-ab
@@ -1,6 +1,7 @@
-$NetBSD: patch-ab,v 1.3 2001/07/05 22:13:08 kristerw Exp $
---- src/Makefile.orig Wed May 2 23:13:44 2001
-+++ src/Makefile Wed May 2 23:24:24 2001
+$NetBSD: patch-ab,v 1.4 2002/09/11 23:43:42 wiz Exp $
+
+--- src/Makefile.orig Tue Mar 19 02:58:57 2002
++++ src/Makefile Thu Mar 28 11:34:15 2002
@@ -17,7 +17,7 @@
XINC_PATH = $(X11_PATH)/include
XLIB_PATH = $(X11_PATH)/lib
@@ -10,12 +11,12 @@ $NetBSD: patch-ab,v 1.3 2001/07/05 22:13:08 kristerw Exp $
endif
AR = ar
-@@ -100,7 +100,7 @@
- # OPTIONS = -O3
- # OPTIONS = -DSYSV -Ae # may be needed for HP-UX
+@@ -112,7 +112,7 @@
+ OPTIONS = -O3 -Wall
+ endif
-CFLAGS = $(OPTIONS) $(SYS_CFLAGS) $(CONFIG)
-+CFLAGS = $(SYS_CFLAGS) $(CONFIG)
++CFLAGS += $(SYS_CFLAGS) $(CONFIG)
LDFLAGS = $(SYS_LDFLAGS) $(EXTRA_LDFLAGS) -lm
diff --git a/games/mirrormagic/patches/patch-ac b/games/mirrormagic/patches/patch-ac
deleted file mode 100644
index a5e20664e62..00000000000
--- a/games/mirrormagic/patches/patch-ac
+++ /dev/null
@@ -1,12 +0,0 @@
-$NetBSD: patch-ac,v 1.1 2001/07/05 22:13:08 kristerw Exp $
---- src/files.c.orig Sat Dec 9 22:09:04 2000
-+++ src/files.c Sun Jun 24 22:54:06 2001
-@@ -82,7 +82,7 @@
- #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)
- #define SETUP_PERMS LEVEL_PERMS
-
- /* sort priorities of level series (also used as level series classes) */
diff --git a/games/mirrormagic/patches/patch-ad b/games/mirrormagic/patches/patch-ad
deleted file mode 100644
index 3534a7c40d5..00000000000
--- a/games/mirrormagic/patches/patch-ad
+++ /dev/null
@@ -1,43 +0,0 @@
-$NetBSD: patch-ad,v 1.1 2001/07/05 22:13:08 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;
-
-+ 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);
- }
-
diff --git a/games/mirrormagic/patches/patch-ae b/games/mirrormagic/patches/patch-ae
deleted file mode 100644
index 0914822a9d0..00000000000
--- a/games/mirrormagic/patches/patch-ae
+++ /dev/null
@@ -1,22 +0,0 @@
-$NetBSD: patch-ae,v 1.1 2001/07/05 22:13:08 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/mirrormagic/patches/patch-af b/games/mirrormagic/patches/patch-af
deleted file mode 100644
index ecf6b5a78a5..00000000000
--- a/games/mirrormagic/patches/patch-af
+++ /dev/null
@@ -1,14 +0,0 @@
-$NetBSD: patch-af,v 1.1 2001/07/05 22:13:09 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"