diff --git a/.gitmodules b/.gitmodules index adcac5915..2916841b5 100644 --- a/.gitmodules +++ b/.gitmodules @@ -25,3 +25,12 @@ [submodule "submodules/msamr"] path = submodules/msamr url = git://git.linphone.org/msamr.git +[submodule "submodules/externals/ffmpeg"] + path = submodules/externals/ffmpeg + url = git://git.videolan.org/ffmpeg +[submodule "submodules/externals/x264"] + path = submodules/externals/x264 + url = git://git.videolan.org/x264.git +[submodule "submodules/msx264"] + path = submodules/msx264 + url = git://git.linphone.org/msx264.git diff --git a/README b/README index c846c7a2a..edf5247c9 100644 --- a/README +++ b/README @@ -8,6 +8,7 @@ Linphone for iPhone depends on liblinphone sdk. To build this sdk, you must inst -intltool -wget -pkgconfig +-gas-preposessor.pl (http://github.com/yuvi/gas-preprocessor/ ) Link macport libtoolize to glibtoolize (sudo ln -s /opt/local/bin/glibtoolize /opt/local/bin/libtoolize) diff --git a/submodules/build/builders.d/ffmpeg.mk b/submodules/build/builders.d/ffmpeg.mk new file mode 100644 index 000000000..7bc7cf12e --- /dev/null +++ b/submodules/build/builders.d/ffmpeg.mk @@ -0,0 +1,38 @@ +ffmpeg_configure_options=\ + --disable-mmx \ + --enable-cross-compile \ + --disable-ffprobe --disable-ffserver --disable-avdevice \ + --disable-avfilter --disable-network \ + --disable-everything --enable-decoder=mpeg4 --enable-encoder=mpeg4 \ + --enable-decoder=h264 --disable-avformat --enable-armv6 --enable-armv6t2 \ + --enable-armvfp --enable-neon \ + --source-path=$(BUILDER_SRC_DIR)/$(ffmpeg_dir) \ + --cross-prefix=$$SDK_BIN_PATH/ \ + --sysroot=$$SYSROOT_PATH --arch=$$ARCH \ + --enable-static --disable-shared --target-os=darwin \ + --cpu=cortex-a8 --extra-cflags="-arch $$ARCH " --extra-ldflags="-arch $$ARCH -Wl,-syslibroot,$$SYSROOT_PATH " \ +# --as=$(BUILDER_SRC_DIR)/externals/x264/extras/gas-preprocessor.pl + +#--sysinclude=PATH location of cross-build system headers + +ffmpeg_dir?=externals/ffmpeg + +$(BUILDER_BUILD_DIR)/$(ffmpeg_dir)/Makefile: $(BUILDER_SRC_DIR)/$(ffmpeg_dir)/configure + mkdir -p $(BUILDER_BUILD_DIR)/$(ffmpeg_dir) + cd $(BUILDER_BUILD_DIR)/$(ffmpeg_dir)/ \ + && host_alias=${host} . $(BUILDER_SRC_DIR)/build/$(config_site) \ + && $(BUILDER_SRC_DIR)/$(ffmpeg_dir)/configure --prefix=$(prefix) $(ffmpeg_configure_options) + +build-ffmpeg: $(BUILDER_BUILD_DIR)/$(ffmpeg_dir)/Makefile + cd $(BUILDER_BUILD_DIR)/$(ffmpeg_dir) && PKG_CONFIG_PATH=$(prefix)/lib/pkgconfig CONFIG_SITE=$(BUILDER_SRC_DIR)/build/$(config_site) make && make install + +clean-ffmpeg: + cd $(BUILDER_BUILD_DIR)/$(ffmpeg_dir) && make clean + +veryclean-ffmpeg: + cd $(BUILDER_BUILD_DIR)/$(ffmpeg_dir) && make distclean + cd $(BUILDER_SRC_DIR)/$(ffmpeg_dir) && rm -f configure + +clean-makefile-ffmpeg: + cd $(BUILDER_BUILD_DIR)/$(ffmpeg_dir) && rm -f Makefile + diff --git a/submodules/externals/ffmpeg b/submodules/externals/ffmpeg new file mode 160000 index 000000000..907783f22 --- /dev/null +++ b/submodules/externals/ffmpeg @@ -0,0 +1 @@ +Subproject commit 907783f221ad9594a528681e30777705f11bf0b5 diff --git a/submodules/externals/x264 b/submodules/externals/x264 new file mode 160000 index 000000000..08d04a4d3 --- /dev/null +++ b/submodules/externals/x264 @@ -0,0 +1 @@ +Subproject commit 08d04a4d30b452faed3b763528611737d994b30b diff --git a/submodules/msx264 b/submodules/msx264 new file mode 160000 index 000000000..2e10820e9 --- /dev/null +++ b/submodules/msx264 @@ -0,0 +1 @@ +Subproject commit 2e10820e9c32fe75f049308d69e4164b46bc0d1a