From 48c3ea110cf476dac175857ead206a00827f3c3e Mon Sep 17 00:00:00 2001
From: Boris Kraut <krt@blackbox.local>
Date: Sat, 9 Aug 2014 23:58:10 +0200
Subject: [PATCH] MuPDF: Enable 1.5 builds

---
 metadata/com.artifex.mupdfdemo.txt | 49 ++++++++++++++++++++++--------
 1 file changed, 36 insertions(+), 13 deletions(-)

diff --git a/metadata/com.artifex.mupdfdemo.txt b/metadata/com.artifex.mupdfdemo.txt
index 1df9cd1c94..db9e325500 100644
--- a/metadata/com.artifex.mupdfdemo.txt
+++ b/metadata/com.artifex.mupdfdemo.txt
@@ -61,8 +61,7 @@ Build:1.2-MIPS,52
         make generate
     buildjni=yes
 
-Build:1.5-ARM,53
-    disable=wip
+Build:1.5,53
     commit=1.5-ios-appstore
     forcevercode=yes
     subdir=platform/android
@@ -74,29 +73,53 @@ Build:1.5-ARM,53
     buildjni=yes
     scandelete=build/debug/
 
-Maintainer Notes:
-Source code is not up to date as far as android versioning goes. Our version
-codes probably differ from the official ones.
+Build:1.5,54
+    commit=1.5-ios-appstore
+    forcevercode=yes
+    subdir=platform/android
+    submodules=yes
+    forceversion=yes
+    prebuild=sed -i -e 's/armeabi-v7a/x86/g' -e 's/android-8/android-9/g' jni/Application.mk && \
+        cd ../.. && \
+        make generate
+    buildjni=yes
+    scandelete=build/debug/
 
-Looking at http://mupdf.com/downloads/ and platform/android/jni/Application.mk
-the version scheme is like:
+Build:1.5,55
+    commit=1.5-ios-appstore
+    forcevercode=yes
+    subdir=platform/android
+    submodules=yes
+    forceversion=yes
+    prebuild=sed -i -e 's/armeabi-v7a/mips/g' -e 's/android-8/android-9/g' jni/Application.mk && \
+        cd ../.. && \
+        make generate
+    buildjni=yes
+    scandelete=build/debug/
+
+Maintainer Notes:
+Our version codes differs until 1.5. With 1.6 we try to sync up with
+upstream releases. They will try to tag android releases and update
+their versionCode in the Manifest, too.
 
 armeabi = baseversion + 0, e.g. mupdf-1.5-android-50-armeabi.apk
 armv7 = baseversion + 1, e.g. mupdf-1.5-android-51-armv7a.apk
 x86 = baseversion + 2, e.g. mupdf-1.5-android-52-x86.apk
 mips= baseversion + 3, e.g. mupdf-1.5-android-53-mips.apk
 
-I'd assume baseversion corresponds to the versionName, e.g. 1.5 = 50. This
-would make 1.6 starting with verCode 60 up to 63 for the mips release. However,
-the verCode has been 50 for ages (~2013!) and the devs in #ghostscript said:
-"The android apk version numbers bear no resemblance to the app version."
+The basename "bears no resemblance to the app version", however 1.4
+used 40 and 1.5 used 50. This would make 1.6 start with 60 -- or
+even a 16xx scheme.
 
 Documents:
 http://www.mupdf.com/docs/how-to-build-mupdf-for-android
+http://mupdf.com/downloads/
+http://twiki.ghostscript.com/do/view/MuPDF/AndroidReleases
+http://git.ghostscript.com/?p=mupdf.git;a=blob;f=platform/android/jni/Application.mk;h=60909b6e9989b79231a6f3a7a04f371039185dbf;hb=HEAD
 .
 
 Auto Update Mode:None
 Update Check Mode:None
-Current Version:1.4
-Current Version Code:53
+Current Version:1.5
+Current Version Code:55