Fix building with >=flac-1.1.3 on AMD64 systems for bug 181822, thanks to Dominique Michel for patch and aballier at gentoo.org for reporting.

Package-Manager: portage-2.1.3_rc8

4 files changed, 85 insertions, 16 deletions

diff --git a/media-sound/alsaplayer/ChangeLog b/media-sound/alsaplayer/ChangeLog
index 0ac9b695c350..593622278d42 100644
--- a/media-sound/alsaplayer/ChangeLog
+++ b/media-sound/alsaplayer/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for media-sound/alsaplayer
 # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/alsaplayer/ChangeLog,v 1.61 2007/06/17 02:47:01 dirtyepic Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/alsaplayer/ChangeLog,v 1.62 2007/07/14 18:39:11 drac Exp $
+
+  14 Jul 2007; Samuli Suominen <drac@gentoo.org>
+  +files/alsaplayer-0.99.80_rc1-amd64-flac-1.1.3.patch,
+  alsaplayer-0.99.80_rc1.ebuild:
+  Fix building with >=flac-1.1.3 on AMD64 systems for bug 181822, thanks to
+  Dominique Michel for patch and aballier at gentoo.org for reporting.
 
   17 Jun 2007; Ryan Hill <dirtyepic@gentoo.org> metadata.xml:
   Update metadata.
diff --git a/media-sound/alsaplayer/Manifest b/media-sound/alsaplayer/Manifest
index 6264c8a71d27..40cfba1a77bd 100644
--- a/media-sound/alsaplayer/Manifest
+++ b/media-sound/alsaplayer/Manifest
@@ -10,20 +10,24 @@ AUX alsaplayer-0.99.77-ppc-endian-fix.patch 830 RMD160 ea0d3dcc6dd69c9a05b471365
 MD5 109304bdd6fb8813a5b4b5c59aa84a84 files/alsaplayer-0.99.77-ppc-endian-fix.patch 830
 RMD160 ea0d3dcc6dd69c9a05b4713656763ef82b06e287 files/alsaplayer-0.99.77-ppc-endian-fix.patch 830
 SHA256 2edd1fdf7316bc6bd673e176b938f7541722c5d74c9c971b678c41bb331f608f files/alsaplayer-0.99.77-ppc-endian-fix.patch 830
+AUX alsaplayer-0.99.80_rc1-amd64-flac-1.1.3.patch 2129 RMD160 5e64f5e3f95307b8b6b1a4939614643bd30a694b SHA1 c8d15d69279f7b230b48f89398bbc2595df217ca SHA256 41d20054426d53d959dd4f87aa130599e1635f08ed68491cc47bbd8a9870452c
+MD5 b4e66b81bf923e91d860622492e460cd files/alsaplayer-0.99.80_rc1-amd64-flac-1.1.3.patch 2129
+RMD160 5e64f5e3f95307b8b6b1a4939614643bd30a694b files/alsaplayer-0.99.80_rc1-amd64-flac-1.1.3.patch 2129
+SHA256 41d20054426d53d959dd4f87aa130599e1635f08ed68491cc47bbd8a9870452c files/alsaplayer-0.99.80_rc1-amd64-flac-1.1.3.patch 2129
 DIST alsaplayer-0.99.77.tar.bz2 657622 RMD160 a40c25f17ec6f4f81283bb2ee91c0bee27e1a108 SHA1 dffb35c121216399e8f543559456dafd1b4abd6e SHA256 5bfcbb14f5c64f0d5fd56420910f192a1bebac99c8a6e53855a69f64a3f3d6a0
 DIST alsaplayer-0.99.80-rc1.tar.bz2 789763 RMD160 1ec76d6847ff1068cd33c6d1f0d380a7114e0c13 SHA1 553e9c66931d3d6cd87e5a95340e1ffa7d14f588 SHA256 3b6e10ceec44279bf251e884ec5a293b236109c511d3fbb332ba4ee2168782b8
 EBUILD alsaplayer-0.99.77-r1.ebuild 2457 RMD160 04fe80bd47c454a0275c31e8eacd82b46fdd0fa7 SHA1 1b19fe6e519cc4b606737f12827dd5707b17a27c SHA256 fe3a17795d0d3320d178408dda1f0e72f8d09432c8a2a39ba070db5c815505f3
 MD5 b927a3d77fd96ea87c95ce00e2381d84 alsaplayer-0.99.77-r1.ebuild 2457
 RMD160 04fe80bd47c454a0275c31e8eacd82b46fdd0fa7 alsaplayer-0.99.77-r1.ebuild 2457
 SHA256 fe3a17795d0d3320d178408dda1f0e72f8d09432c8a2a39ba070db5c815505f3 alsaplayer-0.99.77-r1.ebuild 2457
-EBUILD alsaplayer-0.99.80_rc1.ebuild 2114 RMD160 5cefeb098b2676cb12e7e2eeb181bfbd881f910c SHA1 20af4f5482cb6bfd109efea87028c0b1f7da5f04 SHA256 c96f8b0d8d581055a660fbd8f8f8bd5c213317ab55cf573d3123ac229760fb18
-MD5 d0fd01f6f65ef2449f1ac2c38e825710 alsaplayer-0.99.80_rc1.ebuild 2114
-RMD160 5cefeb098b2676cb12e7e2eeb181bfbd881f910c alsaplayer-0.99.80_rc1.ebuild 2114
-SHA256 c96f8b0d8d581055a660fbd8f8f8bd5c213317ab55cf573d3123ac229760fb18 alsaplayer-0.99.80_rc1.ebuild 2114
-MISC ChangeLog 10097 RMD160 669c78b9d9a36f3109e5138b1bffd40c0ff2475e SHA1 dd4d3467588faa39afb0f38e7195cc87f645c884 SHA256 a77b621b9e4d3d79c7a7894f8a26f2974fcc948d8f325e934739c6fddd6cca38
-MD5 c596f0f367ce6becef12c20b7fcdc19a ChangeLog 10097
-RMD160 669c78b9d9a36f3109e5138b1bffd40c0ff2475e ChangeLog 10097
-SHA256 a77b621b9e4d3d79c7a7894f8a26f2974fcc948d8f325e934739c6fddd6cca38 ChangeLog 10097
+EBUILD alsaplayer-0.99.80_rc1.ebuild 2167 RMD160 d05f5e3f8c78275df1568a0999c94909c513ac1a SHA1 4c33b879c26fd3ef8bff590c24d1f49f796eeb0b SHA256 765575cef464ffef9ab66d76376ccf3404d396271d7dd7380aa08bf874413f99
+MD5 90fc0a6215e0e20ba9931aef3107901c alsaplayer-0.99.80_rc1.ebuild 2167
+RMD160 d05f5e3f8c78275df1568a0999c94909c513ac1a alsaplayer-0.99.80_rc1.ebuild 2167
+SHA256 765575cef464ffef9ab66d76376ccf3404d396271d7dd7380aa08bf874413f99 alsaplayer-0.99.80_rc1.ebuild 2167
+MISC ChangeLog 10378 RMD160 b6c787b91b46a1e8fb422b54a64b3a63b2e7fffa SHA1 4ef5272e3d3d24f1f660347ef0d741e7ad813338 SHA256 3d61d982aa14b693ba1388da867ab9d9c2be0d0a0f25ba5ad44cf2ef9380fa81
+MD5 7271e0f8da4132ced0219228c2654a39 ChangeLog 10378
+RMD160 b6c787b91b46a1e8fb422b54a64b3a63b2e7fffa ChangeLog 10378
+SHA256 3d61d982aa14b693ba1388da867ab9d9c2be0d0a0f25ba5ad44cf2ef9380fa81 ChangeLog 10378
 MISC metadata.xml 349 RMD160 d7b4314978d8556532949fcaf110623719c5e84c SHA1 31bc15cea6ba25281060f611e36748379e800cbb SHA256 ac3e0972a440ffb1f9bed194b8093c263a834ac48e2b70d0ba08c51c14dc5d1b
 MD5 8669954dc9a80e8ad3dcc147259e3ee4 metadata.xml 349
 RMD160 d7b4314978d8556532949fcaf110623719c5e84c metadata.xml 349
diff --git a/media-sound/alsaplayer/alsaplayer-0.99.80_rc1.ebuild b/media-sound/alsaplayer/alsaplayer-0.99.80_rc1.ebuild
index 9379be847931..b9eac4963b49 100644
--- a/media-sound/alsaplayer/alsaplayer-0.99.80_rc1.ebuild
+++ b/media-sound/alsaplayer/alsaplayer-0.99.80_rc1.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-sound/alsaplayer/alsaplayer-0.99.80_rc1.ebuild,v 1.2 2007/06/16 08:42:08 drac Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/alsaplayer/alsaplayer-0.99.80_rc1.ebuild,v 1.3 2007/07/14 18:39:11 drac Exp $
 
 inherit eutils autotools versionator
 
@@ -15,13 +15,12 @@ SLOT="0"
 KEYWORDS="~amd64 ~mips ~ppc ~sparc ~x86"
 IUSE="alsa audiofile doc esd flac gtk jack mikmod nas ogg opengl oss vorbis xosd"
 
-RDEPEND="
-	media-libs/alsa-lib
+RDEPEND="media-libs/alsa-lib
 	media-libs/libsndfile
 	media-libs/libmad
 	audiofile? ( media-libs/audiofile )
 	esd? ( media-sound/esound )
-	flac? ( media-libs/flac )
+	flac? ( >=media-libs/flac-1.1.3 )
 	jack? ( >=media-sound/jack-audio-connection-kit-0.80.0 )
 	mikmod? ( >=media-libs/libmikmod-3.1.10 )
 	nas? ( media-libs/nas )
@@ -29,7 +28,6 @@ RDEPEND="
 	opengl? ( virtual/opengl )
 	vorbis? ( media-libs/libvorbis )
 	xosd? ( x11-libs/xosd )"
-
 DEPEND="${RDEPEND}
 	>=dev-libs/glib-2.10.1
 	dev-util/pkgconfig
@@ -42,9 +40,8 @@ S="${WORKDIR}"/${PN}-${MY_PV}
 src_unpack() {
 	unpack ${A}
 	cd "${S}"
-
 	epatch "${FILESDIR}"/${PN}-0.99.77-cxxflags.patch
-
+	epatch "${FILESDIR}"/${P}-amd64-flac-1.1.3.patch
 	eautoreconf
 }
 
diff --git a/media-sound/alsaplayer/files/alsaplayer-0.99.80_rc1-amd64-flac-1.1.3.patch b/media-sound/alsaplayer/files/alsaplayer-0.99.80_rc1-amd64-flac-1.1.3.patch
new file mode 100644
index 000000000000..27e842e19e68
--- /dev/null
+++ b/media-sound/alsaplayer/files/alsaplayer-0.99.80_rc1-amd64-flac-1.1.3.patch
@@ -0,0 +1,62 @@
+--- input/flac/FlacStream.h-dist	2007-04-25 14:44:52.000000000 +0200
++++ input/flac/FlacStream.h	2007-04-25 14:45:11.000000000 +0200
+@@ -191,7 +191,7 @@ class FlacStream
+ 
+     FLAC__StreamDecoderReadStatus 
+                  realReadCallBack (FLAC__byte buffer[],
+-				   unsigned * bytes);
++				   size_t * bytes);
+ 
+ 
+  protected:
+@@ -233,7 +233,7 @@ class FlacStream
+     static FLAC__StreamDecoderReadStatus
+ 	readCallBack (const FLAC__StreamDecoder * decoder,
+ 		      FLAC__byte buffer[],
+-		      unsigned * bytes,
++		      size_t * bytes,
+ 		      void * client_data);
+ 
+     static void errCallBack (const FLAC__StreamDecoder * decoder,
+--- input/flac/FlacStream.cpp-dist	2007-04-25 14:44:10.000000000 +0200
++++ input/flac/FlacStream.cpp	2007-04-25 14:44:49.000000000 +0200
+@@ -321,7 +321,7 @@
+ 
+ 
+ FLAC__StreamDecoderReadStatus
+-FlacStream::realReadCallBack (FLAC__byte buffer[], unsigned * bytes)
++FlacStream::realReadCallBack (FLAC__byte buffer[], size_t * bytes)
+ {
+     *bytes = reader_read (buffer, *bytes, _datasource);
+     return *bytes > 0 ? FLAC__STREAM_DECODER_READ_STATUS_CONTINUE :
+@@ -336,7 +336,7 @@
+ FLAC__StreamDecoderReadStatus
+ FlacStream::readCallBack (const FLAC__StreamDecoder *,
+ 			  FLAC__byte buffer[],
+-			  unsigned * bytes,
++			  size_t * bytes,
+ 			  void * client_data)
+ {
+     if (!client_data)
+--- input/flac/FlacSeekableStream.cpp-dist	2007-04-25 14:45:29.000000000 +0200
++++ input/flac/FlacSeekableStream.cpp	2007-04-25 14:45:43.000000000 +0200
+@@ -255,7 +255,7 @@
+ FlacSeekableStream::readCallBack (const FLAC__StreamDecoder * /*decoder*/,
+ #endif
+ 				  FLAC__byte buffer[],
+-				  unsigned * bytes,
++				  size_t * bytes,
+ 				  void * client_data)
+ {
+     if (!client_data)
+--- input/flac/FlacSeekableStream.h-dist	2007-04-25 14:45:32.000000000 +0200
++++ input/flac/FlacSeekableStream.h	2007-04-25 14:45:53.000000000 +0200
+@@ -114,7 +114,7 @@ class FlacSeekableStream : public FlacSt
+ 	readCallBack (const FLAC__StreamDecoder * decoder,
+ #endif
+ 		      FLAC__byte buffer[],
+-		      unsigned * bytes,
++		      size_t * bytes,
+ 		      void * client_data);
+ 
+ #ifdef LEGACY_FLAC