diff options
| author | Joe Marcus Clarke <marcus@FreeBSD.org> | 2008-09-08 02:25:14 +0000 |
|---|---|---|
| committer | Joe Marcus Clarke <marcus@FreeBSD.org> | 2008-09-08 02:25:14 +0000 |
| commit | 0d0680aaab03c9cbc9d3e2cd3f69f85ef8ae7228 (patch) | |
| tree | 5c919de3c3054f9e1751ac43d262d258c9f9960b /audio/esound/files | |
| parent | Adding math/octave-forge-audio. (diff) | |
Update to 0.2.40.
Diffstat (limited to 'audio/esound/files')
| -rw-r--r-- | audio/esound/files/patch-ad | 17 | ||||
| -rw-r--r-- | audio/esound/files/patch-audio_oss.c | 16 |
2 files changed, 9 insertions, 24 deletions
diff --git a/audio/esound/files/patch-ad b/audio/esound/files/patch-ad index 20eeeab10606..c2059f5d0703 100644 --- a/audio/esound/files/patch-ad +++ b/audio/esound/files/patch-ad @@ -1,5 +1,5 @@ ---- esdlib.c.orig 2008-07-15 11:35:15.000000000 -0400 -+++ esdlib.c 2008-07-18 00:33:42.000000000 -0400 +--- esdlib.c.orig 2008-07-30 17:08:59.000000000 -0400 ++++ esdlib.c 2008-09-07 22:19:48.000000000 -0400 @@ -21,6 +21,8 @@ #include <errno.h> #include <sys/wait.h> @@ -9,16 +9,7 @@ #include <sys/un.h> -@@ -152,6 +154,8 @@ write_timeout (int fd, const char *buf, - - if (n > 0) - nwritten += n; -+ else if (n < 0) -+ break; - } while (nwritten < buflen); - - fcntl (fd, F_SETFL, flags); -@@ -889,8 +893,7 @@ int esd_open_sound( const char *host ) +@@ -895,8 +897,7 @@ int esd_open_sound( const char *host ) setsid(); cmd = malloc(strlen(SERVERDIR"/esd -spawnfd 999999") + (esd_spawn_options?strlen(esd_spawn_options):0)); @@ -28,7 +19,7 @@ execl("/bin/sh", "/bin/sh", "-c", cmd, NULL); perror("execl"); _exit(1); -@@ -1703,3 +1706,34 @@ int esd_close( int esd ) +@@ -1709,3 +1710,34 @@ int esd_close( int esd ) return close( esd ); } diff --git a/audio/esound/files/patch-audio_oss.c b/audio/esound/files/patch-audio_oss.c index a5d30b0dddb2..ba70a323ca36 100644 --- a/audio/esound/files/patch-audio_oss.c +++ b/audio/esound/files/patch-audio_oss.c @@ -1,21 +1,15 @@ ---- audio_oss.c.orig 2008-07-15 12:00:03.000000000 -0400 -+++ audio_oss.c 2008-07-17 13:56:25.000000000 -0400 -@@ -1,4 +1,5 @@ - #include "config.h" -+#include <errno.h> +--- audio_oss.c.orig 2008-07-29 14:07:50.000000000 -0400 ++++ audio_oss.c 2008-09-07 22:22:15.000000000 -0400 +@@ -12,8 +13,14 @@ - #ifdef HAVE_MACHINE_SOUNDCARD_H - # include <machine/soundcard.h> -@@ -10,9 +11,14 @@ - # endif - #endif + #include <errno.h> +#if defined(__sparc__) || defined(__powerpc__) +#define AFMT_S16_NE AFMT_S16_BE +#else +#define AFMT_S16_NE AFMT_S16_LE +#endif - ++ /* FreeBSD uses a different identifier? what other BSDs? */ -#if defined(__FreeBSD__) || defined(__FreeBSD_kernel__) +#ifndef SNDCTL_DSP_SETDUPLEX |