Commit b9c5a440 authored by Jean-Baptiste Kempf's avatar Jean-Baptiste Kempf

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)
parent 6478c429
...@@ -1040,7 +1040,7 @@ ifdef SVN ...@@ -1040,7 +1040,7 @@ ifdef SVN
ifdef HAVE_WIN32 ifdef HAVE_WIN32
ffmpeg: .dshow_headers ffmpeg: .dshow_headers
else else
ffmpeg: ffmpeg:
endif endif
$(SVN) co $(FFMPEG_SVN) ffmpeg $(SVN) co $(FFMPEG_SVN) ffmpeg
ifdef HAVE_ISA_THUMB ifdef HAVE_ISA_THUMB
...@@ -1054,6 +1054,9 @@ ifdef HAVE_UCLIBC ...@@ -1054,6 +1054,9 @@ ifdef HAVE_UCLIBC
patch -p0 < Patches/ffmpeg-svn-internal-define.patch patch -p0 < Patches/ffmpeg-svn-internal-define.patch
patch -p0 < Patches/ffmpeg-svn-libavformat.patch patch -p0 < Patches/ffmpeg-svn-libavformat.patch
endif endif
ifdef HAVE_WIN32
sed -i "s/std=c99/std=gnu99/" ffmpeg/configure
endif
else else
ffmpeg-$(FFMPEG_VERSION).tar.gz: ffmpeg-$(FFMPEG_VERSION).tar.gz:
echo "ffmpeg snapshot is too old, you MUST use subversion !" echo "ffmpeg snapshot is too old, you MUST use subversion !"
...@@ -1073,7 +1076,7 @@ FFMPEGCONF += \ ...@@ -1073,7 +1076,7 @@ FFMPEGCONF += \
--disable-ffplay \ --disable-ffplay \
--disable-devices \ --disable-devices \
--disable-protocols \ --disable-protocols \
--disable-filters \ --disable-avfilter \
--disable-network --disable-network
ifdef HAVE_WIN64 ifdef HAVE_WIN64
FFMPEGCONF += --disable-bzlib --disable-decoder=dca --disable-encoder=vorbis --enable-libmp3lame --enable-w32threads --disable-dxva2 --disable-bsfs 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 ...@@ -1083,6 +1086,7 @@ FFMPEGCONF += --disable-bzlib --disable-decoder=dca --disable-encoder=vorbis --e
else else
FFMPEGCONF += --enable-pthreads FFMPEGCONF += --enable-pthreads
endif endif
FFMPEG_CFLAGS += --std=gnu99
endif endif
ifdef HAVE_WINCE ifdef HAVE_WINCE
...@@ -1098,7 +1102,7 @@ else ...@@ -1098,7 +1102,7 @@ else
endif endif
endif 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 $@ touch $@
ifdef SVN ifdef SVN
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment