From d00abfdd352474e348949c5c8e4b9a8d74f4dfb2 Mon Sep 17 00:00:00 2001
From: Christopher Homberger <christopher.homberger@web.de>
Date: Sat, 23 Nov 2019 00:30:06 +0100
Subject: [PATCH] initial armhf support

---
 README.md           | 20 ++++++++++++++------
 mcpelauncher-client |  2 +-
 minecraft-symbols   |  2 +-
 3 files changed, 16 insertions(+), 8 deletions(-)

diff --git a/README.md b/README.md
index dc41d954..d9f87518 100644
--- a/README.md
+++ b/README.md
@@ -5,7 +5,7 @@ A fork of MCPE Launcher created by ChristopherHX for the Linux and Mac OS Bedroc
 - Character Creator [X]
 - Fox [X]
 - All MC 1.13 features without crashes [X]
-- Xbox Authentication [X], **Currently no Autologin (login each time starting the game!)**
+- Xbox Authentication [*], **WORKS ONLY ON x86, x86_64, AMD64, x64, Currently no Autologin (login each time starting the game!)**
 
 # Installation Guide
 ## Install Prebuilds for Ubuntu
@@ -22,18 +22,26 @@ https://github.com/ChristopherHX/linux-packaging-scripts/releases
 - Then click the green checkmark of the latest commit, click Details (popup)
 - Upper right under Artifacts is the download DMG in a .zip
 
-## Build from Source
+## Build from Source (gcc < 8.3.0 generates unusable launchers)
 - First, make sure you have all needed drivers installed:
-`sudo apt-get install g++-multilib libpng-dev:i386 libx11-dev:i386 libxi-dev:i386 libcurl4-openssl-dev:i386 libudev-dev:i386 libevdev-dev:i386 libegl1-mesa-dev:i386 libasound2:i386`
-- Next, in the same window, run `git clone --recursive https://github.com/ChristopherHX/mcpelauncher-manifest.git mcpelauncher && cd mcpelauncher`in the home directory.
+- x86, x86_64, AMD64, x64: `sudo dpkg --add-architecture i386 && sudo apt-get install g++-multilib libpng-dev:i386 libx11-dev:i386 libxi-dev:i386 libcurl4-openssl-dev:i386 libudev-dev:i386 libevdev-dev:i386 libegl1-mesa-dev:i386 libasound2:i386`
+- armhf, arm64:
+  - `sudo dpkg --add-architecture armhf && sudo apt-get install python3-pip g++-arm-linux-gnueabihf libpng-dev:armhf libx11-dev:armhf libxi-dev:armhf libcurl4-openssl-dev:armhf libudev-dev:armhf libevdev-dev:armhf libegl1-mesa-dev:armhf libasound2:armhf && pip3 install jinja2 ds_store`
+  - Download https://github.com/ChristopherHX/mcpelauncher-manifest/releases/download/1.12.x.2.armhf.raspbian.buster/mesa.tar.xz and extract to $HOME/mesa
+  - it should contain `$HOME/mesa/include` and `$HOME/mesa/lib`
+- Next, in the same window, run `git clone --recursive https://github.com/ChristopherHX/mcpelauncher-manifest.git mcpelauncher && cd mcpelauncher` in the home directory.
 - Also run the following commands below:
 - `mkdir -p build && cd build`
-- `cmake ..`
+- x86, x86_64, AMD64, x64:`cmake ..`
+- armhf, arm64: 
+  - `cd ../mcpelauncher-linux-bin && git checkout armhf && cd ../minecraft-symbols/tools && python3 ./process_headers.py --armhf && cd ../../build`
+  - `CC=arm-linux-gnueabihf-gcc CXX=arm-linux-gnueabihf-g++ cmake -DCMAKE_CXX_FLAGS="-isystem $HOME/mesa/include -latomic" ..`
 - `make -j12`
 
 - Finally
   - ~~`cd ~/.local/share/mcpelauncher/versions/1.13.X/assets`~~ No longer needed
-  - `~/mcpelauncher/build/mcpelauncher-client/mcpelauncher-client -dg ~/.local/share/mcpelauncher/versions/1.13.X`
+  - x86, x86_64, AMD64, x64: `~/mcpelauncher/build/mcpelauncher-client/mcpelauncher-client -dg ~/.local/share/mcpelauncher/versions/1.13.X`
+  - armhf, arm64: `LD_LIBRARY_PATH=$HOME/mesa/lib LIBGL_DRIVERS_PATH=$HOME/mesa/lib/dri GBM_DRIVERS_PATH=$HOME/mesa/lib OPENSSL_armcap=0 ~/mcpelauncher/build/mcpelauncher-client/mcpelauncher-client -dg ~/.local/share/mcpelauncher/versions/1.13.X`
   - Then Minecraft Bedrock 1.13.x will begin to start up. Make sure you replace `1.13.X` with your 1.13.X or 1.14.X installation, otherwise this setup will not work for you
 
 **Before starting the new launcher, please remember to download the game with the original Bedrock launcher QT GUI!**
diff --git a/mcpelauncher-client b/mcpelauncher-client
index d5f67130..2800627d 160000
--- a/mcpelauncher-client
+++ b/mcpelauncher-client
@@ -1 +1 @@
-Subproject commit d5f67130b32ba0452c433e039a656d888aff5f9b
+Subproject commit 2800627d57b36c82476b2529abeed0364ee02d74
diff --git a/minecraft-symbols b/minecraft-symbols
index c9026a96..ebf334ce 160000
--- a/minecraft-symbols
+++ b/minecraft-symbols
@@ -1 +1 @@
-Subproject commit c9026a968dc0608628d6f6d9e8abfd31fc6c85da
+Subproject commit ebf334ce8244bce45d91664878f5cd989f7b55cd