Update Android SDK to API version 34

Author: neodesys

Diff for: android/app/build.gradle

@@ -3,13 +3,14 @@ plugins {
 }
 
 android {
-    compileSdk 33
+    compileSdk 34
+    ndkVersion "26.3.11579264"
     namespace "com.neodesys.minedigger"
 
     defaultConfig {
-        minSdk 16
-        targetSdk 33
-        versionCode 4
+        minSdk 21
+        targetSdk 34
+        versionCode 5
         versionName "1.0"
     }
 

Diff for: android/build-external-libs

@@ -31,7 +31,7 @@ readonly PATCH_DIR="patch"
 readonly DEST_DIR="app/prebuild"
 
 readonly ANDROID_ABI="all"
-readonly ANDROID_VERSION="16"
+readonly ANDROID_VERSION="21"
 
 readonly ZENITY=`which zenity`
 readonly NDK_BUILD=`which ndk-build`
@@ -136,15 +136,14 @@ function buildAndroidLibs()
 
     #Patch external sources
     if [ -f "$PATCH_DIR/${MODULE}.patch" ]; then
-        if ! patch -bd "$SRC_DIR" -r - <"$PATCH_DIR/${MODULE}.patch" &>$DEBUG_STREAM; then
-            rm -f "$SRC_DIR/Android.mk.orig"
+        if ! patch -d "$SRC_DIR" -p1 -r - <"$PATCH_DIR/${MODULE}.patch" &>$DEBUG_STREAM; then
             echo -e "\033[1;31mCannot apply sources patch to $SRC_DIR\033[0m" >&2
             return 3
         fi
     fi
 
     #Create Application.mk file
-    trap 'rm -f "$SRC_DIR/Application.mk"; mv -f "$SRC_DIR/Android.mk.orig" "$SRC_DIR/Android.mk" 2>/dev/null; rm -rf "$SRC_DIR/obj"; exit 0' SIGHUP SIGINT SIGQUIT SIGABRT SIGKILL SIGTERM
+    trap 'rm -rf "$SRC_DIR/obj"; exit 0' SIGHUP SIGINT SIGQUIT SIGABRT SIGKILL SIGTERM
 
     cat <<-EOF > "$SRC_DIR/Application.mk"
         APP_BUILD_SCRIPT := Android.mk
@@ -179,8 +178,6 @@ EOF
         RET=4
     fi
 
-    rm -f "$SRC_DIR/Application.mk"
-    mv -f "$SRC_DIR/Android.mk.orig" "$SRC_DIR/Android.mk" 2>$DEBUG_STREAM
     rm -rf "$SRC_DIR/obj"
 
     return $RET

Diff for: android/build.gradle

@@ -4,7 +4,7 @@ buildscript {
         mavenCentral()
     }
     dependencies {
-        classpath "com.android.tools.build:gradle:8.1.0"
+        classpath 'com.android.tools.build:gradle:8.4.1'
     }
 }
 

Diff for: android/gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.3-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.6-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME

Diff for: android/patch/SDL2.patch

@@ -1,11 +1,35 @@
---- Android.mk
-+++ Android.mk
-@@ -61,7 +61,7 @@
- 
+---
+ Android.mk                            | 4 ++--
+ src/render/opengles2/SDL_gles2funcs.h | 4 ++--
+ 2 files changed, 4 insertions(+), 4 deletions(-)
+
+diff --git a/Android.mk b/Android.mk
+index 4f94082..a213083 100755
+--- a/Android.mk
++++ b/Android.mk
+@@ -61,9 +61,9 @@ LOCAL_MODULE := SDL2_static
+
  LOCAL_MODULE_FILENAME := libSDL2
- 
+
 -LOCAL_SRC_FILES += $(LOCAL_PATH)/src/main/android/SDL_android_main.c
 +LOCAL_SRC_FILES += src/main/android/SDL_android_main.c
- 
+
  LOCAL_LDLIBS := 
  LOCAL_EXPORT_LDLIBS := -Wl,--undefined=Java_org_libsdl_app_SDLActivity_nativeInit -ldl -lGLESv1_CM -lGLESv2 -llog -landroid
+
+ include $(BUILD_STATIC_LIBRARY)
+diff --git a/src/render/opengles2/SDL_gles2funcs.h b/src/render/opengles2/SDL_gles2funcs.h
+index c2a20f7..7178659 100644
+--- a/src/render/opengles2/SDL_gles2funcs.h
++++ b/src/render/opengles2/SDL_gles2funcs.h
+@@ -53,7 +53,7 @@ SDL_PROC(void, glPixelStorei, (GLenum, GLint))
+ SDL_PROC(void, glReadPixels, (GLint, GLint, GLsizei, GLsizei, GLenum, GLenum, GLvoid*))
+ SDL_PROC(void, glScissor, (GLint, GLint, GLsizei, GLsizei))
+ SDL_PROC(void, glShaderBinary, (GLsizei, const GLuint *, GLenum, const void *, GLsizei))
+-SDL_PROC(void, glShaderSource, (GLuint, GLsizei, const char **, const GLint *))
++SDL_PROC(void, glShaderSource, (GLuint, GLsizei, const char *const *, const GLint *))
+ SDL_PROC(void, glTexImage2D, (GLenum, GLint, GLint, GLsizei, GLsizei, GLint, GLenum, GLenum, const void *))
+ SDL_PROC(void, glTexParameteri, (GLenum, GLenum, GLint))
+ SDL_PROC(void, glTexSubImage2D, (GLenum, GLint, GLint, GLint, GLsizei, GLsizei, GLenum, GLenum, const GLvoid *))
+--
+2.34.1

Diff for: android/patch/SDL2_image.patch

@@ -1,39 +1,46 @@
---- Android.mk
-+++ Android.mk
-@@ -2,7 +2,8 @@
- 
+---
+ Android.mk                     | 14 +++++++-------
+ external/jpeg-9/jmem-android.c |  1 +
+ 2 files changed, 8 insertions(+), 7 deletions(-)
+
+diff --git a/Android.mk b/Android.mk
+index c2080dd..d991665 100644
+--- a/Android.mk
++++ b/Android.mk
+@@ -2,7 +2,8 @@ LOCAL_PATH := $(call my-dir)
+
  include $(CLEAR_VARS)
- 
+
 -LOCAL_MODULE := SDL2_image
 +LOCAL_MODULE := SDL2_image_static
 +LOCAL_MODULE_FILENAME := libSDL2_image
- 
+
  # Enable this if you want to support loading JPEG images
  # The library path should be a relative path to this directory.
-@@ -16,11 +17,11 @@
- 
+@@ -16,11 +17,11 @@ PNG_LIBRARY_PATH := external/libpng-1.6.2
+
  # Enable this if you want to support loading WebP images
  # The library path should be a relative path to this directory.
 -SUPPORT_WEBP := true
 +SUPPORT_WEBP := false
  WEBP_LIBRARY_PATH := external/libwebp-0.3.0
- 
- 
+
+
 -LOCAL_C_INCLUDES := $(LOCAL_PATH)
 +LOCAL_C_INCLUDES := $(LOCAL_PATH) ../SDL2-2.0.3/include
  LOCAL_CFLAGS := -DLOAD_BMP -DLOAD_GIF -DLOAD_LBM -DLOAD_PCX -DLOAD_PNM \
                  -DLOAD_TGA -DLOAD_XCF -DLOAD_XPM -DLOAD_XV
  LOCAL_CFLAGS += -O3 -fstrict-aliasing -fprefetch-loop-arrays
-@@ -29,7 +30,7 @@
- 
+@@ -29,7 +30,7 @@ LOCAL_SRC_FILES := $(notdir $(filter-out %/showimage.c, $(wildcard $(LOCAL_PATH)
+
  LOCAL_LDLIBS :=
  LOCAL_STATIC_LIBRARIES :=
 -LOCAL_SHARED_LIBRARIES := SDL2
 +LOCAL_SHARED_LIBRARIES :=
- 
+
  ifeq ($(SUPPORT_JPG),true)
      LOCAL_C_INCLUDES += $(LOCAL_PATH)/$(JPG_LIBRARY_PATH)
-@@ -77,7 +78,7 @@
+@@ -77,7 +78,7 @@ ifeq ($(SUPPORT_JPG),true)
          $(JPG_LIBRARY_PATH)/jfdctfst.c \
          $(JPG_LIBRARY_PATH)/jfdctint.c \
          $(JPG_LIBRARY_PATH)/jidctflt.c \
@@ -42,17 +49,31 @@
          $(JPG_LIBRARY_PATH)/jidctint.c \
          $(JPG_LIBRARY_PATH)/jquant1.c \
          $(JPG_LIBRARY_PATH)/jquant2.c \
-@@ -107,7 +108,6 @@
+@@ -107,7 +108,6 @@ ifeq ($(SUPPORT_PNG),true)
          $(PNG_LIBRARY_PATH)/pngwrite.c \
          $(PNG_LIBRARY_PATH)/pngwtran.c \
          $(PNG_LIBRARY_PATH)/pngwutil.c
 -    LOCAL_LDLIBS += -lz
  endif
- 
+
  ifeq ($(SUPPORT_WEBP),true)
-@@ -118,4 +118,4 @@
- 
+@@ -118,4 +118,4 @@ endif
+
  LOCAL_EXPORT_C_INCLUDES += $(LOCAL_C_INCLUDES)
- 
+
 -include $(BUILD_SHARED_LIBRARY)
 +include $(BUILD_STATIC_LIBRARY)
+diff --git a/external/jpeg-9/jmem-android.c b/external/jpeg-9/jmem-android.c
+index 5da4d0a..271233d 100644
+--- a/external/jpeg-9/jmem-android.c
++++ b/external/jpeg-9/jmem-android.c
+@@ -28,6 +28,7 @@ extern void free JPP((void *ptr));
+ #define SEEK_SET  0		/* if not, assume 0 is correct */
+ #endif
+
++#include <unistd.h>
+
+ /*
+  * Memory allocation and freeing are controlled by the regular library
+--
+2.34.1

Diff for: android/patch/SDL2_mixer.patch

@@ -1,52 +1,122 @@
---- Android.mk
-+++ Android.mk
-@@ -2,21 +2,22 @@
- 
+---
+ Android.mk  | 15 ++++++++-------
+ load_ogg.c  | 16 ++++++++--------
+ music_ogg.c |  8 ++++----
+ 3 files changed, 20 insertions(+), 19 deletions(-)
+
+diff --git a/Android.mk b/Android.mk
+index 81c94b5..06e6973 100644
+--- a/Android.mk
++++ b/Android.mk
+@@ -2,21 +2,22 @@ LOCAL_PATH := $(call my-dir)
+
  include $(CLEAR_VARS)
- 
+
 -LOCAL_MODULE := SDL2_mixer
 +LOCAL_MODULE := SDL2_mixer_static
 +LOCAL_MODULE_FILENAME := libSDL2_mixer
- 
+
  # Enable this if you want to support loading MOD music via modplug
  # The library path should be a relative path to this directory.
 -SUPPORT_MOD_MODPLUG := true
 +SUPPORT_MOD_MODPLUG := false
  MODPLUG_LIBRARY_PATH := external/libmodplug-0.8.8.4
- 
+
  # Enable this if you want to support loading MOD music via mikmod
  # The library path should be a relative path to this directory.
 -SUPPORT_MOD_MIKMOD := true
 +SUPPORT_MOD_MIKMOD := false
  MIKMOD_LIBRARY_PATH := external/libmikmod-3.1.12
- 
+
  # Enable this if you want to support loading MP3 music via SMPEG
  # The library path should be a relative path to this directory.
 -SUPPORT_MP3_SMPEG := true
 +SUPPORT_MP3_SMPEG := false
  SMPEG_LIBRARY_PATH := external/smpeg2-2.0.0
- 
+
  # Enable this if you want to support loading OGG Vorbis music via Tremor
-@@ -26,14 +27,14 @@
+@@ -26,14 +27,14 @@ OGG_LIBRARY_PATH := external/libogg-1.3.1
  VORBIS_LIBRARY_PATH := external/libvorbisidec-1.2.1
- 
- 
+
+
 -LOCAL_C_INCLUDES := $(LOCAL_PATH)
 +LOCAL_C_INCLUDES := $(LOCAL_PATH) ../SDL2-2.0.3/include
  LOCAL_CFLAGS := -DWAV_MUSIC
- 
+
  LOCAL_SRC_FILES := $(notdir $(filter-out %/playmus.c %/playwave.c, $(wildcard $(LOCAL_PATH)/*.c)))
- 
+
  LOCAL_LDLIBS :=
  LOCAL_STATIC_LIBRARIES :=
 -LOCAL_SHARED_LIBRARIES := SDL2
 +LOCAL_SHARED_LIBRARIES :=
- 
+
  ifeq ($(SUPPORT_MOD_MODPLUG),true)
      LOCAL_C_INCLUDES += $(LOCAL_PATH)/$(MODPLUG_LIBRARY_PATH)/src $(LOCAL_PATH)/$(MODPLUG_LIBRARY_PATH)/src/libmodplug
-@@ -110,4 +111,4 @@
- 
+@@ -110,4 +111,4 @@ endif
+
  LOCAL_EXPORT_C_INCLUDES += $(LOCAL_C_INCLUDES)
- 
+
 -include $(BUILD_SHARED_LIBRARY)
 +include $(BUILD_STATIC_LIBRARY)
+diff --git a/load_ogg.c b/load_ogg.c
+index 4b92f44..c1e1e7a 100644
+--- a/load_ogg.c
++++ b/load_ogg.c
+@@ -43,24 +43,24 @@ static size_t sdl_read_func(void *ptr, size_t size, size_t nmemb, void *datasour
+     return SDL_RWread((SDL_RWops*)datasource, ptr, size, nmemb);
+ }
+
+-static Sint64 sdl_seek_func(void *datasource, ogg_int64_t offset, int whence)
++static int sdl_seek_func(void *datasource, ogg_int64_t offset, int whence)
+ {
+-    return SDL_RWseek((SDL_RWops*)datasource, offset, whence);
++    return (int)SDL_RWseek((SDL_RWops*)datasource, offset, whence);
+ }
+
+-static Sint64 sdl_close_func_freesrc(void *datasource)
++static int sdl_close_func_freesrc(void *datasource)
+ {
+-    return SDL_RWclose((SDL_RWops*)datasource);
++    return (int)SDL_RWclose((SDL_RWops*)datasource);
+ }
+
+-static Sint64 sdl_close_func_nofreesrc(void *datasource)
++static int sdl_close_func_nofreesrc(void *datasource)
+ {
+-    return SDL_RWseek((SDL_RWops*)datasource, 0, RW_SEEK_SET);
++    return (int)SDL_RWseek((SDL_RWops*)datasource, 0, RW_SEEK_SET);
+ }
+
+-static Sint64 sdl_tell_func(void *datasource)
++static long sdl_tell_func(void *datasource)
+ {
+-    return SDL_RWtell((SDL_RWops*)datasource);
++    return (long)SDL_RWtell((SDL_RWops*)datasource);
+ }
+
+
+diff --git a/music_ogg.c b/music_ogg.c
+index 5997cc7..fb42a35 100644
+--- a/music_ogg.c
++++ b/music_ogg.c
+@@ -56,14 +56,14 @@ static size_t sdl_read_func(void *ptr, size_t size, size_t nmemb, void *datasour
+     return SDL_RWread((SDL_RWops*)datasource, ptr, size, nmemb);
+ }
+
+-static Sint64 sdl_seek_func(void *datasource, ogg_int64_t offset, int whence)
++static int sdl_seek_func(void *datasource, ogg_int64_t offset, int whence)
+ {
+-    return SDL_RWseek((SDL_RWops*)datasource, offset, whence);
++    return (int)SDL_RWseek((SDL_RWops*)datasource, offset, whence);
+ }
+
+-static Sint64 sdl_tell_func(void *datasource)
++static long sdl_tell_func(void *datasource)
+ {
+-    return SDL_RWtell((SDL_RWops*)datasource);
++    return (long)SDL_RWtell((SDL_RWops*)datasource);
+ }
+
+ /* Load an OGG stream from an SDL_RWops object */
+--
+2.34.1