Contribs: force gnu99 for FFmpeg and fix compilation

[vlc] / extras / contrib / src / Makefile

diff --git a/extras/contrib/src/Makefile b/extras/contrib/src/Makefile
index 70189766004101cc94e12e7a73fd319a45605037..dc887a772cb762c32c1c12cdd85d3e0f243c05f6 100644 (file)
--- 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
@@ -2468,15 +2472,15 @@ DISTCLEAN_PKG += glew-$(GLEW_VERSION)-src.tgz
 # ***************************************************************************
 # projectM
 # ***************************************************************************
-libprojectM-$(LIBPROJECTM_VERSION)-Source.tar.gz:
+projectM-$(LIBPROJECTM_VERSION)-Source.tar.gz:
        $(WGET) $(LIBPROJECTM_URL)
 
-libprojectM: libprojectM-$(LIBPROJECTM_VERSION)-Source.tar.gz
+libprojectM: projectM-$(LIBPROJECTM_VERSION)-Source.tar.gz
        rm -rf $@ || true
        gunzip -c $< | tar xf - --exclude='[*?:<>\|]'
        mv projectM-$(LIBPROJECTM_VERSION)-Source $@ || true
        patch -p0 < Patches/libprojectM-win32.patch
-       cd $@; rm CMakeCache.txt
+       -cd $@; rm CMakeCache.txt
 
 .libprojectM: libprojectM .glew
        (cd $<; $(HOSTCC) CPPFLAGS="$(CPPFLAGS)" cmake . -DCMAKE_TOOLCHAIN_FILE=../../toolchain.cmake -DINCLUDE-PROJECTM-LIBVISUAL:BOOL=OFF -DDISABLE_NATIVE_PRESETS:BOOL=ON -DUSE_FTGL:BOOL=OFF -DINCLUDE-PROJECTM-PULSEAUDIO:BOOL=OFF -DINCLUDE-PROJECTM-QT:BOOL=OFF -DBUILD_PROJECTM_STATIC:BOOL=ON -DCMAKE_INSTALL_PREFIX=$(PREFIX) && make install)