From 98b260600b87db2fcd26ca928a40215b476f7dd6 Mon Sep 17 00:00:00 2001 From: kloczek Date: Sun, 4 Feb 2001 21:54:57 +0000 Subject: [PATCH] - patches from RH and Conectiva. Changed files: sox-saywhat.patch -> 1.1 sox-soundcard.patch -> 1.1 sox-types.patch -> 1.1 --- sox-saywhat.patch | 11 +++++++++++ sox-soundcard.patch | 11 +++++++++++ sox-types.patch | 27 +++++++++++++++++++++++++++ 3 files changed, 49 insertions(+) create mode 100644 sox-saywhat.patch create mode 100644 sox-soundcard.patch create mode 100644 sox-types.patch diff --git a/sox-saywhat.patch b/sox-saywhat.patch new file mode 100644 index 0000000..67e23a9 --- /dev/null +++ b/sox-saywhat.patch @@ -0,0 +1,11 @@ +--- sox-12.17.1/avr.c.saywhat Tue Jan 2 11:48:05 2001 ++++ sox-12.17.1/avr.c Tue Jan 2 11:48:12 2001 +@@ -38,7 +38,7 @@ + unsigned short midi; /* 0xffff = no MIDI note assigned, + 0xffXX = single key note assignment + 0xLLHH = key split, low/hi note */ +- ULONG int rate; /* sample frequency in hertz */ ++ ULONG rate; /* sample frequency in hertz */ + ULONG size; /* sample length in bytes or words (see rez) */ + ULONG lbeg; /* offset to start of loop in bytes or words. + set to zero if unused. */ diff --git a/sox-soundcard.patch b/sox-soundcard.patch new file mode 100644 index 0000000..296ee31 --- /dev/null +++ b/sox-soundcard.patch @@ -0,0 +1,11 @@ +--- sox-12.17.1/oss.c Sun Aug 13 15:04:30 2000 ++++ sox-12.17.1.acme/oss.c Tue Nov 21 09:24:59 2000 +@@ -37,6 +37,8 @@ + #ifdef HAVE_MACHINE_SOUNDCARD_H + #include + #endif ++/* hack */ ++#include + #include + #include "st.h" + diff --git a/sox-types.patch b/sox-types.patch new file mode 100644 index 0000000..db1195b --- /dev/null +++ b/sox-types.patch @@ -0,0 +1,27 @@ +--- sox-12.17.1/st.h.blarg Tue Jan 2 11:56:01 2001 ++++ sox-12.17.1/st.h Tue Jan 2 11:56:24 2001 +@@ -33,14 +33,9 @@ + #define st_free free + + /* FIXME: Move to separate header */ +-#ifdef __alpha__ + #include /* To get defines for 32-bit integers */ + #define LONG int32_t + #define ULONG u_int32_t +-#else +-#define LONG long +-#define ULONG unsigned long +-#endif + + #define MAXLONG 0x7fffffffL + #define MAXULONG 0xffffffffL +--- sox-12.17.1/resample.c.blarg Tue Jan 2 12:00:15 2001 ++++ sox-12.17.1/resample.c Tue Jan 2 12:02:10 2001 +@@ -180,7 +180,6 @@ + resample_t r = (resample_t) effp->priv; + LONG Xoff, gcdrate; + int i; +- extern long st_gcd(P2(long a,long b)); + + r->Factor = (double)effp->outinfo.rate / (double)effp->ininfo.rate; + -- 2.44.0