From 5ede5607c3ceb6daf26bbb57d73e4d20419a7013 Mon Sep 17 00:00:00 2001
From: relan <email@hidden>
Date: Thu, 12 Oct 2017 09:33:26 +0300
Subject: [PATCH] VLC: fix 2.5.2

---
 metadata/org.videolan.vlc.txt | 20 ++++++++++++--------
 srclibs/VLCmedialibrary.txt   |  4 ++++
 2 files changed, 16 insertions(+), 8 deletions(-)
 create mode 100644 srclibs/VLCmedialibrary.txt

diff --git a/metadata/org.videolan.vlc.txt b/metadata/org.videolan.vlc.txt
index 0266cf072c..8fa35004d8 100644
--- a/metadata/org.videolan.vlc.txt
+++ b/metadata/org.videolan.vlc.txt
@@ -1270,13 +1270,13 @@ Build:2.1.20,12012007
     ndk=r14b
 
 Build:2.5.2,12050204
-    disable=crashes on start
     commit=2.5.2
     subdir=vlc-android
     sudo=apt-get -y install g++ ragel libltdl-dev
     gradle=VanillaARMv7
-    srclibs=VLC@1c02164
+    srclibs=VLC@ef7c26f5,VLCmedialibrary@6e94f5a0
     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 's/git reset --hard ${TESTED_HASH}/true/' ../compile.sh && \
         sed -i -e '/signingConfig/d' build.gradle
@@ -1288,13 +1288,13 @@ Build:2.5.2,12050204
     ndk=r14b
 
 Build:2.5.2,12050205
-    disable=crashes on start
     commit=2.5.2
     subdir=vlc-android
     sudo=apt-get -y install g++ ragel libltdl-dev
     gradle=VanillaX86
-    srclibs=VLC@1c02164
+    srclibs=VLC@ef7c26f5,VLCmedialibrary@6e94f5a0
     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 's/git reset --hard ${TESTED_HASH}/true/' ../compile.sh && \
         sed -i -e '/signingConfig/d' build.gradle
@@ -1306,13 +1306,13 @@ Build:2.5.2,12050205
     ndk=r14b
 
 Build:2.5.2,12050207
-    disable=crashes on start
     commit=2.5.2
     subdir=vlc-android
     sudo=apt-get -y install g++ ragel libltdl-dev
     gradle=VanillaARMv8
-    srclibs=VLC@1c02164
+    srclibs=VLC@ef7c26f5,VLCmedialibrary@6e94f5a0
     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 's/git reset --hard ${TESTED_HASH}/true/' ../compile.sh && \
         sed -i -e '/signingConfig/d' build.gradle
@@ -1325,8 +1325,12 @@ Build:2.5.2,12050207
 
 Maintainer Notes:
 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:
 https://git.videolan.org/?p=vlc.git;a=blob;f=extras/tools/bootstrap#l72
diff --git a/srclibs/VLCmedialibrary.txt b/srclibs/VLCmedialibrary.txt
new file mode 100644
index 0000000000..d4afc4dd6a
--- /dev/null
+++ b/srclibs/VLCmedialibrary.txt
@@ -0,0 +1,4 @@
+Repo Type:git
+Repo:https://code.videolan.org/videolan/medialibrary.git
+
+Prepare:git submodule update --init