diff options
| author |   Kito Danya Dietrich <kito@gentoo.org> | 2005-08-03 20:17:01 +0000 |
|---|---|---|
| committer | Kito Danya Dietrich <kito@gentoo.org> | 2005-08-03 20:17:01 +0000 |
| commit | 0f365f0218e39af4f0c7343f2dfd252cf4c4aa20 (patch) | |
| tree | 439afdc4e75cf45e9fa485de99877a8acd807d44 /media-sound | |
| parent | Stable on x86. (diff) | |
| download | gentoo-2-0f365f0218e39af4f0c7343f2dfd252cf4c4aa20.tar.gz gentoo-2-0f365f0218e39af4f0c7343f2dfd252cf4c4aa20.tar.bz2 gentoo-2-0f365f0218e39af4f0c7343f2dfd252cf4c4aa20.zip | |
add Fink patch to audio_carbon.c to avoid conflicting types on OS X 10.4
(Portage version: 2.0.51.22-r2)
Diffstat (limited to 'media-sound')
| -rw-r--r-- | media-sound/madplay/ChangeLog | 6 | ||||
| -rw-r--r-- | media-sound/madplay/files/madplay-macos.patch | 20 | ||||
| -rw-r--r-- | media-sound/madplay/madplay-0.15.2b.ebuild | 3 |
3 files changed, 27 insertions, 2 deletions
diff --git a/media-sound/madplay/ChangeLog b/media-sound/madplay/ChangeLog index 304512c7c78b..41f9e7ff7871 100644 --- a/media-sound/madplay/ChangeLog +++ b/media-sound/madplay/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for media-sound/madplay # Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/media-sound/madplay/ChangeLog,v 1.36 2005/04/14 15:05:52 geoman Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-sound/madplay/ChangeLog,v 1.37 2005/08/03 20:17:01 kito Exp $ + + 03 Aug 2005; Kito <kito@gentoo.org> +files/madplay-macos.patch, + madplay-0.15.2b.ebuild: + add Fink patch to audio_carbon.c to avoid conflicting types on OS X 10.4: 14 Apr 2005; Stephen P. Becker <geoman@gentoo.org> madplay-0.15.0b.ebuild, madplay-0.15.0b-r1.ebuild, madplay-0.15.1b.ebuild, madplay-0.15.2b.ebuild: diff --git a/media-sound/madplay/files/madplay-macos.patch b/media-sound/madplay/files/madplay-macos.patch new file mode 100644 index 000000000000..4cc45774274d --- /dev/null +++ b/media-sound/madplay/files/madplay-macos.patch @@ -0,0 +1,20 @@ +--- madplay-0.15.2b/audio_carbon.c.bak 2005-04-04 02:03:58.000000000 -0700 ++++ madplay-0.15.2b/audio_carbon.c 2005-04-04 02:04:39.000000000 -0700 +@@ -94,7 +94,7 @@ + } + + static +-int wait(struct buffer *buffer) ++int carbon_wait(struct buffer *buffer) + { + if (MPWaitOnSemaphore(buffer->semaphore, kDurationForever) != noErr) { + audio_error = _("MPWaitOnSemaphore() failed"); +@@ -263,7 +263,7 @@ + /* wait for block to finish playing */ + + if (buffer->pcm_nsamples == 0) { +- if (wait(buffer) == -1) ++ if (carbon_wait(buffer) == -1) + return -1; + + buffer->pcm_length = 0; diff --git a/media-sound/madplay/madplay-0.15.2b.ebuild b/media-sound/madplay/madplay-0.15.2b.ebuild index 28fe231974b4..1eefa14550be 100644 --- a/media-sound/madplay/madplay-0.15.2b.ebuild +++ b/media-sound/madplay/madplay-0.15.2b.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2005 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-sound/madplay/madplay-0.15.2b.ebuild,v 1.16 2005/04/14 15:05:52 geoman Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-sound/madplay/madplay-0.15.2b.ebuild,v 1.17 2005/08/03 20:17:01 kito Exp $ inherit eutils @@ -28,6 +28,7 @@ src_unpack() { unpack ${A} cd ${S} epunt_cxx #74499 + epatch ${FILESDIR}/${PN}-macos.patch } src_compile() { |