[vlc-devel] [PATCH 4 of 6] contrib: fix a few quirks detected during win32 cross compilation

[Edouard Gomez]

# HG changeset patch
# User Edouard Gomez <ed.gomez at free.fr>
# Date 1223648709 -7200
# Node ID 77d2f22cc2429e73fb47a875f9b37e4cad010e82
# Parent  337acc18537f7d45f95fa87350006a3c1b7b5203
contrib: fix a few quirks detected during win32 cross compilation

Review carefully as chunks impact the avcode plugin:
   - I had to disable libfaac support because whatever I tried
     the vlc ffmpeg plugin was always failing final link
     because of faac symbols missing. Though i tried to
     look at the compiled libfaac.a with mingw nm, I could not
     find any reason why the symbols were seen in the plugin link.
   - I had to remove the --cc=$(CC) assignment, because during
     cross compilation ffmpeg build system would concatenate
     the CC value with the cross-prefix value ending with calls
     to i386-mingw32-i386-mingw32-gcc.
   - Most of the = assignments should be turned in += assignments
     otherwise pieces of FFMPEGCONF get lost in the different
     if tests. I think this change is the safer among the three
     patches related to ffmpeg.
   - libmodplug win32 patch modifies the configure template but
     doesn't autoreconf, the build was failing. Added autoreconf
     call for win32 case.

diff --git a/extras/contrib/src/Makefile b/extras/contrib/src/Makefile
--- a/extras/contrib/src/Makefile
+++ b/extras/contrib/src/Makefile
@@ -84,9 +84,10 @@
 HOSTCC2=$(HOSTCC)
 endif
 
+FFMPEGCONF=
 # For ffmpeg if not cross compiling
 ifneq ($(CC),)
-  FFMPEGCONF=--cc="$(CC)"
+  #FFMPEGCONF+=--cc="$(CC)"
 endif
 
 #
@@ -101,7 +102,7 @@
     #
     ifndef HAVE_CYGWIN
         # We are REALLY cross compiling
-        FFMPEGCONF=--cross-prefix=$(HOST)- --enable-cross-compile
+        FFMPEGCONF+= --cross-prefix=$(HOST)- --enable-cross-compile
         X264CONF=--host=$(HOST)
         PTHREADSCONF="CROSS=$(HOST)-"
     else
@@ -132,7 +133,7 @@
 FFMPEGCONF+= --enable-small --disable-debug --disable-mpegaudio-hp
 FFMPEG_CFLAGS += -DHAVE_LRINTF --std=c99
 else
-FFMPEGCONF+= --enable-libmp3lame --enable-libfaac --enable-swscale
+FFMPEGCONF+= --enable-libmp3lame --enable-swscale
 endif
 
 ifdef HAVE_BEOS
@@ -1092,7 +1093,7 @@
 endif
 
 
-FFMPEGCONF = --enable-gpl --enable-postproc --disable-vhook --disable-ffserver --disable-ffmpeg --disable-ffplay --disable-devices --disable-protocols --disable-network --enable-swscale
+FFMPEGCONF += --enable-gpl --enable-postproc --disable-vhook --disable-ffserver --disable-ffmpeg --disable-ffplay --disable-devices --disable-protocols --disable-network --enable-swscale
 
 ifdef HAVE_WINCE
 .ffmpeg: ffmpeg .zlib
@@ -1431,6 +1432,7 @@
 	$(EXTRACT_GZ)
 ifdef HAVE_WIN32
 	patch -p0 < Patches/libmodplug-win32.patch
+	(cd $@ && autoreconf)
 endif
 
 .mod: libmodplug