[vlc-commits] android: disable live555

[Rafaël Carré]

vlc/vlc-1.2 | branch: master | Rafaël Carré <funman at videolan.org> | Tue Jan 17 21:59:56 2012 -0500| [7cb66424aca5dcee97c61a8c7c29118f82c3a5b9] | committer: Jean-Baptiste Kempf

android: disable live555

also remove obsolete flags
(cherry picked from commit d8b9e7ae0784b0409bbbc039e9ebbcd95539f94c)

Signed-off-by: Jean-Baptiste Kempf <jb at videolan.org>

> http://git.videolan.org/gitweb.cgi/vlc/vlc-1.2.git/?a=commit;h=7cb66424aca5dcee97c61a8c7c29118f82c3a5b9
---

 extras/package/android/configure.sh |    4 +---
 1 files changed, 1 insertions(+), 3 deletions(-)

diff --git a/extras/package/android/configure.sh b/extras/package/android/configure.sh
index 2c37c12..c7812cb 100755
--- a/extras/package/android/configure.sh
+++ b/extras/package/android/configure.sh
@@ -45,7 +45,7 @@ RANLIB="${CROSS_COMPILE}ranlib" \
 AR="${CROSS_COMPILE}ar" \
 PKG_CONFIG_LIBDIR="$VLC_SOURCEDIR/extras/contrib/hosts/arm-eabi/lib/pkgconfig" \
 sh $VLC_SOURCEDIR/configure --host=arm-eabi-linux --build=x86_64-unknown-linux $EXTRA_PARAMS \
-                --enable-live555 --enable-realrtsp \
+                --disable-live555 --enable-realrtsp \
                 --enable-avformat \
                 --enable-swscale \
                 --enable-avcodec \
@@ -98,8 +98,6 @@ sh $VLC_SOURCEDIR/configure --host=arm-eabi-linux --build=x86_64-unknown-linux $
                 --disable-caca \
                 --disable-glx \
                 --disable-egl \
-                --disable-gl \
-                --disable-gles1 --disable-gles2 \
                 --disable-goom \
                 --disable-projectm \
                 --enable-iomx \