diff options
| author | augustss <augustss> | 1997-10-29 01:48:29 +0000 |
|---|---|---|
| committer | augustss <augustss> | 1997-10-29 01:48:29 +0000 |
| commit | 245714f63bf6440ee147d7e3bd7bb3f521174ecc (patch) | |
| tree | 1c71ef8bef2e916dcb44f494553c83b4f0ac4e01 /audio | |
| parent | fba006f4e9c1d53db173bbdd1ff5ba18b6e2af76 (diff) | |
| download | pkgsrc-245714f63bf6440ee147d7e3bd7bb3f521174ecc.tar.gz | |
Change RCS id.
NetBSD port.
Diffstat (limited to 'audio')
| -rw-r--r-- | audio/sox/Makefile | 3 | ||||
| -rw-r--r-- | audio/sox/patches/patch-ad | 67 |
2 files changed, 69 insertions, 1 deletions
diff --git a/audio/sox/Makefile b/audio/sox/Makefile index 781d32573a9..2563c0455a4 100644 --- a/audio/sox/Makefile +++ b/audio/sox/Makefile @@ -3,7 +3,8 @@ # Date created: 17 Oct 1994 # Whom: torstenb # -# $Id: Makefile,v 1.1.1.1 1997/10/28 23:19:03 augustss Exp $ +# $NetBSD: Makefile,v 1.2 1997/10/29 01:48:29 augustss Exp $ +# FreeBSD Id: Makefile,v 1.9 1997/02/04 10:32:34 max Exp # DISTNAME= soxgamma diff --git a/audio/sox/patches/patch-ad b/audio/sox/patches/patch-ad new file mode 100644 index 00000000000..2b0c9c9f5a5 --- /dev/null +++ b/audio/sox/patches/patch-ad @@ -0,0 +1,67 @@ +Only in .: .build_done +diff -u ../work/Makefile.unx ./Makefile.unx +--- ../work/Makefile.unx Wed Oct 29 02:43:00 1997 ++++ ./Makefile.unx Wed Oct 29 02:26:11 1997 +@@ -154,7 +154,7 @@ + + + +-# FreeBSD 1.x / 2.x / 3.x ++# NetBSD 1.3 + CFLAGS = -O -DLINUXSOUND -D_HAVE_PARAM_H + CC = cc + AR = ar r +@@ -163,7 +163,7 @@ + all: sox + + sox: sox.o $(SOUNDLIB) +- $(CC) $(CFLAGS) -o sox sox.o $(SOUNDLIB) -lm ++ $(CC) $(CFLAGS) -o sox sox.o $(SOUNDLIB) -lm -lossaudio + + $(SOUNDLIB): $(LIBOBJS) + $(RM) $(SOUNDLIB) +Only in .: libst.a +diff -u ../work/sbdsp.c ./sbdsp.c +--- ../work/sbdsp.c Wed Oct 29 02:42:59 1997 ++++ ./sbdsp.c Wed Oct 29 02:42:09 1997 +@@ -21,7 +21,12 @@ + #include <i386/isa/sblast.h> + #else + #ifdef LINUXSOUND ++#ifdef __NetBSD__ ++#include <sys/ioctl.h> ++#include <soundcard.h> ++#else + #include <machine/soundcard.h> ++#endif + #else + #include <sys/sb.h> + #endif +@@ -77,6 +82,12 @@ + ioctl(fileno(ft->fp), DSP_IOCTL_VOICE, &off); + ioctl(fileno(ft->fp), DSP_IOCTL_SPEED, &ft->info.rate); + #else ++#ifdef __NetBSD__ ++ { ++ int fmt = AFMT_U8; ++ ioctl(fileno(ft->fp), SNDCTL_DSP_SETFMT, &fmt); ++ } ++#endif + #if defined(LINUXSOUND) + #if SOUND_VERSION >= 200 + ioctl(fileno(ft->fp), SOUND_PCM_WRITE_RATE, &ft->info.rate); +@@ -150,6 +161,12 @@ + ioctl(fileno(ft->fp), DSP_IOCTL_VOICE, &on); + ioctl(fileno(ft->fp), DSP_IOCTL_SPEED, &ft->info.rate); + #else ++#ifdef __NetBSD__ ++ { ++ int fmt = AFMT_U8; ++ ioctl(fileno(ft->fp), SNDCTL_DSP_SETFMT, &fmt); ++ } ++#endif + #if defined(LINUXSOUND) + ioctl(fileno(ft->fp), SNDCTL_DSP_SYNC, 0); + #if SOUND_VERSION >= 200 +Only in .: sox +Only in .: ut |