10000 Merge branch 'sdl_image-2.0.1' of https://github.com/brussee/python-f… · suriyan/python-for-android@7af8cf7 · GitHub
[go: up one dir, main page]
Skip to content

Commit 7af8cf7

Browse files
inclementinclement
committed
Merge branch 'sdl_image-2.0.1' of https://github.com/brussee/python-for-android into brussee-sdl2-2.0.4
2 parents c7600a5 + e0b8f8d commit 7af8cf7

File tree

6 files changed

+34
-37
lines changed

6 files changed

+34
-37
lines changed

‎pythonforandroid/recipes/sdl2_image/__init__.py

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3,14 +3,12 @@
33

44

55
class LibSDL2Image(BootstrapNDKRecipe):
6-
version = '2.0.0'
6+
version = '2.0.1'
77
url = 'https://www.libsdl.org/projects/SDL_image/release/SDL2_image-{version}.tar.gz'
88
dir_name = 'SDL2_image'
99

10-
patches = ['disable_webp.patch',
10+
patches = ['toggle_jpg_png_webp.patch',
1111
('disable_jpg.patch', is_arch('x86')),
12-
'extra-cflags.patch',
13-
('disable-assembler.patch', is_arch('arm64-v8a'))]
14-
12+
'extra_cflags.patch']
1513

1614
recipe = LibSDL2Image()

‎pythonforandroid/recipes/sdl2_image/disable-assembler.patch

Lines changed: 0 additions & 11 deletions
This file was deleted.

‎pythonforandroid/recipes/sdl2_image/disable_jpg.patch

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,6 @@
1-
diff --git a/Android.mk b/Android.mk
2-
index 31e2118..8cd2cb9 100644
3-
--- a/Android.mk
4-
+++ b/Android.mk
5-
@@ -6,7 +6,7 @@ LOCAL_MODULE := SDL2_image
1+
--- orig/Android.mk 2016-04-15 21:15:41.578603933 +0200
2+
+++ patch/Android.mk 2016-04-15 21:15:29.214617537 +0200
3+
@@ -6,7 +6,7 @@
64

75
# Enable this if you want to support loading JPEG images
86
# The library path should be a relative path to this directory.

‎pythonforandroid/recipes/sdl2_image/disable_webp.patch

Lines changed: 0 additions & 13 deletions
This file was deleted.

‎pythonforandroid/recipes/sdl2_image/extra-cflags.patch renamed to ‎pythonforandroid/recipes/sdl2_image/extra_cflags.patch

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
--- SDL2_image/Android.mk 2016-01-14 13:55:28.195171992 -0600
2-
+++ b/Android.mk 2016-01-14 13:55:15.038929244 -0600
3-
@@ -23,7 +23,7 @@
1+
--- orig/Android.mk 2016-01-03 06:52:28.000000000 +0100
2+
+++ patch/Android.mk 2016-04-15 21:03:18.547379710 +0200
3+
@@ -25,7 +25,7 @@
44
LOCAL_C_INCLUDES := $(LOCAL_PATH)
55
LOCAL_CFLAGS := -DLOAD_BMP -DLOAD_GIF -DLOAD_LBM -DLOAD_PCX -DLOAD_PNM \
66
-DLOAD_TGA -DLOAD_XCF -DLOAD_XPM -DLOAD_XV

‎pythonforandroid/recipes/sdl2_image/toggle_jpg_png_webp.patch

Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,25 @@
1+
--- orig/Android.mk 2016-01-03 06:52:28.000000000 +0100
2+
+++ patch/Android.mk 2016-04-15 21:14:23.906688966 +0200
3+
@@ -6,19 +6,19 @@
4+
5+
# Enable this if you want to support loading JPEG images
6+
# The library path should be a relative path to this directory.
7+
-SUPPORT_JPG ?= true
8+
+SUPPORT_JPG := true
9+
JPG_LIBRARY_PATH := external/jpeg-9
10+
11+
# Enable this if you want to support loading PNG images
12+
# The library path should be a relative path to this directory.
13+
-SUPPORT_PNG ?= true
14+
+SUPPORT_PNG := true
15+
PNG_LIBRARY_PATH := external/libpng-1.6.2
16+
17+
# Enable this if you want to support loading WebP images
18+
# The library path should be a relative path to this directory.
19+
#
20+
# IMPORTANT: In order to enable this must have a symlink in your jni directory to external/libwebp-0.3.0.
21+
-SUPPORT_WEBP ?= false
22+
+SUPPORT_WEBP := false
23+
WEBP_LIBRARY_PATH := external/libwebp-0.3.0
24+
25+

0 commit comments

Comments
 (0)
0