diff options
| author | hubertf <hubertf@pkgsrc.org> | 2007-10-09 20:13:40 +0000 |
|---|---|---|
| committer | hubertf <hubertf@pkgsrc.org> | 2007-10-09 20:13:40 +0000 |
| commit | 72daea85c24c7d1274bd8815f64b9a7440a0c731 (patch) | |
| tree | 4bacbf45f9a0f817c07e489bf2b767414419917e | |
| parent | bd986edbc7589ee68fff8e2354ef7cb37ad88aa3 (diff) | |
| download | pkgsrc-72daea85c24c7d1274bd8815f64b9a7440a0c731.tar.gz | |
Make this building on Mac OS X - rename wait() to madplay_wait()
Bump version to madplay-0.15.2bnb3
OK'd by agc@
| -rw-r--r-- | audio/madplay/Makefile | 4 | ||||
| -rw-r--r-- | audio/madplay/distinfo | 3 | ||||
| -rw-r--r-- | audio/madplay/patches/patch-ac | 22 |
3 files changed, 26 insertions, 3 deletions
diff --git a/audio/madplay/Makefile b/audio/madplay/Makefile index e712015ff47..33a2a519a3e 100644 --- a/audio/madplay/Makefile +++ b/audio/madplay/Makefile @@ -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 --git a/audio/madplay/distinfo b/audio/madplay/distinfo index 77fc378bfba..a2b4707662a 100644 --- a/audio/madplay/distinfo +++ b/audio/madplay/distinfo @@ -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 --git a/audio/madplay/patches/patch-ac b/audio/madplay/patches/patch-ac new file mode 100644 index 00000000000..601bb71a46a --- /dev/null +++ b/audio/madplay/patches/patch-ac @@ -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; |