[pkgsrc/trunk]: pkgsrc/audio/madplay Make this building on Mac OS X - rename ...

[hubertf <hubertf%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/5811b40ad06d
branches:  trunk
changeset: 533961:5811b40ad06d
user:      hubertf <hubertf%pkgsrc.org@localhost>
date:      Tue Oct 09 20:13:40 2007 +0000

description:
Make this building on Mac OS X - rename wait() to madplay_wait()
Bump version to madplay-0.15.2bnb3
OK'd by agc@

diffstat:

 audio/madplay/Makefile         |   4 ++--
 audio/madplay/distinfo         |   3 ++-
 audio/madplay/patches/patch-ac |  22 ++++++++++++++++++++++
 3 files changed, 26 insertions(+), 3 deletions(-)

diffs (53 lines):

diff -r 4d9156abfa5b -r 5811b40ad06d audio/madplay/Makefile
--- a/audio/madplay/Makefile    Tue Oct 09 19:19:08 2007 +0000
+++ b/audio/madplay/Makefile    Tue Oct 09 20:13:40 2007 +0000
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.31 2007/06/08 18:34:38 wiz Exp $
+# $NetBSD: Makefile,v 1.32 2007/10/09 20:13:40 hubertf Exp $
 #
 
 DISTNAME=      madplay-0.15.2b
-PKGREVISION=   2
+PKGREVISION=   3
 CATEGORIES=    audio
 MASTER_SITES=  ${MASTER_SITE_SOURCEFORGE:=mad/}
 
diff -r 4d9156abfa5b -r 5811b40ad06d audio/madplay/distinfo
--- a/audio/madplay/distinfo    Tue Oct 09 19:19:08 2007 +0000
+++ b/audio/madplay/distinfo    Tue Oct 09 20:13:40 2007 +0000
@@ -1,7 +1,8 @@
-$NetBSD: distinfo,v 1.7 2005/02/23 20:39:48 agc Exp $
+$NetBSD: distinfo,v 1.8 2007/10/09 20:13:40 hubertf Exp $
 
 SHA1 (madplay-0.15.2b.tar.gz) = 29105eb27c1416aa33c8d1ab3404a8e5f0aecd3f
 RMD160 (madplay-0.15.2b.tar.gz) = 0d3dc164891be5e4f37ce83364f6a40e8049dd3e
 Size (madplay-0.15.2b.tar.gz) = 590929 bytes
 SHA1 (patch-aa) = 0dd6ee05f9b0d58a88fe9b61f52bf847227c51a6
 SHA1 (patch-ab) = 7af616781aa695e6be2c4a4cae23dafc5d056c4f
+SHA1 (patch-ac) = 520be2c3b72c9962b4fe6f2d3618fc3fdc109899
diff -r 4d9156abfa5b -r 5811b40ad06d audio/madplay/patches/patch-ac
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/audio/madplay/patches/patch-ac    Tue Oct 09 20:13:40 2007 +0000
@@ -0,0 +1,22 @@
+$NetBSD: patch-ac,v 1.4 2007/10/09 20:13:40 hubertf Exp $
+
+--- audio_carbon.c.orig        2004-01-23 10:41:31.000000000 +0100
++++ audio_carbon.c
+@@ -94,7 +94,7 @@ void callback(SndChannelPtr channel, Snd
+ }
+ 
+ static
+-int wait(struct buffer *buffer)
++int madplay_wait(struct buffer *buffer)
+ {
+   if (MPWaitOnSemaphore(buffer->semaphore, kDurationForever) != noErr) {
+     audio_error = _("MPWaitOnSemaphore() failed");
+@@ -263,7 +263,7 @@ int play(struct audio_play *play)
+   /* wait for block to finish playing */
+ 
+   if (buffer->pcm_nsamples == 0) {
+-    if (wait(buffer) == -1)
++    if (madplay_wait(buffer) == -1)
+       return -1;
+ 
+     buffer->pcm_length = 0;