Skip to content

Commit 7d10569

Browse files
committed
fix recipes build
1 parent 7183fd6 commit 7d10569

File tree

3 files changed

+15
-16
lines changed

3 files changed

+15
-16
lines changed

pythonforandroid/recipes/kivy/__init__.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,6 @@ class KivyRecipe(PyProjectRecipe):
3434
# WARNING: Remove this patch when a new Kivy version is released.
3535
patches = [
3636
("sdl-gl-swapwindow-nogil.patch", is_kivy_affected_by_deadlock_issue),
37-
"use_cython.patch",
3837
"no-ast-str.patch"
3938
]
4039

@@ -59,6 +58,7 @@ def get_recipe_env(self, arch, **kwargs):
5958

6059
# NDKPLATFORM is our switch for detecting Android platform, so can't be None
6160
env['NDKPLATFORM'] = "NOTNONE"
61+
env['KIVY_CROSS_PLATFORM'] = 'android'
6262
if 'sdl2' in self.ctx.recipe_build_order:
6363
env['USE_SDL2'] = '1'
6464
env['KIVY_SPLIT_EXAMPLES'] = '1'

pythonforandroid/recipes/kivy/use_cython.patch

Lines changed: 0 additions & 11 deletions
This file was deleted.
Lines changed: 14 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,22 @@
1-
diff -Naur SDL2_image.orig/Android.mk SDL2_image/Android.mk
2-
--- SDL2_image.orig/Android.mk 2022-10-03 20:51:52.000000000 +0200
3-
+++ SDL2_image/Android.mk 2022-10-03 20:52:48.000000000 +0200
4-
@@ -32,7 +32,7 @@
1+
--- a/Android.mk
2+
+++ b/Android.mk
3+
@@ -33,8 +33,8 @@
54

65
# Enable this if you want to support loading WebP images
76
# The library path should be a relative path to this directory.
87
-SUPPORT_WEBP ?= false
8+
-SUPPORT_SAVE_WEBP ?= true
99
+SUPPORT_WEBP := true
10+
+SUPPORT_SAVE_WEBP := true
1011
WEBP_LIBRARY_PATH := external/libwebp
1112

1213

14+
@@ -160,7 +160,7 @@
15+
ifeq ($(SUPPORT_WEBP),true)
16+
LOCAL_C_INCLUDES += $(LOCAL_PATH)/$(WEBP_LIBRARY_PATH)/src
17+
LOCAL_CFLAGS += -DLOAD_WEBP
18+
- LOCAL_STATIC_LIBRARIES += webpdemux
19+
+ LOCAL_STATIC_LIBRARIES += webpmux webpdemux
20+
LOCAL_STATIC_LIBRARIES += webp
21+
ifeq ($(SUPPORT_SAVE_WEBP),true)
22+
LOCAL_CFLAGS += -DSAVE_WEBP=1

0 commit comments

Comments
 (0)