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

improve openh264 build and update belle-sip

Browse source
This commit is contained in:
Simon Morlat 2014-04-16 15:28:35 +02:00
parent 8e8bb099d5
commit 2d1352126b
4 changed files with 32 additions and 40 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

66
Makefile
View file

@ -204,61 +204,53 @@ clean-x264:
#openh264 #openh264
ifeq ($(BUILD_VIDEO),1) ifeq ($(BUILD_VIDEO),1)
ifeq ($(BUILD_OPENH264), 1) ifeq ($(BUILD_OPENH264), 1)
BUILD_OPENH264_DEPS=\ BUILD_OPENH264_DEPS=build-openh264-arm
$(OPENH264_BUILD_DIR)/include/codec_api.h \
$(OPENH264_BUILD_DIR)/include/codec_app_def.h \
$(OPENH264_BUILD_DIR)/include/codec_def.h \
$(OPENH264_BUILD_DIR)/arm/libwels.a
ifeq ($(BUILD_FOR_X86), 1) ifeq ($(BUILD_FOR_X86), 1)
BUILD_OPENH264_DEPS+=$(OPENH264_BUILD_DIR)/x86/libwels.a BUILD_OPENH264_DEPS+=build-openh264-x86
endif
endif endif
endif endif
OPENH264_SRC_DIR=$(TOPDIR)/submodules/externals/openh264 OPENH264_SRC_DIR=$(TOPDIR)/submodules/externals/openh264
OPENH264_BUILD_DIR=$(TOPDIR)/submodules/externals/build/openh264 OPENH264_BUILD_DIR=$(TOPDIR)/submodules/externals/build/openh264
OPENH264_BUILD_DIR_ARM=$(OPENH264_BUILD_DIR)/arm
openh264-patch: $(OPENH264_SRC_DIR)/patch.stamp OPENH264_BUILD_DIR_X86=$(OPENH264_BUILD_DIR)/x86
$(OPENH264_SRC_DIR)/patch.stamp: $(TOPDIR)/patches/openh264-permissive.patch $(OPENH264_SRC_DIR)/patch.stamp: $(TOPDIR)/patches/openh264-permissive.patch
cd $(OPENH264_SRC_DIR) && patch -p1 < $(TOPDIR)/patches/openh264-permissive.patch && touch $(OPENH264_SRC_DIR)/patch.stamp cd $(OPENH264_SRC_DIR) && patch -p1 < $(TOPDIR)/patches/openh264-permissive.patch && touch $(OPENH264_SRC_DIR)/patch.stamp
$(OPENH264_BUILD_DIR)/include/codec_api.h: openh264-patch: $(OPENH264_SRC_DIR)/patch.stamp
mkdir -p $(OPENH264_BUILD_DIR)/include/wels && \
cp $(OPENH264_SRC_DIR)/codec/api/svc/codec_api.h $(OPENH264_BUILD_DIR)/include/wels/
$(OPENH264_BUILD_DIR)/include/codec_app_def.h: openh264-install-headers:
mkdir -p $(OPENH264_BUILD_DIR)/include/wels && \ mkdir -p $(OPENH264_SRC_DIR)/include/wels
cp $(OPENH264_SRC_DIR)/codec/api/svc/codec_app_def.h $(OPENH264_BUILD_DIR)/include/wels/ rsync -rvLpgoc --exclude ".git" $(OPENH264_SRC_DIR)/codec/api/svc/* $(OPENH264_SRC_DIR)/include/wels/.
$(OPENH264_BUILD_DIR)/include/codec_def.h: copy-openh264-x86: openh264-patch openh264-install-headers
mkdir -p $(OPENH264_BUILD_DIR)/include/wels && \ mkdir -p $(OPENH264_BUILD_DIR)
cp $(OPENH264_SRC_DIR)/codec/api/svc/codec_def.h $(OPENH264_BUILD_DIR)/include/wels/ mkdir -p $(OPENH264_BUILD_DIR_X86)
cd $(OPENH264_BUILD_DIR_X86) \
&& rsync -rvLpgoc --exclude ".git" $(OPENH264_SRC_DIR)/* .
$(OPENH264_BUILD_DIR)/arm/libwels.a: openh264-patch copy-openh264-arm: openh264-patch openh264-install-headers
mkdir -p $(OPENH264_BUILD_DIR)/arm && \ mkdir -p $(OPENH264_BUILD_DIR)
cd $(OPENH264_SRC_DIR) && \ mkdir -p $(OPENH264_BUILD_DIR_ARM)
make libraries -j $(NUMCPUS) OS=android ARCH=arm NDKROOT=$(NDK_PATH) TARGET=$(ANDROID_MOST_RECENT_TARGET) && \ cd $(OPENH264_BUILD_DIR_ARM) \
cp libwels.a $(OPENH264_BUILD_DIR)/arm/libwels.a && \ && rsync -rvLpgoc --exclude ".git" $(OPENH264_SRC_DIR)/* .
make clean OS=android ARCH=arm NDKROOT=$(NDK_PATH) TARGET=$(ANDROID_MOST_RECENT_TARGET) \
|| ( echo "Build of openh264 for arm failed." ; exit 1 )
$(OPENH264_BUILD_DIR)/x86/libwels.a: openh264-patch build-openh264-x86: copy-openh264-x86
mkdir -p $(OPENH264_BUILD_DIR)/x86 && \ cd $(OPENH264_BUILD_DIR_X86) && \
cd $(OPENH264_SRC_DIR) && \ make libraries -j $(NUMCPUS) OS=android ARCH=x86 NDKROOT=$(NDK_PATH) TARGET=$(ANDROID_MOST_RECENT_TARGET)
make libraries -j $(NUMCPUS) OS=android ARCH=x86 NDKROOT=$(NDK_PATH) TARGET=$(ANDROID_MOST_RECENT_TARGET) && \
cp libwels.a $(OPENH264_BUILD_DIR)/x86/libwels.a && \ build-openh264-arm: copy-openh264-arm
make clean OS=android ARCH=x86 NDKROOT=$(NDK_PATH) TARGET=$(ANDROID_MOST_RECENT_TARGET) \ cd $(OPENH264_BUILD_DIR_ARM) && \
|| ( echo "Build of openh264 for arm failed." ; exit 1 ) make libraries -j $(NUMCPUS) OS=android ARCH=arm NDKROOT=$(NDK_PATH) TARGET=$(ANDROID_MOST_RECENT_TARGET)
endif
build-openh264: $(BUILD_OPENH264_DEPS) build-openh264: $(BUILD_OPENH264_DEPS)
clean-openh264: clean-openh264:
cd $(OPENH264_SRC_DIR) && make clean OS=android ARCH=x86 NDKROOT=$(NDK_PATH) TARGET=$(ANDROID_MOST_RECENT_TARGET) cd $(OPENH264_SRC_DIR) && git clean -dfx && git reset --hard
cd $(OPENH264_SRC_DIR) && make clean OS=android ARCH=arm NDKROOT=$(NDK_PATH) TARGET=$(ANDROID_MOST_RECENT_TARGET) rm -rf $(OPENH264_BUILD_DIR_ARM)
rm -rf $(OPENH264_BUILD_DIR)/arm && \ rm -rf $(OPENH264_BUILD_DIR_X86)
rm -rf $(OPENH264_BUILD_DIR)/x86
#libvpx #libvpx
ifeq ($(BUILD_VIDEO),1) ifeq ($(BUILD_VIDEO),1)

2
README
View file

@ -4,7 +4,7 @@
To build liblinphone for Android, you must: To build liblinphone for Android, you must:
0) download the Android sdk with platform-tools and tools updated to latest revision (at least API 16 is needed), then add both 'tools' and 'platform-tools' folders in your path. 0) download the Android sdk with platform-tools and tools updated to latest revision (at least API 16 is needed), then add both 'tools' and 'platform-tools' folders in your path.
1) download the Android ndk (>=r9d) from google and add it to your path (no symlink !!!). 1) download the Android ndk (>=r9d) from google and add it to your path (no symlink !!!).
2) install yasm, nasm, curl, ant and the autotools: autoconf, automake, aclocal, libtoolize, pkgconfig 2) install yasm, nasm, curl, ant, rsync and the autotools: autoconf, automake, aclocal, libtoolize, pkgconfig
On 64 bits linux systems you'll need the ia32-libs package On 64 bits linux systems you'll need the ia32-libs package
With the latest Debian (multiarch), you need this: With the latest Debian (multiarch), you need this:
dpkg --add-architecture i386 dpkg --add-architecture i386

2
submodules/belle-sip

@ -1 +1 @@
Subproject commit 0177ef2de50f9609d8ed0525e8878f957da6ab61 Subproject commit 1b86808a1b7c6803b71b8d08607b3a0d7a2e9ea9

2
submodules/msopenh264

@ -1 +1 @@
Subproject commit 4a0ac438f11eeabcf202957ff45a44dacc316c2e Subproject commit 652fe94fe6910258ec6cacd85a39071bacbbdca1