Merge branch 'vlc' into 'master'

Update VLC

See merge request !322
This commit is contained in:
Boris Kraut 2014-10-18 09:15:30 +00:00
commit 3c16e390ba

View file

@ -327,6 +327,40 @@ Build:0.9.9,9904
ANDROID_ABI=armeabi-v7a ./compile.sh release
buildjni=no
Build:0.9.10,10002
commit=0.9.10
subdir=vlc-android
srclibs=VLC-2.2@e33e5de
forcevercode=yes
prebuild=sed -i '/ant/d' ../Makefile && \
ln -s vlc-android/$$VLC-2.2$$ ../vlc
build=cd ../ && \
ANDROID_ABI=x86 ./compile.sh release
buildjni=no
Build:0.9.10,10003
commit=0.9.10
subdir=vlc-android
srclibs=VLC-2.2@e33e5de
forcevercode=yes
prebuild=sed -i '/ant/d' ../Makefile && \
ln -s vlc-android/$$VLC-2.2$$ ../vlc
build=cd ../ && \
ANDROID_ABI=armeabi ./compile.sh release
buildjni=no
Build:0.9.10,10004
commit=0.9.10
subdir=vlc-android
srclibs=VLC-2.2@e33e5de
forcevercode=yes
prebuild=sed -i '/ant/d' ../Makefile && \
ln -s vlc-android/$$VLC-2.2$$ ../vlc
build=cd ../ && \
ANDROID_ABI=armeabi-v7a ./compile.sh release
buildjni=no
Maintainer Notes:
Instructions and dependencies here: http://wiki.videolan.org/AndroidCompile
see http://buildbot.videolan.org/builders/ for version code scheme