From bf71549f7768118892d7a3112631e6a894eabf4d Mon Sep 17 00:00:00 2001
From: Masafumi Max NAKANE <max@FreeBSD.org>
Date: Tue, 4 Feb 1997 10:32:42 +0000
Subject: Upgrade, 10.11 -> 12.12. Suggested by:	Bill Fenner
 <fenner@parc.xerox.com> (Closing PR #2554.)

---
 audio/sox/files/patch-aa | 28 ++++++++++++++--------------
 1 file changed, 14 insertions(+), 14 deletions(-)

(limited to 'audio/sox/files/patch-aa')

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);
-- 
cgit v1.2.3