From 58aa1d717de2298877a0778a2a2ba820953d3b08 Mon Sep 17 00:00:00 2001
From: luk3yx <luk3yx@users.noreply.github.com>
Date: Wed, 10 Mar 2021 10:52:20 +1300
Subject: [PATCH] Switch to Minetest's irrlicht fork

---
 {snap/scripts => scripts}/launcher            |   0
 .../minetest/misc/minetest-xorg-icon-128.png  | Bin
 snapcraft.yaml                                |  23 ++++++++++++++----
 3 files changed, 18 insertions(+), 5 deletions(-)
 rename {snap/scripts => scripts}/launcher (100%)
 rename {snap/scripts => scripts}/share/minetest/misc/minetest-xorg-icon-128.png (100%)

diff --git a/snap/scripts/launcher b/scripts/launcher
similarity index 100%
rename from snap/scripts/launcher
rename to scripts/launcher
diff --git a/snap/scripts/share/minetest/misc/minetest-xorg-icon-128.png b/scripts/share/minetest/misc/minetest-xorg-icon-128.png
similarity index 100%
rename from snap/scripts/share/minetest/misc/minetest-xorg-icon-128.png
rename to scripts/share/minetest/misc/minetest-xorg-icon-128.png
diff --git a/snapcraft.yaml b/snapcraft.yaml
index 57c5efb..84488cc 100644
--- a/snapcraft.yaml
+++ b/snapcraft.yaml
@@ -11,6 +11,13 @@ confinement: strict
 icon: snap/gui/minetest.svg
 base: core18
 
+architectures:
+  - build-on: amd64
+  - build-on: arm64
+  - build-on: armhf
+  - build-on: i386
+  - build-on: ppc64el
+
 apps:
   minetest:
     command: launcher
@@ -27,7 +34,7 @@ apps:
 
 parts:
   launcher:
-    source: snap/scripts
+    source: scripts
     plugin: dump
   minetestgame:
     source: https://github.com/minetest/minetest_game.git
@@ -35,22 +42,29 @@ parts:
     source-branch: master
     organize:
       '*': 'share/minetest/games/minetest_game/'
+  irrlicht:
+    source: https://github.com/minetest/irrlicht.git
+    source-branch: master
+    plugin: cmake
+    override-pull: |
+      snapcraftctl pull
+      tag=$(git describe --tags $(git rev-list --tags --max-count=1))
+      git checkout "$tag"
   minetest:
     source: https://github.com/minetest/minetest.git
     source-branch: master
     plugin: cmake
     configflags: [-DRUN_IN_PLACE=FALSE]
+    after:
+      - irrlicht
     build-packages:
       - cmake
       - gcc
       - g++
       - gettext
-      - imagemagick
-      - libbz2-dev
       - libcurl4-gnutls-dev
       - libfreetype6-dev
       - libglu1-mesa-dev
-      - libirrlicht-dev
       - libjpeg-dev
       - libjsoncpp-dev
       - libleveldb-dev
@@ -68,7 +82,6 @@ parts:
       - libpulse0
       - libcurl3-gnutls
       - libgl1-mesa-glx
-      - libirrlicht1.8
       - libxshmfence1
       - libxcb-sync1
       - libxcb-present0