From 1e0adf213d41e1e7785c2c855d104acd27509218 Mon Sep 17 00:00:00 2001
From: Hans-Christoph Steiner <hans@eds.org>
Date: Thu, 9 Feb 2017 23:11:27 +0100
Subject: [PATCH] VLC: Enable 2.0.6 builds, closes fdroid/fdroidserver#224

---
 metadata/org.videolan.vlc.txt | 34 ++++++++++++++++++----------------
 1 file changed, 18 insertions(+), 16 deletions(-)

diff --git a/metadata/org.videolan.vlc.txt b/metadata/org.videolan.vlc.txt
index 099fc7c80e..529cfe77ed 100644
--- a/metadata/org.videolan.vlc.txt
+++ b/metadata/org.videolan.vlc.txt
@@ -1132,49 +1132,54 @@ Build:2.0.5,12000525
         sed -i -e '/sdk-manager/d' ../build.gradle && \
         wget -c http://downloads.videolan.org/pub/contrib/jpeg/jpegsrc.v9a.tar.gz -O ../vlc/contrib/tarballs/jpegsrc.v9a.tar.gz
     build=cd ../ && \
-        echo $ANDROID_NDK && \
-        echo $ANDROID_SDK && \
         ./compile.sh -a "x86" --release
     ndk=r11c
 
 Build:2.0.6,12000603
-    disable=wait
     commit=2.0.6
     subdir=vlc-android
     gradle=VanillaARMv6fpu
     srclibs=VLC@6689dcb
     prebuild=ln -s vlc-android/$$VLC$$ ../vlc && \
         sed -i -e '/sdk-manager/d' ../build.gradle && \
-        wget -c http://downloads.videolan.org/pub/contrib/jpeg/jpegsrc.v9a.tar.gz -O ../vlc/contrib/tarballs/jpegsrc.v9a.tar.gz
+        wget -c http://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 && \
+        cd ../vlc/contrib/tarballs/ && \
+        sha256sum -c jpegsrc.v9a.tar.gz.sha256
     build=cd ../ && \
+        sed -i 's,http://download,https://download,g' compile.sh && \
         ./compile.sh -a "armeabi" --release
     ndk=r11c
 
 Build:2.0.6,12000604
-    disable=still failing
     commit=2.0.6
     subdir=vlc-android
     gradle=VanillaARMv7
     srclibs=VLC@6689dcb
     prebuild=ln -s vlc-android/$$VLC$$ ../vlc && \
         sed -i -e '/sdk-manager/d' ../build.gradle && \
-        wget -c http://downloads.videolan.org/pub/contrib/jpeg/jpegsrc.v9a.tar.gz -O ../vlc/contrib/tarballs/jpegsrc.v9a.tar.gz
+        wget -c http://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 && \
+        cd ../vlc/contrib/tarballs/ && \
+        sha256sum -c jpegsrc.v9a.tar.gz.sha256
     build=cd ../ && \
+        sed -i 's,http://download,https://download,g' compile.sh && \
         ./compile.sh -a "armeabi-v7a" --release
     ndk=r11c
 
 Build:2.0.6,12000605
-    disable=builds, wait for https://gitlab.com/fdroid/fdroidserver/issues/224
     commit=2.0.6
     subdir=vlc-android
     gradle=VanillaX86
     srclibs=VLC@6689dcb
     prebuild=ln -s vlc-android/$$VLC$$ ../vlc && \
         sed -i -e '/sdk-manager/d' ../build.gradle && \
-        wget -c http://downloads.videolan.org/pub/contrib/jpeg/jpegsrc.v9a.tar.gz -O ../vlc/contrib/tarballs/jpegsrc.v9a.tar.gz
+        wget -c http://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 && \
+        cd ../vlc/contrib/tarballs/ && \
+        sha256sum -c jpegsrc.v9a.tar.gz.sha256
     build=cd ../ && \
-        echo $ANDROID_NDK && \
-        echo $ANDROID_SDK && \
+        sed -i 's,http://download,https://download,g' compile.sh && \
         ./compile.sh -a "x86" --release
     ndk=r11c
 
@@ -1238,16 +1243,13 @@ 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
 
+For recommended versions of the build tools, see:
+https://git.videolan.org/?p=vlc.git;a=blob;f=extras/tools/bootstrap;h=e60e5ebf93e69e7bb731e80d0fbc6ebd1226dfdb;hb=HEAD#l73
+
 On new releases remove the updatecheck and force the CV to the last working
 build. This will make sure users don't get notified about the update until
 the final build from the BS has been reviewed and tested. Once done, undo
 those changes.
-
-Recent issues with 1.4.x are due outdated build system, see the following
-thread https://forum.videolan.org/viewtopic.php?f=35&t=126228 .
-
-1.7.5 x86 test build: livemedia doesnt keep an archive of older, tested
-releases.
 .
 
 Archive Policy:0 versions