missytake/fdroiddata
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Update VLC to 1.1.3 (1010304)

Browse source
This commit is contained in:
Boris Kraut 2015-03-08 12:22:21 +01:00
parent 4f5bf0503f
commit 8e28437622
1 changed files with 63 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

69
metadata/org.videolan.vlc.txt
View file

@ -432,15 +432,62 @@ Build:1.0.1,10104
ANDROID_ABI=armeabi-v7a ./compile.sh release
buildjni=no
Build:1.1.2,1010202
disable=BuildCondig and R issues
commit=1.1.2
Build:1.1.3,1010302
disable=wait for armeabi-v7a build to succeed on bs
commit=1.1.3
subdir=vlc-android
srclibs=VLC@96e66d5
srclibs=VLC@a9b19e4
prebuild=sed -i -e '/^TARGET/aPASSWORD_KEYSTORE="$PASSWORD_KEYSTORE" gradle $TARGET\nexit 0' -e 's@\-d \"gradle\/wrapper\"@1@g' ../compile.sh && \
ln -s vlc-android/$$VLC$$ ../vlc && \
build=cd ../ && \
ANDROID_ABI=x86 ./compile.sh release
sed -i -e 's/01010300/01010302/g' AndroidManifest.xml && \
sed -i -e 's/getString(R.string.build_time)/"20150308"/g' \
-e 's/getString(R.string.build_host)/"localhost"/g' \
-e 's/getString(R.string.build_revision)/"rev"/g' \
-e 's/BuildConfig.APPLICATION_ID/"org.videlan.vlc"/g' \
-e 's/BuildConfig.VERSION_NAME/"1.1.3"/g' \
-e 's/BuildConfig.VERSION_CODE/1010302/g' \
src/org/videolan/vlc/widget/VLCAppWidgetProvider.java src/org/videolan/vlc/gui/audio/AudioUtil.java src/org/videolan/vlc/gui/NativeCrashActivity.java src/org/videolan/vlc/widget/SlidingPaneLayout.java src/org/videolan/vlc/gui/MainActivity.java src/org/videolan/vlc/gui/AboutFragment.java src/org/videolan/vlc/audio/AudioService.java
build=cd ../ && \
./compile.sh -a "x86" --release
buildjni=no
ndk=r10d
Build:1.1.3,1010303
disable=wait for armeabi-v7a build to succeed on bs
commit=1.1.3
subdir=vlc-android
srclibs=VLC@a9b19e4
prebuild=sed -i -e '/^TARGET/aPASSWORD_KEYSTORE="$PASSWORD_KEYSTORE" gradle $TARGET\nexit 0' -e 's@\-d \"gradle\/wrapper\"@1@g' ../compile.sh && \
ln -s vlc-android/$$VLC$$ ../vlc && \
sed -i -e 's/01010300/01010303/g' AndroidManifest.xml && \
sed -i -e 's/getString(R.string.build_time)/"20150308"/g' \
-e 's/getString(R.string.build_host)/"localhost"/g' \
-e 's/getString(R.string.build_revision)/"rev"/g' \
-e 's/BuildConfig.APPLICATION_ID/"org.videlan.vlc"/g' \
-e 's/BuildConfig.VERSION_NAME/"1.1.3"/g' \
-e 's/BuildConfig.VERSION_CODE/1010303/g' \
src/org/videolan/vlc/widget/VLCAppWidgetProvider.java src/org/videolan/vlc/gui/audio/AudioUtil.java src/org/videolan/vlc/gui/NativeCrashActivity.java src/org/videolan/vlc/widget/SlidingPaneLayout.java src/org/videolan/vlc/gui/MainActivity.java src/org/videolan/vlc/gui/AboutFragment.java src/org/videolan/vlc/audio/AudioService.java
build=cd ../ && \
./compile.sh -a "armeabi" --release
buildjni=no
ndk=r10d
Build:1.1.3,1010304
commit=1.1.3
subdir=vlc-android
srclibs=VLC@a9b19e4
prebuild=sed -i -e '/^TARGET/agradle clean\nPASSWORD_KEYSTORE="$PASSWORD_KEYSTORE" gradle $TARGET\nexit 0' -e 's@\-d \"gradle\/wrapper\"@1@g' ../compile.sh && \
ln -s vlc-android/$$VLC$$ ../vlc && \
sed -i -e 's/01010300/01010304/g' AndroidManifest.xml && \
sed -i -e 's/getString(R.string.build_time)/"20150308"/g' \
-e 's/getString(R.string.build_host)/"localhost"/g' \
-e 's/getString(R.string.build_revision)/"rev"/g' \
-e 's/BuildConfig.APPLICATION_ID/"org.videlan.vlc"/g' \
-e 's/BuildConfig.VERSION_NAME/"1.1.3"/g' \
-e 's/BuildConfig.VERSION_CODE/1010304/g' \
src/org/videolan/vlc/widget/VLCAppWidgetProvider.java src/org/videolan/vlc/gui/audio/AudioUtil.java src/org/videolan/vlc/gui/NativeCrashActivity.java src/org/videolan/vlc/widget/SlidingPaneLayout.java src/org/videolan/vlc/gui/MainActivity.java src/org/videolan/vlc/gui/AboutFragment.java src/org/videolan/vlc/audio/AudioService.java
build=cd ../ && \
./compile.sh -a "armeabi-v7a" --release
buildjni=no
ndk=r10d
@ -448,6 +495,16 @@ Maintainer Notes:
Instructions and dependencies here: http://wiki.videolan.org/AndroidCompile
see http://buildbot.videolan.org/builders/ for version code scheme
The VLC srclib commit can be found out from TESTED_HASH value in compile.sh
Issues:
* Builds locally, but might break on the BS, since we call gradle directly:
We might have to move config etc. out of the two .sh files into our
prebuild and then use fdroid's own gradle= field.
* The sed magic for BuildConfig. and R. should not be necessary. I don't
know what is causing this issue, but maybe running gradle clean properly
will do the trick.
* Switching to a gradle= field should also enable us to use forcevercode
instead of sed.
.
# +0: - (upstream)