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

Merge branch 'vlc-update' into 'master'

Browse source 
Make VLC 2.0.6 build again

See merge request !2242
This commit is contained in:
Boris Kraut 2017-05-21 21:24:43 +00:00
parent 0df668f788 a094d04d66
commit 391c4ead81
2 changed files with 10 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -1056,6 +1056,7 @@ Build:1.9.0,1090005
prebuild=ln -s vlc-android/$$VLC$$ ../vlc prebuild=ln -s vlc-android/$$VLC$$ ../vlc
build=cd ../ && \ build=cd ../ && \
./compile.sh -a "x86" --release ./compile.sh -a "x86" --release
ndk=r10e
Build:2.0.2,12000213 Build:2.0.2,12000213
disable=failing build disable=failing build
@ -1142,12 +1143,11 @@ Build:2.0.5,12000525
ndk=r11c ndk=r11c
Build:2.0.6,12000603 Build:2.0.6,12000603
disable=doesnt build anymore
commit=2.0.6 commit=2.0.6
subdir=vlc-android subdir=vlc-android
gradle=VanillaARMv6fpu gradle=VanillaARMv6fpu
srclibs=VLC@6689dcb srclibs=VLC-2.0.6@6689dcb
prebuild=ln -s vlc-android/$$VLC$$ ../vlc && \ prebuild=ln -s vlc-android/$$VLC-2.0.6$$ ../vlc && \
sed -i -e '/sdk-manager/d' ../build.gradle && \ sed -i -e '/sdk-manager/d' ../build.gradle && \
wget -c https://downloads.videolan.org/pub/contrib/jpeg/jpegsrc.v9a.tar.gz -O ../vlc/contrib/tarballs/jpegsrc.v9a.tar.gz && \ wget -c https://downloads.videolan.org/pub/contrib/jpeg/jpegsrc.v9a.tar.gz -O ../vlc/contrib/tarballs/jpegsrc.v9a.tar.gz && \
echo "3a753ea48d917945dd54a2d97de388aa06ca2eb1066cbfdc6652036349fe05a7 jpegsrc.v9a.tar.gz" > ../vlc/contrib/tarballs/jpegsrc.v9a.tar.gz.sha256 && \ echo "3a753ea48d917945dd54a2d97de388aa06ca2eb1066cbfdc6652036349fe05a7 jpegsrc.v9a.tar.gz" > ../vlc/contrib/tarballs/jpegsrc.v9a.tar.gz.sha256 && \
@ -1159,12 +1159,11 @@ Build:2.0.6,12000603
ndk=r11c ndk=r11c
Build:2.0.6,12000604 Build:2.0.6,12000604
disable=doesnt build anymore
commit=2.0.6 commit=2.0.6
subdir=vlc-android subdir=vlc-android
gradle=VanillaARMv7 gradle=VanillaARMv7
srclibs=VLC@6689dcb srclibs=VLC-2.0.6@6689dcb
prebuild=ln -s vlc-android/$$VLC$$ ../vlc && \ prebuild=ln -s vlc-android/$$VLC-2.0.6$$ ../vlc && \
sed -i -e '/sdk-manager/d' ../build.gradle && \ sed -i -e '/sdk-manager/d' ../build.gradle && \
wget -c https://downloads.videolan.org/pub/contrib/jpeg/jpegsrc.v9a.tar.gz -O ../vlc/contrib/tarballs/jpegsrc.v9a.tar.gz && \ wget -c https://downloads.videolan.org/pub/contrib/jpeg/jpegsrc.v9a.tar.gz -O ../vlc/contrib/tarballs/jpegsrc.v9a.tar.gz && \
echo "3a753ea48d917945dd54a2d97de388aa06ca2eb1066cbfdc6652036349fe05a7 jpegsrc.v9a.tar.gz" > ../vlc/contrib/tarballs/jpegsrc.v9a.tar.gz.sha256 && \ echo "3a753ea48d917945dd54a2d97de388aa06ca2eb1066cbfdc6652036349fe05a7 jpegsrc.v9a.tar.gz" > ../vlc/contrib/tarballs/jpegsrc.v9a.tar.gz.sha256 && \
@ -1176,12 +1175,11 @@ Build:2.0.6,12000604
ndk=r11c ndk=r11c
Build:2.0.6,12000605 Build:2.0.6,12000605
disable=doesnt build anymore
commit=2.0.6 commit=2.0.6
subdir=vlc-android subdir=vlc-android
gradle=VanillaX86 gradle=VanillaX86
srclibs=VLC@6689dcb srclibs=VLC-2.0.6@6689dcb
prebuild=ln -s vlc-android/$$VLC$$ ../vlc && \ prebuild=ln -s vlc-android/$$VLC-2.0.6$$ ../vlc && \
sed -i -e '/sdk-manager/d' ../build.gradle && \ sed -i -e '/sdk-manager/d' ../build.gradle && \
wget -c https://downloads.videolan.org/pub/contrib/jpeg/jpegsrc.v9a.tar.gz -O ../vlc/contrib/tarballs/jpegsrc.v9a.tar.gz && \ wget -c https://downloads.videolan.org/pub/contrib/jpeg/jpegsrc.v9a.tar.gz -O ../vlc/contrib/tarballs/jpegsrc.v9a.tar.gz && \
echo "3a753ea48d917945dd54a2d97de388aa06ca2eb1066cbfdc6652036349fe05a7 jpegsrc.v9a.tar.gz" > ../vlc/contrib/tarballs/jpegsrc.v9a.tar.gz.sha256 && \ echo "3a753ea48d917945dd54a2d97de388aa06ca2eb1066cbfdc6652036349fe05a7 jpegsrc.v9a.tar.gz" > ../vlc/contrib/tarballs/jpegsrc.v9a.tar.gz.sha256 && \

3
srclibs/VLC-2.0.6.txt Normal file
View file

@ -0,0 +1,3 @@
Repo Type:git
Repo:git://git.videolan.org/vlc.git
Prepare:sed -i -e '/ifndef HAVE_WIN32/ a ifndef HAVE_ANDROID' -e '/^PKGS_FOUND/ a endif' contrib/src/iconv/rules.mak; sed -i -e 's/heanet.dl.sourceforge.net/pilotfiber.dl.sourceforge.net/' contrib/src/main.mak ; sed -i -e 's/^#USE_LIBAV/USE_LIBAV/' -e '0,/FFMPEG_HASH/! s/FFMPEG_HASH=.*/FFMPEG_HASH=v12/' contrib/src/ffmpeg/rules.mak