WIP

misl6 · misl6 · commit 3407d51bc9da · 2025-04-01T19:32:03.000+02:00
diff --git a/pythonforandroid/bootstraps/common/build/build.py b/pythonforandroid/bootstraps/common/build/build.py
@@ -658,6 +658,10 @@ def make_package(args):
                 subprocess.check_output(patch_command + ["--dry-run"])
             except subprocess.CalledProcessError as e:
                 if e.returncode == 1:
+                    print(e.stderr)
+                    print(e.stdout)
+                    print(e.cmd)
+                    print(e.output)
                     # Return code 1 means not all hunks could be applied, this usually
                     # means the patch is already applied.
                     print("Warning: failed to apply patch (exit code 1), "
diff --git a/pythonforandroid/bootstraps/common/build/jni/application/src/Android.mk b/pythonforandroid/bootstraps/common/build/jni/application/src/Android.mk
@@ -9,8 +9,7 @@ SDL_PATH := ../../SDL
 LOCAL_C_INCLUDES := $(LOCAL_PATH)/$(SDL_PATH)/include
 
 # Add your application source files here...
-LOCAL_SRC_FILES := $(SDL_PATH)/src/main/android/SDL_android_main.c \
-	start.c
+LOCAL_SRC_FILES := start.c
 
 LOCAL_CFLAGS += -I$(PYTHON_INCLUDE_ROOT) $(EXTRA_CFLAGS)
 
diff --git a/pythonforandroid/bootstraps/common/build/jni/application/src/start.c b/pythonforandroid/bootstraps/common/build/jni/application/src/start.c
@@ -16,10 +16,16 @@
 
 #include "bootstrap_name.h"
 
-#ifndef BOOTSTRAP_USES_NO_SDL_HEADERS
+#ifdef BOOTSTRAP_NAME_SDL2
 #include "SDL.h"
 #include "SDL_opengles2.h"
 #endif
+
+#ifdef BOOTSTRAP_NAME_SDL3
+#include "SDL3/SDL.h"
+#include "SDL3/SDL_opengles2.h"
+#endif
+
 #include "android/log.h"
 
 #define ENTRYPOINT_MAXLEN 128
diff --git a/pythonforandroid/bootstraps/qt/build/jni/application/src/bootstrap_name.h b/pythonforandroid/bootstraps/qt/build/jni/application/src/bootstrap_name.h
@@ -1,4 +1,3 @@
 
-#define BOOTSTRAP_USES_NO_SDL_HEADERS
 
 const char bootstrap_name[] = "qt";
diff --git a/pythonforandroid/bootstraps/sdl3/build/jni/application/src/Android_static.mk b/pythonforandroid/bootstraps/sdl3/build/jni/application/src/Android_static.mk
@@ -8,5 +8,6 @@ LOCAL_SRC_FILES := start.c
 
 LOCAL_STATIC_LIBRARIES := SDL3_static
 
+
 include $(BUILD_SHARED_LIBRARY)
 $(call import-module,SDL)LOCAL_PATH := $(call my-dir)
diff --git a/pythonforandroid/bootstraps/sdl3/build/src/main/java/org/kivy/android/PythonActivity.java b/pythonforandroid/bootstraps/sdl3/build/src/main/java/org/kivy/android/PythonActivity.java
@@ -634,10 +634,12 @@ public void requestPermissions(String[] permissions) {
     }
 
     public static void changeKeyboard(int inputType) {
+    /*
       if (SDLActivity.keyboardInputType != inputType){
           SDLActivity.keyboardInputType = inputType;
           InputMethodManager imm = (InputMethodManager) getContext().getSystemService(Context.INPUT_METHOD_SERVICE);
           imm.restartInput(mTextEdit);
           }
+     */
     }
 }
diff --git a/pythonforandroid/bootstraps/sdl3/build/src/patches/SDLActivity.java.patch b/pythonforandroid/bootstraps/sdl3/build/src/patches/SDLActivity.java.patch
@@ -1,20 +1,19 @@
 --- a/src/main/java/org/libsdl/app/SDLActivity.java
 +++ b/src/main/java/org/libsdl/app/SDLActivity.java
-@@ -221,6 +221,8 @@
+@@ -259,6 +259,7 @@
+         String[] arguments = SDLActivity.mSingleton.getArguments();
  
-     // This is what SDL runs in. It invokes SDL_main(), eventually
-     protected static Thread mSDLThread;
-+
-+    public static int keyboardInputType = InputType.TYPE_CLASS_TEXT | InputType.TYPE_TEXT_VARIATION_VISIBLE_PASSWORD;
- 
-     protected static SDLGenericMotionListener_API12 getMotionListener() {
-         if (mMotionListener == null) {
-@@ -323,6 +325,15 @@
+         Log.v("SDL", "Running main function " + function + " from library " + library);
++        SDLActivity.mSingleton.appConfirmedActive();
+         SDLActivity.nativeRunMain(library, function, arguments);
+         Log.v("SDL", "Finished main function");
+     }
+@@ -351,6 +352,15 @@
          Log.v(TAG, "Model: " + Build.MODEL);
          Log.v(TAG, "onCreate()");
          super.onCreate(savedInstanceState);
 +
-+        SDLActivity.initialize();
++        SDL.initialize();
 +        // So we can call stuff from static callbacks
 +        mSingleton = this;
 +    }
@@ -23,18 +22,9 @@
 +    // and we can't run setup tasks until that thread completes.
 +    protected void finishLoad() {
  
-         try {
-             Thread.currentThread().setName("SDLActivity");
-@@ -837,7 +848,7 @@
-     Handler commandHandler = new SDLCommandHandler();
  
-     // Send a message from the SDLMain thread
--    boolean sendCommand(int command, Object data) {
-+    protected boolean sendCommand(int command, Object data) {
-         Message msg = commandHandler.obtainMessage();
-         msg.arg1 = command;
-         msg.obj = data;
-@@ -1385,7 +1396,22 @@
+         /* Control activity re-creation */
+@@ -1541,8 +1551,22 @@
              return null;
          }
          return SDLActivity.mSurface.getNativeSurface();
@@ -46,32 +36,14 @@
 +    public static void triggerAppConfirmedActive() {
 +        mSingleton.appConfirmedActive();
      }
-+  
+ 
 +    /**
-+     * Trick needed for loading screen, overridden by PythonActivity
-+     * to keep loading screen active
-+     */
++    * Trick needed for loading screen, overridden by PythonActivity
++    * to keep loading screen active
++    */
 +    public void appConfirmedActive() {
 +    }
-+ 
- 
++
      // Input
  
-@@ -1881,6 +1907,7 @@
- 
-         Log.v("SDL", "Running main function " + function + " from library " + library);
- 
-+        SDLActivity.mSingleton.appConfirmedActive();
-         SDLActivity.nativeRunMain(library, function, arguments);
- 
-         Log.v("SDL", "Finished main function");
-@@ -1938,8 +1965,7 @@
-     public InputConnection onCreateInputConnection(EditorInfo outAttrs) {
-         ic = new SDLInputConnection(this, true);
- 
--        outAttrs.inputType = InputType.TYPE_CLASS_TEXT |
--                             InputType.TYPE_TEXT_FLAG_MULTI_LINE;
-+        outAttrs.inputType = SDLActivity.keyboardInputType;
-         outAttrs.imeOptions = EditorInfo.IME_FLAG_NO_EXTRACT_UI |
-                               EditorInfo.IME_FLAG_NO_FULLSCREEN /* API 11 */;
- 
+     /**
diff --git a/pythonforandroid/bootstraps/service_library/build/jni/application/src/bootstrap_name.h b/pythonforandroid/bootstraps/service_library/build/jni/application/src/bootstrap_name.h
@@ -1,6 +1,5 @@
 
 #define BOOTSTRAP_NAME_LIBRARY
-#define BOOTSTRAP_USES_NO_SDL_HEADERS
 
 const char bootstrap_name[] = "service_library";
 
diff --git a/pythonforandroid/bootstraps/service_only/build/jni/application/src/bootstrap_name.h b/pythonforandroid/bootstraps/service_only/build/jni/application/src/bootstrap_name.h
@@ -1,6 +1,5 @@
 
 #define BOOTSTRAP_NAME_SERVICEONLY
-#define BOOTSTRAP_USES_NO_SDL_HEADERS
 
 const char bootstrap_name[] = "service_only";
 
diff --git a/pythonforandroid/bootstraps/webview/build/jni/application/src/bootstrap_name.h b/pythonforandroid/bootstraps/webview/build/jni/application/src/bootstrap_name.h
@@ -1,6 +1,5 @@
 
 #define BOOTSTRAP_NAME_WEBVIEW
-#define BOOTSTRAP_USES_NO_SDL_HEADERS
 
 const char bootstrap_name[] = "webview";
 
diff --git a/pythonforandroid/recipes/android/__init__.py b/pythonforandroid/recipes/android/__init__.py
@@ -12,7 +12,7 @@ class AndroidRecipe(IncludedFilesBehaviour, CythonRecipe):
 
     src_filename = 'src'
 
-    depends = [('sdlx', 'sdl3', 'genericndkbuild'), 'pyjnius']
+    depends = [('sdl3',  'genericndkbuild'), 'pyjnius']
 
     config_env = {}
 
diff --git a/pythonforandroid/recipes/kivy/__init__.py b/pythonforandroid/recipes/kivy/__init__.py
@@ -23,7 +23,8 @@ def is_kivy_affected_by_deadlock_issue(recipe=None, arch=None):
 
 class KivyRecipe(CythonRecipe):
     version = '2.3.1'
-    url = 'https://github.com/kivy/kivy/archive/{version}.zip'
+    # url = 'https://github.com/kivy/kivy/archive/{version}.zip'
+    url = 'https://github.com/misl6/kivy/archive/refs/heads/feat/sdl2-to-sdl3.zip'
     name = 'kivy'
 
     depends = ['sdl3', 'pyjnius', 'setuptools']
@@ -73,6 +74,17 @@ def get_recipe_env(self, arch):
                 *sdl2_mixer_recipe.get_include_dirs(arch),
                 join(self.ctx.bootstrap.build_dir, 'jni', 'SDL2_ttf'),
             ])
+        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'),
+            ])
 
         return env
 
diff --git a/pythonforandroid/recipes/pyjnius/__init__.py b/pythonforandroid/recipes/pyjnius/__init__.py
@@ -9,10 +9,13 @@ class PyjniusRecipe(CythonRecipe):
     version = '1.6.1'
     url = 'https://github.com/kivy/pyjnius/archive/{version}.zip'
     name = 'pyjnius'
-    depends = [('genericndkbuild', 'sdlx', 'sdl3'), 'six']
+    depends = [('genericndkbuild', 'sdl3'), 'six']
     site_packages_name = 'jnius'
 
-    patches = [('genericndkbuild_jnienv_getter.patch', will_build('genericndkbuild'))]
+    patches = [
+        ('genericndkbuild_jnienv_getter.patch', will_build('genericndkbuild')),
+        ('sdl3_jnienv_getter.patch', will_build('sdl3')),
+    ] 
 
     def get_recipe_env(self, arch):
         env = super().get_recipe_env(arch)
diff --git a/pythonforandroid/recipes/sdl3_mixer/__init__.py b/pythonforandroid/recipes/sdl3_mixer/__init__.py
@@ -6,11 +6,13 @@
 
 
 class LibSDL3Mixer(BootstrapNDKRecipe):
-    version = "78a2035cf4cf95066d7d9e6208e99507376409a7"
+    version = "72a73339731a12c1002f9caca64f1ab924938102"
     # url = "https://github.com/libsdl-org/SDL_ttf/releases/download/release-{version}/SDL3_ttf-{version}.tar.gz"
     url = "https://github.com/libsdl-org/SDL_mixer/archive/{version}.tar.gz"
     dir_name = 'SDL3_mixer'
 
+    patches = ['disable-libgme.patch']
+
     def get_include_dirs(self, arch):
         return [
             os.path.join(self.ctx.bootstrap.build_dir, "jni", "SDL3_mixer", "include")

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,3 @@`
`1`	`1`
`2`		`-#define BOOTSTRAP_USES_NO_SDL_HEADERS`
`3`	`2`
`4`	`3`	`const char bootstrap_name[] = "qt";`
Original file line number	Diff line number	Diff line change
`@@ -634,10 +634,12 @@ public void requestPermissions(String[] permissions) {`
`634`	`634`	`}`
`635`	`635`
`636`	`636`	`public static void changeKeyboard(int inputType) {`
	`637`	`+ /*`
`637`	`638`	`if (SDLActivity.keyboardInputType != inputType){`
`638`	`639`	`SDLActivity.keyboardInputType = inputType;`
`639`	`640`	`InputMethodManager imm = (InputMethodManager) getContext().getSystemService(Context.INPUT_METHOD_SERVICE);`
`640`	`641`	`imm.restartInput(mTextEdit);`
`641`	`642`	`}`
	`643`	`+ */`
`642`	`644`	`}`
`643`	`645`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,5 @@`
`1`	`1`
`2`	`2`	`#define BOOTSTRAP_NAME_LIBRARY`
`3`		`-#define BOOTSTRAP_USES_NO_SDL_HEADERS`
`4`	`3`
`5`	`4`	`const char bootstrap_name[] = "service_library";`
`6`	`5`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,5 @@`
`1`	`1`
`2`	`2`	`#define BOOTSTRAP_NAME_SERVICEONLY`
`3`		`-#define BOOTSTRAP_USES_NO_SDL_HEADERS`
`4`	`3`
`5`	`4`	`const char bootstrap_name[] = "service_only";`
`6`	`5`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,5 @@`
`1`	`1`
`2`	`2`	`#define BOOTSTRAP_NAME_WEBVIEW`
`3`		`-#define BOOTSTRAP_USES_NO_SDL_HEADERS`
`4`	`3`
`5`	`4`	`const char bootstrap_name[] = "webview";`
`6`	`5`