On Fri, Nov 07, 2008 at 01:16:51AM +0300, Andrew Savchenko wrote:
On Thursday 06 November 2008 13:32, Diego Biurrun wrote: [...]
--- configure.orig 2008-11-06 07:06:20.000000000 +0300 +++ configure 2008-11-06 10:31:48.000000000 +0300
You don't use Subversion?
I do, but not svn diff. Just an old habit. Fixed.
Good.
@@ -408,6 +421,7 @@ --as=ASSEMBLER assembler to build MPlayer [as] + --yasm=YASM yasm assembler to build MPlayer [yasm]
Yasm
I suppose you mean "Yasm assembler to ...".
Yes.
--- common.mak.orig 2008-05-12 21:50:30.000000000 +0400 +++ common.mak 2008-11-06 09:57:20.000000000 +0300 @@ -80,6 +80,12 @@
Syncing this file from FFmpeg should be done separately.
Full sync is done. (In the first version it was only partial.) Of course, this commit should be done in first place, otherwise compilation will be broken in between.
I have committed this in the meantime, it was high time for a sync again.
--- configure (revision 27899) +++ configure (working copy) @@ -2385,7 +2403,41 @@
+echocheck "yasm" +if test -z "$YASMFLAGS" ; then + if darwin ; then + if x86_64 ; then + objformat="macho64" + else + objformat="macho" + fi
x86_64 && objformat="macho64" || objformat="macho"
@@ -7797,6 +7849,7 @@ CC = $_cc CXX = $_cc +YASM = $_yasm HOST_CC = $_host_cc INSTALL = $_install
Put it after HOST_CC.
@@ -7983,6 +8037,7 @@
# Some FFmpeg codecs depend on these. Enable them unconditionally for now. CONFIG_FFT=yes +CONFIG_FFT_MMX=$(test $_yasm && test "$_mmx" == "yes" && echo yes)
This is not the way to go. There should be no logic in this place.
@@ -8007,6 +8062,7 @@
HAVE_PTHREADS = $_pthreads HAVE_W32THREADS = $_w32threads +HAVE_YASM=$(test $_yasm && echo yes)
Ditto, set a variable that you can use here above. Diego