Fix build with latest jack, bug #294226

Package-Manager: portage-2.2_rc51/cvs/Linux x86_64

4 files changed, 41 insertions, 8 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/Manifest b/media-plugins/audacious-plugins/Manifest
index 66fc35f7a651..c4f791c883f8 100644
--- a/media-plugins/audacious-plugins/Manifest
+++ b/media-plugins/audacious-plugins/Manifest
@@ -4,20 +4,21 @@ Hash: SHA1
 AUX 1.5.1-libmtp-0.3.0-API.patch 1936 RMD160 5a02b522df61e0dc32db13ab18d825ad1289b03f SHA1 1bfe2256f7f30703b39c98e9a3d815d89f22e9f2 SHA256 9e4154cfd8ae19a9525e7c5429ade2f5f049cc263fcb421ebc1ed208baf8d619
 AUX 1.5.1-missing-include.patch 376 RMD160 ae09acafa32c52696d4d8cec79636cfa17eee87e SHA1 fee2cdfeecac269c5ae6c32bf1eaff14de281c13 SHA256 fc91c4cf6b8d70d8a81e5744abdd3c19b6eaf6f76332a6b782e2ecb62389ea59
 AUX 2.1-libmpcdecsv7.patch 1549 RMD160 3ff62a034d28b35c08c4e90f859065400258bc21 SHA1 d919d4a34868cc0b097281f71a20315a663a0c56 SHA256 1cb0933640889a010e46b2672d34d9ca3ff218dcea35c508191c9a55cfeab1bc
+AUX 2.2-jackcompat.patch 811 RMD160 4d8ddf51be312903175a22c4cdc877f5518a8e58 SHA1 1c4d8ae53b150f194ce7f8d46be444bed5049e4d SHA256 5979809ed82980df98372bb7852e958d45c0b99fcc3fae5994da6367b2656c55
 DIST audacious-plugins-1.5.1.tgz 2944448 RMD160 4b9fc29ccf61d1a503f10f060cbdee8b148f28b8 SHA1 630c936027c66649795cac7327cf6ab3590d3e49 SHA256 aed33732c55566604a24cd2cd1751c24d159ff8eca510647c5c3c7889fd8ae15
 DIST audacious-plugins-2.1.tgz 3610509 RMD160 fb73e37b5c05baf376dfbcf9744d96ae85de0d02 SHA1 735c773688e65ee57ce72005a72a53bb7cacc78b SHA256 fe7441e9ee6ab903fa71d21e6ee6b1b2d398567a6618d519cbeb5fa0a6e3a013
 DIST audacious-plugins-2.2-beta2.tgz 3154448 RMD160 a3b443b722f558954472a2ebad436d91c9044783 SHA1 c7f3c41a81ab784cee07b2f8bbf6ece72d6b687c SHA256 4f87b3a582b5b3f7de4113316d6c3114ebc303878e2d2d8092d06e29808e5a47
 DIST audacious-plugins-2.2.tgz 3135776 RMD160 3b57282efc1f69319c0b3d0e196023a0b00f8d8f SHA1 f70ef19d397a7d72c00ee9a5c18ae4242e6e412b SHA256 aee812b34aa057bfff9e38dda29f1261e8e8cbdde65cf5fe553ab6b6a9ae33c8
 EBUILD audacious-plugins-1.5.1-r3.ebuild 3246 RMD160 da6714c4c1b364548a5e6546e1f38b0cc3acfb17 SHA1 3f2679b32eb327159c22c81009458ea697ccb6d5 SHA256 874227de6c1c60e1bf48fe270a873522b8bde54ceb160888768007b08e2a5b8e
 EBUILD audacious-plugins-2.1-r1.ebuild 3442 RMD160 54a6e84ad653164fb87350e538f8a7d6630de61f SHA1 79877c1c840584254f92536c2ffce77816e27d52 SHA256 6b07442b86434bac4e7c07224cdb572cd6da07cea523a2cd1932033a205fdb1f
-EBUILD audacious-plugins-2.2.ebuild 3217 RMD160 960a5ab550d9e28fd0a096eeb464de6fefe42a7f SHA1 e4205b174bada70deeeec16d0eaf5f2320a38200 SHA256 dbd8474e416d973126e01d103d42d12765e216c2cb54a7c84492ae00973d7187
+EBUILD audacious-plugins-2.2.ebuild 3304 RMD160 473bb0f59b3e8862c9e12fc1288f1c048fc80363 SHA1 ef314d99765ce030cba34f492938a3ccd948a811 SHA256 e8c331a1fb24524acaa3f7380acc45fc7c7e6da64f7319398643e04da299c69f
 EBUILD audacious-plugins-2.2_beta2.ebuild 3223 RMD160 19c98f6407ee02b977641292d0b14c7be3f35ed3 SHA1 b9c4f97629906c531edb5677e66013494f96fc48 SHA256 4f5899314d355f5b75b2b80f8bfbba41b997842080322b30a1a23a3e66480458
-MISC ChangeLog 30858 RMD160 651d64d1da0c614caf1c4d0d5f52991401d940e1 SHA1 181285bbf6751c2613987dfa82a4f7f0fd31fe80 SHA256 dd77d4b75572bdc7c6f2a9e14b00858e1bd9ab50ad5547ea5c15bb298be3b7f1
+MISC ChangeLog 31014 RMD160 2b17534fdc4b1f6df399fab095fb8bbb688a35fd SHA1 137d28b04ea029ccb4f067c57968833e33ca0d13 SHA256 9b0c42e397d923b9e8467af693495e0f01f80da384b3dd481dd2a47ea5e29712
 MISC metadata.xml 1002 RMD160 3e3ea302e359501b64752636a9e20e0e18c36e8d SHA1 16531a02cdabff00331759883e57f6f5928aa4be SHA256 14508c88a753bccfd1004009d85b34d28b81e6f0ecc8c5b062c122c3b9366d91
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.11 (GNU/Linux)
+Version: GnuPG v2.0.13 (GNU/Linux)
 
-iEYEARECAAYFAksJwnAACgkQp5vW4rUFj5qoeACeIKcrM9KbhovPKVTM+lIdE5Se
-0REAnRHcnthp3WcTFbDQryBeJqvLT5Bu
-=hIzm
+iEYEARECAAYFAksLFHcACgkQvFcC4BYPU0ot6QCeNoCQjK8pFzmFBN3g+sReeKWo
+F8wAn1s+CBeeBRJ2p2X8idVlng2w8r0t
+=cToU
 -----END PGP SIGNATURE-----
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,