diff options
Diffstat (limited to 'media-video/avidemux')
| -rw-r--r-- | media-video/avidemux/ChangeLog | 9 | ||||
| -rw-r--r-- | media-video/avidemux/avidemux-2.4.3.ebuild | 6 | ||||
| -rw-r--r-- | media-video/avidemux/files/lavcodec-mpegvideo_mmx-asm-fix.patch | 56 |
3 files changed, 67 insertions, 4 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/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" + ); + } |