From 3018cba56cdcda088ffa766812f42c62ed9855ab Mon Sep 17 00:00:00 2001
From: Sylvain Berfini <sylvain.berfini@linphone.org>
Date: Fri, 7 Mar 2014 14:15:45 +0100
Subject: [PATCH] Fix the no video build

---
 Makefile           | 7 +++++++
 jni/Android.mk     | 2 +-
 jni/Application.mk | 7 +++----
 3 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/Makefile b/Makefile
index 99947a622..63c09fd22 100644
--- a/Makefile
+++ b/Makefile
@@ -119,10 +119,12 @@ $(LIBILBC_BUILD_DIR)/src/iLBC_decode.c: $(LIBILBC_BUILD_DIR)/Makefile
 prepare-ilbc: $(LIBILBC_BUILD_DIR)/src/iLBC_decode.c
 
 #ffmpeg
+ifeq ($(BUILD_VIDEO),1)
 BUILD_FFMPEG_DEPS=$(FFMPEG_SRC_DIR)/non_versioned_soname_patch_applied.txt $(FFMPEG_BUILD_DIR)/arm/libavcodec/libavcodec-linphone-arm.so
 ifeq ($(BUILD_FOR_X86), 1)
 	BUILD_FFMPEG_DEPS+=$(FFMPEG_BUILD_DIR)/x86/libavcodec/libavcodec-linphone-x86.so
 endif
+endif
 FFMPEG_SRC_DIR=$(TOPDIR)/submodules/externals/ffmpeg
 FFMPEG_BUILD_DIR=$(TOPDIR)/submodules/externals/build/ffmpeg
 FFMPEG_CONFIGURE_OPTIONS=--target-os=linux --enable-cross-compile --enable-runtime-cpudetect \
@@ -159,11 +161,14 @@ clean-ffmpeg:
 	rm -rf $(FFMPEG_BUILD_DIR)/x86
 
 #x264
+ifeq ($(BUILD_VIDEO),1)
 ifeq ($(BUILD_X264), 1)
 BUILD_X264_DEPS=$(X264_SRC_DIR)/log2f_fix_patch_applied.txt $(X264_BUILD_DIR)/arm/libx264.a
 ifeq ($(BUILD_FOR_X86), 1)
 	BUILD_X264_DEPS+=$(X264_BUILD_DIR)/x86/libx264.a
 endif
+endif
+
 X264_SRC_DIR=$(TOPDIR)/submodules/externals/x264
 X264_BUILD_DIR=$(TOPDIR)/submodules/externals/build/x264
 X264_CONFIGURE_OPTIONS=
@@ -200,10 +205,12 @@ clean-x264:
 	rm -rf $(X264_BUILD_DIR)/x86
 
 #libvpx
+ifeq ($(BUILD_VIDEO),1)
 BUILD_VPX_DEPS=$(LIBVPX_SRC_DIR)/configure_android_x86_patch_applied.txt $(LIBVPX_BUILD_DIR)/arm/libvpx.a
 ifeq ($(BUILD_FOR_X86), 1)
 	BUILD_VPX_DEPS+=$(LIBVPX_BUILD_DIR)/x86/libvpx.a
 endif
+endif
 LIBVPX_SRC_DIR=$(TOPDIR)/submodules/externals/libvpx
 LIBVPX_BUILD_DIR=$(TOPDIR)/submodules/externals/build/libvpx
 LIBVPX_CONFIGURE_OPTIONS=--disable-vp9 --disable-examples --disable-unit-tests --disable-postproc --enable-error-concealment --enable-debug
diff --git a/jni/Android.mk b/jni/Android.mk
index e1212dce4..1d1b3f5b3 100755
--- a/jni/Android.mk
+++ b/jni/Android.mk
@@ -10,13 +10,13 @@ else
 _BUILD_X264=$(BUILD_X264)
 _BUILD_VIDEO=$(BUILD_VIDEO)
 endif
+
 ifeq ($(_BUILD_VIDEO),0)
 ifeq (,$(DUMP_VAR))
 $(info $(TARGET_ARCH_ABI): Video is disabled for targets other than armeabi-v7a and x86)
 endif
 endif
 
-
 ifeq ($(BUILD_GPLV3_ZRTP), 1)
 	BUILD_SRTP=1
 ZRTP_C_INCLUDE= \
diff --git a/jni/Application.mk b/jni/Application.mk
index 09e00e4c2..96ef37a65 100644
--- a/jni/Application.mk
+++ b/jni/Application.mk
@@ -55,6 +55,9 @@ endif
 ifeq ($(BUILD_VIDEO),1)
 APP_MODULES += libavutil-linphone libavcodec-linphone libswscale-linphone
 APP_MODULES += libvpx
+ifeq ($(BUILD_X264),1)
+APP_MODULES +=libx264 libmsx264
+endif
 endif
 
 _BUILD_AMR=0
@@ -74,10 +77,6 @@ ifneq ($(BUILD_AMRWB), 0)
 APP_MODULES += libvoamrwbenc
 endif
 
-ifeq ($(BUILD_X264),1)
-APP_MODULES +=libx264 libmsx264
-endif
-
 ifeq ($(BUILD_SILK),1)
 APP_MODULES +=libmssilk
 endif