diff options
| author | Steve Price <steve@FreeBSD.org> | 1999-09-20 02:27:09 +0000 |
|---|---|---|
| committer | Steve Price <steve@FreeBSD.org> | 1999-09-20 02:27:09 +0000 |
| commit | 0dc0972e3fb725b7b438204b6178e2f7f9c10b44 (patch) | |
| tree | 75f44833541095a5d76d487ce70957875c366761 /audio/timidity | |
| parent | Use SYSTEM_OSS on the Alpha too. Also include errno.h so this build on (diff) | |
Breakout a multipart patch and use the default implementation instead
of the missing byts_swap_* on FreeBSD/Alpha.
Notes
Notes:
svn path=/head/; revision=21810
Diffstat (limited to 'audio/timidity')
| -rw-r--r-- | audio/timidity/files/patch-aa | 53 | ||||
| -rw-r--r-- | audio/timidity/files/patch-af | 53 |
2 files changed, 53 insertions, 53 deletions
diff --git a/audio/timidity/files/patch-aa b/audio/timidity/files/patch-aa index 3f12b08b1ce0..c6f1c4dc1d23 100644 --- a/audio/timidity/files/patch-aa +++ b/audio/timidity/files/patch-aa @@ -1,56 +1,3 @@ -*** config.h.orig Sat Jun 1 16:54:49 1996 ---- config.h Sun Nov 17 10:00:29 1996 -*************** -*** 217,222 **** ---- 217,238 ---- - # endif - #endif /* linux */ - -+ #ifdef __FreeBSD__ -+ #include <errno.h> -+ #include <machine/endian.h> -+ #if BYTE_ORDER == LITTLE_ENDIAN -+ #undef BIG_ENDIAN -+ #undef PDP_ENDIAN -+ #elif BYTE_ORDER == BIG_ENDIAN -+ #undef LITTLE_ENDIAN -+ #undef PDP_ENDIAN -+ #else -+ # error No valid byte sex defined -+ #endif -+ #define USE_LDEXP -+ #define PI M_PI -+ #endif -+ - /* Win32 on Intel machines */ - #ifdef __WIN32__ - # define LITTLE_ENDIAN -*************** -*** 254,266 **** ---- 270,292 ---- - #ifdef LITTLE_ENDIAN - #define LE_SHORT(x) x - #define LE_LONG(x) x -+ #ifdef __FreeBSD__ -+ #define BE_SHORT(x) __byte_swap_word(x) -+ #define BE_LONG(x) __byte_swap_long(x) -+ #else - #define BE_SHORT(x) XCHG_SHORT(x) - #define BE_LONG(x) XCHG_LONG(x) -+ #endif - #else - #define BE_SHORT(x) x - #define BE_LONG(x) x -+ #ifdef __FreeBSD__ -+ #define LE_SHORT(x) __byte_swap_word(x) -+ #define LE_LONG(x) __byte_swap_long(x) -+ #else - #define LE_SHORT(x) XCHG_SHORT(x) - #define LE_LONG(x) XCHG_LONG(x) -+ #endif - #endif - - #define MAX_AMPLIFICATION 800 *** mix.c.orig Mon May 20 17:09:46 1996 --- mix.c Sun Nov 17 10:01:36 1996 *************** diff --git a/audio/timidity/files/patch-af b/audio/timidity/files/patch-af new file mode 100644 index 000000000000..c1610885e266 --- /dev/null +++ b/audio/timidity/files/patch-af @@ -0,0 +1,53 @@ +*** config.h.orig Sat Jun 1 07:54:49 1996 +--- config.h Sat Sep 18 15:32:38 1999 +*************** +*** 217,222 **** +--- 217,238 ---- + # endif + #endif /* linux */ + ++ #ifdef __FreeBSD__ ++ #include <errno.h> ++ #include <machine/endian.h> ++ #if BYTE_ORDER == LITTLE_ENDIAN ++ #undef BIG_ENDIAN ++ #undef PDP_ENDIAN ++ #elif BYTE_ORDER == BIG_ENDIAN ++ #undef LITTLE_ENDIAN ++ #undef PDP_ENDIAN ++ #else ++ # error No valid byte sex defined ++ #endif ++ #define USE_LDEXP ++ #define PI M_PI ++ #endif ++ + /* Win32 on Intel machines */ + #ifdef __WIN32__ + # define LITTLE_ENDIAN +*************** +*** 254,266 **** +--- 270,292 ---- + #ifdef LITTLE_ENDIAN + #define LE_SHORT(x) x + #define LE_LONG(x) x ++ #if defined(__FreeBSD__) && !defined(__alpha__) ++ #define BE_SHORT(x) __byte_swap_word(x) ++ #define BE_LONG(x) __byte_swap_long(x) ++ #else + #define BE_SHORT(x) XCHG_SHORT(x) + #define BE_LONG(x) XCHG_LONG(x) ++ #endif + #else + #define BE_SHORT(x) x + #define BE_LONG(x) x ++ #ifdef __FreeBSD__ ++ #define LE_SHORT(x) __byte_swap_word(x) ++ #define LE_LONG(x) __byte_swap_long(x) ++ #else + #define LE_SHORT(x) XCHG_SHORT(x) + #define LE_LONG(x) XCHG_LONG(x) ++ #endif + #endif + + #define MAX_AMPLIFICATION 800 |