diff --git a/Makefile b/Makefile index c445edb63..70d8c7e14 100644 --- a/Makefile +++ b/Makefile @@ -210,7 +210,7 @@ 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_SRC_DIR)/configure_android_x86_patch_applied.txt: - @patch -p0 < $(TOPDIR)/patches/libvpx_configure_android_x86.patch + @patch -p1 < $(TOPDIR)/patches/libvpx_configure_android_x86.patch touch $@ $(LIBVPX_BUILD_DIR)/arm/libvpx.a: diff --git a/patches/libvpx_configure_android_x86.patch b/patches/libvpx_configure_android_x86.patch index 67514c471..3496853dd 100644 --- a/patches/libvpx_configure_android_x86.patch +++ b/patches/libvpx_configure_android_x86.patch @@ -1,10 +1,10 @@ ---- submodules/externals/libvpx/build/make/configure.sh.orig 2013-09-27 16:49:14.000000000 +0200 -+++ submodules/externals/libvpx/build/make/configure.sh 2013-09-27 16:49:01.000000000 +0200 -@@ -1052,6 +1052,32 @@ +--- a/submodules/externals/libvpx/build/make/configure.sh ++++ b/submodules/externals/libvpx/build/make/configure.sh +@@ -1037,6 +1037,33 @@ EOF os2) AS=${AS:-nasm} ;; -+ android*) ++ android*) + SDK_PATH=${sdk_path} + COMPILER_LOCATION=`find "${SDK_PATH}" \ + -name "i686-linux-android-gcc*" -print -quit` @@ -30,6 +30,7 @@ + + soft_enable realtime_only + ;; ++ esac AS="${alt_as:-${AS:-auto}}" diff --git a/submodules/externals/libvpx b/submodules/externals/libvpx index db9235657..2e88f2f2e 160000 --- a/submodules/externals/libvpx +++ b/submodules/externals/libvpx @@ -1 +1 @@ -Subproject commit db9235657741ce3fa5b9226f55d780304320ef8c +Subproject commit 2e88f2f2ec777259bda1714e72f1ecd2519bceb5