diff options
| author |   Alexis Ballier <aballier@gentoo.org> | 2009-11-23 23:02:09 +0000 |
|---|---|---|
| committer | Alexis Ballier <aballier@gentoo.org> | 2009-11-23 23:02:09 +0000 |
| commit | 78e73cee8f0fd65ab12d7f4f44b4774f401e045b (patch) | |
| tree | da67d95fd2b320611ead6b8618bc6c6a4bb4fb1a /media-plugins/audacious-plugins | |
| parent | Fix typo in DESCRIPTION (diff) | |
| download | gentoo-2-78e73cee8f0fd65ab12d7f4f44b4774f401e045b.tar.gz gentoo-2-78e73cee8f0fd65ab12d7f4f44b4774f401e045b.tar.bz2 gentoo-2-78e73cee8f0fd65ab12d7f4f44b4774f401e045b.zip | |
Fix build with latest jack, bug #294226
(Portage version: 2.2_rc51/cvs/Linux x86_64)
Diffstat (limited to 'media-plugins/audacious-plugins')
| -rw-r--r-- | media-plugins/audacious-plugins/ChangeLog | 6 | ||||
| -rw-r--r-- | media-plugins/audacious-plugins/audacious-plugins-2.2.ebuild | 8 | ||||
| -rw-r--r-- | media-plugins/audacious-plugins/files/2.2-jackcompat.patch | 22 |
3 files changed, 34 insertions, 2 deletions
diff --git a/media-plugins/audacious-plugins/ChangeLog b/media-plugins/audacious-plugins/ChangeLog index 684d259214a4..086817e8e036 100644 --- a/media-plugins/audacious-plugins/ChangeLog +++ b/media-plugins/audacious-plugins/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for media-plugins/audacious-plugins # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/media-plugins/audacious-plugins/ChangeLog,v 1.146 2009/11/22 22:57:56 chainsaw Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-plugins/audacious-plugins/ChangeLog,v 1.147 2009/11/23 23:02:09 aballier Exp $ + + 23 Nov 2009; Alexis Ballier <aballier@gentoo.org> + +files/2.2-jackcompat.patch, audacious-plugins-2.2.ebuild: + Fix build with latest jack, bug #294226 *audacious-plugins-2.2 (22 Nov 2009) diff --git a/media-plugins/audacious-plugins/audacious-plugins-2.2.ebuild b/media-plugins/audacious-plugins/audacious-plugins-2.2.ebuild index 9f780a70351d..ffc9a3d7e061 100644 --- a/media-plugins/audacious-plugins/audacious-plugins-2.2.ebuild +++ b/media-plugins/audacious-plugins/audacious-plugins-2.2.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2009 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-plugins/audacious-plugins/audacious-plugins-2.2.ebuild,v 1.1 2009/11/22 22:57:56 chainsaw Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-plugins/audacious-plugins/audacious-plugins-2.2.ebuild,v 1.2 2009/11/23 23:02:09 aballier Exp $ inherit eutils flag-o-matic @@ -54,6 +54,12 @@ DEPEND="${RDEPEND} nls? ( dev-util/intltool ) >=dev-util/pkgconfig-0.9.0" +src_unpack() { + unpack ${A} + cd "${S}" + epatch "${FILESDIR}/${PV}-jackcompat.patch" +} + mp3_warning() { if ! useq mp3 ; then ewarn "MP3 support is optional, you may want to enable the mp3 USE-flag" diff --git a/media-plugins/audacious-plugins/files/2.2-jackcompat.patch b/media-plugins/audacious-plugins/files/2.2-jackcompat.patch new file mode 100644 index 000000000000..c4d40540711c --- /dev/null +++ b/media-plugins/audacious-plugins/files/2.2-jackcompat.patch @@ -0,0 +1,22 @@ +Index: audacious-plugins-2.2/src/jack/jack.c +=================================================================== +--- audacious-plugins-2.2.orig/src/jack/jack.c ++++ audacious-plugins-2.2/src/jack/jack.c +@@ -236,7 +236,7 @@ static OutputPluginInitStatus jack_init( + + + /* Return the amount of data that can be written to the device */ +-static gint jack_free(void) ++static gint audacious_jack_free(void) + { + unsigned long return_val = JACK_GetBytesFreeSpace(driver); + unsigned long tmp; +@@ -448,7 +448,7 @@ OutputPlugin jack_op = + .close_audio = jack_close, + .flush = jack_flush, + .pause = jack_pause, +- .buffer_free = jack_free, ++ .buffer_free = audacious_jack_free, + .buffer_playing = jack_playing, + .output_time = jack_get_output_time, + .written_time = jack_get_written_time, |