--- ffmpeg-0.4.9_p20050226-r3.ebuild.orig 2005-04-13 13:36:37.000000000 +0100 +++ ffmpeg-0.4.9_p20050226-r3.ebuild 2005-04-13 15:19:11.000000000 +0100 @@ -44,9 +44,10 @@ #ffmpeg doesn'g use libtool, so the condition for PIC code #is __PIC__, not PIC. - sed -i -e 's/#if\(\(.*def *\)\|\(.*defined *\)\)PIC/#if\1__PIC__/' \ - libavcodec/i386/dsputil_mmx{.c,_rnd.h} \ + sed -i -e 's/#\(\(.*def *\)\|\(.*defined *\)\|\(.*defined(*\)\)PIC/#\1__PIC__/' \ + libavcodec/i386/dsputil_mmx{.c,_rnd.h,_avg.h} \ libavcodec/msmpeg4.c \ + libavcodec/common.h \ || die "sed failed (__PIC__)" #fixup liba52 to respect the --disable-mmx configure option @@ -72,10 +73,10 @@ #disable mmx accelerated code if not requirested, or if PIC is required # as the provided asm decidedly isn't PIC. - if has_pic || use !mmx; then - myconf="${myconf} --disable-mmx" - else + if ( !has_pic && use mmx ) || use amd64 ; then myconf="${myconf} --enable-mmx" + else + myconf="${myconf} --disable-mmx" fi use encode && use aac && myconf="${myconf} --enable-faac"