cropsly · vivutech · Apr 19, 2016 · Apr 19, 2016 · Jun 28, 2017 · Jun 28, 2017
diff --git a/abi_settings.sh b/abi_settings.sh
@@ -26,7 +26,7 @@ esac
 
 TOOLCHAIN_PREFIX=${BASEDIR}/toolchain-android
 if [ ! -d "$TOOLCHAIN_PREFIX" ]; then
-  ${ANDROID_NDK_ROOT_PATH}/build/tools/make-standalone-toolchain.sh --toolchain=${NDK_TOOLCHAIN_ABI}-${NDK_TOOLCHAIN_ABI_VERSION} --platform=android-${ANDROID_API_VERSION} --install-dir=${TOOLCHAIN_PREFIX}
+  ${ANDROID_NDK_ROOT_PATH}/build/tools/make_standalone_toolchain.py --arch=${NDK_ABI} --api=${ANDROID_API_VERSION} --install-dir=${TOOLCHAIN_PREFIX}
 fi
 CROSS_PREFIX=${TOOLCHAIN_PREFIX}/bin/${NDK_CROSS_PREFIX}-
 NDK_SYSROOT=${TOOLCHAIN_PREFIX}/sysroot

diff --git a/android_build.sh b/android_build.sh
@@ -5,10 +5,10 @@
 BASEDIR=$(pwd)
 TOOLCHAIN_PREFIX=${BASEDIR}/toolchain-android
 # Applying required patches
-patch  -p0 -N --dry-run --silent -f fontconfig/src/fcxml.c < android_donot_use_lconv.patch 1>/dev/null
-if [ $? -eq 0 ]; then
-  patch -p0 -f fontconfig/src/fcxml.c < android_donot_use_lconv.patch
-fi
+# patch  -p0 -N --dry-run --silent -f fontconfig/src/fcxml.c < android_donot_use_lconv.patch 1>/dev/null
+# if [ $? -eq 0 ]; then
+#   patch -p0 -f fontconfig/src/fcxml.c < android_donot_use_lconv.patch
+# fi
 
 for i in "${SUPPORTED_ARCHITECTURES[@]}"
 do

diff --git a/android_donot_use_lconv.patch b/android_donot_use_lconv.patch
diff --git a/expat_build.sh b/expat_build.sh
@@ -2,7 +2,7 @@
 
 . abi_settings.sh $1 $2 $3
 
-pushd expat-2.1.0
+pushd expat-2.2.1
 
 make clean
 

diff --git a/ffmpeg b/ffmpeg
diff --git a/ffmpeg_build.sh b/ffmpeg_build.sh
@@ -2,7 +2,9 @@
 
 . abi_settings.sh $1 $2 $3
 
-pushd ffmpeg
+oot="${2}/build/${1}/oot/ffmpeg"
+mkdir -p "$oot"
+pushd "$oot"
 
 case $1 in
   armeabi-v7a | armeabi-v7a-neon)
@@ -13,9 +15,9 @@ case $1 in
   ;;
 esac
 
-make clean
+make distclean
 
-./configure \
+"${2}/ffmpeg/configure" \
 --target-os="$TARGET_OS" \
 --cross-prefix="$CROSS_PREFIX" \
 --arch="$NDK_ABI" \
@@ -37,7 +39,7 @@ make clean
 --disable-ffplay \
 --disable-ffprobe \
 --enable-gpl \
---enable-yasm \
+--disable-asm \
 --disable-doc \
 --disable-shared \
 --enable-static \

diff --git a/fontconfig b/fontconfig
diff --git a/freetype2 b/freetype2
diff --git a/init_update_libs.sh b/init_update_libs.sh
@@ -2,16 +2,16 @@
 
 echo "============================================"
 echo "Updating submodules"
-git submodule update --init
+git submodule update --init || exit 1
 echo "============================================"
 echo "Updating libpng, expat and fribidi"
 rm -rf libpng-*
 rm -rf expat-*
 rm -rf fribidi-*
 rm -rf lame-*
 
-wget -O- ftp://ftp.simplesystems.org/pub/libpng/png/src/libpng16/libpng-1.6.21.tar.xz | tar xJ
-wget -O- http://downloads.sourceforge.net/project/expat/expat/2.1.0/expat-2.1.0.tar.gz | tar xz
-wget -O- http://fribidi.org/download/fribidi-0.19.7.tar.bz2 | tar xj
-wget -O- http://sourceforge.net/projects/lame/files/lame/3.99/lame-3.99.5.tar.gz | tar xz
+wget -O- ftp://ftp-osl.osuosl.org/pub/libpng/src/libpng16/libpng-1.6.30.tar.xz | tar xJ || exit 1
+wget -O- http://downloads.sourceforge.net/project/expat/expat/2.2.1/expat-2.2.1.tar.bz2 | tar xj || exit 1
+wget -O- http://fribidi.org/download/fribidi-0.19.7.tar.bz2 | tar xj || exit 1
+wget -O- http://sourceforge.net/projects/lame/files/lame/3.99/lame-3.99.5.tar.gz | tar xz || exit 1
 echo "============================================"
diff --git a/libass b/libass
diff --git a/libpng_build.sh b/libpng_build.sh
@@ -2,7 +2,7 @@
 
 . abi_settings.sh $1 $2 $3
 
-pushd libpng-1.6.21
+pushd libpng-1.6.30
 
 make clean
 

diff --git a/settings.sh b/settings.sh
@@ -1,17 +1,17 @@
 #!/bin/bash
 
-SUPPORTED_ARCHITECTURES=(armeabi-v7a armeabi-v7a-neon x86)
+SUPPORTED_ARCHITECTURES=(armeabi-v7a x86)
 ANDROID_NDK_ROOT_PATH=${ANDROID_NDK}
 if [[ -z "$ANDROID_NDK_ROOT_PATH" ]]; then
   echo "You need to set ANDROID_NDK environment variable, please check instructions"
   exit
 fi
-ANDROID_API_VERSION=9
-NDK_TOOLCHAIN_ABI_VERSION=4.8
+ANDROID_API_VERSION=14
+NDK_TOOLCHAIN_ABI_VERSION=4.9
 
 NUMBER_OF_CORES=$(nproc)
 HOST_UNAME=$(uname -m)
-TARGET_OS=linux
+TARGET_OS=android
 
 CFLAGS='-U_FORTIFY_SOURCE -D_FORTIFY_SOURCE=2 -fno-strict-overflow -fstack-protector-all'
 LDFLAGS='-Wl,-z,relro -Wl,-z,now -pie'

diff --git a/x264 b/x264
+11 −2		.travis.yml
+4 −0		COPYING
+50 −0		Changelog
+2 −1		README.md
+8 −4		configure.ac
+3 −3		libass/Makefile.am
+29 −51		libass/ass.c
+5 −1		libass/ass.h
+14 −22		libass/ass_bitmap.c
+1 −1		libass/ass_bitmap.h
+2 −2		libass/ass_blur.c
+319 −149		libass/ass_cache.c
+19 −7		libass/ass_cache.h
+1 −1		libass/ass_cache_template.h
+34 −16		libass/ass_directwrite.c
+37 −29		libass/ass_font.c
+2 −2		libass/ass_font.h
+4 −3		libass/ass_fontconfig.c
+10 −3		libass/ass_fontselect.c
+11 −0		libass/ass_fontselect.h
+11 −13		libass/ass_parse.c
+12 −1		libass/ass_rasterizer.c
+351 −306		libass/ass_render.c
+15 −13		libass/ass_render.h
+15 −7		libass/ass_render_api.c
+50 −47		libass/ass_shaper.c
+112 −28		libass/ass_strtod.c
+5 −0		libass/ass_types.h
+27 −3		libass/ass_utils.c
+3 −1		libass/ass_utils.h
+3 −0		libass/dwrite_c.h
+1 −0		test/test.c