[Android] enable ass/ssa subtitles

[Sébastien Toque]

android | branch: master | Sébastien Toque <xilasz at gmail.com> | Fri Jun  1 19:23:58 2012 +0200| [6fae93e9f77010a3bc19a58230f4b44d3bcea8d4] | committer: Sébastien Toque

enable ass/ssa subtitles

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

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

diff --git a/compile.sh b/compile.sh
index d98389a..6c80fa7 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=f8aa395031
+TESTED_HASH=defdb5a9e1
 if [ ! -d "vlc" ]; then
     echo "VLC source not found, cloning"
     git clone git://git.videolan.org/vlc.git vlc
@@ -79,8 +79,6 @@ cd contrib/android
     --disable-sdl \
     --disable-SDL_image \
     --disable-fontconfig \
-    --disable-ass \
-    --disable-fribidi \
     --disable-zvbi \
     --disable-kate \
     --disable-caca \
diff --git a/configure.sh b/configure.sh
index b343233..e5a3c71 100755
--- a/configure.sh
+++ b/configure.sh
@@ -91,7 +91,7 @@ sh $VLC_SOURCEDIR/configure --host=arm-linux-androideabi --build=x86_64-unknown-
                 --disable-skins2 \
                 --disable-mtp \
                 --disable-notify \
-                --disable-libass \
+                --enable-libass \
                 --disable-svg \
                 --disable-sqlite \
                 --disable-udev \
diff --git a/vlc-android/jni/Android.mk b/vlc-android/jni/Android.mk
index 92a14d1..3169ee0 100644
--- a/vlc-android/jni/Android.mk
+++ b/vlc-android/jni/Android.mk
@@ -32,7 +32,8 @@ 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 -lfreetype -liconv \
+	-lxml2 -lpng -lgnutls -lgcrypt -lgpg-error \
+	-lfreetype -liconv -lass -lfribidi \
 	$(CPP_STATIC)
 
 include $(BUILD_SHARED_LIBRARY)