Fix building with >=flac-1.1.3 on AMD64 systems for bug 185330, thanks to Chris Smith for reporting and Huber Olivier for testing.

Package-Manager: portage-2.1.3_rc8

4 files changed, 32 insertions, 12 deletions

diff --git a/media-libs/akode/ChangeLog b/media-libs/akode/ChangeLog
index addf1352ab06..909a9cdd485c 100644
--- a/media-libs/akode/ChangeLog
+++ b/media-libs/akode/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for media-libs/akode
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/akode/ChangeLog,v 1.27 2007/04/08 13:11:42 carlo Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/akode/ChangeLog,v 1.28 2007/07/14 18:08:18 drac Exp $
+
+  14 Jul 2007; Samuli Suominen <drac@gentoo.org>
+  +files/akode-2.0.2-amd64-flac-1.1.3.patch, akode-2.0.2.ebuild:
+  Fix building with >=flac-1.1.3 on AMD64 systems for bug 185330, thanks to
+  Chris Smith for reporting and Huber Olivier for testing.
 
 *akode-2.0.2 (08 Apr 2007)
 
diff --git a/media-libs/akode/Manifest b/media-libs/akode/Manifest
index 2fb39e127df7..e9965d05a2ad 100644
--- a/media-libs/akode/Manifest
+++ b/media-libs/akode/Manifest
@@ -2,6 +2,10 @@ AUX akode-2.0.1-alsa-tests.patch 2369 RMD160 5f2f833524823daa1cc51b6ebe1f0e8005a
 MD5 f81efdb0c8e6b88a4781c763df8de9f0 files/akode-2.0.1-alsa-tests.patch 2369
 RMD160 5f2f833524823daa1cc51b6ebe1f0e8005a84e3a files/akode-2.0.1-alsa-tests.patch 2369
 SHA256 4f22d466e2ac1b4838c9b9bd7861817f34de9602749bdda8890b7686a9d7612e files/akode-2.0.1-alsa-tests.patch 2369
+AUX akode-2.0.2-amd64-flac-1.1.3.patch 515 RMD160 c4d88ea933fb00575316f80ea2d4627864e32f76 SHA1 b1ebc8d706df291399f874174c3c27693308e6db SHA256 a0531f197d46d6c721e118c9b5a24fa5945057b6991f9ca94cb9b4b081841452
+MD5 2f87e9fc78d0a50938f5819c3197dce7 files/akode-2.0.2-amd64-flac-1.1.3.patch 515
+RMD160 c4d88ea933fb00575316f80ea2d4627864e32f76 files/akode-2.0.2-amd64-flac-1.1.3.patch 515
+SHA256 a0531f197d46d6c721e118c9b5a24fa5945057b6991f9ca94cb9b4b081841452 files/akode-2.0.2-amd64-flac-1.1.3.patch 515
 DIST 30375-akode-2.0.1.tar.bz2 460964 RMD160 e476f01a6baea4051e407166b1997ecdca1bfa86 SHA1 122fe6aabda78a8bda6d81074b7b66eb424f34eb SHA256 a1a31d3ea59e151ff1ff51e9f2be0db84fc9fcb40f590abb1c46494d6ff1c08e
 DIST 30375-akode-2.0.2.tar.bz2 472605 RMD160 fa0322367d8e24e541007d3f9e508c3c31370d96 SHA1 10ad1e335bc53c2a90d133b493568324514c729c SHA256 ad689f7b3531cc3c42fda07c264873360bc0f4a94b90c1a4c91c92a22333a7a6
 DIST 30375-akode-2.0b3.tar.gz 643404 RMD160 34dfdd7da4c839c54d4cd34d79c62d02514d0137 SHA1 a4287bf6ea50c44589160e0c8ccbfe143d210428 SHA256 f84b19b26ad7040ade074160ac6a9c50d44941b75fb04526cea078e2bab5b577
@@ -15,10 +19,10 @@ EBUILD akode-2.0.1.ebuild 1566 RMD160 0208217f4857a02e81c06993c1ca43e8043d6b47 S
 MD5 75065b6fa6282e45aa7f15fdf0393424 akode-2.0.1.ebuild 1566
 RMD160 0208217f4857a02e81c06993c1ca43e8043d6b47 akode-2.0.1.ebuild 1566
 SHA256 3699e0402a20947ca1e5401a010dea83309133179c7b10cabe2a60233e4fe661 akode-2.0.1.ebuild 1566
-EBUILD akode-2.0.2.ebuild 1559 RMD160 0a1b22d2b8ebc7aa0c9e0401b3eaa873da16f896 SHA1 b93af2b3863f1f04bb9002d7726701f562990a01 SHA256 e85ffa3a1b32cbca018609c7268cfcd6740e09de7620f14f6472f46b471c652d
-MD5 1c457b6928000dbb7a8b9554c00ad2d9 akode-2.0.2.ebuild 1559
-RMD160 0a1b22d2b8ebc7aa0c9e0401b3eaa873da16f896 akode-2.0.2.ebuild 1559
-SHA256 e85ffa3a1b32cbca018609c7268cfcd6740e09de7620f14f6472f46b471c652d akode-2.0.2.ebuild 1559
+EBUILD akode-2.0.2.ebuild 1609 RMD160 8eb1e48bf82833a409040a10e629e3f6cec81e7c SHA1 95599253e83a90b1cb136cac2149fd526dc46086 SHA256 e2bc80da6abc229c692d98122d6312c6c19003c8958c1a684f4302eb839f5578
+MD5 5eb77c6a0a02b6b0ccc668157e0ec34d akode-2.0.2.ebuild 1609
+RMD160 8eb1e48bf82833a409040a10e629e3f6cec81e7c akode-2.0.2.ebuild 1609
+SHA256 e2bc80da6abc229c692d98122d6312c6c19003c8958c1a684f4302eb839f5578 akode-2.0.2.ebuild 1609
 EBUILD akode-2.0_beta3.ebuild 1244 RMD160 5fbb36a67ef54d0216233128e079b28baa7fd68d SHA1 03f697e9006b26ee22bea95394742668b370ee74 SHA256 6272a9beb1936de51c6d416525d73181de0d065aa7f958d1e5ecac36c5ecd939
 MD5 458c99a66374878127d005bbbcfc8656 akode-2.0_beta3.ebuild 1244
 RMD160 5fbb36a67ef54d0216233128e079b28baa7fd68d akode-2.0_beta3.ebuild 1244
@@ -27,10 +31,10 @@ EBUILD akode-2.0_rc1.ebuild 1211 RMD160 602c5c1c24b54843364c651b02091b2118a1a3cd
 MD5 ae4a37da5b51caf9fd970e30a46d526d akode-2.0_rc1.ebuild 1211
 RMD160 602c5c1c24b54843364c651b02091b2118a1a3cd akode-2.0_rc1.ebuild 1211
 SHA256 b799a452de9ce07685587f67c4bd1e5941f80d90b14208519478b45fa0954090 akode-2.0_rc1.ebuild 1211
-MISC ChangeLog 3419 RMD160 9761b705d27d8bd26b44f945d815a11ed876df4d SHA1 b5c1d631529c70605e550a4496b88e3ed0fd73fe SHA256 ddf6e0a2bfc8e91d2a85637896fe2cdd23baf8f84741fe2fa05b25f83961e734
-MD5 ac63dc9abe98f902ea88bf6f6f2c8590 ChangeLog 3419
-RMD160 9761b705d27d8bd26b44f945d815a11ed876df4d ChangeLog 3419
-SHA256 ddf6e0a2bfc8e91d2a85637896fe2cdd23baf8f84741fe2fa05b25f83961e734 ChangeLog 3419
+MISC ChangeLog 3668 RMD160 cfdc58a3992774fb6813dcd3cd6273cd4f89f358 SHA1 6ad9003bcbd328f57890c257bb9d2496672a95de SHA256 910f64f38685c8a9371673da17cb4302f3c3200f9357d6f08913487f874e3b9e
+MD5 f2ec41324e89a4a2153698478e6d6129 ChangeLog 3668
+RMD160 cfdc58a3992774fb6813dcd3cd6273cd4f89f358 ChangeLog 3668
+SHA256 910f64f38685c8a9371673da17cb4302f3c3200f9357d6f08913487f874e3b9e ChangeLog 3668
 MISC metadata.xml 156 RMD160 ecce3b981f150c45ae1e84e2d208e678d6124259 SHA1 b64f7c0b4e5db816d82ad19848f72118af129d35 SHA256 2f4da28506b9d4185f320f67a6191d30c7a921217ed4447ed46ea0bc4aefc79a
 MD5 acc03a4b12bb0433a57e95bd253b9501 metadata.xml 156
 RMD160 ecce3b981f150c45ae1e84e2d208e678d6124259 metadata.xml 156
diff --git a/media-libs/akode/akode-2.0.2.ebuild b/media-libs/akode/akode-2.0.2.ebuild
index 154309957e8e..81a30d1775d2 100644
--- a/media-libs/akode/akode-2.0.2.ebuild
+++ b/media-libs/akode/akode-2.0.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/akode/akode-2.0.2.ebuild,v 1.1 2007/04/08 13:11:42 carlo Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/akode/akode-2.0.2.ebuild,v 1.2 2007/07/14 18:08:18 drac Exp $
 
 WANT_AUTOMAKE="1.9"
 WANT_AUTOCONF="2.5"
@@ -8,7 +8,7 @@ WANT_AUTOCONF="2.5"
 inherit eutils autotools
 
 MY_P=${P/_beta/b}
-S=${WORKDIR}/${MY_P}
+S="${WORKDIR}"/${MY_P}
 
 DESCRIPTION="A simple framework to decode the most common audio formats."
 HOMEPAGE="http://www.carewolf.com/"
@@ -30,8 +30,8 @@ DEPEND="media-libs/libsamplerate
 
 src_unpack() {
 	unpack ${A}
-
 	cd "${S}"
+	epatch "${FILESDIR}"/${P}-amd64-flac-1.1.3.patch
 
 	sed -i -e '/case $AUTO\(CONF\|HEADER\)_VERSION in/,+1 s/2\.5/2.[56]/g' \
 		admin/cvs.sh
diff --git a/media-libs/akode/files/akode-2.0.2-amd64-flac-1.1.3.patch b/media-libs/akode/files/akode-2.0.2-amd64-flac-1.1.3.patch
new file mode 100644
index 000000000000..3179351e8051
--- /dev/null
+++ b/media-libs/akode/files/akode-2.0.2-amd64-flac-1.1.3.patch
@@ -0,0 +1,11 @@
+--- akode-2.0.2.orig/akode/plugins/xiph_decoder/flac113_decoder.cpp     2007-06-05 19:12:42.000000000 +0000
++++ akode-2.0.2/akode/plugins/xiph_decoder/flac113_decoder.cpp  2007-06-05 19:13:13.000000000 +0000
+@@ -108,7 +108,7 @@
+ static FLAC__StreamDecoderReadStatus flac_read_callback(
+         const FLAC__StreamDecoder *,
+         FLAC__byte buffer[],
+-        unsigned *bytes,
++        size_t *bytes,
+         void *client_data)
+ {
+     FLACDecoder::private_data *data = (FLACDecoder::private_data*)client_data;