support for kivy master

Author: T-Dynamos

pythonforandroid/archs.py

@@ -1,10 +1,11 @@
 from os import environ
 from os.path import join
+from glob import glob
 from multiprocessing import cpu_count
 import shutil
 
 from pythonforandroid.recipe import Recipe
-from pythonforandroid.util import BuildInterruptingException, build_platform
+from pythonforandroid.util import BuildInterruptingException
 
 
 class Arch:
@@ -212,16 +213,12 @@ def get_env(self, with_flags_in_cc=True):
 
         # Host python (used by some recipes)
         hostpython_recipe = Recipe.get_recipe(
-            'host' + self.ctx.python_recipe.name, self.ctx)
-        env['BUILDLIB_PATH'] = join(
+            'hostpython3', self.ctx)
+
+        env['BUILDLIB_PATH'] = glob(join(
             hostpython_recipe.get_build_dir(self.arch),
-            'native-build',
-            'build',
-            'lib.{}-{}'.format(
-                build_platform,
-                self.ctx.python_recipe.major_minor_version_string,
-            ),
-        )
+            'native-build', 'build', 'lib*'
+        ))[0]
 
         # for reproducible builds
         if 'SOURCE_DATE_EPOCH' in environ:

pythonforandroid/bootstraps/_sdl_common/__init__.py

@@ -1,6 +1,7 @@
 from os.path import join
 
 from pythonforandroid.toolchain import Bootstrap
+from pythonforandroid.recipe import Recipe
 from pythonforandroid.util import ensure_dir
 
 
@@ -14,10 +15,12 @@ def _assemble_distribution_for_arch(self, arch):
         self.distribute_libs(arch, [self.ctx.get_libs_dir(arch.arch)])
         # Note: SDL bootstrap does not call distribute_aars()
 
-        python_bundle_dir = join(f'_python_bundle__{arch.arch}', '_python_bundle')
+        python_bundle_dir = join(f"_python_bundle__{arch.arch}", "_python_bundle")
         ensure_dir(python_bundle_dir)
-        site_packages_dir = self.ctx.python_recipe.create_python_bundle(
-            join(self.dist_dir, python_bundle_dir), arch)
+        python_recipe = Recipe.get_recipe("python3", self.ctx)
+        site_packages_dir = python_recipe.create_python_bundle(
+            join(self.dist_dir, python_bundle_dir), arch
+        )
         if not self.ctx.with_debug_symbols:
             self.strip_libraries(arch)
         self.fry_eggs(site_packages_dir)

pythonforandroid/distribution.py

@@ -6,6 +6,7 @@
     debug, info, info_notify, warning, Err_Style, Err_Fore)
 from pythonforandroid.util import (
     current_directory, BuildInterruptingException, rmdir)
+from pythonforandroid.recipe import Recipe
 
 
 class Distribution:
@@ -256,8 +257,8 @@ def save_info(self, dirn):
                            'ndk_api': self.ctx.ndk_api,
                            'use_setup_py': self.ctx.use_setup_py,
                            'recipes': self.ctx.recipe_build_order + self.ctx.python_modules,
-                           'hostpython': self.ctx.hostpython,
-                           'python_version': self.ctx.python_recipe.major_minor_version_string},
+                           'hostpython': Recipe.get_recipe("hostpython3", self.ctx).python_exe,
+                           'python_version': Recipe.get_recipe("python3", self.ctx).major_minor_version_string},
                           fileh)
 
 

pythonforandroid/recipes/kivy/__init__.py

@@ -7,35 +7,44 @@
 from pythonforandroid.toolchain import current_directory, shprint
 
 
-def is_kivy_affected_by_deadlock_issue(recipe=None, arch=None):
+def get_kivy_version(recipe=None, arch=None):
     with current_directory(join(recipe.get_build_dir(arch.arch), "kivy")):
         kivy_version = shprint(
             sh.Command(sys.executable),
             "-c",
             "import _version; print(_version.__version__)",
         )
+        return str(kivy_version)
+
+
+def is_kivy_affected_by_deadlock_issue(recipe=None, arch=None):
+    return packaging.version.parse(
+        get_kivy_version(recipe, arch)
+    ) < packaging.version.Version("2.2.0.dev0")
+
 
-        return packaging.version.parse(
-            str(kivy_version)
-        ) < packaging.version.Version("2.2.0.dev0")
+def is_kivy_less_than_3(recipe=None, arch=None):
+    return packaging.version.parse(
+        get_kivy_version(recipe, arch)
+    ) < packaging.version.Version("3.0.0.dev0")
 
 
 class KivyRecipe(PyProjectRecipe):
-    version = '2.3.1'
-    url = 'https://github.com/kivy/kivy/archive/{version}.zip'
-    name = 'kivy'
+    version = "2.3.1"
+    url = "https://github.com/kivy/kivy/archive/{version}.zip"
+    name = "kivy"
 
-    depends = [('sdl2', 'sdl3'), 'pyjnius', 'setuptools', 'android']
-    python_depends = ['certifi', 'chardet', 'idna', 'requests', 'urllib3', 'filetype']
+    depends = [("sdl2", "sdl3"), "pyjnius", "setuptools", "android"]
+    python_depends = ["certifi", "chardet", "idna", "requests", "urllib3", "filetype"]
     hostpython_prerequisites = ["cython>=0.29.1,<=3.0.12"]
 
     # sdl-gl-swapwindow-nogil.patch is needed to avoid a deadlock.
     # See: https://github.com/kivy/kivy/pull/8025
     # WARNING: Remove this patch when a new Kivy version is released.
     patches = [
         ("sdl-gl-swapwindow-nogil.patch", is_kivy_affected_by_deadlock_issue),
-        "use_cython.patch",
-        "no-ast-str.patch"
+        ("use_cython.patch", is_kivy_less_than_3),
+        "no-ast-str.patch",
     ]
 
     @property
@@ -49,27 +58,32 @@ def get_recipe_env(self, arch, **kwargs):
         env = super().get_recipe_env(arch, **kwargs)
 
         # Taken from CythonRecipe
-        env['LDFLAGS'] = env['LDFLAGS'] + ' -L{} '.format(
-            self.ctx.get_libs_dir(arch.arch) +
-            ' -L{} '.format(self.ctx.libs_dir) +
-            ' -L{}'.format(join(self.ctx.bootstrap.build_dir, 'obj', 'local',
-                                arch.arch)))
-        env['LDSHARED'] = env['CC'] + ' -shared'
-        env['LIBLINK'] = 'NOTNONE'
+        env["LDFLAGS"] = env["LDFLAGS"] + " -L{} ".format(
+            self.ctx.get_libs_dir(arch.arch)
+            + " -L{} ".format(self.ctx.libs_dir)
+            + " -L{}".format(
+                join(self.ctx.bootstrap.build_dir, "obj", "local", arch.arch)
+            )
+        )
+        env["LDSHARED"] = env["CC"] + " -shared"
+        env["LIBLINK"] = "NOTNONE"
+        env["KIVY_CROSS_PLATFORM"] = "android"
 
         # NDKPLATFORM is our switch for detecting Android platform, so can't be None
-        env['NDKPLATFORM'] = "NOTNONE"
-        if 'sdl2' in self.ctx.recipe_build_order:
-            env['USE_SDL2'] = '1'
-            env['KIVY_SPLIT_EXAMPLES'] = '1'
-            sdl2_mixer_recipe = self.get_recipe('sdl2_mixer', self.ctx)
-            sdl2_image_recipe = self.get_recipe('sdl2_image', self.ctx)
-            env['KIVY_SDL2_PATH'] = ':'.join([
-                join(self.ctx.bootstrap.build_dir, 'jni', 'SDL', 'include'),
-                *sdl2_image_recipe.get_include_dirs(arch),
-                *sdl2_mixer_recipe.get_include_dirs(arch),
-                join(self.ctx.bootstrap.build_dir, 'jni', 'SDL2_ttf'),
-            ])
+        env["NDKPLATFORM"] = "NOTNONE"
+        if "sdl2" in self.ctx.recipe_build_order:
+            env["USE_SDL2"] = "1"
+            env["KIVY_SPLIT_EXAMPLES"] = "1"
+            sdl2_mixer_recipe = self.get_recipe("sdl2_mixer", self.ctx)
+            sdl2_image_recipe = self.get_recipe("sdl2_image", self.ctx)
+            env["KIVY_SDL2_PATH"] = ":".join(
+                [
+                    join(self.ctx.bootstrap.build_dir, "jni", "SDL", "include"),
+                    *sdl2_image_recipe.get_include_dirs(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:
             sdl3_mixer_recipe = self.get_recipe("sdl3_mixer", self.ctx)
             sdl3_image_recipe = self.get_recipe("sdl3_image", self.ctx)

pythonforandroid/recipes/python3/__init__.py

@@ -392,7 +392,7 @@ def compile_python_files(self, dir):
             python3, and as of Python 3.5, the .pyo filename extension is no
             longer used...uses .pyc (https://www.python.org/dev/peps/pep-0488)
         '''
-        args = [self.ctx.hostpython]
+        args = [Recipe.get_recipe("hostpython3", self.ctx).python_exe]
         args += ['-OO', '-m', 'compileall', '-b', '-f', dir]
         subprocess.call(args)