Merge pull request kivy#3135 from T-Dynamos/sdl2_image_fix

clayote · web-flow · commit be3de2e28e5a · 2025-05-15T08:08:33.000+12:00
`sdl2_image`: fix downloading
diff --git a/pythonforandroid/recipes/sdl2_image/__init__.py b/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)
 
 
