From: Jean-Baptiste Kempf <jb@videolan.org>
Date: Mon, 9 Aug 2010 11:23:06 +0000 (+0200)
Subject: Contribs: force gnu99 for FFmpeg and fix compilation
X-Git-Tag: 1.2.0-pre1~5518
X-Git-Url: https://git.sesse.net/?a=commitdiff_plain;h=b9c5a440d6458b9b2e50450293b9aa3e20865ad6;p=vlc

Contribs: force gnu99 for FFmpeg and fix compilation

For somewhat reason, on debian's (and arch's) mingw, strcasecmp isn't defined in c99 (very probably because _NO_OLDNAMES is defined)
---

diff --git a/extras/contrib/src/Makefile b/extras/contrib/src/Makefile
index d9d0dbddc4..dc887a772c 100644
--- a/extras/contrib/src/Makefile
+++ b/extras/contrib/src/Makefile
@@ -1040,7 +1040,7 @@ ifdef SVN
 ifdef HAVE_WIN32
 ffmpeg: .dshow_headers
 else
-ffmpeg: 
+ffmpeg:
 endif
 	$(SVN) co $(FFMPEG_SVN) ffmpeg
 ifdef HAVE_ISA_THUMB
@@ -1054,6 +1054,9 @@ ifdef HAVE_UCLIBC
 	patch -p0 < Patches/ffmpeg-svn-internal-define.patch
 	patch -p0 < Patches/ffmpeg-svn-libavformat.patch
 endif
+ifdef HAVE_WIN32
+	sed -i "s/std=c99/std=gnu99/" ffmpeg/configure
+endif
 else
 ffmpeg-$(FFMPEG_VERSION).tar.gz:
 	echo "ffmpeg snapshot is too old, you MUST use subversion !"
@@ -1073,7 +1076,7 @@ FFMPEGCONF += \
 	--disable-ffplay \
 	--disable-devices \
 	--disable-protocols \
-	--disable-filters \
+	--disable-avfilter \
 	--disable-network
 ifdef HAVE_WIN64
 FFMPEGCONF += --disable-bzlib --disable-decoder=dca --disable-encoder=vorbis --enable-libmp3lame --enable-w32threads --disable-dxva2 --disable-bsfs 
@@ -1083,6 +1086,7 @@ FFMPEGCONF += --disable-bzlib --disable-decoder=dca --disable-encoder=vorbis --e
 else
 FFMPEGCONF += --enable-pthreads
 endif
+FFMPEG_CFLAGS += --std=gnu99
 endif
 
 ifdef HAVE_WINCE
@@ -1098,7 +1102,7 @@ else
 endif
 endif
 endif
-	(cd $<; $(HOSTCC) ./configure --prefix=$(PREFIX) --extra-cflags="$(CFLAGS) $(FFMPEG_CFLAGS) -DHAVE_STDINT_H" --extra-ldflags="$(LDFLAGS)" $(FFMPEGCONF) --disable-shared --enable-static && make && make install-libs install-headers)
+	(cd $<; $(HOSTCC) ./configure --prefix=$(PREFIX) --extra-cflags="$(FFMPEG_CFLAGS) -DHAVE_STDINT_H" --extra-ldflags="$(LDFLAGS)" $(FFMPEGCONF) --disable-shared --enable-static && make && make install-libs install-headers)
 	touch $@
 
 ifdef SVN