From 55fb84bf50186239e898ec788dd3f789e32c6eea Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Aur=C3=A9lien=20G=C3=A2teau?= <mail@agateau.com>
Date: Mon, 16 Dec 2019 19:06:27 +0000
Subject: [PATCH] Update Pixel Wheels to 0.14.1 (14)

Use our own build of Aseprite. The packaged version is too old: it
generates bad assets because it does not understand hidden layers.
See https://github.com/agateau/pixelwheels/issues/33.
---
 metadata/com.agateau.tinywheels.android.yml | 38 +++++++++++++++++++--
 srclibs/aseprite.txt                        |  4 +++
 2 files changed, 40 insertions(+), 2 deletions(-)
 create mode 100644 srclibs/aseprite.txt

diff --git a/metadata/com.agateau.tinywheels.android.yml b/metadata/com.agateau.tinywheels.android.yml
index ffdefd7f94..8fc277b707 100644
--- a/metadata/com.agateau.tinywheels.android.yml
+++ b/metadata/com.agateau.tinywheels.android.yml
@@ -60,7 +60,41 @@ Builds:
       - xvfb-run -a make -C .. mapscreenshotgenerator
       - make -C .. packer
 
+  - versionName: 0.14.1
+    versionCode: 14
+    commit: 0.14.1
+    subdir: android
+    sudo:
+      - apt-get update || apt-get update
+      - apt-get install -y g++ python3-pil imagemagick-6.q16 ninja-build libx11-dev
+        libxcursor-dev
+    gradle:
+      - yes
+    srclibs:
+      - aseprite@v1.2.16.3
+      - pafx@269b0241a4b5507a1f45d0aa576fb9f9dad91ad8
+    rm:
+      - tools/packr.jar
+    prebuild: sed -i -e 's#./gradlew#gradle#' ../Makefile
+    scandelete:
+      - android/libs/
+    build:
+      - install_dir=$PWD/aseprite
+      - pushd $$aseprite$$
+      - mkdir -p build
+      - cd build
+      - cmake "-DCMAKE_INSTALL_PREFIX=$install_dir" -DENABLE_UI=OFF -DCMAKE_BUILD_TYPE=MinSizeRel
+        -G Ninja ..
+      - ninja aseprite
+      - ninja install
+      - popd
+      - export PATH=$PATH:$PWD/aseprite/bin
+      - gradle tools:dist -b ../build.gradle
+      - export PYTHONPATH=../$$pafx$$/build/lib/
+      - make -C .. assets
+      - make -C .. packer
+
 AutoUpdateMode: Version %v
 UpdateCheckMode: Tags
-CurrentVersion: 0.13.0
-CurrentVersionCode: 12
+CurrentVersion: 0.14.1
+CurrentVersionCode: 14
diff --git a/srclibs/aseprite.txt b/srclibs/aseprite.txt
new file mode 100644
index 0000000000..456b7d42a3
--- /dev/null
+++ b/srclibs/aseprite.txt
@@ -0,0 +1,4 @@
+Repo Type:git
+Repo:https://github.com/aseprite/aseprite
+
+Prepare:git submodule update --init --recursive