summaryrefslogtreecommitdiff
path: root/audio/timidity/patches
diff options
context:
space:
mode:
authormycroft <mycroft>2000-04-27 14:44:23 +0000
committermycroft <mycroft>2000-04-27 14:44:23 +0000
commitdf44ed85402641fd4dfd976c5d59808d694f5c28 (patch)
tree63cbb873da72763ce613f3437aebb8a15ddc0e39 /audio/timidity/patches
parente927a1f443410bf832a5949292d7d8bf305cfc65 (diff)
downloadpkgsrc-df44ed85402641fd4dfd976c5d59808d694f5c28.tar.gz
Fix LP64 problems.
Diffstat (limited to 'audio/timidity/patches')
-rw-r--r--audio/timidity/patches/patch-ba48
-rw-r--r--audio/timidity/patches/patch-bc14
-rw-r--r--audio/timidity/patches/patch-bg15
-rw-r--r--audio/timidity/patches/patch-bh14
-rw-r--r--audio/timidity/patches/patch-bi16
5 files changed, 95 insertions, 12 deletions
diff --git a/audio/timidity/patches/patch-ba b/audio/timidity/patches/patch-ba
index be143fe6b04..4717b2c61a9 100644
--- a/audio/timidity/patches/patch-ba
+++ b/audio/timidity/patches/patch-ba
@@ -1,11 +1,45 @@
-$NetBSD: patch-ba,v 1.2 1998/08/07 10:36:15 agc Exp $
+$NetBSD: patch-ba,v 1.3 2000/04/27 14:44:23 mycroft Exp $
--- config.h.orig Sat Jun 1 08:54:49 1996
-+++ config.h Sat Mar 7 13:17:30 1998
-@@ -325,6 +325,18 @@
- #define rindex(s,c) strrchr(s,c)
++++ config.h Thu Apr 27 10:35:09 2000
+@@ -186,7 +186,7 @@
+ #define AUDIO_BUFFER_SIZE (1<<AUDIO_BUFFER_BITS)
+
+ /* Byte order, defined in <machine/endian.h> for FreeBSD and DEC OSF/1 */
+-#ifdef DEC
++#if defined(DEC) || defined(__NetBSD__)
+ #include <machine/endian.h>
+ #endif
+
+@@ -223,6 +223,14 @@
#endif
+ /* DEC MMS has 64 bit long words */
++#if defined(__NetBSD__)
++typedef u_int32_t uint32;
++typedef int32_t int32;
++typedef u_int16_t uint16;
++typedef int16_t int16;
++typedef u_int8_t uint8;
++typedef int8_t int8;
++#else
+ #ifdef DEC
+ typedef unsigned int uint32;
+ typedef int int32;
+@@ -234,6 +242,7 @@
+ typedef short int16;
+ typedef unsigned char uint8;
+ typedef char int8;
++#endif
+
+ /* Instrument files are little-endian, MIDI files big-endian, so we
+ need to do some conversions. */
+@@ -323,6 +332,18 @@
+ extern char *optarg;
+ #define PI 3.14159265358979323846
+ #define rindex(s,c) strrchr(s,c)
++#endif
++
+#ifdef __NetBSD__
+# include <errno.h>
+# include <math.h>
@@ -16,8 +50,6 @@ $NetBSD: patch-ba,v 1.2 1998/08/07 10:36:15 agc Exp $
+# include <errno.h>
+# include <math.h>
+# define PI M_PI
-+#endif
-+
+ #endif
+
#ifdef __WIN32__
- # include <math.h>
- # define PI M_PI
diff --git a/audio/timidity/patches/patch-bc b/audio/timidity/patches/patch-bc
index 9e4efefcf61..58b45f7f3f6 100644
--- a/audio/timidity/patches/patch-bc
+++ b/audio/timidity/patches/patch-bc
@@ -1,8 +1,14 @@
-$NetBSD: patch-bc,v 1.2 1998/08/07 10:36:16 agc Exp $
+$NetBSD: patch-bc,v 1.3 2000/04/27 14:44:23 mycroft Exp $
--- sun_a.c.orig Mon May 20 09:09:47 1996
-+++ sun_a.c Sat Mar 7 13:28:46 1998
-@@ -33,7 +33,7 @@
++++ sun_a.c Thu Apr 27 10:37:28 2000
+@@ -28,12 +28,13 @@
+ */
+
+ #include <unistd.h>
++#include <string.h>
+ #include <fcntl.h>
+ #include <errno.h>
#include <sys/ioctl.h>
@@ -11,7 +17,7 @@ $NetBSD: patch-bc,v 1.2 1998/08/07 10:36:16 agc Exp $
#include <sys/audioio.h>
#else
#include <sun/audioio.h>
-@@ -81,7 +81,7 @@
+@@ -81,7 +82,7 @@
/* Open the audio device */
diff --git a/audio/timidity/patches/patch-bg b/audio/timidity/patches/patch-bg
new file mode 100644
index 00000000000..f3c617398f8
--- /dev/null
+++ b/audio/timidity/patches/patch-bg
@@ -0,0 +1,15 @@
+$NetBSD: patch-bg,v 1.1 2000/04/27 14:44:24 mycroft Exp $
+
+--- common.c.orig Sat Jun 1 08:20:19 1996
++++ common.c Thu Apr 27 10:09:23 2000
+@@ -204,8 +204,8 @@
+ if (count > (1<<21))
+ {
+ ctl->cmsg(CMSG_FATAL, VERB_NORMAL,
+- "Strange, I feel like allocating %d bytes. This must be a bug.",
+- count);
++ "Strange, I feel like allocating %ld bytes. This must be a bug.",
++ (long) count);
+ }
+ else if ((p=malloc(count)))
+ return p;
diff --git a/audio/timidity/patches/patch-bh b/audio/timidity/patches/patch-bh
new file mode 100644
index 00000000000..b8351618c53
--- /dev/null
+++ b/audio/timidity/patches/patch-bh
@@ -0,0 +1,14 @@
+$NetBSD: patch-bh,v 1.1 2000/04/27 14:44:24 mycroft Exp $
+
+--- timidity.c.orig Tue May 21 15:16:20 1996
++++ timidity.c Thu Apr 27 10:35:59 2000
+@@ -204,7 +204,8 @@
+ {
+ if (i<low || i > high)
+ {
+- fprintf(stderr, "%s must be between %ld and %ld\n", name, low, high);
++ fprintf(stderr, "%s must be between %ld and %ld\n", name, (long) low,
++ (long) high);
+ return -1;
+ }
+ else *param=i;
diff --git a/audio/timidity/patches/patch-bi b/audio/timidity/patches/patch-bi
new file mode 100644
index 00000000000..5ef9984ac71
--- /dev/null
+++ b/audio/timidity/patches/patch-bi
@@ -0,0 +1,16 @@
+$NetBSD: patch-bi,v 1.1 2000/04/27 14:44:24 mycroft Exp $
+
+--- wave_a.c.orig Mon May 20 09:10:15 1996
++++ wave_a.c Thu Apr 27 10:37:13 2000
+@@ -26,10 +26,10 @@
+ #ifdef __WIN32__
+ #include <stdlib.h>
+ #include <io.h>
+-#include <string.h>
+ #else
+ #include <unistd.h>
+ #endif
++#include <string.h>
+ #include <fcntl.h>
+ #include <errno.h>
+