Use get_include_dirs + black format

Author: misl6

pythonforandroid/recipes/kivy/__init__.py

@@ -75,19 +75,21 @@ 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'
-            env['KIVY_SDL3_PATH'] = ':'.join([
-                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'),
-            ])
+        if "sdl3" in self.ctx.recipe_build_order:
+            sdl3_mixer_recipe = self.get_recipe("sdl3_mixer", self.ctx)
+            sdl3_image_recipe = self.get_recipe("sdl3_image", self.ctx)
+            sdl3_ttf_recipe = self.get_recipe("sdl3_ttf", self.ctx)
+            sdl3_recipe = self.get_recipe("sdl3", self.ctx)
+            env["USE_SDL3"] = "1"
+            env["KIVY_SPLIT_EXAMPLES"] = "1"
+            env["KIVY_SDL3_PATH"] = ":".join(
+                [
+                    *sdl3_mixer_recipe.get_include_dirs(arch),
+                    *sdl3_image_recipe.get_include_dirs(arch),
+                    *sdl3_ttf_recipe.get_include_dirs(arch),
+                    *sdl3_recipe.get_include_dirs(arch),
+                ]
+            )
 
         return env
 

pythonforandroid/recipes/sdl3/__init__.py

@@ -10,19 +10,36 @@ class LibSDL3Recipe(BootstrapNDKRecipe):
     url = "https://github.com/libsdl-org/SDL/releases/download/release-{version}/SDL3-{version}.tar.gz"
     # md5sum = 'a344eb827a03045c9b399e99af4af13d'
 
-    dir_name = 'SDL'
+    dir_name = "SDL"
 
-    depends = ['sdl3_image', 'sdl3_mixer', 'sdl3_ttf']
+    depends = ["sdl3_image", "sdl3_mixer", "sdl3_ttf"]
 
-    def get_recipe_env(self, arch=None, with_flags_in_cc=True, with_python=True):
+    def get_recipe_env(
+        self, arch=None, with_flags_in_cc=True, with_python=True
+    ):
         env = super().get_recipe_env(
-            arch=arch, with_flags_in_cc=with_flags_in_cc, with_python=with_python)
-        env['APP_ALLOW_MISSING_DEPS'] = 'true'
+            arch=arch,
+            with_flags_in_cc=with_flags_in_cc,
+            with_python=with_python,
+        )
+        env["APP_ALLOW_MISSING_DEPS"] = "true"
         return env
 
+    def get_include_dirs(self, arch):
+        return [
+            join(self.ctx.bootstrap.build_dir, "jni", "SDL", "include"),
+            join(self.ctx.bootstrap.build_dir, "jni", "SDL", "include", "SDL3"),
+        ]
+
     def should_build(self, arch):
         libdir = join(self.get_build_dir(arch.arch), "../..", "libs", arch.arch)
-        libs = ['libmain.so', 'libSDL3.so', 'libSDL3_image.so', 'libSDL3_mixer.so', 'libSDL3_ttf.so']
+        libs = [
+            "libmain.so",
+            "libSDL3.so",
+            "libSDL3_image.so",
+            "libSDL3_mixer.so",
+            "libSDL3_ttf.so",
+        ]
         return not all(exists(join(libdir, x)) for x in libs)
 
     def build_arch(self, arch):
@@ -33,7 +50,7 @@ def build_arch(self, arch):
                 sh.Command(join(self.ctx.ndk_dir, "ndk-build")),
                 "V=1",
                 "NDK_DEBUG=" + ("1" if self.ctx.build_as_debuggable else "0"),
-                _env=env
+                _env=env,
             )
 
 

pythonforandroid/recipes/sdl3_image/__init__.py

@@ -8,19 +8,30 @@
 class LibSDL3Image(BootstrapNDKRecipe):
     version = "3.2.4"
     url = "https://github.com/libsdl-org/SDL_image/releases/download/release-{version}/SDL3_image-{version}.tar.gz"
-    dir_name = 'SDL3_image'
+    dir_name = "SDL3_image"
 
-    patches = ['enable-webp.patch']
+    patches = ["enable-webp.patch"]
 
     def get_include_dirs(self, arch):
         return [
-            os.path.join(self.ctx.bootstrap.build_dir, "jni", "SDL3_image", "include")
+            os.path.join(
+                self.ctx.bootstrap.build_dir, "jni", "SDL3_image", "include"
+            ),
+            os.path.join(
+                self.ctx.bootstrap.build_dir,
+                "jni",
+                "SDL3_image",
+                "include",
+                "SDL3_image",
+            ),
         ]
 
     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")
+        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"))

pythonforandroid/recipes/sdl3_mixer/__init__.py

@@ -9,21 +9,34 @@ class LibSDL3Mixer(BootstrapNDKRecipe):
     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'
+    dir_name = "SDL3_mixer"
 
-    patches = ['disable-libgme.patch']
+    patches = ["disable-libgme.patch"]
 
     def get_include_dirs(self, arch):
         return [
-            os.path.join(self.ctx.bootstrap.build_dir, "jni", "SDL3_mixer", "include")
+            os.path.join(
+                self.ctx.bootstrap.build_dir, "jni", "SDL3_mixer", "include"
+            ),
+            os.path.join(
+                self.ctx.bootstrap.build_dir,
+                "jni",
+                "SDL3_mixer",
+                "include",
+                "SDL3_mixer",
+            ),
         ]
 
     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")
+        external_deps_dir = os.path.join(
+            self.get_build_dir(arch.arch), "external"
+        )
 
-        if not os.path.exists(os.path.join(external_deps_dir, "libgme", "Android.mk")):
+        if not os.path.exists(
+            os.path.join(external_deps_dir, "libgme", "Android.mk")
+        ):
             with current_directory(external_deps_dir):
                 shprint(sh.Command("./download.sh"))
         super().prebuild_arch(arch)

pythonforandroid/recipes/sdl3_ttf/__init__.py

@@ -6,14 +6,30 @@
 
 
 class LibSDL3TTF(BootstrapNDKRecipe):
-    version = '3.2.0'
+    version = "3.2.0"
     url = "https://github.com/libsdl-org/SDL_ttf/releases/download/release-{version}/SDL3_ttf-{version}.tar.gz"
-    dir_name = 'SDL3_ttf'
+    dir_name = "SDL3_ttf"
+
+    def get_include_dirs(self, arch):
+        return [
+            os.path.join(
+                self.ctx.bootstrap.build_dir, "jni", "SDL3_ttf", "include"
+            ),
+            os.path.join(
+                self.ctx.bootstrap.build_dir,
+                "jni",
+                "SDL3_ttf",
+                "include",
+                "SDL3_ttf",
+            ),
+        ]
 
     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")
+        external_deps_dir = os.path.join(
+            self.get_build_dir(arch.arch), "external"
+        )
         if not os.path.exists(os.path.join(external_deps_dir, "harfbuzz")):
             with current_directory(external_deps_dir):
                 shprint(sh.Command("./download.sh"))