From a094d04d662a7f290d84fcd1c9d6ffbc2832ba20 Mon Sep 17 00:00:00 2001 From: Andrew Patrikalakis Date: Sun, 21 May 2017 21:24:42 +0000 Subject: [PATCH] Make VLC 2.0.6 build again --- metadata/org.videolan.vlc.txt | 16 +++++++--------- srclibs/VLC-2.0.6.txt | 3 +++ 2 files changed, 10 insertions(+), 9 deletions(-) create mode 100644 srclibs/VLC-2.0.6.txt diff --git a/metadata/org.videolan.vlc.txt b/metadata/org.videolan.vlc.txt index 66b2db87ca..b3db6eb558 100644 --- a/metadata/org.videolan.vlc.txt +++ b/metadata/org.videolan.vlc.txt @@ -1056,6 +1056,7 @@ Build:1.9.0,1090005 prebuild=ln -s vlc-android/$$VLC$$ ../vlc build=cd ../ && \ ./compile.sh -a "x86" --release + ndk=r10e Build:2.0.2,12000213 disable=failing build @@ -1142,12 +1143,11 @@ Build:2.0.5,12000525 ndk=r11c Build:2.0.6,12000603 - disable=doesnt build anymore commit=2.0.6 subdir=vlc-android gradle=VanillaARMv6fpu - srclibs=VLC@6689dcb - prebuild=ln -s vlc-android/$$VLC$$ ../vlc && \ + srclibs=VLC-2.0.6@6689dcb + prebuild=ln -s vlc-android/$$VLC-2.0.6$$ ../vlc && \ 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 && \ 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 Build:2.0.6,12000604 - disable=doesnt build anymore commit=2.0.6 subdir=vlc-android gradle=VanillaARMv7 - srclibs=VLC@6689dcb - prebuild=ln -s vlc-android/$$VLC$$ ../vlc && \ + srclibs=VLC-2.0.6@6689dcb + prebuild=ln -s vlc-android/$$VLC-2.0.6$$ ../vlc && \ 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 && \ 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 Build:2.0.6,12000605 - disable=doesnt build anymore commit=2.0.6 subdir=vlc-android gradle=VanillaX86 - srclibs=VLC@6689dcb - prebuild=ln -s vlc-android/$$VLC$$ ../vlc && \ + srclibs=VLC-2.0.6@6689dcb + prebuild=ln -s vlc-android/$$VLC-2.0.6$$ ../vlc && \ 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 && \ echo "3a753ea48d917945dd54a2d97de388aa06ca2eb1066cbfdc6652036349fe05a7 jpegsrc.v9a.tar.gz" > ../vlc/contrib/tarballs/jpegsrc.v9a.tar.gz.sha256 && \ diff --git a/srclibs/VLC-2.0.6.txt b/srclibs/VLC-2.0.6.txt new file mode 100644 index 0000000000..a8e7e14718 --- /dev/null +++ b/srclibs/VLC-2.0.6.txt @@ -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