kivy and pyjnius: switch to PyProjectRecipe

Author: T-Dynamos

ci/constants.py

@@ -19,7 +19,7 @@ class TargetPython(Enum):
     # requires `libpq-dev` system dependency e.g. for `pg_config` binary
     'psycopg2',
     # most likely some setup in the Docker container, because it works in host
-    'pyjnius', 'pyopenal',
+    'pyopenal',
     # SyntaxError: invalid syntax (Python2)
     'storm',
     # mpmath package with a version >= 0.19 required

pythonforandroid/recipes/kivy/__init__.py

@@ -1,70 +1,23 @@
-import glob
-from os.path import basename, exists, join
-import sys
-import packaging.version
+from os.path import join
+from pythonforandroid.recipe import PyProjectRecipe
 
-import sh
-from pythonforandroid.recipe import CythonRecipe
-from pythonforandroid.toolchain import current_directory, shprint
 
-
-def is_kivy_affected_by_deadlock_issue(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 packaging.version.parse(
-            str(kivy_version)
-        ) < packaging.version.Version("2.2.0.dev0")
-
-
-class KivyRecipe(CythonRecipe):
+class KivyRecipe(PyProjectRecipe):
     version = '2.3.1'
     url = 'https://github.com/kivy/kivy/archive/{version}.zip'
-    name = 'kivy'
-
-    depends = ['sdl2', 'pyjnius', 'setuptools']
+    depends = ['sdl2', 'pyjnius']
     python_depends = ['certifi', 'chardet', 'idna', 'requests', 'urllib3', 'filetype']
+    patches = ["use_cython.patch"]
 
-    # 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)]
-
-    def cythonize_build(self, env, build_dir='.'):
-        super().cythonize_build(env, build_dir=build_dir)
-
-        if not exists(join(build_dir, 'kivy', 'include')):
-            return
-
-        # If kivy is new enough to use the include dir, copy it
-        # manually to the right location as we bypass this stage of
-        # the build
-        with current_directory(build_dir):
-            build_libs_dirs = glob.glob(join('build', 'lib.*'))
-
-            for dirn in build_libs_dirs:
-                shprint(sh.cp, '-r', join('kivy', 'include'),
-                        join(dirn, 'kivy'))
-
-    def cythonize_file(self, env, build_dir, filename):
-        # We can ignore a few files that aren't important to the
-        # android build, and may not work on Android anyway
-        do_not_cythonize = ['window_x11.pyx', ]
-        if basename(filename) in do_not_cythonize:
-            return
-        super().cythonize_file(env, build_dir, filename)
-
-    def get_recipe_env(self, arch):
-        env = super().get_recipe_env(arch)
+    def get_recipe_env(self, arch, **kwargs):
+        env = super().get_recipe_env(arch, **kwargs)
         # NDKPLATFORM is our switch for detecting Android platform, so can't be None
         env['NDKPLATFORM'] = "NOTNONE"
+        env['LIBLINK'] = "NOTNONE"
         if 'sdl2' in self.ctx.recipe_build_order:
             env['USE_SDL2'] = '1'
             env['KIVY_SPLIT_EXAMPLES'] = '1'
+            sdl_recipe = self.get_recipe("sdl2", self.ctx)
             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([
@@ -73,7 +26,7 @@ def get_recipe_env(self, arch):
                 *sdl2_mixer_recipe.get_include_dirs(arch),
                 join(self.ctx.bootstrap.build_dir, 'jni', 'SDL2_ttf'),
             ])
-
+            env["LDFLAGS"] += " -L" + join(sdl_recipe.get_build_dir(arch.arch), "../..", "libs", arch.arch)
         return env
 
 

pythonforandroid/recipes/kivy/sdl-gl-swapwindow-nogil.patch

@@ -0,0 +1,11 @@
+--- kivy-master/setup.py	2025-02-25 03:08:18.000000000 +0530
++++ kivy-master.mod/setup.py	2025-03-01 13:10:24.227808612 +0530
+@@ -249,7 +249,7 @@
+ # This determines whether Cython specific functionality may be used.
+ can_use_cython = True
+ 
+-if platform in ('ios', 'android'):
++if platform in ('ios'):
+     # NEVER use or declare cython on these platforms
+     print('Not using cython on %s' % platform)
+     can_use_cython = False

pythonforandroid/recipes/kivy/use_cython.patch

@@ -1,23 +1,26 @@
-from pythonforandroid.recipe import CythonRecipe
+from pythonforandroid.recipe import PyProjectRecipe
 from pythonforandroid.toolchain import shprint, current_directory, info
 from pythonforandroid.patching import will_build
 import sh
 from os.path import join
 
 
-class PyjniusRecipe(CythonRecipe):
+class PyjniusRecipe(PyProjectRecipe):
     version = '1.6.1'
     url = 'https://github.com/kivy/pyjnius/archive/{version}.zip'
     name = 'pyjnius'
-    depends = [('genericndkbuild', 'sdl2'), 'six']
+    depends = ['six']
     site_packages_name = 'jnius'
+    patches = [('genericndkbuild_jnienv_getter.patch', will_build('genericndkbuild')), "use_cython.patch"]
 
-    patches = [('genericndkbuild_jnienv_getter.patch', will_build('genericndkbuild'))]
-
-    def get_recipe_env(self, arch):
-        env = super().get_recipe_env(arch)
+    def get_recipe_env(self, arch, **kwargs):
+        env = super().get_recipe_env(arch, **kwargs)
         # NDKPLATFORM is our switch for detecting Android platform, so can't be None
         env['NDKPLATFORM'] = "NOTNONE"
+        env['LIBLINK'] = "NOTNONE"
+        env["ANDROID_PYJNIUS_CYTHON_3"] = "1"
+        sdl_recipe = self.get_recipe("sdl2", self.ctx)
+        env["LDFLAGS"] += " -L" + join(sdl_recipe.get_build_dir(arch.arch), "../..", "libs", arch.arch)
         return env
 
     def postbuild_arch(self, arch):

pythonforandroid/recipes/pyjnius/__init__.py

@@ -0,0 +1,13 @@
+--- pyjnius-1.6.1/setup.py	2023-11-05 21:07:43.000000000 +0530
++++ pyjnius-1.6.1.mod/setup.py	2025-03-01 14:47:11.964847337 +0530
+@@ -59,10 +59,6 @@
+ if NDKPLATFORM is not None and getenv('LIBLINK'):
+     PLATFORM = 'android'
+ 
+-# detect platform
+-if PLATFORM == 'android':
+-    PYX_FILES = [fn[:-3] + 'c' for fn in PYX_FILES]
+-
+ JAVA=get_java_setup(PLATFORM)
+ 
+ assert JAVA.is_jdk(), "You need a JDK, we only found a JRE. Try setting JAVA_HOME"