Merge branch 'kivy:develop' into firebase

Author: kengoon

pythonforandroid/recipes/pyjnius/__init__.py

@@ -14,6 +14,7 @@ class PyjniusRecipe(PyProjectRecipe):
 
     patches = [
         "use_cython.patch",
+        "cython_version_pin.patch",
         ('genericndkbuild_jnienv_getter.patch', will_build('genericndkbuild')),
         ('sdl3_jnienv_getter.patch', will_build('sdl3')),
     ]

pythonforandroid/recipes/pyjnius/cython_version_pin.patch

@@ -0,0 +1,9 @@
+--- pyjnius-1.6.1/pyproject.toml	2023-11-05 21:07:43.000000000 +0530
++++ pyjnius-1.6.1.mod/pyproject.toml	2025-05-11 20:31:14.699072764 +0530
+@@ -2,5 +2,5 @@
+ requires = [
+     "setuptools>=58.0.0",
+     "wheel",
+-    "Cython"
++    "Cython==3.0.0"
+ ]

pythonforandroid/recipes/sdl2_image/__init__.py

@@ -2,11 +2,10 @@
 import sh
 from pythonforandroid.logger import shprint
 from pythonforandroid.recipe import BootstrapNDKRecipe
-from pythonforandroid.util import current_directory
 
 
 class LibSDL2Image(BootstrapNDKRecipe):
-    version = '2.8.0'
+    version = '2.8.2'
     url = 'https://github.com/libsdl-org/SDL_image/releases/download/release-{version}/SDL2_image-{version}.tar.gz'
     dir_name = 'SDL2_image'
 
@@ -20,10 +19,26 @@ def get_include_dirs(self, arch):
     def prebuild_arch(self, arch):
         # We do not have a folder for each arch on BootstrapNDKRecipe, so we
         # need to skip the external deps download if we already have done it.
-        external_deps_dir = os.path.join(self.get_build_dir(arch.arch), "external")
-        if not os.path.exists(os.path.join(external_deps_dir, "libwebp")):
-            with current_directory(external_deps_dir):
-                shprint(sh.Command("./download.sh"))
+
+        build_dir = self.get_build_dir(arch.arch)
+
+        with open(os.path.join(build_dir, ".gitmodules"), "r") as file:
+            for section in file.read().split('[submodule "')[1:]:
+                line_split = section.split(" = ")
+                # Parse .gitmodule section
+                clone_path, url, branch = (
+                    os.path.join(build_dir, line_split[1].split("\n")[0].strip()),
+                    line_split[2].split("\n")[0].strip(),
+                    line_split[-1].strip()
+                )
+                # Clone if needed
+                if not os.path.exists(clone_path) or not os.listdir(clone_path):
+                    shprint(
+                        sh.git, "clone", url,
+                        "--depth", "1", "-b",
+                        branch, clone_path, "--recursive"
+                    )
+
         super().prebuild_arch(arch)