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

upgrade to libvpx v1.4.0

Browse source 
This requires to make a clean of the build environment:
cd submodules/external/libvpx && git reset --hard
make clean
make
This commit is contained in:
Simon Morlat 2015-08-30 15:29:48 +02:00
parent 22479baea0
commit f1d2c1a6ea
3 changed files with 36 additions and 34 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
Makefile
View file

@ -342,13 +342,13 @@ 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
$(LIBVPX_SRC_DIR)/configure_android_x86_patch_applied.txt: $(LIBVPX_SRC_DIR)/configure_android_x86_patch_applied.txt:
@patch -p1 < $(TOPDIR)/patches/libvpx_configure_android_x86.patch cd $(LIBVPX_SRC_DIR) && patch -p1 < $(TOPDIR)/patches/libvpx_configure_android_x86.patch
touch $@ touch $@
$(LIBVPX_BUILD_DIR)/arm/libvpx.a: $(LIBVPX_BUILD_DIR)/arm/libvpx.a:
mkdir -p $(LIBVPX_BUILD_DIR)/arm && \ mkdir -p $(LIBVPX_BUILD_DIR)/arm && \
cd $(LIBVPX_BUILD_DIR)/arm && \ cd $(LIBVPX_BUILD_DIR)/arm && \
$(LIBVPX_SRC_DIR)/configure --target=armv7-android-gcc --sdk-path=$(NDK_PATH) $(LIBVPX_CONFIGURE_OPTIONS) && \ $(LIBVPX_SRC_DIR)/configure --target=armv7-android-gcc --extra-cflags="-mfloat-abi=softfp -mfpu=neon" --sdk-path=$(NDK_PATH) $(LIBVPX_CONFIGURE_OPTIONS) && \
make -j${NUMCPUS} \ make -j${NUMCPUS} \
|| ( echo "Build of libvpx for arm failed." ; exit 1 ) || ( echo "Build of libvpx for arm failed." ; exit 1 )

64
patches/libvpx_configure_android_x86.patch
View file

@ -1,36 +1,38 @@
--- a/submodules/externals/libvpx/build/make/configure.sh diff --git a/build/make/configure.sh b/build/make/configure.sh
+++ b/submodules/externals/libvpx/build/make/configure.sh index 25c9f80..336b006 100644
@@ -1037,6 +1037,33 @@ EOF --- a/build/make/configure.sh
os2) +++ b/build/make/configure.sh
AS=${AS:-nasm} @@ -1082,6 +1082,33 @@ EOF
;; os2)
+ android*) AS=${AS:-nasm}
+ SDK_PATH=${sdk_path} ;;
+ COMPILER_LOCATION=`find "${SDK_PATH}" \ + android*)
+ -name "i686-linux-android-gcc*" -print -quit` + SDK_PATH=${sdk_path}
+ TOOLCHAIN_PATH=${COMPILER_LOCATION%/*}/i686-linux-android- + COMPILER_LOCATION=`find "${SDK_PATH}" \
+ CC=${TOOLCHAIN_PATH}gcc + -name "i686-linux-android-gcc*" -print -quit`
+ CXX=${TOOLCHAIN_PATH}g++ + TOOLCHAIN_PATH=${COMPILER_LOCATION%/*}/i686-linux-android-
+ AR=${TOOLCHAIN_PATH}ar + CC=${TOOLCHAIN_PATH}gcc
+ LD=${TOOLCHAIN_PATH}gcc + CXX=${TOOLCHAIN_PATH}g++
+ STRIP=${TOOLCHAIN_PATH}strip + AR=${TOOLCHAIN_PATH}ar
+ NM=${TOOLCHAIN_PATH}nm + LD=${TOOLCHAIN_PATH}gcc
+ STRIP=${TOOLCHAIN_PATH}strip
+ NM=${TOOLCHAIN_PATH}nm
+ +
+ if [ -z "${alt_libc}" ]; then + if [ -z "${alt_libc}" ]; then
+ alt_libc=`find "${SDK_PATH}" -name arch-x86 -print | \ + alt_libc=`find "${SDK_PATH}" -name arch-x86 -print | \
+ awk '{n = split($0,a,"/"); \ + awk '{n = split($0,a,"/"); \
+ split(a[n-1],b,"-"); \ + split(a[n-1],b,"-"); \
+ print $0 " " b[2]}' | \ + print $0 " " b[2]}' | \
+ sort -g -k 2 | \ + sort -g -k 2 | \
+ awk '{ print $1 }' | tail -1` + awk '{ print $1 }' | tail -1`
+ fi + fi
+ +
+ add_cflags "--sysroot=${alt_libc}" + add_cflags "--sysroot=${alt_libc}"
+ add_ldflags "--sysroot=${alt_libc}" + add_ldflags "--sysroot=${alt_libc}"
+ +
+ soft_enable realtime_only + soft_enable realtime_only
+ ;; + ;;
+ +
esac esac
AS="${alt_as:-${AS:-auto}}" AS="${alt_as:-${AS:-auto}}"

2
submodules/externals/libvpx vendored

@ -1 +1 @@
Subproject commit 2e88f2f2ec777259bda1714e72f1ecd2519bceb5 Subproject commit c74bf6d889992c3cabe017ec353ca85c323107cd