Fix amr on 64-bit arches per bug# 130530

Package-Manager: portage-2.1_pre7-r5

4 files changed, 53 insertions, 12 deletions

diff --git a/media-video/ffmpeg/ChangeLog b/media-video/ffmpeg/ChangeLog
index 34bf4b090b17..977c0e96a962 100644
--- a/media-video/ffmpeg/ChangeLog
+++ b/media-video/ffmpeg/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for media-video/ffmpeg
 # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ChangeLog,v 1.134 2006/04/14 21:45:44 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ChangeLog,v 1.135 2006/04/20 21:57:34 dang Exp $
+
+  20 Apr 2006; Daniel Gryniewicz <dang@gentoo.org>
+  +files/ffmpeg-0.4.9_p20060302-amr-64bit.patch,
+  ffmpeg-0.4.9_p20060302.ebuild:
+  Fix amr on 64-bit arches per bug# 130530
 
   14 Apr 2006; Diego Pettenò <flameeyes@gentoo.org>
   +files/ffmpeg-0.4.9_p20060302-fbsd-flags.patch,
diff --git a/media-video/ffmpeg/Manifest b/media-video/ffmpeg/Manifest
index c9409f6d9bae..aa72b26b7a2f 100644
--- a/media-video/ffmpeg/Manifest
+++ b/media-video/ffmpeg/Manifest
@@ -1,9 +1,9 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-MD5 601a544555e23ab71134de356cae70b2 ChangeLog 20289
-RMD160 c68e60c78cf4fdb11a0e1faee0a81e373fb9e7bd ChangeLog 20289
-SHA256 f16947bc76a0872d7d061d74dfbcd9d96e9d551c8b300ebb1dad432943efce4d ChangeLog 20289
+MD5 fe7950f45e56abdc2933e0b5b26f64e2 ChangeLog 20461
+RMD160 8a5560adbcfbd56ddf4748d7cec6836abd1c30e0 ChangeLog 20461
+SHA256 1b8b65d689d53896cc8c604e51976a7154c81ac6cad38ffb83cc475abd4e769b ChangeLog 20461
 MD5 da4fb7c75a6d011f4d7e0d337d449129 ffmpeg-0.4.9_p20050226-r3.ebuild 4388
 RMD160 bb6e81aff569ad13e7bf13aa09f76602e4f2a590 ffmpeg-0.4.9_p20050226-r3.ebuild 4388
 SHA256 5135d135bcdd29a9e5f4dcd2e1d4b75bc851a465de513531537af6bf4684a7a5 ffmpeg-0.4.9_p20050226-r3.ebuild 4388
@@ -19,9 +19,9 @@ SHA256 c0407f86a50fd884266d46a607e16d7917d65f0a87c9e7baee4718dc401b14a2 ffmpeg-0
 MD5 77bf2e5e661831311253e8558432768f ffmpeg-0.4.9_p20051216.ebuild 5792
 RMD160 a9c7ea9d50e9d86a76bc8024e808884db7ebf71f ffmpeg-0.4.9_p20051216.ebuild 5792
 SHA256 ac025d3a396f68a30490eb333c1c061bf4a6a315bb66e67011f5c1b71e809da6 ffmpeg-0.4.9_p20051216.ebuild 5792
-MD5 3d1adf3c0eeb7a8ce2337c3b6899b296 ffmpeg-0.4.9_p20060302.ebuild 7414
-RMD160 6472926540bc97b20c3809bede8b04531374114e ffmpeg-0.4.9_p20060302.ebuild 7414
-SHA256 c22668a31468b4188c8b316f163a63a7fb7c16e6f10574cd1874f2d61bb0c192 ffmpeg-0.4.9_p20060302.ebuild 7414
+MD5 61ba79f0c442c33f0a6b15cc8a934b9a ffmpeg-0.4.9_p20060302.ebuild 7566
+RMD160 987592d7277204bd92d13e504d13a5e6326b35b3 ffmpeg-0.4.9_p20060302.ebuild 7566
+SHA256 1035dbb29a0d27f5cfebd5a68b647adde4e9fa19f89342716a020174e0023eeb ffmpeg-0.4.9_p20060302.ebuild 7566
 MD5 003b0062185efcb0ea5a6115fa8a646a files/0.4.8-gcc3.4-magicF2W.patch 994
 RMD160 4192e2537d220d4b63c55bdea36ac7f5532d8a6a files/0.4.8-gcc3.4-magicF2W.patch 994
 SHA256 3d359f8483903dcc876be0ee4ff511d63a8cf57fade26d58f72e4a3ec0694226 files/0.4.8-gcc3.4-magicF2W.patch 994
@@ -52,6 +52,9 @@ SHA256 e687fd7008c401c54e31552b15b56a5590b85d7ac8b2c39b906acca82a09b5c8 files/ff
 MD5 033883c60f131664912970ffb6042612 files/ffmpeg-0.4.9_p20051216-asneeded-configure.patch 559
 RMD160 b59933fab102460b62b092799c27a7811748f76a files/ffmpeg-0.4.9_p20051216-asneeded-configure.patch 559
 SHA256 b7c7fbbe39e8ceabccabc1935cb4fa91b7287bc72eca323b21b25f0e9e08f13f files/ffmpeg-0.4.9_p20051216-asneeded-configure.patch 559
+MD5 fefa74601660fd82e001bd32b27ac34a files/ffmpeg-0.4.9_p20060302-amr-64bit.patch 1161
+RMD160 c3e17a8e8a3e501ae9ce8b8e455063444d1bc15f files/ffmpeg-0.4.9_p20060302-amr-64bit.patch 1161
+SHA256 f993ac1ad11e254d846fbd0b3f73f81043551fce90438fdd196374ca9ece6c9c files/ffmpeg-0.4.9_p20060302-amr-64bit.patch 1161
 MD5 270ce6c29f270b7fc4e6129f45c35720 files/ffmpeg-0.4.9_p20060302-fbsd-flags.patch 366
 RMD160 ae6a9b23e3a5cc018563a9f023273be821bab44a files/ffmpeg-0.4.9_p20060302-fbsd-flags.patch 366
 SHA256 0af48d342f5001d856ba850b7c8ecc8e46ff809b765b28adbb1c0674b4c2c414 files/ffmpeg-0.4.9_p20060302-fbsd-flags.patch 366
@@ -92,9 +95,9 @@ MD5 7300a7b361fa9f48e37722c6952bd432 metadata.xml 158
 RMD160 d91ff64b3e5f86657b8b6ba02c41a26247a2fac7 metadata.xml 158
 SHA256 f9dd4fb4a7f368e776ea0d7d394dad8f3a674e67f6103d6fb58a8a98971eeee4 metadata.xml 158
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.2.2 (GNU/Linux)
+Version: GnuPG v1.4.2.2-ecc0.1.6 (GNU/Linux)
 
-iD8DBQFEQBgcAiZjviIA2XgRAv5xAJ9FS+75aC3hwLs4lZxkIWKdm3anXQCdEOvH
-LgtdBsYa7iDgC1cUfKJWy+0=
-=UV8K
+iD8DBQFESAO1omPajV0RnrERAqTJAJ4xu3sWgw7B44H6Tf62DLUTGpc9OQCcCcJB
+2shbRuj/H8fS8U9oZsqXKrc=
+=3py7
 -----END PGP SIGNATURE-----
diff --git a/media-video/ffmpeg/ffmpeg-0.4.9_p20060302.ebuild b/media-video/ffmpeg/ffmpeg-0.4.9_p20060302.ebuild
index 74e0827cdb16..0856560e0f62 100644
--- a/media-video/ffmpeg/ffmpeg-0.4.9_p20060302.ebuild
+++ b/media-video/ffmpeg/ffmpeg-0.4.9_p20060302.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ffmpeg-0.4.9_p20060302.ebuild,v 1.12 2006/04/14 21:45:46 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ffmpeg-0.4.9_p20060302.ebuild,v 1.13 2006/04/20 21:57:34 dang Exp $
 
 inherit eutils flag-o-matic multilib toolchain-funcs
 
@@ -61,6 +61,12 @@ src_unpack() {
 		mkdir ${S_BASE}/libavcodec/amrwb_float
 		cd ${S_BASE}/libavcodec/amrwb_float
 		unzip -q ${WORKDIR}/26204-510_ANSI-C_source_code.zip
+
+		# Patch if we're on 64-bit
+		if useq alpha || useq amd64 || useq ia64 || useq ppc64; then
+			cd ${S_BASE}
+			epatch ${FILESDIR}/${P}-amr-64bit.patch
+		fi
 	fi
 
 	cd ${S_BASE}
diff --git a/media-video/ffmpeg/files/ffmpeg-0.4.9_p20060302-amr-64bit.patch b/media-video/ffmpeg/files/ffmpeg-0.4.9_p20060302-amr-64bit.patch
new file mode 100644
index 000000000000..540ef94f5f34
--- /dev/null
+++ b/media-video/ffmpeg/files/ffmpeg-0.4.9_p20060302-amr-64bit.patch
@@ -0,0 +1,27 @@
+diff --exclude-from=/home/dang/.diffrc -u -ruN ffmpeg-0.4.9-p20060302.orig/libavcodec/amr_float/typedef.h ffmpeg-0.4.9-p20060302/libavcodec/amr_float/typedef.h
+--- ffmpeg-0.4.9-p20060302.orig/libavcodec/amr_float/typedef.h	2003-03-26 14:15:42.000000000 -0500
++++ ffmpeg-0.4.9-p20060302/libavcodec/amr_float/typedef.h	2006-04-19 18:39:20.000000000 -0400
+@@ -16,7 +16,7 @@
+ typedef char Word8;

+ typedef unsigned char UWord8;

+ typedef short Word16;

+-typedef long Word32;

++typedef int Word32;

+ typedef float Float32;

+ typedef double Float64;

+ 

+diff --exclude-from=/home/dang/.diffrc -u -ruN ffmpeg-0.4.9-p20060302.orig/libavcodec/amrwb_float/typedef.h ffmpeg-0.4.9-p20060302/libavcodec/amrwb_float/typedef.h
+--- ffmpeg-0.4.9-p20060302.orig/libavcodec/amrwb_float/typedef.h	2003-02-18 00:00:02.000000000 -0500
++++ ffmpeg-0.4.9-p20060302/libavcodec/amrwb_float/typedef.h	2006-04-19 18:37:30.000000000 -0400
+@@ -11,8 +11,8 @@
+ typedef unsigned char UWord8;

+ typedef short Word16;

+ typedef unsigned short UWord16;

+-typedef long Word32;

++typedef int Word32;

+ typedef double Float64;

+ typedef float Float32;

+ 

+-#endif
+\ No newline at end of file
++#endif