Fixing bug #116678 (ffmpeg on amd64)

(Portage version: 2.1_pre6-r6)

5 files changed, 71 insertions, 15 deletions

diff --git a/app-emulation/vice/ChangeLog b/app-emulation/vice/ChangeLog
index d0a2a636effb..4e2b6174585a 100644
--- a/app-emulation/vice/ChangeLog
+++ b/app-emulation/vice/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-emulation/vice
 # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/vice/ChangeLog,v 1.35 2006/03/17 14:47:29 gustavoz Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/vice/ChangeLog,v 1.36 2006/03/25 11:14:38 tupone Exp $
+
+  25 Mar 2006; <Tupone@gentoo.org> +files/vice-1.19-64bitfix.patch,
+  vice-1.19.ebuild:
+  Fixing bug #116678 ffmpeg on amd64. Thanks to Andreas Arens
 
   17 Mar 2006; Gustavo Zacarias <gustavoz@gentoo.org> vice-1.19.ebuild:
   Keyworded ~sparc wrt #126147
diff --git a/app-emulation/vice/Manifest b/app-emulation/vice/Manifest
index b3df9f79a910..f933b5f2aeb5 100644
--- a/app-emulation/vice/Manifest
+++ b/app-emulation/vice/Manifest
@@ -1,16 +1,21 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-MD5 45ea7f5e4f5ff25f2d51dd4da782514c ChangeLog 4439
+MD5 e34dc76c47aa12f1bc87f1ad3138020e ChangeLog 4590
+RMD160 babe61a1dc02f7a9b44ef99e5fc9a74c58dc76ad ChangeLog 4590
+SHA256 17effe96193f245cda030da4d34201a1e03651d53850f9c45068e2e812530ce2 ChangeLog 4590
 MD5 feb8195c915d5109dfd6b96df7bf4f91 files/digest-vice-1.17 62
-MD5 a3c398734bf808672ba34c9328f8ef1e files/digest-vice-1.19 62
+RMD160 b6b506964decf5e5a140e5eee8859d2f41c001af files/digest-vice-1.17 62
+SHA256 adf1f194ecc8589eae35c37db1c7796ddb046e19aff853bb2a769ec617101e5d files/digest-vice-1.17 62
+MD5 99fd8c681eb2ed93e3e4513bf66b8d4a files/digest-vice-1.19 232
+RMD160 736cb2993393b6add14f15fc56af0148df11c3ef files/digest-vice-1.19 232
+SHA256 12704a4dc33f2e5e71b6f3d73df08d3fffb614b12e79546306473b255ff4661c files/digest-vice-1.19 232
+MD5 deacb0b29944f25716bf051f45b8f174 files/vice-1.19-64bitfix.patch 1019
+RMD160 95fd93ae3fda668a660e510c444a9681967a2e39 files/vice-1.19-64bitfix.patch 1019
+SHA256 1d5ed8ae642d201110446b64fbcca58f288e55f7e1d3bc9800dd2d7417aa096e files/vice-1.19-64bitfix.patch 1019
 MD5 f17b9b8fa07a38914fe1c03268f51678 metadata.xml 158
+RMD160 cbd9984bb6b426c8c9cee5022fe0a26261612fea metadata.xml 158
+SHA256 1423a4fdd4a79b1728a2056d9e300f7e1074253095d82726218d9e9b953888a3 metadata.xml 158
 MD5 2d1b39ff22170da1997f8533003e554e vice-1.17.ebuild 1946
-MD5 3ab1b31433974ed477b84853e68516b8 vice-1.19.ebuild 1954
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.2.2-ecc0.1.6 (GNU/Linux)
-
-iD8DBQFEGswRKRy60XGEcJIRAg/uAKCnYHzGV9BLz273vk1FBAiAKrNkpQCfRRx4
-VlLPAfIHZnWUGmvWOplNfqQ=
-=axIt
------END PGP SIGNATURE-----
+RMD160 f54e5373d3d8c285ecf96138cc78582c248da387 vice-1.17.ebuild 1946
+SHA256 47c0a16b28d0d4dbb45b7492ad061799bcc16db0aba0a390294adbc46844510f vice-1.17.ebuild 1946
+MD5 e117c4a79db0ca7510126482e620cfc3 vice-1.19.ebuild 2038
+RMD160 4b09c66c462a2dbe95a4f34aca2208080833a558 vice-1.19.ebuild 2038
+SHA256 c9b01bd91a0156772b64d78c16b8da2d6fba35f2db2574b6729acf993525368b vice-1.19.ebuild 2038
diff --git a/app-emulation/vice/files/digest-vice-1.19 b/app-emulation/vice/files/digest-vice-1.19
index f4dae3e44ae5..013680847651 100644
--- a/app-emulation/vice/files/digest-vice-1.19
+++ b/app-emulation/vice/files/digest-vice-1.19
@@ -1 +1,3 @@
 MD5 92f828f29e05f57d7a498a861d3dab6a vice-1.19.tar.gz 4796181
+RMD160 d0a62750c30e3cf8645117a8e8536a8061c260ea vice-1.19.tar.gz 4796181
+SHA256 faf354cfef53f5b31c459692fac73dd45b72d9b05d6920348bd881856d75cd7e vice-1.19.tar.gz 4796181
diff --git a/app-emulation/vice/files/vice-1.19-64bitfix.patch b/app-emulation/vice/files/vice-1.19-64bitfix.patch
new file mode 100644
index 000000000000..5961b8eea2ae
--- /dev/null
+++ b/app-emulation/vice/files/vice-1.19-64bitfix.patch
@@ -0,0 +1,39 @@
+--- vice-1.18/src/gfxoutputdrv/ffmpeg/common.h.unpatched	2005-12-25 11:57:38.000000000 +0100
++++ vice-1.18/src/gfxoutputdrv/ffmpeg/common.h	2005-12-25 12:01:47.000000000 +0100
+@@ -18,6 +18,10 @@
+ //#define A32_BITSTREAM_READER
+ #define LIBMPEG2_BITSTREAM_READER_HACK //add BERO
+ 
++#if defined(WIN32) && !defined(__MINGW32__) && !defined(__CYGWIN__) && !defined(EMULATE_INTTYPES)
++#    define EMULATE_INTTYPES
++#endif
++
+ #ifndef M_PI
+ #define M_PI    3.14159265358979323846
+ #endif
+@@ -93,7 +97,6 @@
+ #endif
+ #endif
+ 
+-#define EMULATE_INTTYPES
+ #ifndef EMULATE_INTTYPES
+ #   include <inttypes.h>
+ #else
+@@ -255,7 +258,7 @@
+ 
+ extern const uint32_t inverse[256];
+ 
+-#ifdef ARCH_X86
++#if defined(ARCH_X86) || defined(ARCH_X86_64)
+ #    define FASTDIV(a,b) \
+     ({\
+         int ret,dmy;\
+@@ -1219,7 +1222,7 @@
+ #define MKBETAG(a,b,c,d) (d | (c << 8) | (b << 16) | (a << 24))
+ 
+ 
+-#ifdef ARCH_X86
++#if defined(ARCH_X86) || defined(ARCH_X86_64)
+ #define MASK_ABS(mask, level)\
+             asm volatile(\
+ 		"cdq			\n\t"\
diff --git a/app-emulation/vice/vice-1.19.ebuild b/app-emulation/vice/vice-1.19.ebuild
index 24e79466c7f5..af622df04df9 100644
--- a/app-emulation/vice/vice-1.19.ebuild
+++ b/app-emulation/vice/vice-1.19.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/app-emulation/vice/vice-1.19.ebuild,v 1.6 2006/03/17 14:47:29 gustavoz Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/vice/vice-1.19.ebuild,v 1.7 2006/03/25 11:14:39 tupone Exp $
 
 inherit eutils games
 
@@ -62,6 +62,12 @@ DEPEND="${RDEPEND}
 			x11-proto/videoproto )
 		virtual/x11 )"
 
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	epatch "${FILESDIR}/${P}"-64bitfix.patch
+}
+
 src_compile() {
 	egamesconf \
 		--disable-dependency-tracking \