diff options
| author |   Luca Barbato <lu_zero@gentoo.org> | 2006-03-04 06:58:43 +0000 |
|---|---|---|
| committer | Luca Barbato <lu_zero@gentoo.org> | 2006-03-04 06:58:43 +0000 |
| commit | 2cbacb5aa45dff3742b85f647373cc6d68aed71d (patch) | |
| tree | 6b994997592833d51428d3ab02104683585140a9 /media-video | |
| parent | Stable on ppc. bug 124854 (diff) | |
| download | gentoo-2-2cbacb5aa45dff3742b85f647373cc6d68aed71d.tar.gz gentoo-2-2cbacb5aa45dff3742b85f647373cc6d68aed71d.tar.bz2 gentoo-2-2cbacb5aa45dff3742b85f647373cc6d68aed71d.zip | |
gcc4 patch for x86
(Portage version: 2.1_pre4-r1)
Diffstat (limited to 'media-video')
| -rw-r--r-- | media-video/ffmpeg/ChangeLog | 6 | ||||
| -rw-r--r-- | media-video/ffmpeg/ffmpeg-0.4.9_p20060302.ebuild | 4 | ||||
| -rw-r--r-- | media-video/ffmpeg/files/ffmpeg-shared-gcc4.1.patch | 40 |
3 files changed, 48 insertions, 2 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/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)) + ); + } + |