From 898686d561d894695d22b5e226489b34f7a6d972 Mon Sep 17 00:00:00 2001
From: David Guillot <david@guillot.me>
Date: Mon, 25 Jul 2016 19:37:49 +0000
Subject: [PATCH 1/2] VLC: added builds for 2.0.5 with NDK forced to r11c

---
 metadata/org.videolan.vlc.txt | 40 ++++++++++++++++++++++++++++++++++-
 1 file changed, 39 insertions(+), 1 deletion(-)

diff --git a/metadata/org.videolan.vlc.txt b/metadata/org.videolan.vlc.txt
index d5d640c94b..d09dd2dcc0 100644
--- a/metadata/org.videolan.vlc.txt
+++ b/metadata/org.videolan.vlc.txt
@@ -1092,9 +1092,47 @@ Build:2.0.2,12000215
         echo $ANDROID_SDK && \
         ./compile.sh -a "x86" --release
 
+Build:2.0.5,12000523
+    commit=2.0.5
+    subdir=vlc-android
+    gradle=VanillaARMv6fpu
+    srclibs=VLC@848f58d
+    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
+    build=cd ../ && \
+        ./compile.sh -a "armeabi" --release
+    ndk=r11c
+
+Build:2.0.5,12000524
+    commit=2.0.5
+    subdir=vlc-android
+    gradle=VanillaARMv7
+    srclibs=VLC@848f58d
+    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
+    build=cd ../ && \
+        ./compile.sh -a "armeabi-v7a" --release
+    ndk=r11c
+
+Build:2.0.5,12000525
+    commit=2.0.5
+    subdir=vlc-android
+    gradle=VanillaX86
+    srclibs=VLC@848f58d
+    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
+    build=cd ../ && \
+        echo $ANDROID_NDK && \
+        echo $ANDROID_SDK && \
+        ./compile.sh -a "x86" --release
+    ndk=r11c
+
 Maintainer Notes:
 Instructions and dependencies here: http://wiki.videolan.org/AndroidCompile
-see http://buildbot.videolan.org/builders/ for version code scheme
+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
 
 On new releases remove the updatecheck and force the CV to the last working

From ce35e6a60ba573045402cd7750fde603a930665b Mon Sep 17 00:00:00 2001
From: David Guillot <david@guillot.me>
Date: Mon, 1 Aug 2016 09:09:57 +0000
Subject: [PATCH 2/2] VLC: removed NDK r11c forcing for 2.x builds

---
 metadata/org.videolan.vlc.txt | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/metadata/org.videolan.vlc.txt b/metadata/org.videolan.vlc.txt
index d09dd2dcc0..179a65856a 100644
--- a/metadata/org.videolan.vlc.txt
+++ b/metadata/org.videolan.vlc.txt
@@ -1102,7 +1102,6 @@ Build:2.0.5,12000523
         wget -c http://downloads.videolan.org/pub/contrib/jpeg/jpegsrc.v9a.tar.gz -O ../vlc/contrib/tarballs/jpegsrc.v9a.tar.gz
     build=cd ../ && \
         ./compile.sh -a "armeabi" --release
-    ndk=r11c
 
 Build:2.0.5,12000524
     commit=2.0.5
@@ -1114,7 +1113,6 @@ Build:2.0.5,12000524
         wget -c http://downloads.videolan.org/pub/contrib/jpeg/jpegsrc.v9a.tar.gz -O ../vlc/contrib/tarballs/jpegsrc.v9a.tar.gz
     build=cd ../ && \
         ./compile.sh -a "armeabi-v7a" --release
-    ndk=r11c
 
 Build:2.0.5,12000525
     commit=2.0.5
@@ -1128,7 +1126,6 @@ Build:2.0.5,12000525
         echo $ANDROID_NDK && \
         echo $ANDROID_SDK && \
         ./compile.sh -a "x86" --release
-    ndk=r11c
 
 Maintainer Notes:
 Instructions and dependencies here: http://wiki.videolan.org/AndroidCompile