[MPlayer-dev-eng] [PATCH] Quick and dirty fix build after BUILD_ROOT got removed from FFmpeg (798b264)

[Reimar Döffinger]

On Mon, May 30, 2011 at 09:59:25PM +0200, Reimar Döffinger wrote:
> On Mon, May 30, 2011 at 09:52:20PM +0200, Clément Bœsch wrote:
> > I'll commit the attached patch as a temporary fix in a few hours if no one
> > comes up with something better.
> 
> I think I have something mostly finished.


Index: configure
===================================================================
--- configure	(revision 33526)
+++ configure	(working copy)
@@ -8138,8 +8138,7 @@
 YASMFLAGS  = $YASMFLAGS
 
 CONFIG_STATIC = yes
-SRC_PATH      = ../../
-BUILD_ROOT    = ..
+SRC_PATH      = ../
 LIBPREF       = lib
 LIBSUF        = .a
 LIBNAME       = \$(LIBPREF)\$(NAME)\$(LIBSUF)
@@ -8739,7 +8738,7 @@
 done
 echo "$(ff_config_enable "$cpuexts_all" "$cpuexts" "%" "HAVE")" >> "$TMPS"
 
-cmp -s "$TMPS" config.asm || mv -f "$TMPS" config.asm
+cmp -s "$TMPS" config.asm || mv -f "$TMPS" ffmpeg/config.asm
 fi
 
 
@@ -8748,6 +8747,10 @@
 include ../../config.mak
 EOF
 
+cat > ffmpeg/config.h << EOF
+#include "../config.h"
+EOF
+
 #############################################################################
 
 cat << EOF