WIP

Author: misl6

pythonforandroid/bootstraps/common/build/jni/application/src/start.c

@@ -23,7 +23,7 @@
 
 #ifdef BOOTSTRAP_NAME_SDL3
 #include "SDL3/SDL.h"
-#include "SDL3/SDL_opengles2.h"
+#include "SDL3/SDL_main.h"
 #endif
 
 #include "android/log.h"

pythonforandroid/recipes/android/__init__.py

@@ -74,9 +74,9 @@ def prebuild_arch(self, arch):
                 self.config_env[key] = str(value)
 
             if is_sdl:
-                fh.write('JNIEnv *SDL_AndroidGetJNIEnv(void);\n')
+                fh.write('JNIEnv *SDL_GetAndroidJNIEnv(void);\n')
                 fh.write(
-                    '#define SDL_ANDROID_GetJNIEnv SDL_AndroidGetJNIEnv\n'
+                    '#define SDL_ANDROID_GetJNIEnv SDL_GetAndroidJNIEnv\n'
                 )
             else:
                 fh.write('JNIEnv *WebView_AndroidGetJNIEnv(void);\n')

pythonforandroid/recipes/kivy/__init__.py

@@ -29,6 +29,7 @@ class KivyRecipe(CythonRecipe):
 
     depends = ['sdl3', 'pyjnius', 'setuptools']
     python_depends = ['certifi', 'chardet', 'idna', 'requests', 'urllib3', 'filetype']
+    hostpython_prerequisites = []
 
     # sdl-gl-swapwindow-nogil.patch is needed to avoid a deadlock.
     # See: https://github.com/kivy/kivy/pull/8025
@@ -54,7 +55,7 @@ def cythonize_build(self, env, build_dir='.'):
     def cythonize_file(self, env, build_dir, filename):
         # We can ignore a few files that aren't important to the
         # android build, and may not work on Android anyway
-        do_not_cythonize = ['window_x11.pyx', ]
+        do_not_cythonize = ['window_x11.pyx', 'camera_avfoundation.pyx', 'img_imageio.pyx', 'egl_angle_metal.pyx']
         if basename(filename) in do_not_cythonize:
             return
         super().cythonize_file(env, build_dir, filename)
@@ -77,13 +78,15 @@ def get_recipe_env(self, arch):
         if 'sdl3' in self.ctx.recipe_build_order:
             env['USE_SDL3'] = '1'
             env['KIVY_SPLIT_EXAMPLES'] = '1'
-            sdl3_mixer_recipe = self.get_recipe('sdl3_mixer', self.ctx)
-            sdl3_image_recipe = self.get_recipe('sdl3_image', self.ctx)
             env['KIVY_SDL3_PATH'] = ':'.join([
-                join(self.ctx.bootstrap.build_dir, 'jni', 'SDL3', 'include'),
-                *sdl3_image_recipe.get_include_dirs(arch),
-                *sdl3_mixer_recipe.get_include_dirs(arch),
-                join(self.ctx.bootstrap.build_dir, 'jni', 'SDL3_ttf'),
+                join(self.ctx.bootstrap.build_dir, 'jni', 'SDL', 'include'),
+                join(self.ctx.bootstrap.build_dir, 'jni', 'SDL3_image', 'include'),
+                join(self.ctx.bootstrap.build_dir, 'jni', 'SDL3_mixer', 'include'),
+                join(self.ctx.bootstrap.build_dir, 'jni', 'SDL3_ttf', 'include'),
+                join(self.ctx.bootstrap.build_dir, 'jni', 'SDL', 'include', 'SDL3'),
+                join(self.ctx.bootstrap.build_dir, 'jni', 'SDL3_image', 'include', 'SDL3_image'),
+                join(self.ctx.bootstrap.build_dir, 'jni', 'SDL3_mixer', 'include', 'SDL3_mixer'),
+                join(self.ctx.bootstrap.build_dir, 'jni', 'SDL3_ttf', 'include', 'SDL3_ttf'),
             ])
 
         return env

pythonforandroid/recipes/pyjnius/sdl3_jnienv_getter.patch

@@ -0,0 +1,24 @@
+diff -Naur pyjnius.orig/jnius/env.py pyjnius/jnius/env.py
+--- pyjnius.orig/jnius/env.py	2022-05-28 11:16:02.000000000 +0200
++++ pyjnius/jnius/env.py	2022-05-28 11:18:30.000000000 +0200
+@@ -268,7 +268,7 @@
+ 
+ class AndroidJavaLocation(UnixJavaLocation):
+     def get_libraries(self):
+-        return ['SDL2', 'log']
++        return ['SDL3', 'log']
+ 
+     def get_include_dirs(self):
+         # When cross-compiling for Android, we should not use the include dirs
+diff -Naur pyjnius.orig/jnius/jnius_jvm_android.pxi pyjnius/jnius/jnius_jvm_android.pxi
+--- pyjnius.orig/jnius/jnius_jvm_android.pxi	2022-05-28 11:16:02.000000000 +0200
++++ pyjnius/jnius/jnius_jvm_android.pxi	2022-05-28 11:17:17.000000000 +0200
+@@ -1,6 +1,6 @@
+ # on android, rely on SDL to get the JNI env
+-cdef extern JNIEnv *SDL_AndroidGetJNIEnv()
++cdef extern JNIEnv *SDL_GetAndroidJNIEnv()
+ 
+ 
+ cdef JNIEnv *get_platform_jnienv() except NULL:
+-    return <JNIEnv*>SDL_AndroidGetJNIEnv()
++    return <JNIEnv*>SDL_GetAndroidJNIEnv()

pythonforandroid/recipes/sdl3_mixer/disable-libgme.patch

@@ -0,0 +1,12 @@
+diff -Naur SDL3_mixer.orig/Android.mk SDL3_mixer/Android.mk
+--- SDL3_mixer.orig/Android.mk	2025-03-16 21:05:19
++++ SDL3_mixer/Android.mk	2025-03-16 21:06:33
+@@ -31,7 +31,7 @@
+ WAVPACK_LIBRARY_PATH := external/wavpack
+ 
+ # Enable this if you want to support loading music via libgme
+-SUPPORT_GME ?= true
++SUPPORT_GME ?= false
+ GME_LIBRARY_PATH := external/libgme
+ 
+ # Enable this if you want to support loading MOD music via XMP-lite