Merge branch 'release/v0.3.4'

.gitignore

@@ -4,6 +4,7 @@ toolchain-*
 libpng-*
 expat-*
 fribidi-*
+lame-*
 
 # Created by http://www.gitignore.io
 

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

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
 

ffmpeg_build.sh

@@ -27,6 +27,7 @@ make clean
 --enable-libass \
 --enable-libfreetype \
 --enable-libfribidi \
+--enable-libmp3lame \
 --enable-fontconfig \
 --enable-pthreads \
 --disable-debug \

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
 

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 "============================================"

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

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