diff options
| author | max <max@FreeBSD.org> | 1997-02-04 18:32:42 +0800 |
|---|---|---|
| committer | max <max@FreeBSD.org> | 1997-02-04 18:32:42 +0800 |
| commit | f07b753115ca5df32cd5af936c16539bde6948da (patch) | |
| tree | 1713d134c71cfb8ef3e9d9eb77f07c10910a8c42 /audio/sox/files | |
| parent | dfe879bee4f543352c2ec5ed32e854bad97563b5 (diff) | |
| download | freebsd-ports-gnome-f07b753115ca5df32cd5af936c16539bde6948da.tar.gz freebsd-ports-gnome-f07b753115ca5df32cd5af936c16539bde6948da.tar.zst freebsd-ports-gnome-f07b753115ca5df32cd5af936c16539bde6948da.zip | |
Upgrade, 10.11 -> 12.12.
Suggested by: Bill Fenner <fenner@parc.xerox.com>
(Closing PR #2554.)
Diffstat (limited to 'audio/sox/files')
| -rw-r--r-- | audio/sox/files/patch-aa | 28 | ||||
| -rw-r--r-- | audio/sox/files/patch-ab | 39 |
2 files changed, 30 insertions, 37 deletions
diff --git a/audio/sox/files/patch-aa b/audio/sox/files/patch-aa index cbc245dbca15..090adb375032 100644 --- a/audio/sox/files/patch-aa +++ b/audio/sox/files/patch-aa @@ -1,5 +1,5 @@ -*** sbdsp.c.orig Mon Jul 26 12:58:00 1993 ---- sbdsp.c Mon Oct 31 18:26:56 1994 +*** sbdsp.c.orig Thu Aug 18 06:11:01 1994 +--- sbdsp.c Mon Jan 27 02:47:53 1997 *************** *** 21,27 **** #include <i386/isa/sblast.h> @@ -18,18 +18,18 @@ #include <sys/sb.h> #endif *************** -*** 77,83 **** - ioctl(fileno(ft->fp), DSP_IOCTL_VOICE, &off); +*** 78,84 **** ioctl(fileno(ft->fp), DSP_IOCTL_SPEED, &ft->info.rate); - #elif defined(LINUXSOUND) + #else + #if defined(LINUXSOUND) ! ioctl(fileno(ft->fp), SNDCTL_DSP_SPEED, ft->info.rate); #else ioctl(fileno(ft->fp), DSP_IOCTL_VOICE, 0); ioctl(fileno(ft->fp), DSP_IOCTL_SPEED, ft->info.rate); ---- 77,87 ---- - ioctl(fileno(ft->fp), DSP_IOCTL_VOICE, &off); +--- 78,88 ---- ioctl(fileno(ft->fp), DSP_IOCTL_SPEED, &ft->info.rate); - #elif defined(LINUXSOUND) + #else + #if defined(LINUXSOUND) ! #if SOUND_VERSION >= 200 ! ioctl(fileno(ft->fp), SOUND_PCM_WRITE_RATE, &ft->info.rate); ! #else @@ -39,17 +39,17 @@ ioctl(fileno(ft->fp), DSP_IOCTL_VOICE, 0); ioctl(fileno(ft->fp), DSP_IOCTL_SPEED, ft->info.rate); *************** -*** 143,149 **** - ioctl(fileno(ft->fp), DSP_IOCTL_SPEED, &ft->info.rate); - #elif defined(LINUXSOUND) +*** 148,154 **** + #else + #if defined(LINUXSOUND) ioctl(fileno(ft->fp), SNDCTL_DSP_SYNC, 0); ! ioctl(fileno(ft->fp), SNDCTL_DSP_SPEED, ft->info.rate); #else ioctl(fileno(ft->fp), DSP_IOCTL_VOICE, 1); ioctl(fileno(ft->fp), DSP_IOCTL_SPEED, ft->info.rate); ---- 147,157 ---- - ioctl(fileno(ft->fp), DSP_IOCTL_SPEED, &ft->info.rate); - #elif defined(LINUXSOUND) +--- 152,162 ---- + #else + #if defined(LINUXSOUND) ioctl(fileno(ft->fp), SNDCTL_DSP_SYNC, 0); ! #if SOUND_VERSION >= 200 ! ioctl(fileno(ft->fp), SOUND_PCM_WRITE_RATE, &ft->info.rate); diff --git a/audio/sox/files/patch-ab b/audio/sox/files/patch-ab index 0135eb323bc7..e00a39ff6724 100644 --- a/audio/sox/files/patch-ab +++ b/audio/sox/files/patch-ab @@ -1,23 +1,16 @@ -*** Makefile.unx.orig Mon Jul 26 12:58:00 1993 ---- Makefile.unx Mon Oct 31 19:19:42 1994 -*************** -*** 122,128 **** ---- 122,139 ---- - # AR = ar r - # RANLIB = ranlib - -+ -+ # FreeBSD 1.x / 2.x -+ CFLAGS = -O -DLINUXSOUND -D_HAVE_PARAM_H -+ CC = cc -+ AR = ar r -+ RANLIB = ranlib -+ - all: sox -+ -+ install: -+ cp sox ${PREFIX}/bin/sox -+ cp sox.man ${PREFIX}/man/man1/sox.1 - - sox: sox.o $(SOUNDLIB) - $(CC) $(CFLAGS) -o sox sox.o $(SOUNDLIB) -lm +--- Makefile.unx.orig Sat Oct 8 09:14:48 1994 ++++ Makefile.unx Mon Jan 27 15:09:32 1997 +@@ -153,6 +153,13 @@ + # RM = del /q + + ++ ++# FreeBSD 1.x / 2.x / 3.x ++CFLAGS = -O -DLINUXSOUND -D_HAVE_PARAM_H ++CC = cc ++AR = ar r ++RANLIB = ranlib ++ + all: sox + + sox: sox.o $(SOUNDLIB) |