PR/37835 -- Copy patches from vorbis-tools that fix pthread programming

problems.

4 files changed, 37 insertions, 8 deletions

diff --git a/audio/tremor-tools/Makefile b/audio/tremor-tools/Makefile
index ea0038a1dfa..12fc8f52a7d 100644
--- a/audio/tremor-tools/Makefile
+++ b/audio/tremor-tools/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.27 2010/12/29 14:46:35 obache Exp $
+# $NetBSD: Makefile,v 1.28 2011/03/20 19:13:15 shattered Exp $
 
 DISTNAME=	vorbis-tools-1.0
 PKGNAME=	tremor-tools-1.0.0.8
-PKGREVISION=	11
+PKGREVISION=	12
 CATEGORIES=	audio
 MASTER_SITES=	http://www.vorbis.com/files/1.0/unix/
 
diff --git a/audio/tremor-tools/distinfo b/audio/tremor-tools/distinfo
index e7b899a5268..81749dc996d 100644
--- a/audio/tremor-tools/distinfo
+++ b/audio/tremor-tools/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.5 2010/05/19 18:25:19 drochner Exp $
+$NetBSD: distinfo,v 1.6 2011/03/20 19:13:15 shattered Exp $
 
 SHA1 (vorbis-tools-1.0.tar.gz) = 5c2508786cf6a2a270c697d3debe66ee83df376d
 RMD160 (vorbis-tools-1.0.tar.gz) = 2f3874699be904fdf64c6edf09e21ccb8f0eee28
@@ -6,9 +6,10 @@ Size (vorbis-tools-1.0.tar.gz) = 425404 bytes
 SHA1 (patch-aa) = c2104ab110674452a440d3992158627db89b9eba
 SHA1 (patch-ab) = 67987002621dd1aedddc39177d3e8267cd8aa930
 SHA1 (patch-ac) = c38abc6647d990c89258e14a959db80cd4656db7
-SHA1 (patch-ad) = 81beeaa3f8ae918fa30df26f06c92a45914ccb99
+SHA1 (patch-ad) = f4876082223020f88aec9fe2797948860076009f
 SHA1 (patch-ae) = 37b3128b58fd6dcaf303930c64ac7bf6df9fa043
 SHA1 (patch-af) = 4bdf3edbd80ffdeacdc260fe172468ec2b0b3efb
 SHA1 (patch-ag) = 729ca84168ee781335429840ee54a2b894b82f54
 SHA1 (patch-ah) = d865a74020d7c1ee6e24c6394f4a1336773fa87a
 SHA1 (patch-ai) = c16f9f114472b1ced936d8e26161204bc25c9249
+SHA1 (patch-aj) = 3d91078799a80832ad4481610ad0836c64f3a08a
diff --git a/audio/tremor-tools/patches/patch-ad b/audio/tremor-tools/patches/patch-ad
index 3bff9ac41c7..7f61d9196fa 100644
--- a/audio/tremor-tools/patches/patch-ad
+++ b/audio/tremor-tools/patches/patch-ad
@@ -1,8 +1,8 @@
-$NetBSD: patch-ad,v 1.1.1.1 2002/09/24 09:35:17 chris Exp $
+$NetBSD: patch-ad,v 1.2 2011/03/20 19:13:16 shattered Exp $
 
---- ogg123/ogg123.c.orig	Sat Jul  6 20:12:18 2002
-+++ ogg123/ogg123.c	Sat Sep 14 19:05:37 2002
-@@ -453,6 +453,16 @@
+--- ogg123/ogg123.c.orig	2002-07-06 19:12:18.000000000 +0000
++++ ogg123/ogg123.c
+@@ -453,6 +453,16 @@ void play (char *source_string)
      return;
    }
  
@@ -19,3 +19,17 @@ $NetBSD: patch-ad,v 1.1.1.1 2002/09/24 09:35:17 chris Exp $
    /* Decide which statistics are valid */
    select_stats(stat_format, &options, source, decoder, audio_buffer);
  
+@@ -580,7 +590,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."));
+   
diff --git a/audio/tremor-tools/patches/patch-aj b/audio/tremor-tools/patches/patch-aj
new file mode 100644
index 00000000000..d1c95427f69
--- /dev/null
+++ b/audio/tremor-tools/patches/patch-aj
@@ -0,0 +1,14 @@
+$NetBSD: patch-aj,v 1.1 2011/03/20 19:13:16 shattered Exp $
+
+--- ogg123/buffer.c.orig	2002-07-14 05:38:00.000000000 +0000
++++ ogg123/buffer.c
+@@ -409,7 +409,9 @@ void buffer_reset (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);
+   
+   /* Reinit pthread variables */