[Android] Compile zvbi

[Jean-Baptiste Kempf]

vlc-ports/android | branch: master | Jean-Baptiste Kempf <jb at videolan.org> | Wed Dec 10 22:36:20 2014 +0100| [8b4abd219a6d91fac95afa20d59f437919beb772] | committer: Jean-Baptiste Kempf

Compile zvbi

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

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

diff --git a/compile.sh b/compile.sh
index 81a1446..f1c2738 100755
--- a/compile.sh
+++ b/compile.sh
@@ -298,7 +298,7 @@ cd contrib/contrib-android-${TARGET_TUPLE}
     --disable-sdl \
     --disable-SDL_image \
     --disable-fontconfig \
-    --disable-zvbi \
+    --enable-zvbi \
     --disable-kate \
     --disable-caca \
     --disable-gettext \
diff --git a/configure.sh b/configure.sh
index aefecf2..c24c0ad 100755
--- a/configure.sh
+++ b/configure.sh
@@ -84,7 +84,7 @@ sh $VLC_SOURCEDIR/configure --host=$TARGET_TUPLE --build=x86_64-unknown-linux $E
                 --enable-mad \
                 --disable-dca \
                 --disable-sdl-image \
-                --disable-zvbi \
+                --enable-zvbi \
                 --disable-fluidsynth \
                 --disable-jack \
                 --disable-pulse \
diff --git a/libvlc/jni/Android.mk b/libvlc/jni/Android.mk
index 5a868fb..dc654f3 100644
--- a/libvlc/jni/Android.mk
+++ b/libvlc/jni/Android.mk
@@ -79,6 +79,7 @@ LOCAL_LDLIBS := -L$(VLC_CONTRIB)/lib \
 	-lEGL -lGLESv2 -ljpeg \
 	-ldvdnav -ldvdread -ldvdcss \
 	-lmad \
+	-lzvbi \
 	$(CPP_STATIC)
 
 include $(BUILD_SHARED_LIBRARY)