Difuse/difuse-phone-android
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Fix the no video build

Browse source
This commit is contained in:
Sylvain Berfini 2014-03-07 14:15:45 +01:00
parent 37177cd0c5
commit 3018cba56c
3 changed files with 11 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
Makefile
View file

@ -119,10 +119,12 @@ $(LIBILBC_BUILD_DIR)/src/iLBC_decode.c: $(LIBILBC_BUILD_DIR)/Makefile
prepare-ilbc: $(LIBILBC_BUILD_DIR)/src/iLBC_decode.c prepare-ilbc: $(LIBILBC_BUILD_DIR)/src/iLBC_decode.c
#ffmpeg #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 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) ifeq ($(BUILD_FOR_X86), 1)
BUILD_FFMPEG_DEPS+=$(FFMPEG_BUILD_DIR)/x86/libavcodec/libavcodec-linphone-x86.so BUILD_FFMPEG_DEPS+=$(FFMPEG_BUILD_DIR)/x86/libavcodec/libavcodec-linphone-x86.so
endif endif
endif
FFMPEG_SRC_DIR=$(TOPDIR)/submodules/externals/ffmpeg FFMPEG_SRC_DIR=$(TOPDIR)/submodules/externals/ffmpeg
FFMPEG_BUILD_DIR=$(TOPDIR)/submodules/externals/build/ffmpeg FFMPEG_BUILD_DIR=$(TOPDIR)/submodules/externals/build/ffmpeg
FFMPEG_CONFIGURE_OPTIONS=--target-os=linux --enable-cross-compile --enable-runtime-cpudetect \ FFMPEG_CONFIGURE_OPTIONS=--target-os=linux --enable-cross-compile --enable-runtime-cpudetect \
@ -159,11 +161,14 @@ clean-ffmpeg:
rm -rf $(FFMPEG_BUILD_DIR)/x86 rm -rf $(FFMPEG_BUILD_DIR)/x86
#x264 #x264
ifeq ($(BUILD_VIDEO),1)
ifeq ($(BUILD_X264), 1) ifeq ($(BUILD_X264), 1)
BUILD_X264_DEPS=$(X264_SRC_DIR)/log2f_fix_patch_applied.txt $(X264_BUILD_DIR)/arm/libx264.a BUILD_X264_DEPS=$(X264_SRC_DIR)/log2f_fix_patch_applied.txt $(X264_BUILD_DIR)/arm/libx264.a
ifeq ($(BUILD_FOR_X86), 1) ifeq ($(BUILD_FOR_X86), 1)
BUILD_X264_DEPS+=$(X264_BUILD_DIR)/x86/libx264.a BUILD_X264_DEPS+=$(X264_BUILD_DIR)/x86/libx264.a
endif endif
endif
X264_SRC_DIR=$(TOPDIR)/submodules/externals/x264 X264_SRC_DIR=$(TOPDIR)/submodules/externals/x264
X264_BUILD_DIR=$(TOPDIR)/submodules/externals/build/x264 X264_BUILD_DIR=$(TOPDIR)/submodules/externals/build/x264
X264_CONFIGURE_OPTIONS= X264_CONFIGURE_OPTIONS=
@ -200,10 +205,12 @@ clean-x264:
rm -rf $(X264_BUILD_DIR)/x86 rm -rf $(X264_BUILD_DIR)/x86
#libvpx #libvpx
ifeq ($(BUILD_VIDEO),1)
BUILD_VPX_DEPS=$(LIBVPX_SRC_DIR)/configure_android_x86_patch_applied.txt $(LIBVPX_BUILD_DIR)/arm/libvpx.a BUILD_VPX_DEPS=$(LIBVPX_SRC_DIR)/configure_android_x86_patch_applied.txt $(LIBVPX_BUILD_DIR)/arm/libvpx.a
ifeq ($(BUILD_FOR_X86), 1) ifeq ($(BUILD_FOR_X86), 1)
BUILD_VPX_DEPS+=$(LIBVPX_BUILD_DIR)/x86/libvpx.a BUILD_VPX_DEPS+=$(LIBVPX_BUILD_DIR)/x86/libvpx.a
endif endif
endif
LIBVPX_SRC_DIR=$(TOPDIR)/submodules/externals/libvpx LIBVPX_SRC_DIR=$(TOPDIR)/submodules/externals/libvpx
LIBVPX_BUILD_DIR=$(TOPDIR)/submodules/externals/build/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 LIBVPX_CONFIGURE_OPTIONS=--disable-vp9 --disable-examples --disable-unit-tests --disable-postproc --enable-error-concealment --enable-debug

2
jni/Android.mk
View file

@ -10,13 +10,13 @@ else
_BUILD_X264=$(BUILD_X264) _BUILD_X264=$(BUILD_X264)
_BUILD_VIDEO=$(BUILD_VIDEO) _BUILD_VIDEO=$(BUILD_VIDEO)
endif endif
ifeq ($(_BUILD_VIDEO),0) ifeq ($(_BUILD_VIDEO),0)
ifeq (,$(DUMP_VAR)) ifeq (,$(DUMP_VAR))
$(info $(TARGET_ARCH_ABI): Video is disabled for targets other than armeabi-v7a and x86) $(info $(TARGET_ARCH_ABI): Video is disabled for targets other than armeabi-v7a and x86)
endif endif
endif endif
ifeq ($(BUILD_GPLV3_ZRTP), 1) ifeq ($(BUILD_GPLV3_ZRTP), 1)
BUILD_SRTP=1 BUILD_SRTP=1
ZRTP_C_INCLUDE= \ ZRTP_C_INCLUDE= \

7
jni/Application.mk
View file

@ -55,6 +55,9 @@ endif
ifeq ($(BUILD_VIDEO),1) ifeq ($(BUILD_VIDEO),1)
APP_MODULES += libavutil-linphone libavcodec-linphone libswscale-linphone APP_MODULES += libavutil-linphone libavcodec-linphone libswscale-linphone
APP_MODULES += libvpx APP_MODULES += libvpx
ifeq ($(BUILD_X264),1)
APP_MODULES +=libx264 libmsx264
endif
endif endif
_BUILD_AMR=0 _BUILD_AMR=0
@ -74,10 +77,6 @@ ifneq ($(BUILD_AMRWB), 0)
APP_MODULES += libvoamrwbenc APP_MODULES += libvoamrwbenc
endif endif
ifeq ($(BUILD_X264),1)
APP_MODULES +=libx264 libmsx264
endif
ifeq ($(BUILD_SILK),1) ifeq ($(BUILD_SILK),1)
APP_MODULES +=libmssilk APP_MODULES +=libmssilk
endif endif