fix kivy recipe

Author: DexerBR

pythonforandroid/recipes/kivy/__init__.py

@@ -7,17 +7,25 @@
 from pythonforandroid.toolchain import current_directory, shprint
 
 
-def is_kivy_affected_by_deadlock_issue(recipe=None, arch=None):
+def get_kivy_version(recipe, arch):
     with current_directory(join(recipe.get_build_dir(arch.arch), "kivy")):
-        kivy_version = shprint(
+        return 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")
+
+def is_kivy_affected_by_deadlock_issue(recipe=None, arch=None):
+    return packaging.version.parse(
+        str(get_kivy_version(recipe, arch))
+    ) < packaging.version.Version("2.2.0.dev0")
+
+
+def is_kivy_less_than_3(recipe=None, arch=None):
+    return packaging.version.parse(
+        str(get_kivy_version(recipe, arch))
+    ) < packaging.version.Version("3.0.0")
 
 
 class KivyRecipe(PyProjectRecipe):
@@ -34,7 +42,7 @@ class KivyRecipe(PyProjectRecipe):
     # 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",
+        ("use_cython.patch", is_kivy_less_than_3),
         "no-ast-str.patch"
     ]
 
@@ -59,6 +67,9 @@ def get_recipe_env(self, arch, **kwargs):
 
         # NDKPLATFORM is our switch for detecting Android platform, so can't be None
         env['NDKPLATFORM'] = "NOTNONE"
+        if not is_kivy_less_than_3(self, arch):
+            env['KIVY_CROSS_PLATFORM'] = 'android'
+
         if 'sdl2' in self.ctx.recipe_build_order:
             env['USE_SDL2'] = '1'
             env['KIVY_SPLIT_EXAMPLES'] = '1'

pythonforandroid/recipes/sdl3_image/enable-webp.patch

@@ -1,12 +1,22 @@
-diff -Naur SDL2_image.orig/Android.mk SDL2_image/Android.mk
---- SDL2_image.orig/Android.mk	2022-10-03 20:51:52.000000000 +0200
-+++ SDL2_image/Android.mk	2022-10-03 20:52:48.000000000 +0200
-@@ -32,7 +32,7 @@
+--- a/Android.mk
++++ b/Android.mk
+@@ -33,8 +33,8 @@
 
  # Enable this if you want to support loading WebP images
  # The library path should be a relative path to this directory.
 -SUPPORT_WEBP ?= false
+-SUPPORT_SAVE_WEBP ?= true
 +SUPPORT_WEBP := true
++SUPPORT_SAVE_WEBP := true
  WEBP_LIBRARY_PATH := external/libwebp
 
 
+@@ -160,7 +160,7 @@
+ ifeq ($(SUPPORT_WEBP),true)
+     LOCAL_C_INCLUDES += $(LOCAL_PATH)/$(WEBP_LIBRARY_PATH)/src
+     LOCAL_CFLAGS += -DLOAD_WEBP
+-    LOCAL_STATIC_LIBRARIES += webpdemux
++    LOCAL_STATIC_LIBRARIES += webpmux webpdemux
+     LOCAL_STATIC_LIBRARIES += webp
+ ifeq ($(SUPPORT_SAVE_WEBP),true)
+     LOCAL_CFLAGS += -DSAVE_WEBP=1