Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion pythonforandroid/recipes/kivy/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -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"
]

Expand All @@ -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'
Expand Down
11 changes: 0 additions & 11 deletions pythonforandroid/recipes/kivy/use_cython.patch

This file was deleted.

4 changes: 2 additions & 2 deletions pythonforandroid/recipes/sdl3/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -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"]

Expand Down
2 changes: 1 addition & 1 deletion pythonforandroid/recipes/sdl3_image/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -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"

Expand Down
11 changes: 7 additions & 4 deletions pythonforandroid/recipes/sdl3_image/enable-webp.patch
Original file line number Diff line number Diff line change
@@ -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


Loading