diff options
| author | sbd <sbd@pkgsrc.org> | 2012-06-28 08:18:43 +0000 |
|---|---|---|
| committer | sbd <sbd@pkgsrc.org> | 2012-06-28 08:18:43 +0000 |
| commit | 880bc95bfe8ed91b01839ef0240f619ed0ad74b0 (patch) | |
| tree | 1b9d6e7fde9c1362deab96f89520ee05890d5670 /audio/mad123 | |
| parent | 5ca9f0458a5f13be4d2226cd16d2b91fd7edfd2e (diff) | |
| download | pkgsrc-880bc95bfe8ed91b01839ef0240f619ed0ad74b0.tar.gz | |
Make a "Fix build on SunOS." patch work on Linux aswell.
Diffstat (limited to 'audio/mad123')
| -rw-r--r-- | audio/mad123/distinfo | 4 | ||||
| -rw-r--r-- | audio/mad123/patches/patch-ab | 18 |
2 files changed, 12 insertions, 10 deletions
diff --git a/audio/mad123/distinfo b/audio/mad123/distinfo index f719c74841b..80aa168157a 100644 --- a/audio/mad123/distinfo +++ b/audio/mad123/distinfo @@ -1,10 +1,10 @@ -$NetBSD: distinfo,v 1.8 2012/02/15 22:09:31 hans Exp $ +$NetBSD: distinfo,v 1.9 2012/06/28 08:18:43 sbd Exp $ SHA1 (mad123-0.8.5.tar.gz) = 97c5d6185a54e2262d52a687ff3a3714ff260af8 RMD160 (mad123-0.8.5.tar.gz) = bd2bf0b79a3c9d3513583daccdfc182a2d17cc41 Size (mad123-0.8.5.tar.gz) = 24836 bytes SHA1 (patch-aa) = c2b6eb6eb4b23151c31ae7031150baae403aefad -SHA1 (patch-ab) = 2384933ec17a47fc677a93f3fc8eeca32c1168b9 +SHA1 (patch-ab) = caaf521e4d62c96fade0619c457ad6e5f58263a0 SHA1 (patch-ac) = 7c150b2f15cbc00876c8619b80ee29c73b0b71df SHA1 (patch-audio__dev.h) = 699760f797aa4b90a5672b42b24e08443fe0ae69 SHA1 (patch-mp3__stream.c) = bfd36ec13ab8f78e65007692195ed12275ffc0d8 diff --git a/audio/mad123/patches/patch-ab b/audio/mad123/patches/patch-ab index fab7aa2f342..d32eb100c61 100644 --- a/audio/mad123/patches/patch-ab +++ b/audio/mad123/patches/patch-ab @@ -1,18 +1,20 @@ -$NetBSD: patch-ab,v 1.3 2012/02/15 22:09:31 hans Exp $ +$NetBSD: patch-ab,v 1.4 2012/06/28 08:18:43 sbd Exp $ --- audio_dev.c.orig 2004-09-22 09:23:43.000000000 +0000 +++ audio_dev.c -@@ -22,7 +22,9 @@ +@@ -22,7 +22,11 @@ #include <sys/types.h> #include <sys/param.h> #include <sys/fcntl.h> +#ifndef __linux__ #include <sys/filio.h> ++#else ++#include <stdint.h> +#endif #include <sys/ioctl.h> #include <sys/mman.h> #include <sys/wait.h> -@@ -35,6 +35,10 @@ +@@ -35,6 +39,10 @@ #include <unistd.h> #include <mad.h> @@ -23,7 +25,7 @@ $NetBSD: patch-ab,v 1.3 2012/02/15 22:09:31 hans Exp $ #include "audio_dev.h" #if (BYTE_ORDER == BIG_ENDIAN) -@@ -43,6 +47,10 @@ +@@ -43,6 +51,10 @@ #undef WORDS_BIGENDIAN #endif @@ -34,7 +36,7 @@ $NetBSD: patch-ab,v 1.3 2012/02/15 22:09:31 hans Exp $ #define PCM_BUFFSIZE ((sizeof(((struct mad_pcm *)0)->samples) / \ sizeof(mad_fixed_t)) * 2) struct pcm_data { -@@ -58,7 +66,7 @@ struct pcm_data { +@@ -58,7 +70,7 @@ struct pcm_data { #define PCM_LOW_WATER 32 struct pcm_buffer { volatile int pb_command; @@ -43,7 +45,7 @@ $NetBSD: patch-ab,v 1.3 2012/02/15 22:09:31 hans Exp $ int pb_rate; int pb_nchannels; volatile int pb_purge; -@@ -74,7 +82,7 @@ struct audio_dev_ctx { +@@ -74,7 +86,7 @@ struct audio_dev_ctx { int ac_paused; int ac_peerread; int ac_peerwrite; @@ -52,7 +54,7 @@ $NetBSD: patch-ab,v 1.3 2012/02/15 22:09:31 hans Exp $ void (*ac_readcallback)(void *); void *ac_cbarg; struct pcm_buffer *ac_pcm; -@@ -97,8 +105,12 @@ static void audio_convert_dither(unsigne +@@ -97,8 +109,12 @@ static void audio_convert_dither(unsigne static const struct audio_dev_backend *audio_dev_backends[] = { @@ -65,7 +67,7 @@ $NetBSD: patch-ab,v 1.3 2012/02/15 22:09:31 hans Exp $ #ifndef NOARTS &audio_dev_arts, #endif -@@ -326,7 +338,7 @@ audio_dev_output(struct audio_dev_ctx *a +@@ -326,7 +342,7 @@ audio_dev_output(struct audio_dev_ctx *a pd->pd_len = len; written /= pd->pd_nchannels; |