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

(Portage version: 2.1.3_rc8)

3 files changed, 20 insertions, 4 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/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;