Merge branch 'feature/use-official-repos' into develop

.gitignore

@@ -1,6 +1,9 @@
 *.o
 build
 toolchain-*
+libpng-*
+expat-*
+fribidi-*
 
 # Created by http://www.gitignore.io
 
@@ -33,4 +36,3 @@ Temporary Items
 
 # KDE directory preferences
 .directory
-

.gitmodules

@@ -13,15 +13,6 @@
 [submodule "fontconfig"]
 	path = fontconfig
 	url = git://anongit.freedesktop.org/fontconfig
-[submodule "expat"]
-	path = expat
-	url = https://github.com/hiteshsondhi88/expat.git
-[submodule "libpng"]
-	path = libpng
-	url = https://github.com/hiteshsondhi88/libpng.git
-[submodule "fribidi"]
-	path = fribidi
-	url = https://github.com/hiteshsondhi88/fribidi.git
 [submodule "SampleFFmpegApp"]
 	path = SampleFFmpegApp
 	url = https://github.com/hiteshsondhi88/SampleFFmpegApp.git

README.md

@@ -14,8 +14,9 @@ Instructions
   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
-  2. git submodule update --init
+  2. ./init_update_libs.sh
   3. ./android_build.sh
+* To update submodules and libraries you can use ./init_update_libs.sh command
 * Find the executable binary in build directory.
 * If you want to use FONTCONFIG then you need to specify your custom fontconfig config file (e.g - "FONTCONFIG_FILE=/sdcard/fonts.conf ./ffmpeg --version", where /sdcard/fonts.conf is location of your FONTCONFIG configuration file).
 * You can also download [prebuilt-binaries](https://github.com/hiteshsondhi88/ffmpeg-android/releases/download/v0.1.0/prebuilt-binaries.tar.gz) here.

expat_build.sh

@@ -2,7 +2,7 @@
 
 . abi_settings.sh $1 $2 $3
 
-pushd expat
+pushd expat-2.1.0
 
 make clean
 

fribidi_build.sh

@@ -2,7 +2,7 @@
 
 . abi_settings.sh $1 $2 $3
 
-pushd fribidi
+pushd fribidi-0.19.6
 
 make clean
 

init_update_libs.sh

@@ -0,0 +1,15 @@
+#!/bin/bash
+
+echo "============================================"
+echo "Updating submodules"
+git submodule update --init
+echo "============================================"
+echo "Updating libpng, expat and fribidi"
+rm -rf libpng-*
+rm -rf expat-*
+rm -rf fribidi-*
+
+wget -O- https://downloads.sf.net/project/libpng/libpng16/1.6.13/libpng-1.6.13.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
+echo "============================================"

settings.sh

@@ -2,6 +2,10 @@
 
 SUPPORTED_ARCHITECTURES=(armeabi-v7a armeabi-v7a-neon)
 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