From d3ef9779eeb6e3b5c857f5c23d103fd32cb58489 Mon Sep 17 00:00:00 2001
From: proller <proller@github.com>
Date: Sun, 11 Jan 2026 22:51:19 +0100
Subject: [PATCH] fix

---
 .../main/java/org/libsdl/app/SDLActivity.java |  2 +-
 android/build.gradle                          |  4 ++--
 cmake/Modules/freeminer_src.cmake             | 21 ++++++++++++-------
 3 files changed, 17 insertions(+), 10 deletions(-)

diff --git a/android/app/src/main/java/org/libsdl/app/SDLActivity.java b/android/app/src/main/java/org/libsdl/app/SDLActivity.java
index 919640040..0c1a3110e 100644
--- a/android/app/src/main/java/org/libsdl/app/SDLActivity.java
+++ b/android/app/src/main/java/org/libsdl/app/SDLActivity.java
@@ -61,7 +61,7 @@ public class SDLActivity extends Activity implements View.OnSystemUiVisibilityCh
     private static final String TAG = "SDL";
     private static final int SDL_MAJOR_VERSION = 2;
     private static final int SDL_MINOR_VERSION = 32;
-    private static final int SDL_MICRO_VERSION = 0;
+    private static final int SDL_MICRO_VERSION = 10;
 /*
     // Display InputType.SOURCE/CLASS of events and devices
     //
diff --git a/android/build.gradle b/android/build.gradle
index 57abd8088..309cec46c 100644
--- a/android/build.gradle
+++ b/android/build.gradle
@@ -15,8 +15,8 @@ buildscript {
 		mavenCentral()
 	}
 	dependencies {
-		classpath 'com.android.tools.build:gradle:8.5.1'
-		classpath 'de.undercouch:gradle-download-task:4.1.1'
+		classpath 'com.android.tools.build:gradle:8.13.2'
+		classpath 'de.undercouch:gradle-download-task:5.6.0'
 		// NOTE: Do not place your application dependencies here; they belong
 		// in the individual module build.gradle files
 	}
diff --git a/cmake/Modules/freeminer_src.cmake b/cmake/Modules/freeminer_src.cmake
index be123bae9..3e393e155 100644
--- a/cmake/Modules/freeminer_src.cmake
+++ b/cmake/Modules/freeminer_src.cmake
@@ -35,7 +35,7 @@ if(FETCH_DEPS)
         # GIT_TAG "bzip2-1.0.8" # CMake support not available
         GIT_SHALLOW TRUE
 
-        SOURCE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/external/bzip2
+        # SOURCE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/external/bzip2
         OVERRIDE_FIND_PACKAGE TRUE
         USES_TERMINAL_DOWNLOAD TRUE
         GIT_PROGRESS TRUE
@@ -57,7 +57,7 @@ if(FETCH_OPENSSL AND FETCH_DEPS AND NOT TARGET OpenSSL::SSL)
         GIT_TAG main
         SOURCE_SUBDIR cmake
         GIT_SUBMODULES_RECURSE OFF
-        SOURCE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/external/openssl-cmake
+        # SOURCE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/external/openssl-cmake
         GIT_SHALLOW TRUE
         OVERRIDE_FIND_PACKAGE TRUE
         USES_TERMINAL_DOWNLOAD TRUE
@@ -84,7 +84,7 @@ if(FETCH_DEPS)
         GIT_TAG boost-1.90.0
         GIT_SHALLOW TRUE
 
-        SOURCE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/external/boost
+        # SOURCE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/external/boost
         OVERRIDE_FIND_PACKAGE TRUE # needed to find correct Boost
         USES_TERMINAL_DOWNLOAD TRUE
         GIT_PROGRESS TRUE
@@ -238,7 +238,7 @@ if(ENABLE_OSMIUM AND (OSMIUM_INCLUDE_DIR OR EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/m
             SOURCE_SUBDIR build/cmake
             SYSTEM TRUE
 
-            SOURCE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/external/lz4
+            # SOURCE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/external/lz4
             GIT_SHALLOW TRUE
             OVERRIDE_FIND_PACKAGE TRUE
             USES_TERMINAL_DOWNLOAD TRUE
@@ -256,7 +256,7 @@ if(ENABLE_OSMIUM AND (OSMIUM_INCLUDE_DIR OR EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/m
             SOURCE_SUBDIR cmake
 
             GIT_SUBMODULES_RECURSE OFF
-            SOURCE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/external/protozero
+            # SOURCE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/external/protozero
             GIT_SHALLOW TRUE
             OVERRIDE_FIND_PACKAGE TRUE
             USES_TERMINAL_DOWNLOAD TRUE
@@ -274,7 +274,7 @@ if(ENABLE_OSMIUM AND (OSMIUM_INCLUDE_DIR OR EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/m
             GIT_TAG R_2_7_3
             SOURCE_SUBDIR expat/
 
-            SOURCE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/external/expat
+            # SOURCE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/external/expat
             GIT_SHALLOW TRUE
             OVERRIDE_FIND_PACKAGE TRUE
             USES_TERMINAL_DOWNLOAD TRUE
@@ -344,6 +344,13 @@ if(ENABLE_OSMIUM AND (OSMIUM_INCLUDE_DIR OR EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/m
                 )
             endif()
 
+
+
+            #if(ANDROID OR WIN32 OR EMSCRIPTEN OR USE_LIBCXX)
+            if(FETCH_DEPS)
+                set(FETCH_OSMIUM 1 CACHE INTERNAL "")
+            endif()
+
             set(Osmium_DEBUG 1 CACHE INTERNAL "")
             # TODO: support system installed libosmium
             if(NOT FETCH_OSMIUM AND EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/mapgen/earth/libosmium/CMakeLists.txt)
@@ -366,7 +373,7 @@ if(ENABLE_OSMIUM AND (OSMIUM_INCLUDE_DIR OR EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/m
                 FetchContent_Declare(libosmium
                     GIT_REPOSITORY https://github.com/osmcode/libosmium
                     GIT_TAG v2.22.0
-                    SOURCE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/external/libosmium
+                    # SOURCE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/external/libosmium
                     SOURCE_SUBDIR cmake
                     GIT_SUBMODULES_RECURSE OFF