diff options
| author | wiz <wiz@pkgsrc.org> | 2003-07-12 22:35:29 +0000 |
|---|---|---|
| committer | wiz <wiz@pkgsrc.org> | 2003-07-12 22:35:29 +0000 |
| commit | 51b16c27bea929853b697224cfefdf640ddcefe8 (patch) | |
| tree | cd7a8b577cd5d3b71a1c997049e31e6dc7444434 | |
| parent | 6c0c7208c74988dfa5233c627b8278979276dadd (diff) | |
| download | pkgsrc-51b16c27bea929853b697224cfefdf640ddcefe8.tar.gz | |
Fix two pthread programming problems; now ogg123 doesn't dump core
with native libpthread (so far).
With hints and explanations from Nathan J Williams -- thanks!
Bump PKGREVISION.
| -rw-r--r-- | audio/vorbis-tools/Makefile | 4 | ||||
| -rw-r--r-- | audio/vorbis-tools/distinfo | 4 | ||||
| -rw-r--r-- | audio/vorbis-tools/patches/patch-aa | 26 | ||||
| -rw-r--r-- | audio/vorbis-tools/patches/patch-ab | 18 |
4 files changed, 49 insertions, 3 deletions
diff --git a/audio/vorbis-tools/Makefile b/audio/vorbis-tools/Makefile index 27a9b7d7343..10d3890b471 100644 --- a/audio/vorbis-tools/Makefile +++ b/audio/vorbis-tools/Makefile @@ -1,8 +1,8 @@ -# $NetBSD: Makefile,v 1.21 2003/05/02 11:53:47 wiz Exp $ +# $NetBSD: Makefile,v 1.22 2003/07/12 22:35:29 wiz Exp $ DISTNAME= vorbis-tools-1.0 PKGNAME= vorbis-tools-1.0.0.8 -PKGREVISION= 2 +PKGREVISION= 3 CATEGORIES= audio MASTER_SITES= http://www.vorbis.com/files/1.0/unix/ diff --git a/audio/vorbis-tools/distinfo b/audio/vorbis-tools/distinfo index 61fadd6634f..cdb8313dd28 100644 --- a/audio/vorbis-tools/distinfo +++ b/audio/vorbis-tools/distinfo @@ -1,4 +1,6 @@ -$NetBSD: distinfo,v 1.8 2002/08/25 21:49:29 jlam Exp $ +$NetBSD: distinfo,v 1.9 2003/07/12 22:35:29 wiz Exp $ SHA1 (vorbis-tools-1.0.tar.gz) = 5c2508786cf6a2a270c697d3debe66ee83df376d Size (vorbis-tools-1.0.tar.gz) = 425404 bytes +SHA1 (patch-aa) = b8a39b77a742cac4609fed0fd3847e34486514e0 +SHA1 (patch-ab) = 7005d73f3fffb1762fdc52177a8411a1db1b74fe diff --git a/audio/vorbis-tools/patches/patch-aa b/audio/vorbis-tools/patches/patch-aa new file mode 100644 index 00000000000..88397c0dd79 --- /dev/null +++ b/audio/vorbis-tools/patches/patch-aa @@ -0,0 +1,26 @@ +$NetBSD: patch-aa,v 1.6 2003/07/12 22:35:30 wiz Exp $ + +--- ogg123/buffer.c.orig 2002-07-14 07:38:00.000000000 +0200 ++++ ogg123/buffer.c +@@ -35,9 +35,10 @@ + #define MIN4(w,x,y,z) MIN( MIN(w,x), MIN(y,z) ) + + /* Special debugging code. THIS IS NOT PORTABLE! */ ++#define DEBUG_BUFFER + #ifdef DEBUG_BUFFER + FILE *debugfile; +-#define DEBUG(x, y...) { fprintf (debugfile, "%d: " x "\n", getpid(), ## y); } ++#define DEBUG(...) { fprintf (debugfile, "%d: ", getpid());fprintf(debugfile, __VA_ARGS__);fprintf(debugfile,"\n"); } + #else + #define DEBUG(x, y...) + #endif +@@ -434,7 +435,9 @@ void buffer_destroy (buf_t *buf) + + /* Cleanup pthread variables */ + pthread_mutex_destroy(&buf->mutex); ++ COND_SIGNAL(buf->write_cond); + pthread_cond_destroy(&buf->write_cond); ++ COND_SIGNAL(buf->playback_cond); + pthread_cond_destroy(&buf->playback_cond); + + free(buf); diff --git a/audio/vorbis-tools/patches/patch-ab b/audio/vorbis-tools/patches/patch-ab new file mode 100644 index 00000000000..6120fee64dd --- /dev/null +++ b/audio/vorbis-tools/patches/patch-ab @@ -0,0 +1,18 @@ +$NetBSD: patch-ab,v 1.5 2003/07/12 22:35:30 wiz Exp $ + +--- ogg123/ogg123.c.orig 2002-07-06 21:12:18.000000000 +0200 ++++ ogg123/ogg123.c +@@ -580,7 +580,13 @@ void play (char *source_string) + + format->cleanup(decoder); + transport->close(source); ++#if 0 ++ /* ++ * XXX: should be done properly with pthread_cleanup_push instead, ++ * if at all. ++ */ + status_reset_output_lock(); /* In case we were killed mid-output */ ++#endif + + status_message(1, _("Done.")); + |