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

VLC: fix 2.5.2

Browse source
This commit is contained in:
relan 2017-10-12 09:33:26 +03:00
parent 3157460624
commit 5ede5607c3
2 changed files with 16 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -1270,13 +1270,13 @@ Build:2.1.20,12012007
ndk=r14b ndk=r14b
Build:2.5.2,12050204 Build:2.5.2,12050204
disable=crashes on start
commit=2.5.2 commit=2.5.2
subdir=vlc-android subdir=vlc-android
sudo=apt-get -y install g++ ragel libltdl-dev sudo=apt-get -y install g++ ragel libltdl-dev
gradle=VanillaARMv7 gradle=VanillaARMv7
srclibs=VLC@1c02164 srclibs=VLC@ef7c26f5,VLCmedialibrary@6e94f5a0
prebuild=ln -s vlc-android/$$VLC$$ ../vlc && \ prebuild=ln -s vlc-android/$$VLC$$ ../vlc && \
ln -s $$VLCmedialibrary$$ ../medialibrary/medialibrary && \
sed -i -e '/^\.libarchive/a\\t$(RECONF)' ../vlc/contrib/src/libarchive/rules.mak && \ sed -i -e '/^\.libarchive/a\\t$(RECONF)' ../vlc/contrib/src/libarchive/rules.mak && \
sed -i -e 's/git reset --hard ${TESTED_HASH}/true/' ../compile.sh && \ sed -i -e 's/git reset --hard ${TESTED_HASH}/true/' ../compile.sh && \
sed -i -e '/signingConfig/d' build.gradle sed -i -e '/signingConfig/d' build.gradle
@ -1288,13 +1288,13 @@ Build:2.5.2,12050204
ndk=r14b ndk=r14b
Build:2.5.2,12050205 Build:2.5.2,12050205
disable=crashes on start
commit=2.5.2 commit=2.5.2
subdir=vlc-android subdir=vlc-android
sudo=apt-get -y install g++ ragel libltdl-dev sudo=apt-get -y install g++ ragel libltdl-dev
gradle=VanillaX86 gradle=VanillaX86
srclibs=VLC@1c02164 srclibs=VLC@ef7c26f5,VLCmedialibrary@6e94f5a0
prebuild=ln -s vlc-android/$$VLC$$ ../vlc && \ prebuild=ln -s vlc-android/$$VLC$$ ../vlc && \
ln -s $$VLCmedialibrary$$ ../medialibrary/medialibrary && \
sed -i -e '/^\.libarchive/a\\t$(RECONF)' ../vlc/contrib/src/libarchive/rules.mak && \ sed -i -e '/^\.libarchive/a\\t$(RECONF)' ../vlc/contrib/src/libarchive/rules.mak && \
sed -i -e 's/git reset --hard ${TESTED_HASH}/true/' ../compile.sh && \ sed -i -e 's/git reset --hard ${TESTED_HASH}/true/' ../compile.sh && \
sed -i -e '/signingConfig/d' build.gradle sed -i -e '/signingConfig/d' build.gradle
@ -1306,13 +1306,13 @@ Build:2.5.2,12050205
ndk=r14b ndk=r14b
Build:2.5.2,12050207 Build:2.5.2,12050207
disable=crashes on start
commit=2.5.2 commit=2.5.2
subdir=vlc-android subdir=vlc-android
sudo=apt-get -y install g++ ragel libltdl-dev sudo=apt-get -y install g++ ragel libltdl-dev
gradle=VanillaARMv8 gradle=VanillaARMv8
srclibs=VLC@1c02164 srclibs=VLC@ef7c26f5,VLCmedialibrary@6e94f5a0
prebuild=ln -s vlc-android/$$VLC$$ ../vlc && \ prebuild=ln -s vlc-android/$$VLC$$ ../vlc && \
ln -s $$VLCmedialibrary$$ ../medialibrary/medialibrary && \
sed -i -e '/^\.libarchive/a\\t$(RECONF)' ../vlc/contrib/src/libarchive/rules.mak && \ sed -i -e '/^\.libarchive/a\\t$(RECONF)' ../vlc/contrib/src/libarchive/rules.mak && \
sed -i -e 's/git reset --hard ${TESTED_HASH}/true/' ../compile.sh && \ sed -i -e 's/git reset --hard ${TESTED_HASH}/true/' ../compile.sh && \
sed -i -e '/signingConfig/d' build.gradle sed -i -e '/signingConfig/d' build.gradle
@ -1325,8 +1325,12 @@ Build:2.5.2,12050207
Maintainer Notes: Maintainer Notes:
Instructions and dependencies here: http://wiki.videolan.org/AndroidCompile 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 The VLC srclib commit can be found out from TESTED_HASH value in compile.sh,
but sometimes it's different in official builds.
The VLCmedialibrary srclib commit can be found out from MEDIALIBRARY_HASH in
compile-libvlc.sh.
For recommended versions of the build tools, see: For recommended versions of the build tools, see:
https://git.videolan.org/?p=vlc.git;a=blob;f=extras/tools/bootstrap#l72 https://git.videolan.org/?p=vlc.git;a=blob;f=extras/tools/bootstrap#l72

4
srclibs/VLCmedialibrary.txt Normal file
View file

@ -0,0 +1,4 @@
Repo Type:git
Repo:https://code.videolan.org/videolan/medialibrary.git
Prepare:git submodule update --init