Merge branch 'release/v0.3.4'

cropsly · Apr 19, 2016 · e401321 · e401321
2 parents 4df69cb + d8d31f5
commit e401321
Show file tree

Hide file tree

Showing 13 changed files with 44 additions and 10 deletions.
diff --git a/.gitignore b/.gitignore
@@ -4,6 +4,7 @@ toolchain-*
 libpng-*
 expat-*
 fribidi-*
+lame-*
 
 # Created by http://www.gitignore.io
 

diff --git a/README.md b/README.md
@@ -16,7 +16,7 @@ Instructions
 * Set environment variable
   1. export ANDROID_NDK={Android NDK Base Path}
 * Run following commands to compile ffmpeg
-  1. sudo apt-get --quiet --yes install build-essential git autoconf libtool pkg-config gperf gettext yasm
+  1. sudo apt-get --quiet --yes install build-essential git autoconf libtool pkg-config gperf gettext yasm python-lxml
   2. ./init_update_libs.sh
   3. ./android_build.sh
 * To update submodules and libraries you can use ./init_update_libs.sh command

diff --git a/android_build.sh b/android_build.sh
@@ -23,6 +23,7 @@ do
   ./fribidi_build.sh $i $BASEDIR 1 || exit 1
   ./fontconfig_build.sh $i $BASEDIR 1 || exit 1
   ./libass_build.sh $i $BASEDIR 1 || exit 1
+  ./lame_build.sh $i $BASEDIR 1 || exit 1
   ./ffmpeg_build.sh $i $BASEDIR 0 || exit 1
 done
 

diff --git a/ffmpeg b/ffmpeg
diff --git a/ffmpeg_build.sh b/ffmpeg_build.sh
@@ -27,6 +27,7 @@ make clean
 --enable-libass \
 --enable-libfreetype \
 --enable-libfribidi \
+--enable-libmp3lame \
 --enable-fontconfig \
 --enable-pthreads \
 --disable-debug \

diff --git a/fontconfig b/fontconfig
diff --git a/freetype2 b/freetype2
diff --git a/fribidi_build.sh b/fribidi_build.sh
@@ -2,7 +2,7 @@
 
 . abi_settings.sh $1 $2 $3
 
-pushd fribidi-0.19.6
+pushd fribidi-0.19.7
 
 make clean
 

diff --git a/init_update_libs.sh b/init_update_libs.sh
@@ -9,7 +9,8 @@ rm -rf libpng-*
 rm -rf expat-*
 rm -rf fribidi-*
 
-wget -O- http://downloads.sourceforge.net/project/libpng/libpng16/older-releases/1.6.13/libpng-1.6.13.tar.xz | tar xJ
+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.6.tar.bz2 | tar xj
+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
 echo "============================================"
diff --git a/lame_build.sh b/lame_build.sh
@@ -0,0 +1,30 @@
+#!/bin/bash
+
+. abi_settings.sh $1 $2 $3
+
+pushd lame-3.99.5
+
+make clean
+
+case $1 in
+  armeabi-v7a | armeabi-v7a-neon)
+    HOST=arm-linux
+  ;;
+  x86)
+    HOST=i686-linux
+  ;;
+esac
+
+./configure \
+  --with-pic \
+  --with-sysroot="$NDK_SYSROOT" \
+  --host="$HOST" \
+  --enable-static \
+  --disable-shared \
+  --prefix="${TOOLCHAIN_PREFIX}" \
+  --enable-arm-neon="$ARM_NEON" \
+  --disable-shared || exit 1
+
+make -j${NUMBER_OF_CORES} install || exit 1
+
+popd
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.13
+pushd libpng-1.6.21
 
 make clean
 

diff --git a/x264 b/x264
-Original file line number
+Diff line change
@@ Expand Up / @@ -4,6 +4,7 @@ toolchain-* @@
     libpng-*
     expat-*
     fribidi-*
+    lame-*
     # Created by http://www.gitignore.io
@@ Expand Down @@
+22 −5		.gitignore
+43 −0		.travis.yml
+106 −0		Changelog
+24 −11		README.md
+106 −35		configure.ac
+33 −10		libass/Makefile.am
+141 −104		libass/ass.c
+169 −6		libass/ass.h
+357 −323		libass/ass_bitmap.c
+93 −49		libass/ass_bitmap.h
+912 −0		libass/ass_blur.c
+59 −19		libass/ass_cache.c
+20 −5		libass/ass_cache.h
+8 −37		libass/ass_cache_template.h
+11 −12		libass/ass_compat.h
+319 −0		libass/ass_coretext.c
+33 −0		libass/ass_coretext.h
+782 −0		libass/ass_directwrite.c
+29 −0		libass/ass_directwrite.h
+95 −134		libass/ass_drawing.c
+4 −10		libass/ass_drawing.h
+225 −126		libass/ass_font.c
+24 −17		libass/ass_font.h
+246 −468		libass/ass_fontconfig.c
+10 −22		libass/ass_fontconfig.h
+1,082 −0		libass/ass_fontselect.c
+265 −0		libass/ass_fontselect.h
+134 −0		libass/ass_func_template.h
+27 −10		libass/ass_library.c
+2 −0		libass/ass_library.h
+423 −345		libass/ass_parse.c
+3 −2		libass/ass_parse.h
+815 −0		libass/ass_rasterizer.c
+77 −0		libass/ass_rasterizer.h
+385 −0		libass/ass_rasterizer_c.c
+893 −799		libass/ass_render.c
+41 −70		libass/ass_render.h
+35 −8		libass/ass_render_api.c
+52 −21		libass/ass_shaper.c
+2 −2		libass/ass_shaper.h
+75 −0		libass/ass_string.c
+38 −0		libass/ass_string.h
+7 −4		libass/ass_strtod.c
+13 −0		libass/ass_types.h
+255 −139		libass/ass_utils.c
+54 −20		libass/ass_utils.h
+684 −0		libass/dwrite_c.h
+4 −0		libass/libass.sym
+0 −56		libass/x86/blend_bitmaps.h
+1,423 −0		libass/x86/blur.asm
+16 −0		libass/x86/cpuid.asm
+4 −3		libass/x86/cpuid.h
+858 −0		libass/x86/rasterizer.asm
+86 −0		libass/x86/utils.asm
+1 −1		profile/profile.c
+28 −2		test/test.c