gcc4 patch for x86

Package-Manager: portage-2.1_pre4-r1

4 files changed, 57 insertions, 8 deletions

diff --git a/media-video/ffmpeg/ChangeLog b/media-video/ffmpeg/ChangeLog
index 641b8db32745..9eb3db4ff7c6 100644
--- a/media-video/ffmpeg/ChangeLog
+++ b/media-video/ffmpeg/ChangeLog
@@ -1,6 +1,10 @@
 # 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.126 2006/03/03 02:22:49 lu_zero Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ChangeLog,v 1.127 2006/03/04 06:58:43 lu_zero Exp $
+
+  04 Mar 2006; Luca Barbato <lu_zero@gentoo.org>
+  +files/ffmpeg-shared-gcc4.1.patch, ffmpeg-0.4.9_p20060302.ebuild:
+  ffmpeg-shared-gcc4 patch is back
 
 *ffmpeg-0.4.9_p20060302 (03 Mar 2006)
 
diff --git a/media-video/ffmpeg/Manifest b/media-video/ffmpeg/Manifest
index fad77ecea880..a334b1ac3eaa 100644
--- a/media-video/ffmpeg/Manifest
+++ b/media-video/ffmpeg/Manifest
@@ -1,6 +1,6 @@
-MD5 ee3e83458be0b8520fde98bdcccdd594 ChangeLog 18772
-RMD160 de4d2f55ceac92f93e4d563db11cc80c9cedbcbe ChangeLog 18772
-SHA256 8cda84466db7b0a5f72121e9c7807875c081e569a0f10543d1eb58ef40c6c6e2 ChangeLog 18772
+MD5 c58feb715e4a661fae672e5ed61f59a1 ChangeLog 18925
+RMD160 8175b87028cb826c2531ea15ee23e08b61d74203 ChangeLog 18925
+SHA256 561c222dffa6fa4f784a23c14b679248aeb9102d8261c5ab17da14aaac281c8c ChangeLog 18925
 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
@@ -16,9 +16,9 @@ SHA256 c0407f86a50fd884266d46a607e16d7917d65f0a87c9e7baee4718dc401b14a2 ffmpeg-0
 MD5 a0bb2c92819f677e9a54da4e25610aaf ffmpeg-0.4.9_p20051216.ebuild 5657
 RMD160 5f63e67a19662dde24d487c879aa2a0e02ec1483 ffmpeg-0.4.9_p20051216.ebuild 5657
 SHA256 4eff2720f2eeed0ed8d0bce81f2a9ca5efcff9309eeeb352b1b9d600460b93d8 ffmpeg-0.4.9_p20051216.ebuild 5657
-MD5 efac45d1781259536a81429ba6cfe7d1 ffmpeg-0.4.9_p20060302.ebuild 5577
-RMD160 733494ae5eefabbf5c8d6de4f5c02b96e2db6e45 ffmpeg-0.4.9_p20060302.ebuild 5577
-SHA256 4fbdaa0ec7dfa099085647052f00bc9014f849071482988868cc179675a58b40 ffmpeg-0.4.9_p20060302.ebuild 5577
+MD5 7ae240d3bd16b3d6bb08455fe2330610 ffmpeg-0.4.9_p20060302.ebuild 5642
+RMD160 e6017db13df3574529612331d5b5f46cf423cf6c ffmpeg-0.4.9_p20060302.ebuild 5642
+SHA256 823d647bfb365cf3ac3e70dccff1f900591dd70542f8121830b302280bc698cf ffmpeg-0.4.9_p20060302.ebuild 5642
 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
@@ -61,6 +61,9 @@ SHA256 99aefb6d85efae932c639e530fbfd5f634df780ef57f9a5bfdd734dc758762b8 files/ff
 MD5 b4ecc62e882107f766cf621bfc6c7e20 files/ffmpeg-osx.patch 5940
 RMD160 2cc2716ee5cf953a5a701815d850aa9530d3154d files/ffmpeg-osx.patch 5940
 SHA256 d0048b2556bbcab2b60e1692b353a83ced6db31ce03bf2cdeccfe1615b02fb49 files/ffmpeg-osx.patch 5940
+MD5 de019d19bd9c6a18c7ccc84ed818e714 files/ffmpeg-shared-gcc4.1.patch 1713
+RMD160 38b6735f38d146bd4cf55a5514577e1c8155e29f files/ffmpeg-shared-gcc4.1.patch 1713
+SHA256 da5bc0708219cb980a7a8036eb1c17d6f9c041cadf8e76f0195e6e2e491c4afd files/ffmpeg-shared-gcc4.1.patch 1713
 MD5 f486e0b9d41c3d417a3b918189f2be9e files/ffmpeg-shared-gcc4.patch 1575
 RMD160 9a7c31deb50caa7f7a209a02eb750ce43a6bcc74 files/ffmpeg-shared-gcc4.patch 1575
 SHA256 d052657af1553f1daa81c59974799134d619694906abb4363d16c9b14ca75389 files/ffmpeg-shared-gcc4.patch 1575
diff --git a/media-video/ffmpeg/ffmpeg-0.4.9_p20060302.ebuild b/media-video/ffmpeg/ffmpeg-0.4.9_p20060302.ebuild
index 71ed66d73b31..a07108cf7e0f 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.2 2006/03/03 19:03:36 lu_zero Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ffmpeg-0.4.9_p20060302.ebuild,v 1.3 2006/03/04 06:58:43 lu_zero Exp $
 
 inherit eutils flag-o-matic multilib toolchain-funcs
 
@@ -69,6 +69,8 @@ src_unpack() {
 	cd ${S}
 	cp -R ${S_BASE} ${S_STATIC}
 	mv ${S_BASE} ${S_SHARED}
+	cd ${S_SHARED}
+	epatch "${FILESDIR}/ffmpeg-shared-gcc4.1.patch"
 
 }
 
diff --git a/media-video/ffmpeg/files/ffmpeg-shared-gcc4.1.patch b/media-video/ffmpeg/files/ffmpeg-shared-gcc4.1.patch
new file mode 100644
index 000000000000..2e04877689a4
--- /dev/null
+++ b/media-video/ffmpeg/files/ffmpeg-shared-gcc4.1.patch
@@ -0,0 +1,40 @@
+--- /var/tmp/portage/ffmpeg-0.4.9_p20060302/work/ffmpeg-0.4.9-p20060302-shared//libavcodec/i386/dsputil_mmx.c	2006-03-04 07:50:27.000000000 +0100
++++ /tmp/dsputil_mmx.c	2006-03-04 07:49:04.000000000 +0100
+@@ -619,10 +619,22 @@
+ 
+ static inline void transpose4x4(uint8_t *dst, uint8_t *src, int dst_stride, int src_stride){
+     asm volatile( //FIXME could save 1 instruction if done as 8x4 ...
+-        "movd  %4, %%mm0                \n\t"
+-        "movd  %5, %%mm1                \n\t"
+-        "movd  %6, %%mm2                \n\t"
+-        "movd  %7, %%mm3                \n\t"
++        "movd  %0, %%mm0                \n\t"
++        "movd  %1, %%mm1                \n\t"
++        "movd  %2, %%mm2                \n\t"
++        
++        :
++        :  "m" (*(uint32_t*)(src + 0*src_stride)),
++           "m" (*(uint32_t*)(src + 1*src_stride)),
++           "m" (*(uint32_t*)(src + 2*src_stride))
++    );
++    asm volatile( //FIXME could save 1 instruction if done as 8x4 ...
++        "movd  %0, %%mm3                \n\t"
++        
++        :
++        :  "m" (*(uint32_t*)(src + 3*src_stride))
++    );
++    asm volatile( //FIXME could save 1 instruction if done as 8x4 ...
+         "punpcklbw %%mm1, %%mm0         \n\t"
+         "punpcklbw %%mm3, %%mm2         \n\t"
+         "movq %%mm0, %%mm1              \n\t"
+@@ -639,10 +651,6 @@
+           "=m" (*(uint32_t*)(dst + 1*dst_stride)),
+           "=m" (*(uint32_t*)(dst + 2*dst_stride)),
+           "=m" (*(uint32_t*)(dst + 3*dst_stride))
+-        :  "m" (*(uint32_t*)(src + 0*src_stride)),
+-           "m" (*(uint32_t*)(src + 1*src_stride)),
+-           "m" (*(uint32_t*)(src + 2*src_stride)),
+-           "m" (*(uint32_t*)(src + 3*src_stride))
+     );
+ }
+