[Android] Use mpg123 on Android

[Jean-Baptiste Kempf]

vlc-ports/android | branch: master | Jean-Baptiste Kempf <jb at videolan.org> | Wed Dec  2 14:35:34 2015 +0100| [232c95852de9590c2ad28158b98929fe58883288] | committer: Jean-Baptiste Kempf

Use mpg123 on Android

> http://git.videolan.org/gitweb.cgi/vlc-ports/android.git/?a=commit;h=232c95852de9590c2ad28158b98929fe58883288
---

 compile-libvlc.sh     |    2 +-
 compile.sh            |    2 +-
 libvlc/jni/Android.mk |    1 +
 3 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/compile-libvlc.sh b/compile-libvlc.sh
index 09ede97..7a28b51 100755
--- a/compile-libvlc.sh
+++ b/compile-libvlc.sh
@@ -91,7 +91,7 @@ VLC_BOOTSTRAP_ARGS="\
     --enable-iconv \
     --disable-aribb24 \
     --disable-aribb25 \
-    --disable-mpg123 \
+    --enable-mpg123 \
     --enable-libdsm \
     --enable-libarchive \
     --disable-libmpeg2 \
diff --git a/compile.sh b/compile.sh
index 65b1f80..d18e0ae 100755
--- a/compile.sh
+++ b/compile.sh
@@ -131,7 +131,7 @@ fi
 # Fetch VLC source #
 ####################
 
-TESTED_HASH=7740747
+TESTED_HASH=2f19e4f
 if [ ! -d "vlc" ]; then
     echo "VLC source not found, cloning"
     git clone git://git.videolan.org/vlc.git vlc
diff --git a/libvlc/jni/Android.mk b/libvlc/jni/Android.mk
index ad8f3b9..f76baa6 100644
--- a/libvlc/jni/Android.mk
+++ b/libvlc/jni/Android.mk
@@ -86,6 +86,7 @@ LOCAL_LDLIBS := -L$(VLC_CONTRIB)/lib \
 	-lmodplug \
 	-lupnp -lthreadutil -lixml \
 	-larchive \
+	-lmpg123 \
 	$(EXTRA_LDFLAGS)
 
 $(TARGET_OUT)/$(LOCAL_MODULE).so: $(ANDROID_PRIVATE_LIBS)