Add pic patch for x86 as per bug #88582. Thanks to Kevin F. Quinn <kevquinn@gentoo.org> for the patch.

(Portage version: 2.0.51.22-r1)

3 files changed, 60 insertions, 2 deletions

diff --git a/media-video/avifile/ChangeLog b/media-video/avifile/ChangeLog
index 89b503484e96..6bf0dc6ab8a2 100644
--- a/media-video/avifile/ChangeLog
+++ b/media-video/avifile/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for media-video/avifile
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/avifile/ChangeLog,v 1.106 2005/07/13 11:16:00 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/avifile/ChangeLog,v 1.107 2005/07/13 11:59:24 flameeyes Exp $
+
+  13 Jul 2005; Diego Pettenò <flameeyes@gentoo.org>
+  +files/avifile-0.7.43.20050224-pic.patch,
+  avifile-0.7.43.20050224-r2.ebuild:
+  Add pic patch for x86 as per bug #88582. Thanks to Kevin F. Quinn
+  <kevquinn@gentoo.org> for the patch.
 
   13 Jul 2005; Diego Pettenò <flameeyes@gentoo.org>
   avifile-0.7.43.20050224-r1.ebuild, avifile-0.7.43.20050224-r2.ebuild:
diff --git a/media-video/avifile/avifile-0.7.43.20050224-r2.ebuild b/media-video/avifile/avifile-0.7.43.20050224-r2.ebuild
index 2e8e4dd2623c..e54da2c155ab 100644
--- a/media-video/avifile/avifile-0.7.43.20050224-r2.ebuild
+++ b/media-video/avifile/avifile-0.7.43.20050224-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/avifile/avifile-0.7.43.20050224-r2.ebuild,v 1.2 2005/07/13 11:16:00 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/avifile/avifile-0.7.43.20050224-r2.ebuild,v 1.3 2005/07/13 11:59:24 flameeyes Exp $
 
 inherit eutils flag-o-matic
 
@@ -66,6 +66,8 @@ src_unpack() {
 	# fix building with gcc4
 	# http://debian-amd64.alioth.debian.org/gcc-3.4/patches/avifile_0.7.43.20050224-1.0.0.1.gcc4.patch
 	epatch ${FILESDIR}/${P}-1.0.0.1.gcc4.patch
+	# Fix pic building (bug #88582)
+	epatch ${FILESDIR}/${P}-pic.patch
 
 	if ! use qt ; then
 		sed -i -e 's/qtvidcap\ qtrecompress//g' \
diff --git a/media-video/avifile/files/avifile-0.7.43.20050224-pic.patch b/media-video/avifile/files/avifile-0.7.43.20050224-pic.patch
new file mode 100644
index 000000000000..8ce0d463070a
--- /dev/null
+++ b/media-video/avifile/files/avifile-0.7.43.20050224-pic.patch
@@ -0,0 +1,50 @@
+--- avifile-0.7-0.7.43/samples/qtvidcap/deinterlace-rgb.cpp.orig	2005-04-10 13:26:01.000000000 +0200
++++ avifile-0.7-0.7.43/samples/qtvidcap/deinterlace-rgb.cpp	2005-04-10 13:26:38.000000000 +0200
+@@ -17,10 +17,10 @@
+ 	    memcpy(outp, inp, xdim);
+ 	    continue;
+ 	}
+-	int count=xdim/8;
+ 	__asm__ __volatile__ (
+-	"movl %2, %%esi\n\t"
+-	"movl %3, %%edi\n\t"	
++	"movl %2, %%esi\n\t"	// xdim
++	"shr  $3, %2\n\t"
++	"movl %2, %%edi\n\t"	// count = xdim/8
+ 	"pxor %%mm3, %%mm3\n\t"
+ 	"1:\n\t"
+ 	"movq (%%ecx, %%esi), %%mm0\n\t"
+@@ -39,7 +39,7 @@
+ 	"decl %%edi\n\t"
+ 	"jnz 1b\n\t"
+     	:
+-	: "c" (inp-xdim), "d" (outp), "r" (xdim), "r" (count)
++	: "c" (inp-xdim), "d" (outp), "r" (xdim)
+ 	: "esi", "edi"
+ 	);
+     }
+--- avifile-0.7-0.7.43/samples/qtvidcap/qtrenderer.cpp.orig	2005-04-10 14:01:44.000000000 +0200
++++ avifile-0.7-0.7.43/samples/qtvidcap/qtrenderer.cpp	2005-04-10 14:02:36.000000000 +0200
+@@ -160,10 +160,10 @@
+ 	    memcpy(outp, inp, xdim);
+ 	    continue;
+ 	}
+-	int count=xdim/8;
+ 	__asm__ __volatile__ (
+-	"movl %2, %%esi\n\t"
+-	"movl %3, %%edi\n\t"
++	"movl %2, %%esi\n\t"	// xdim
++	"shr  $3,%2\n\t"
++	"movl %2, %%edi\n\t"	// count = xdim/8
+ 	"pxor %%mm3, %%mm3\n\t"
+ 	"1:\n\t"
+ 	"movq (%%ecx, %%esi), %%mm0\n\t"
+@@ -182,7 +182,7 @@
+ 	"decl %%edi\n\t"
+ 	"jnz 1b\n\t"
+     	:
+-	: "c" (inp-xdim), "d" (outp), "r" (xdim), "r" (count)
++	: "c" (inp-xdim), "d" (outp), "r" (xdim)
+ 	: "esi", "edi"
+ 	);
+     }