minetest: 5.6.0

metadata/net.minetest.minetest.yml

@@ -10,6 +10,7 @@ Donate: https://www.minetest.net/development/#donate
 Liberapay: celeron55
 
 Name: Minetest
+AutoName: Minetest
 Description: |-
     Minetest is a near infinite world block sandbox game and a game engine, inspired
     by InfiniMiner, Minecraft and the like.
@@ -184,7 +185,37 @@ Builds:
       - make release
     ndk: r16b
 
+  - versionName: 5.6.0
+    versionCode: 40
+    commit: 5.6.0
+    subdir: android/app
+    sudo:
+      - apt-get update || apt-get update
+      - apt-get install -y gettext wget gcc-multilib openjdk-11-jdk-headless
+      - update-alternatives --auto java
+    patch:
+      - 5.6.0.patch
+    gradle:
+      - yes
+    srclibs:
+      - MinetestGame@5.6.0
+      - minetest_android_deps@de332f3c11a5ee7b731fd606b9a3c577b13093c7
+    prebuild:
+      - sed -i -e 's/enable true/enable false/' build.gradle ../native/build.gradle
+      - sed -i -e '/preBuild.dependsOn getDeps/d' ../native/build.gradle
+      - cp -R $$MinetestGame$$ ../../games/minetest_game
+    build:
+      - pushd $$minetest_android_deps$$
+      - ./build.sh --all armeabi-v7a
+      - ./build.sh --all arm64-v8a
+      - ./build.sh --all x86
+      - ./build.sh --all x86_64
+      - popd
+      - mv $$minetest_android_deps$$/deps ../native
+    ndk: r23c
+
 AutoUpdateMode: None
-UpdateCheckMode: None
+UpdateCheckMode: Tags
-CurrentVersion: 5.2.0.26
+UpdateCheckData: android/build.gradle|"versionCode", (\d+)||(.*)
-CurrentVersionCode: 26
+CurrentVersion: 5.6.0
+CurrentVersionCode: 40

metadata/net.minetest.minetest/5.6.0.patch

@@ -0,0 +1,77 @@
+From d7a9bd2b8b2ccd4d992394ddcb03926050af7a0d Mon Sep 17 00:00:00 2001
+From: savilli <78875209+savilli@users.noreply.github.com>
+Date: Sun, 14 Aug 2022 14:26:26 +0200
+Subject: [PATCH] Fix and enable x86 build for Android
+
+---
+ android/app/build.gradle      |  2 +-
+ android/native/build.gradle   |  2 +-
+ android/native/jni/Android.mk | 15 +++++++++++++--
+ 3 files changed, 15 insertions(+), 4 deletions(-)
+
+diff --git a/android/app/build.gradle b/android/app/build.gradle
+index e8ba9572204f..338167a94ce0 100644
+--- a/android/app/build.gradle
++++ b/android/app/build.gradle
+@@ -40,7 +40,7 @@ android {
+ 		abi {
+ 			enable true
+ 			reset()
+-			include 'armeabi-v7a', 'arm64-v8a'
++			include 'armeabi-v7a', 'arm64-v8a', 'x86'
+ 		}
+ 	}
+ 
+diff --git a/android/native/build.gradle b/android/native/build.gradle
+index 2254aab3aba9..ef8ac2653bf8 100644
+--- a/android/native/build.gradle
++++ b/android/native/build.gradle
+@@ -31,7 +31,7 @@ android {
+ 		abi {
+ 			enable true
+ 			reset()
+-			include 'armeabi-v7a', 'arm64-v8a'//, 'x86'
++			include 'armeabi-v7a', 'arm64-v8a', 'x86'
+ 		}
+ 	}
+ 
+diff --git a/android/native/jni/Android.mk b/android/native/jni/Android.mk
+index 50651d5ba4ad..3edbd29ca482 100644
+--- a/android/native/jni/Android.mk
++++ b/android/native/jni/Android.mk
+@@ -43,6 +43,16 @@ LOCAL_MODULE := Irrlicht
+ LOCAL_SRC_FILES := deps/$(APP_ABI)/Irrlicht/libIrrlichtMt.a
+ include $(PREBUILT_STATIC_LIBRARY)
+ 
++include $(CLEAR_VARS)
++LOCAL_MODULE := Irrlicht-libpng
++LOCAL_SRC_FILES := deps/$(APP_ABI)/Irrlicht/libpng.a
++include $(PREBUILT_STATIC_LIBRARY)
++
++include $(CLEAR_VARS)
++LOCAL_MODULE := Irrlicht-libjpeg
++LOCAL_SRC_FILES := deps/$(APP_ABI)/Irrlicht/libjpeg.a
++include $(PREBUILT_STATIC_LIBRARY)
++
+ ifndef USE_BUILTIN_LUA
+ 
+ include $(CLEAR_VARS)
+@@ -270,7 +280,7 @@ LOCAL_STATIC_LIBRARIES += \
+ 	Curl libmbedcrypto libmbedtls libmbedx509 \
+ 	Freetype \
+ 	Iconv libcharset \
+-	Irrlicht \
++	Irrlicht Irrlicht-libpng Irrlicht-libjpeg \
+ 	OpenAL \
+ 	Gettext \
+ 	SQLite3 \
+@@ -281,7 +291,8 @@ ifndef USE_BUILTIN_LUA
+ endif
+ LOCAL_STATIC_LIBRARIES += android_native_app_glue $(PROFILER_LIBS)
+ 
+-LOCAL_LDLIBS := -lEGL -lGLESv1_CM -lGLESv2 -landroid -lOpenSLES
++# Irrlicht uses zlib
++LOCAL_LDLIBS := -lEGL -lGLESv1_CM -lGLESv2 -landroid -lOpenSLES -lz
+ 
+ include $(BUILD_SHARED_LIBRARY)
+ 

srclibs/minetest_android_deps.yml

@@ -0,0 +1,2 @@
+RepoType: git
+Repo: https://github.com/minetest/minetest_android_deps.git