Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

update sdl2_image to 2.0.1 #708

Merged
merged 1 commit into from
May 7, 2016
+34 −37
Merged

update sdl2_image to 2.0.1 #708

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
8 changes: 3 additions & 5 deletions pythonforandroid/recipes/sdl2_image/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,14 +3,12 @@


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

patches = ['disable_webp.patch',
patches = ['toggle_jpg_png_webp.patch',
('disable_jpg.patch', is_arch('x86')),
'extra-cflags.patch',
('disable-assembler.patch', is_arch('arm64-v8a'))]

'extra_cflags.patch']

recipe = LibSDL2Image()
11 changes: 0 additions & 11 deletions pythonforandroid/recipes/sdl2_image/disable-assembler.patch
View file
Open in desktop

This file was deleted.

8 changes: 3 additions & 5 deletions pythonforandroid/recipes/sdl2_image/disable_jpg.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,6 @@
diff --git a/Android.mk b/Android.mk
index 31e2118..8cd2cb9 100644
--- a/Android.mk
+++ b/Android.mk
@@ -6,7 +6,7 @@ LOCAL_MODULE := SDL2_image
--- orig/Android.mk 2016-04-15 21:15:41.578603933 +0200
+++ patch/Android.mk 2016-04-15 21:15:29.214617537 +0200
@@ -6,7 +6,7 @@

# Enable this if you want to support loading JPEG images
# The library path should be a relative path to this directory.
Expand Down
13 changes: 0 additions & 13 deletions pythonforandroid/recipes/sdl2_image/disable_webp.patch
View file
Open in desktop

This file was deleted.

6 changes: 3 additions & 3 deletions ...oid/recipes/sdl2_image/extra-cflags.patch → ...oid/recipes/sdl2_image/extra_cflags.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
--- SDL2_image/Android.mk 2016-01-14 13:55:28.195171992 -0600
+++ b/Android.mk 2016-01-14 13:55:15.038929244 -0600
@@ -23,7 +23,7 @@
--- orig/Android.mk 2016-01-03 06:52:28.000000000 +0100
+++ patch/Android.mk 2016-04-15 21:03:18.547379710 +0200
@@ -25,7 +25,7 @@
LOCAL_C_INCLUDES := $(LOCAL_PATH)
LOCAL_CFLAGS := -DLOAD_BMP -DLOAD_GIF -DLOAD_LBM -DLOAD_PCX -DLOAD_PNM \
-DLOAD_TGA -DLOAD_XCF -DLOAD_XPM -DLOAD_XV
Expand Down
25 changes: 25 additions & 0 deletions pythonforandroid/recipes/sdl2_image/toggle_jpg_png_webp.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
--- orig/Android.mk 2016-01-03 06:52:28.000000000 +0100
+++ patch/Android.mk 2016-04-15 21:14:23.906688966 +0200
@@ -6,19 +6,19 @@

# Enable this if you want to support loading JPEG images
# The library path should be a relative path to this directory.
-SUPPORT_JPG ?= true
+SUPPORT_JPG := true
JPG_LIBRARY_PATH := external/jpeg-9

# Enable this if you want to support loading PNG images
# The library path should be a relative path to this directory.
-SUPPORT_PNG ?= true
+SUPPORT_PNG := true
PNG_LIBRARY_PATH := external/libpng-1.6.2

# Enable this if you want to support loading WebP images
# The library path should be a relative path to this directory.
#
# IMPORTANT: In order to enable this must have a symlink in your jni directory to external/libwebp-0.3.0.
-SUPPORT_WEBP ?= false
+SUPPORT_WEBP := false
WEBP_LIBRARY_PATH := external/libwebp-0.3.0