Add patch from ffmpeg to prevent compilation failure triggered by -ftracer. Fixes bug 255268.

Package-Manager: portage-2.2_rc22/cvs/Linux 2.6.28-hh1 i686

4 files changed, 70 insertions, 6 deletions

diff --git a/media-video/avidemux/ChangeLog b/media-video/avidemux/ChangeLog
index f7d65a0c156e..e82a06e718b1 100644
--- a/media-video/avidemux/ChangeLog
+++ b/media-video/avidemux/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for media-video/avidemux
-# Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/avidemux/ChangeLog,v 1.140 2008/12/21 14:46:32 nixnut Exp $
+# Copyright 2002-2009 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-video/avidemux/ChangeLog,v 1.141 2009/01/17 20:52:14 yngwin Exp $
+
+  17 Jan 2009; Ben de Groot <yngwin@gentoo.org>
+  +files/lavcodec-mpegvideo_mmx-asm-fix.patch, avidemux-2.4.3.ebuild:
+  Add patch from ffmpeg to prevent compilation failure triggered by
+  -ftracer. Fixes bug 255268.
 
   21 Dec 2008; nixnut <nixnut@gentoo.org> avidemux-2.4.3.ebuild:
   Stable on ppc wrt bug 245535
diff --git a/media-video/avidemux/Manifest b/media-video/avidemux/Manifest
index 25f414c08b0a..8e68d0631d59 100644
--- a/media-video/avidemux/Manifest
+++ b/media-video/avidemux/Manifest
@@ -1,7 +1,8 @@
 AUX avidemux-2.4-i18n.patch 1676 RMD160 5cc06702f8a4d96a12630d4f543035baa5ccac0f SHA1 32557519caeed3b236f48b40d5ee8953b2d03197 SHA256 ab978ed96a2689af2e01ad8b9a08ed9bd4b2f8e4c6721d9598964f1fd8a5e6d2
 AUX avidemux-2.4-libdca.patch 949 RMD160 53ec97b26441f2617566dbb949496be72ecbc07c SHA1 91ff55452ed9bdaabd76fa41add4c405bf6b8405 SHA256 95f49dbe69a4621ef8f33795898623156222e16d0774a6c454e2e303c6290c3e
 AUX avidemux-2.4.3-x264.patch 1484 RMD160 ed487bb8f6a65fca9180790156411d84ee18fe8c SHA1 06fb7f651ff8b3c866785c8a9e65ced1ec395d03 SHA256 b7e6a3374aed67734602b5ef25c994267d8bd2324c46993554853336c6a47553
+AUX lavcodec-mpegvideo_mmx-asm-fix.patch 2443 RMD160 3b1b315ef1e5083f95807ce5419196c832a66aad SHA1 0bd5ca05d373f7fd63cafb03d5514cfc86d8504c SHA256 c6cfcf06da8a254e542077a7ac728be220d41fc0ad3c4b7001ac63de5f36bc6c
 DIST avidemux_2.4.3.tar.gz 6707930 RMD160 3d9d098d97462027ac1a62fe9438451b1915367b SHA1 d3a4dc2c07884916c45f750229d02fbdeb3cedde SHA256 b2e24ed11ad84c1f5c0b6efaad8b1aae07618cf99994ae0d63fbd7f71333214f
-EBUILD avidemux-2.4.3.ebuild 3976 RMD160 b737ee5f191174f0c56998ef77a357e70f485ac3 SHA1 985c1eb3f60e72fb7c9a842a0bd943fb9154efea SHA256 76ab75b8da6610b6391e5174e017c3ef4f0dc171aac168dbd8bf300e542e363d
-MISC ChangeLog 24509 RMD160 c582366b64826d6753cd805c6e6f2393cd394c96 SHA1 e35dc402a86555948b1ffafbccaa06f4822b8624 SHA256 d093078845592d9b9c2d114290f1fb665c700e4f810359097af653f714791bee
+EBUILD avidemux-2.4.3.ebuild 4091 RMD160 645a511321e645f6043f36b7108b6c4b1d8b5a6f SHA1 7069f363839da8da62426b84b4d1d52c907e62a1 SHA256 0c4d69b7a8ab20524bb9eb6b2fbdbd7015c25ac24b1bb9dac2f3aa72ea8d01eb
+MISC ChangeLog 24726 RMD160 9865a7c78c96ebbc9efac9872d4ec3447b1dbe2e SHA1 8794e1243807a8362639943801d93389014d9d07 SHA256 6f7a4c307f4406eb4f9039baecb355093d2694e8abfe9e7cb0f3578cd359352f
 MISC metadata.xml 429 RMD160 b32016aaa9b19e2462d493e38f1d9423d8772361 SHA1 05b0451bfb459579447bd43a30104445f59c23ce SHA256 e5416acf63f5b056b0d9148a73d6914b09c78446338f913a9cf709661487790a
diff --git a/media-video/avidemux/avidemux-2.4.3.ebuild b/media-video/avidemux/avidemux-2.4.3.ebuild
index c9763ae07e99..6cfd7ad54b48 100644
--- a/media-video/avidemux/avidemux-2.4.3.ebuild
+++ b/media-video/avidemux/avidemux-2.4.3.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2008 Gentoo Foundation
+# Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/avidemux/avidemux-2.4.3.ebuild,v 1.6 2008/12/21 14:46:32 nixnut Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/avidemux/avidemux-2.4.3.ebuild,v 1.7 2009/01/17 20:52:14 yngwin Exp $
 
 EAPI="1"
 
@@ -69,6 +69,8 @@ src_unpack() {
 	epatch "${FILESDIR}"/${PN}-2.4-i18n.patch
 	# Upstream patch for newer x264
 	epatch "${FILESDIR}"/${P}-x264.patch
+	# Fix compile error triggered by -ftracer (bug 255268)
+	epatch "${FILESDIR}"/lavcodec-mpegvideo_mmx-asm-fix.patch
 }
 
 src_compile() {
diff --git a/media-video/avidemux/files/lavcodec-mpegvideo_mmx-asm-fix.patch b/media-video/avidemux/files/lavcodec-mpegvideo_mmx-asm-fix.patch
new file mode 100644
index 000000000000..c2ffdaef21b7
--- /dev/null
+++ b/media-video/avidemux/files/lavcodec-mpegvideo_mmx-asm-fix.patch
@@ -0,0 +1,56 @@
+--- a/avidemux/ADM_libraries/ADM_lavcodec/i386/mpegvideo_mmx.c	2008/05/09 11:56:36	13098
++++ b/avidemux/ADM_libraries/ADM_lavcodec/i386/mpegvideo_mmx.c	2008/08/24 08:41:20	14941
+@@ -99,7 +99,7 @@
+
+                 "add $16, %3                    \n\t"
+                 "jng 1b                         \n\t"
+-                ::"r" (block+nCoeffs), "g"(qmul), "g" (qadd), "r" (2*(-nCoeffs))
++                ::"r" (block+nCoeffs), "rm"(qmul), "rm" (qadd), "r" (2*(-nCoeffs))
+                 : "memory"
+         );
+         block[0]= level;
+@@ -162,7 +162,7 @@
+
+                 "add $16, %3                    \n\t"
+                 "jng 1b                         \n\t"
+-                ::"r" (block+nCoeffs), "g"(qmul), "g" (qadd), "r" (2*(-nCoeffs))
++                ::"r" (block+nCoeffs), "rm"(qmul), "rm" (qadd), "r" (2*(-nCoeffs))
+                 : "memory"
+         );
+ }
+@@ -260,7 +260,7 @@
+
+                 "add $16, %%"REG_a"             \n\t"
+                 "js 1b                          \n\t"
+-                ::"r" (block+nCoeffs), "r"(quant_matrix+nCoeffs), "g" (qscale), "g" (-2*nCoeffs)
++                ::"r" (block+nCoeffs), "r"(quant_matrix+nCoeffs), "rm" (qscale), "g" (-2*nCoeffs)
+                 : "%"REG_a, "memory"
+         );
+     block[0]= block0;
+@@ -327,7 +327,7 @@
+
+                 "add $16, %%"REG_a"             \n\t"
+                 "js 1b                          \n\t"
+-                ::"r" (block+nCoeffs), "r"(quant_matrix+nCoeffs), "g" (qscale), "g" (-2*nCoeffs)
++                ::"r" (block+nCoeffs), "r"(quant_matrix+nCoeffs), "rm" (qscale), "g" (-2*nCoeffs)
+                 : "%"REG_a, "memory"
+         );
+ }
+@@ -391,7 +391,7 @@
+
+                 "add $16, %%"REG_a"             \n\t"
+                 "jng 1b                         \n\t"
+-                ::"r" (block+nCoeffs), "r"(quant_matrix+nCoeffs), "g" (qscale), "g" (-2*nCoeffs)
++                ::"r" (block+nCoeffs), "r"(quant_matrix+nCoeffs), "rm" (qscale), "g" (-2*nCoeffs)
+                 : "%"REG_a, "memory"
+         );
+     block[0]= block0;
+@@ -470,7 +470,7 @@
+                 "pxor %%mm7, %%mm0              \n\t"
+                 "movd %%mm0, 124(%0, %3)        \n\t"
+
+-                ::"r" (block+nCoeffs), "r"(quant_matrix+nCoeffs), "g" (qscale), "r" (-2*nCoeffs)
++                ::"r" (block+nCoeffs), "r"(quant_matrix+nCoeffs), "rm" (qscale), "r" (-2*nCoeffs)
+                 : "%"REG_a, "memory"
+         );
+ }