pkg/37835: fix audio/tremor-tools core dumped after play music

[ishit%oak.dti.ne.jp@localhost]

>Number:         37835
>Category:       pkg
>Synopsis:       fix audio/tremor-tools core dumped after play music
>Confidential:   no
>Severity:       non-critical
>Priority:       medium
>Responsible:    pkg-manager
>State:          open
>Class:          change-request
>Submitter-Id:   net
>Arrival-Date:   Mon Jan 21 17:00:00 +0000 2008
>Originator:     ISIHARA Takanori
>Release:        NetBSD/amd 4.0_STABLE
>Organization:
Nagoya *BSD Users' Group :-)
>Environment:
NetBSD ishitPc6.home 4.0_STABLE NetBSD 4.0_STABLE (ISHITPC6) #1: Mon Jan 14 
19:06:32 JST 2008  
sysbuild%ishitPc6.home@localhost:/opt/sysbuild/netbsd-4/obj/amd64/sys/arch/amd64/compile/ISHITPC6
 amd64

>Description:
audio/tremor-tools (igg123) core dumped after play music.

I copy audio/vorbis-tools some patches, do not core dumped after play music.

>How-To-Repeat:
% cd /usr/pkgsrc/audio/tremor-tools
% sudo make install
% rehash
% cd /path/to/dir
% igg123 -q oggfile.ogg
igg123: Error detected by libpthread: Unlocking unlocked mutex.fer   0.0% (EOS) 
Detected by file "/opt/src-netbsd-4/lib/libpthread/pthread_mutex.c", line 363, 
function "pthread_mutex_unlock".
See pthread(3) for information.
Abort (core dumped)

>Fix:
diff -uNr tremor-tools/distinfo tremor-tools.new/distinfo
--- tremor-tools/distinfo       2006-12-07 04:52:55.000000000 +0900
+++ tremor-tools.new/distinfo   2008-01-22 01:04:09.000000000 +0900
@@ -6,8 +6,9 @@
 SHA1 (patch-aa) = c2104ab110674452a440d3992158627db89b9eba
 SHA1 (patch-ab) = 67987002621dd1aedddc39177d3e8267cd8aa930
 SHA1 (patch-ac) = c38abc6647d990c89258e14a959db80cd4656db7
-SHA1 (patch-ad) = 81beeaa3f8ae918fa30df26f06c92a45914ccb99
+SHA1 (patch-ad) = 56101358a5181283e669ea68e7ad4e62f31d9e83
 SHA1 (patch-ae) = 37b3128b58fd6dcaf303930c64ac7bf6df9fa043
 SHA1 (patch-af) = 4bdf3edbd80ffdeacdc260fe172468ec2b0b3efb
 SHA1 (patch-ag) = 729ca84168ee781335429840ee54a2b894b82f54
 SHA1 (patch-ah) = d865a74020d7c1ee6e24c6394f4a1336773fa87a
+SHA1 (patch-ai) = 7d0c670d63c09c8996ba5ad88d3fb3ac79846286
diff -uNr tremor-tools/patches/patch-ad tremor-tools.new/patches/patch-ad
--- tremor-tools/patches/patch-ad       2002-09-24 18:35:17.000000000 +0900
+++ tremor-tools.new/patches/patch-ad   2008-01-22 00:56:37.000000000 +0900
@@ -1,8 +1,8 @@
 $NetBSD: patch-ad,v 1.1.1.1 2002/09/24 09:35:17 chris 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-07 04:12:18.000000000 +0900
++++ ogg123/ogg123.c
+@@ -453,6 +453,16 @@ void play (char *source_string)
      return;
    }
  
@@ -19,3 +19,17 @@
    /* 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 -uNr tremor-tools/patches/patch-ai tremor-tools.new/patches/patch-ai
--- tremor-tools/patches/patch-ai       1970-01-01 09:00:00.000000000 +0900
+++ tremor-tools.new/patches/patch-ai   2008-01-22 01:04:02.000000000 +0900
@@ -0,0 +1,14 @@
+$NetBSD$
+
+--- ogg123/buffer.c.orig       2002-07-14 14:38:00.000000000 +0900
++++ 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 */