[Android] add srt subtitles support

[Sébastien Toque]

android | branch: master | Sébastien Toque <xilasz at gmail.com> | Sat May 26 08:53:53 2012 +0200| [bf06caeadc5fddfcb21dae4e8d1ebf0b4eb7ebf3] | committer: Sébastien Toque

add srt subtitles support

> http://git.videolan.org/gitweb.cgi/android.git/?a=commit;h=bf06caeadc5fddfcb21dae4e8d1ebf0b4eb7ebf3
---

 compile.sh                 |    6 +++---
 configure.sh               |    1 -
 vlc-android/jni/Android.mk |    2 +-
 3 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/compile.sh b/compile.sh
index 5d806f6..e8f1622 100755
--- a/compile.sh
+++ b/compile.sh
@@ -40,7 +40,7 @@ fi
 export PATH=${ANDROID_NDK}/toolchains/arm-linux-androideabi-4.4.3/prebuilt/linux-x86/bin:${PATH}
 
 # 1/ libvlc, libvlccore and its plugins
-TESTED_HASH=2ac6942827e8
+TESTED_HASH=e354bf04a542
 if [ ! -d "vlc" ]; then
     echo "VLC source not found, cloning"
     git clone git://git.videolan.org/vlc.git vlc
@@ -80,7 +80,6 @@ cd contrib/android
     --disable-SDL_image \
     --disable-fontconfig \
     --disable-ass \
-    --disable-freetyp2 \
     --disable-fribidi \
     --disable-zvbi \
     --disable-kate \
@@ -92,7 +91,8 @@ cd contrib/android
     --disable-tremor \
     --disable-vorbis \
     --disable-sidplay2 \
-    --disable-samplerate
+    --disable-samplerate \
+    --enable-iconv
 
 # TODO: mpeg2, theora
 
diff --git a/configure.sh b/configure.sh
index fd313f9..cd280a7 100755
--- a/configure.sh
+++ b/configure.sh
@@ -91,7 +91,6 @@ sh $VLC_SOURCEDIR/configure --host=arm-linux-androideabi --build=x86_64-unknown-
                 --disable-skins2 \
                 --disable-mtp \
                 --disable-notify \
-                --disable-freetype \
                 --disable-libass \
                 --disable-svg \
                 --disable-sqlite \
diff --git a/vlc-android/jni/Android.mk b/vlc-android/jni/Android.mk
index fc807ac..92a14d1 100644
--- a/vlc-android/jni/Android.mk
+++ b/vlc-android/jni/Android.mk
@@ -32,7 +32,7 @@ LOCAL_LDLIBS := -L$(VLC_CONTRIB)/lib \
 	-lavformat -lavcodec -lswscale -lavutil -lpostproc -lgsm -lopenjpeg \
 	-lliveMedia -lUsageEnvironment -lBasicUsageEnvironment -lgroupsock \
 	-lspeex -lspeexdsp \
-	-lxml2 -lpng -lgnutls -lgcrypt -lgpg-error \
+	-lxml2 -lpng -lgnutls -lgcrypt -lgpg-error -lfreetype -liconv \
 	$(CPP_STATIC)
 
 include $(BUILD_SHARED_LIBRARY)