diff --git a/Makefile b/Makefile index 4a5c2c2d9..7c9cbcb1f 100644 --- a/Makefile +++ b/Makefile @@ -147,7 +147,7 @@ FFMPEG_CONFIGURE_OPTIONS=--target-os=linux --enable-cross-compile --enable-runti --disable-avdevice --disable-avfilter --disable-avformat --disable-swresample --disable-network \ --enable-decoder=mjpeg --enable-encoder=mjpeg --enable-decoder=mpeg4 --enable-encoder=mpeg4 --enable-decoder=h264 \ --enable-decoder=h263p --enable-encoder=h263p --enable-decoder=h263 --enable-encoder=h263\ - --disable-static --enable-shared --disable-symver + --disable-static --enable-shared --disable-symver --disable-warnings FFMPEG_ARM_CONFIGURE_OPTIONS=--build-suffix=-linphone-arm --arch=arm --sysroot=$(ARM_SYSROOT) --cross-prefix=$(ARM_TOOLCHAIN_PATH) --enable-pic FFMPEG_X86_CONFIGURE_OPTIONS=--build-suffix=-linphone-x86 --arch=x86 --sysroot=$(X86_SYSROOT) --cross-prefix=$(X86_TOOLCHAIN_PATH) --disable-mmx --disable-sse2 --disable-ssse3 --extra-cflags='-O3' @@ -155,7 +155,11 @@ $(FFMPEG_SRC_DIR)/non_versioned_soname_patch_applied.txt: @patch -p0 < $(TOPDIR)/patches/ffmpeg_non_versioned_soname.patch touch $@ -$(FFMPEG_BUILD_DIR)/arm/config.h: +$(FFMPEG_SRC_DIR)/disable_compiler_warnings_patch_applied.txt: + @patch -p0 < $(TOPDIR)/patches/ffmpeg_disable_compiler_warnings.patch + touch $@ + +$(FFMPEG_BUILD_DIR)/arm/config.h: $(FFMPEG_SRC_DIR)/disable_compiler_warnings_patch_applied.txt mkdir -p $(FFMPEG_BUILD_DIR)/arm && \ cd $(FFMPEG_BUILD_DIR)/arm && \ $(FFMPEG_SRC_DIR)/configure $(FFMPEG_CONFIGURE_OPTIONS) $(FFMPEG_ARM_CONFIGURE_OPTIONS) @@ -172,7 +176,7 @@ $(FFMPEG_BUILD_DIR)/arm/libffmpeg-linphone-arm.so: $(FFMPEG_BUILD_DIR)/arm/libav rm libavcodec/log2_tab.o && \ $(ARM_TOOLCHAIN_PATH)gcc -lm -lz --sysroot=$(ARM_SYSROOT) -Wl,--no-undefined -Wl,-z,noexecstack -shared libavutil/*.o libavutil/arm/*.o libavcodec/*.o libavcodec/arm/*.o libswscale/*.o -o libffmpeg-linphone-arm.so -$(FFMPEG_BUILD_DIR)/x86/config.h: +$(FFMPEG_BUILD_DIR)/x86/config.h: $(FFMPEG_SRC_DIR)/disable_compiler_warnings_patch_applied.txt mkdir -p $(FFMPEG_BUILD_DIR)/x86 && \ cd $(FFMPEG_BUILD_DIR)/x86 && \ $(FFMPEG_SRC_DIR)/configure $(FFMPEG_CONFIGURE_OPTIONS) $(FFMPEG_X86_CONFIGURE_OPTIONS) diff --git a/patches/ffmpeg_disable_compiler_warnings.patch b/patches/ffmpeg_disable_compiler_warnings.patch new file mode 100644 index 000000000..99ea7254b --- /dev/null +++ b/patches/ffmpeg_disable_compiler_warnings.patch @@ -0,0 +1,29 @@ +--- submodules/externals/ffmpeg/configure 2015-02-13 09:45:17.766769717 +0100 ++++ submodules/externals/ffmpeg/configure.new 2015-02-13 09:44:26.891856924 +0100 +@@ -79,6 +79,7 @@ + --logfile=FILE log tests and output to FILE [config.log] + --disable-logging do not log configure debug information + --fatal-warnings fail if any configure warning is generated ++ --disable-warnings disable all compiler warnings + --prefix=PREFIX install in PREFIX [$prefix] + --bindir=DIR install binaries in DIR [PREFIX/bin] + --datadir=DIR install data files in DIR [PREFIX/share/ffmpeg] +@@ -1541,6 +1542,7 @@ + cross_compile + debug + extra_warnings ++ warnings + logging + lto + optimizations +@@ -3987,6 +3989,10 @@ + fi + enabled sdl && add_cflags $sdl_cflags && add_extralibs $sdl_libs + ++if disabled warnings; then ++ add_cflags -w ++fi ++ + texi2html --help 2> /dev/null | grep -q 'init-file' && enable texi2html || disable texi2html + makeinfo --version > /dev/null 2>&1 && enable makeinfo || disable makeinfo + perl --version > /dev/null 2>&1 && enable perl || disable perl