diff options
Diffstat (limited to 'audio')
| -rw-r--r-- | audio/splay/Makefile | 5 | ||||
| -rw-r--r-- | audio/splay/files/patch-sum | 7 | ||||
| -rw-r--r-- | audio/splay/patches/patch-ab | 37 | ||||
| -rw-r--r-- | audio/splay/patches/patch-ad | 31 | ||||
| -rw-r--r-- | audio/splay/patches/patch-ah | 19 |
5 files changed, 76 insertions, 23 deletions
diff --git a/audio/splay/Makefile b/audio/splay/Makefile index 5c4ba50970b..13ffd3b1319 100644 --- a/audio/splay/Makefile +++ b/audio/splay/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.8 2000/01/22 14:34:29 wiz Exp $ +# $NetBSD: Makefile,v 1.9 2000/02/20 18:30:39 dmcmahill Exp $ # FreeBSD Id: Makefile,v 1.4 1997/08/09 23:37:33 fenner Exp # @@ -15,6 +15,9 @@ MASTER_SITES= http://my.netian.com/~polarb/ \ MAINTAINER= packages@netbsd.org HOMEPAGE= http://synergy.kaist.ac.kr/~jwj/ +# endian and alignment issues +NOT_FOR_PLATFORM= *-*-sparc *-*-m68k *-*-macppc *-*-sparc64 + GNU_CONFIGURE= yes CONFIGURE_ARGS= --without-xsplay --without-pthread CONFIGURE_ENV= LIBS="${LIBS} -lossaudio" diff --git a/audio/splay/files/patch-sum b/audio/splay/files/patch-sum index 7f1a9a6464c..f45e7ce2ff0 100644 --- a/audio/splay/files/patch-sum +++ b/audio/splay/files/patch-sum @@ -1,6 +1,7 @@ -$NetBSD: patch-sum,v 1.1 1999/07/09 13:50:15 agc Exp $ +$NetBSD: patch-sum,v 1.2 2000/02/20 18:30:39 dmcmahill Exp $ MD5 (patch-aa) = 5d2ce133b6bd70386e23dc7cb7548e06 -MD5 (patch-ad) = 3773eec36b60fab519fe9071a46b7400 -MD5 (patch-ah) = d341596edfc92c781cace5929e7eae3c +MD5 (patch-ab) = c4c07e538c1984248eb015c067940de0 +MD5 (patch-ad) = 04bb6b3bf2d08bc486cbd8af6edc8299 +MD5 (patch-ah) = 8abbd30329c43bfa655db77718c7d299 MD5 (patch-ai) = 9d1ed97775d63f0d4ffa062c84eddb02 diff --git a/audio/splay/patches/patch-ab b/audio/splay/patches/patch-ab new file mode 100644 index 00000000000..2f1bceb3277 --- /dev/null +++ b/audio/splay/patches/patch-ab @@ -0,0 +1,37 @@ +$NetBSD: patch-ab,v 1.4 2000/02/20 18:30:39 dmcmahill Exp $ + +--- mpegsound/mpegsound.h.orig Fri Mar 6 12:43:55 1998 ++++ mpegsound/mpegsound.h Sun Feb 20 13:02:24 2000 +@@ -12,4 +12,5 @@ + #include <stdio.h> + #include <sys/types.h> ++#include <machine/endian.h> + + #ifdef PTHREADEDMPEG +@@ -91,4 +92,6 @@ + /* Define values for Microsoft WAVE format */ + /*******************************************/ ++#if defined(BYTE_ORDER) && (BYTE_ORDER == LITTLE_ENDIAN ) ++ + #define RIFF 0x46464952 + #define WAVE 0x45564157 +@@ -101,4 +104,19 @@ + #define MODE_MONO 0 + #define MODE_STEREO 1 ++ ++#else ++ ++#define RIFF 0x52494646 ++#define WAVE 0x57415645 ++#define FMT 0x666D7420 ++#define DATA 0x64617461 ++#define PCM_CODE (1 << 8) ++#define WAVE_MONO (1 << 8) ++#define WAVE_STEREO (2 << 8) ++ ++#define MODE_MONO 0 ++#define MODE_STEREO 1 ++ ++#endif + + /********************/ diff --git a/audio/splay/patches/patch-ad b/audio/splay/patches/patch-ad index 17105aba136..9e0711965d8 100644 --- a/audio/splay/patches/patch-ad +++ b/audio/splay/patches/patch-ad @@ -1,32 +1,39 @@ -$NetBSD: patch-ad,v 1.3 1999/03/28 20:08:09 rh Exp $ +$NetBSD: patch-ad,v 1.4 2000/02/20 18:30:39 dmcmahill Exp $ ---- mpegsound/mpegsound_locals.h.orig Fri Mar 6 18:43:55 1998 -+++ mpegsound/mpegsound_locals.h Sun Mar 28 19:32:46 1999 -@@ -27,7 +27,7 @@ +--- mpegsound/mpegsound_locals.h.orig Fri Mar 6 12:43:55 1998 ++++ mpegsound/mpegsound_locals.h Sun Feb 20 10:43:00 2000 +@@ -21,13 +21,13 @@ + { + register unsigned short a; +-#ifndef WORDS_BIGENDIAN ++ + { + int offset=bitindex>>3; +- ++#ifndef WORDS_BIGENDIAN a=(((unsigned char)buffer[offset])<<8) | ((unsigned char)buffer[offset+1]); - } +- } #else - a=((unsigned short *)(buffer+((bixindex>>3)))); -+ a=((unsigned short *)(buffer+offset)); ++ a=(unsigned short)(buffer[offset]); #endif ++ } a<<=(bitindex&7); -@@ -39,15 +39,15 @@ - { +@@ -40,13 +40,12 @@ register unsigned short a; -#ifndef WORDS_BIGENDIAN { -+#ifndef WORDS_BIGENDIAN int offset=bitindex>>3; - +- ++#ifndef WORDS_BIGENDIAN a=(((unsigned char)buffer[offset])<<8) | ((unsigned char)buffer[offset+1]); - } #else - a=((unsigned short *)(buffer+((bixindex>>3)))); -+ a=((unsigned short *)(buffer+offset)); ++ a=(unsigned short)(buffer[offset]); #endif + } a<<=(bitindex&7); - bitindex+=8; diff --git a/audio/splay/patches/patch-ah b/audio/splay/patches/patch-ah index c7676173695..846e97524fa 100644 --- a/audio/splay/patches/patch-ah +++ b/audio/splay/patches/patch-ah @@ -1,9 +1,8 @@ -$NetBSD: patch-ah,v 1.3 1999/03/28 20:08:09 rh Exp $ +$NetBSD: patch-ah,v 1.4 2000/02/20 18:30:39 dmcmahill Exp $ ---- mpegsound/mpeglayer3.cc.orig Fri Mar 6 18:43:55 1998 -+++ mpegsound/mpeglayer3.cc Sun Mar 28 19:41:06 1999 -@@ -46,17 +46,16 @@ - { +--- mpegsound/mpeglayer3.cc.orig Fri Mar 6 12:43:55 1998 ++++ mpegsound/mpeglayer3.cc Sun Feb 20 10:48:43 2000 +@@ -47,15 +47,14 @@ register unsigned short a; -#ifndef WORDS_BIGENDIAN @@ -17,9 +16,15 @@ $NetBSD: patch-ah,v 1.3 1999/03/28 20:08:09 rh Exp $ #else - // a=((unsigned short *)(buffer+((bixindex>>3)&(WINDOWSIZE-1)))); - a=((unsigned short *)(buffer+((bixindex>>3)))); -+ a=((unsigned short *)(buffer+offset)); ++ a=(unsigned short)(buffer[offset]); #endif + } a<<=(bitindex&7); - bitindex+=bits; +@@ -770,5 +769,5 @@ + { + const HUFFMANCODETABLE *h; +- register end; ++ register int end; + + if (i<region1Start) |