diff --git a/pythonforandroid/recipes/kivy/__init__.py b/pythonforandroid/recipes/kivy/__init__.py index c545bbc4c1..31d76aa863 100644 --- a/pythonforandroid/recipes/kivy/__init__.py +++ b/pythonforandroid/recipes/kivy/__init__.py @@ -34,7 +34,6 @@ 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", "no-ast-str.patch" ] @@ -59,6 +58,7 @@ def get_recipe_env(self, arch, **kwargs): # NDKPLATFORM is our switch for detecting Android platform, so can't be None env['NDKPLATFORM'] = "NOTNONE" + env['KIVY_CROSS_PLATFORM'] = 'android' if 'sdl2' in self.ctx.recipe_build_order: env['USE_SDL2'] = '1' env['KIVY_SPLIT_EXAMPLES'] = '1' diff --git a/pythonforandroid/recipes/kivy/use_cython.patch b/pythonforandroid/recipes/kivy/use_cython.patch deleted file mode 100644 index 2a0d2074ba..0000000000 --- a/pythonforandroid/recipes/kivy/use_cython.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- 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 diff --git a/pythonforandroid/recipes/sdl3/__init__.py b/pythonforandroid/recipes/sdl3/__init__.py index 139509c3e8..b4735664d8 100644 --- a/pythonforandroid/recipes/sdl3/__init__.py +++ b/pythonforandroid/recipes/sdl3/__init__.py @@ -6,9 +6,9 @@ class LibSDL3Recipe(BootstrapNDKRecipe): - version = "3.2.18" + version = "3.4.2" url = "https://github.com/libsdl-org/SDL/releases/download/release-{version}/SDL3-{version}.tar.gz" - md5sum = "c7808ef624b74e2ac69cf531e78e0c6e" + md5sum = "b488ea1ede947c06855588314effe905" conflicts = ["sdl2"] diff --git a/pythonforandroid/recipes/sdl3_image/__init__.py b/pythonforandroid/recipes/sdl3_image/__init__.py index f6d705b168..0a09dff97c 100644 --- a/pythonforandroid/recipes/sdl3_image/__init__.py +++ b/pythonforandroid/recipes/sdl3_image/__init__.py @@ -6,7 +6,7 @@ class LibSDL3Image(BootstrapNDKRecipe): - version = "3.2.4" + version = "3.4.0" url = "https://github.com/libsdl-org/SDL_image/releases/download/release-{version}/SDL3_image-{version}.tar.gz" dir_name = "SDL3_image" diff --git a/pythonforandroid/recipes/sdl3_image/enable-webp.patch b/pythonforandroid/recipes/sdl3_image/enable-webp.patch index 98d72f2017..a8624a5b4b 100644 --- a/pythonforandroid/recipes/sdl3_image/enable-webp.patch +++ b/pythonforandroid/recipes/sdl3_image/enable-webp.patch @@ -1,12 +1,15 @@ -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 @@ +diff --git a/Android.mk b/Android.mk +index ad6d0f40..ac77a18c 100644 +--- a/Android.mk ++++ b/Android.mk +@@ -33,8 +33,8 @@ PNG_LIBRARY_PATH := external/libpng # 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 := false WEBP_LIBRARY_PATH := external/libwebp