added an additional gcc 3.4 fix for x86

4 files changed, 103 insertions, 4 deletions

diff --git a/media-video/avifile/ChangeLog b/media-video/avifile/ChangeLog
index cf9d8ef56d26..4163227aeb88 100644
--- a/media-video/avifile/ChangeLog
+++ b/media-video/avifile/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-video/avifile
 # Copyright 2002-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/avifile/ChangeLog,v 1.68 2004/05/04 03:58:51 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/avifile/ChangeLog,v 1.69 2004/05/29 21:03:28 lv Exp $
+
+  29 May 2004; Travis Tilley <lv@gentoo.org> +files/avifile-x86-gcc34.patch,
+  avifile-0.7.38.20030710.ebuild:
+  added an additional gcc 3.4 fix for x86
 
   03 May 2004; Jeremy Huddleston <eradicator@gentoo.org>
   avifile-0.7.32.20030219.ebuild, avifile-0.7.37.20030522-r2.ebuild,
diff --git a/media-video/avifile/Manifest b/media-video/avifile/Manifest
index a62c7ab0e1f7..895f54a1ed09 100644
--- a/media-video/avifile/Manifest
+++ b/media-video/avifile/Manifest
@@ -1,6 +1,6 @@
-MD5 c066dced2996736ab183ee7432980764 avifile-0.7.38.20030710.ebuild 4451
+MD5 874d94167e32e7d66d353755fc9cfada avifile-0.7.38.20030710.ebuild 4487
 MD5 2b031ce54f8c05dfbfa9a541893ef858 avifile-0.7.32.20030219.ebuild 4069
-MD5 4c4a016a74299ad167823a0f9e077182 ChangeLog 12080
+MD5 abcbf19ac2ffc39cd3ce1ea7f5c924df ChangeLog 12226
 MD5 76b95bd390c69f39e5e7b028b3ff69a5 metadata.xml 272
 MD5 07d4fda440558b645a9288d47cb90fdb avifile-0.7.37.20030522-r2.ebuild 4439
 MD5 8390bf9de24635d667a5724c2cc0cbe9 files/avifile-0.7.37.20030522-divx.patch 11943
@@ -9,6 +9,7 @@ MD5 88eda2a3289907201d524c557bd8a753 files/digest-avifile-0.7.32.20030219 73
 MD5 7a55e6cb72df715c9b822505d5b4b8b0 files/avifile-0.7.38.20030710-2.6.patch 2038
 MD5 624ac61f6a4fb9ed9700a7496f2827cb files/avifile-0.7.38.20030710-amd64.patch 466
 MD5 5c7a3ea4957036aa1da3db9880a3ed34 files/flvenc-patch 558
+MD5 f2e5938361909893d37d1ce0b80fdbfc files/avifile-x86-gcc34.patch 5247
 MD5 769b5c63369a3c1bc5b74abe591731fd files/avifile-0.7.38.20030710-sparc.patch 998
 MD5 21e60c1838b04fa1990fe5538569ac4b files/digest-avifile-0.7.38.20030710 71
 MD5 69d7c84947a5ea083f25e43fdacc126e files/avifile-gcc34.patch 5795
diff --git a/media-video/avifile/avifile-0.7.38.20030710.ebuild b/media-video/avifile/avifile-0.7.38.20030710.ebuild
index 9b890a7b186a..ce03b3c3e499 100644
--- a/media-video/avifile/avifile-0.7.38.20030710.ebuild
+++ b/media-video/avifile/avifile-0.7.38.20030710.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/avifile/avifile-0.7.38.20030710.ebuild,v 1.16 2004/05/04 03:58:51 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/avifile/avifile-0.7.38.20030710.ebuild,v 1.17 2004/05/29 21:03:28 lv Exp $
 
 inherit eutils
 
@@ -49,6 +49,7 @@ src_unpack() {
 	use amd64 && epatch ${FILESDIR}/${P}-amd64.patch
 	use sparc && epatch ${FILESDIR}/${P}-sparc.patch
 	epatch ${FILESDIR}/avifile-gcc34.patch
+	epatch ${FILESDIR}/avifile-x86-gcc34.patch
 }
 
 src_compile() {
diff --git a/media-video/avifile/files/avifile-x86-gcc34.patch b/media-video/avifile/files/avifile-x86-gcc34.patch
new file mode 100644
index 000000000000..7554654e0415
--- /dev/null
+++ b/media-video/avifile/files/avifile-x86-gcc34.patch
@@ -0,0 +1,93 @@
+diff -ur avifile-0.7-0.7.38.orig/ffmpeg/libavcodec/i386/dsputil_mmx.c avifile-0.7-0.7.38/ffmpeg/libavcodec/i386/dsputil_mmx.c
+--- avifile-0.7-0.7.38.orig/ffmpeg/libavcodec/i386/dsputil_mmx.c	2003-06-23 18:52:34.000000000 +0000
++++ avifile-0.7-0.7.38/ffmpeg/libavcodec/i386/dsputil_mmx.c	2004-05-19 18:23:59.051278648 +0000
+@@ -29,8 +29,8 @@
+ static const uint64_t mm_wone __attribute__ ((aligned(8))) = 0x0001000100010001ULL;
+ static const uint64_t mm_wtwo __attribute__ ((aligned(8))) = 0x0002000200020002ULL;
+ 
+-static const uint64_t ff_pw_20 __attribute__ ((aligned(8))) = 0x0014001400140014ULL;
+-static const uint64_t ff_pw_3  __attribute__ ((aligned(8))) = 0x0003000300030003ULL;
++static const uint64_t ff_pw_20 __attribute__ ((aligned(8))) __attribute__((used)) = 0x0014001400140014ULL;
++static const uint64_t ff_pw_3  __attribute__ ((aligned(8))) __attribute__((used)) = 0x0003000300030003ULL;
+ static const uint64_t ff_pw_16 __attribute__ ((aligned(8))) = 0x0010001000100010ULL;
+ static const uint64_t ff_pw_15 __attribute__ ((aligned(8))) = 0x000F000F000F000FULL;
+ 
+diff -ur avifile-0.7-0.7.38.orig/ffmpeg/libavcodec/i386/motion_est_mmx.c avifile-0.7-0.7.38/ffmpeg/libavcodec/i386/motion_est_mmx.c
+--- avifile-0.7-0.7.38.orig/ffmpeg/libavcodec/i386/motion_est_mmx.c	2003-03-03 17:07:35.000000000 +0000
++++ avifile-0.7-0.7.38/ffmpeg/libavcodec/i386/motion_est_mmx.c	2004-05-19 16:59:44.019760248 +0000
+@@ -26,7 +26,7 @@
+ 0x0002000200020002,
+ };
+ 
+-static __attribute__ ((aligned(8))) uint64_t bone= 0x0101010101010101LL;
++static __attribute__((aligned(8))) __attribute__((used)) uint64_t bone= 0x0101010101010101LL;
+ 
+ static inline void sad8_mmx(uint8_t *blk1, uint8_t *blk2, int stride, int h)
+ {
+diff -ur avifile-0.7-0.7.38.orig/ffmpeg/libavcodec/i386/simple_idct_mmx.c avifile-0.7-0.7.38/ffmpeg/libavcodec/i386/simple_idct_mmx.c
+--- avifile-0.7-0.7.38.orig/ffmpeg/libavcodec/i386/simple_idct_mmx.c	2003-02-14 13:58:00.000000000 +0000
++++ avifile-0.7-0.7.38/ffmpeg/libavcodec/i386/simple_idct_mmx.c	2004-05-19 18:30:02.730990928 +0000
+@@ -45,8 +45,8 @@
+ #define ROW_SHIFT 11
+ #define COL_SHIFT 20 // 6
+ 
+-static const uint64_t __attribute__((aligned(8))) wm1010= 0xFFFF0000FFFF0000ULL;
+-static const uint64_t __attribute__((aligned(8))) d40000= 0x0000000000040000ULL;
++static const uint64_t __attribute__((aligned(8))) __attribute__((used)) wm1010= 0xFFFF0000FFFF0000ULL;
++static const uint64_t __attribute__((aligned(8))) __attribute__((used)) d40000= 0x0000000000040000ULL;
+ static int16_t __attribute__((aligned(8))) temp[64];
+ static int16_t __attribute__((aligned(8))) coeffs[]= {
+ 	1<<(ROW_SHIFT-1), 0, 1<<(ROW_SHIFT-1), 0,
+diff -ur avifile-0.7-0.7.38.orig/ffmpeg/libavcodec/liba52/resample_mmx.c avifile-0.7-0.7.38/ffmpeg/libavcodec/liba52/resample_mmx.c
+--- avifile-0.7-0.7.38.orig/ffmpeg/libavcodec/liba52/resample_mmx.c	2003-04-16 20:03:07.000000000 +0000
++++ avifile-0.7-0.7.38/ffmpeg/libavcodec/liba52/resample_mmx.c	2004-05-19 18:14:08.958986312 +0000
+@@ -7,10 +7,10 @@
+ 	and it would mean (C / MMX2 / MMX / 3DNOW) versions 
+ */
+ 
+-static uint64_t __attribute__((aligned(8))) magicF2W= 0x43c0000043c00000LL;
+-static uint64_t __attribute__((aligned(8))) wm1010= 0xFFFF0000FFFF0000LL;
+-static uint64_t __attribute__((aligned(8))) wm0101= 0x0000FFFF0000FFFFLL;
+-static uint64_t __attribute__((aligned(8))) wm1100= 0xFFFFFFFF00000000LL;
++static uint64_t __attribute__((aligned(8))) __attribute__((used)) magicF2W= 0x43c0000043c00000LL;
++static uint64_t __attribute__((aligned(8))) __attribute__((used)) wm1010= 0xFFFF0000FFFF0000LL;
++static uint64_t __attribute__((aligned(8))) __attribute__((used)) wm0101= 0x0000FFFF0000FFFFLL;
++static uint64_t __attribute__((aligned(8))) __attribute__((used)) wm1100= 0xFFFFFFFF00000000LL;
+ 
+ static int a52_resample_MONO_to_5_MMX(float * _f, int16_t * s16){
+     int32_t * f = (int32_t *) _f;
+diff -ur avifile-0.7-0.7.38.orig/plugins/libmp3lame_audioenc/lame3.70/quantize-pvt.c avifile-0.7-0.7.38/plugins/libmp3lame_audioenc/lame3.70/quantize-pvt.c
+--- avifile-0.7-0.7.38.orig/plugins/libmp3lame_audioenc/lame3.70/quantize-pvt.c	2001-03-27 17:04:29.000000000 +0000
++++ avifile-0.7-0.7.38/plugins/libmp3lame_audioenc/lame3.70/quantize-pvt.c	2004-05-19 16:44:04.707557408 +0000
+@@ -1007,18 +1007,18 @@
+         "dec %4\n\t"
+ 
+         "movl %5, %%eax\n\t"
+-        "movl 4+%5, %%ebx\n\t"
++        "movl 4+%5, %%edx\n\t"
+         "fxch %%st(1)\n\t"
+         "fadd" F8type " (%2,%%eax," F8size ")\n\t"
+         "fxch %%st(3)\n\t"
+-        "fadd" F8type " (%2,%%ebx," F8size ")\n\t"
++        "fadd" F8type " (%2,%%edx," F8size ")\n\t"
+ 
+         "movl 8+%5, %%eax\n\t"
+-        "movl 12+%5, %%ebx\n\t"
++        "movl 12+%5, %%edx\n\t"
+         "fxch %%st(2)\n\t"
+         "fadd" F8type " (%2,%%eax," F8size ")\n\t"
+         "fxch %%st(1)\n\t"
+-        "fadd" F8type " (%2,%%ebx," F8size ")\n\t"
++        "fadd" F8type " (%2,%%edx," F8size ")\n\t"
+ 
+         "fxch %%st(3)\n\t"
+         "fistpl -16(%3)\n\t"
+@@ -1030,7 +1030,7 @@
+         "jnz loop1\n\n"
+         : /* no outputs */
+         : "t" (istep), "r" (xr), "r" (adj43asm), "r" (ix), "r" (576 / 4), "m" (rx)
+-        : "%eax", "%ebx", "memory", "cc"
++        : "%eax", "%edx", "memory", "cc"
+       );
+   }
+ #elif defined (USE_MSC_ASM)