Merge pull request kivy#1692 from opacam/update-sdl2-image

AndreMiras · web-flow · commit 51e783cb720d · 2019-02-08T13:46:58.000+01:00
SDL2_image update to 2.0.4 and set kivy's version to master
diff --git a/pythonforandroid/recipes/kivy/__init__.py b/pythonforandroid/recipes/kivy/__init__.py
@@ -6,8 +6,8 @@
 
 
 class KivyRecipe(CythonRecipe):
-    # post kivy==1.10.1 with SDL 2.0.9 fixes
-    version = 'b47f669'
+    # post kivy==1.10.1, `fixes SDL2 image loading (jpg)`
+    version = 'a95d67f'
     url = 'https://github.com/kivy/kivy/archive/{version}.zip'
     name = 'kivy'
 
diff --git a/pythonforandroid/recipes/sdl2_image/__init__.py b/pythonforandroid/recipes/sdl2_image/__init__.py
@@ -3,14 +3,14 @@
 
 
 class LibSDL2Image(BootstrapNDKRecipe):
-    version = '2.0.1'
+    version = '2.0.4'
     url = 'https://www.libsdl.org/projects/SDL_image/release/SDL2_image-{version}.tar.gz'
     dir_name = 'SDL2_image'
 
     patches = ['toggle_jpg_png_webp.patch',
                ('disable_jpg.patch', is_arch('x86')),
                'extra_cflags.patch',
-               'fix_with_ndk_15_plus.patch']
+               ]
 
 
 recipe = LibSDL2Image()
diff --git a/pythonforandroid/recipes/sdl2_image/extra_cflags.patch b/pythonforandroid/recipes/sdl2_image/extra_cflags.patch
@@ -1,11 +1,11 @@
---- 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)
+--- SDL2_image-2.0.4/Android.mk.orig	2018-10-31 15:58:52.000000000 +0100
++++ SDL2_image-2.0.4/Android.mk	2019-02-07 21:57:29.552365123 +0100
+@@ -61,6 +61,8 @@ LOCAL_SRC_FILES :=  \
+
  LOCAL_CFLAGS := -DLOAD_BMP -DLOAD_GIF -DLOAD_LBM -DLOAD_PCX -DLOAD_PNM \
-                 -DLOAD_TGA -DLOAD_XCF -DLOAD_XPM -DLOAD_XV
--LOCAL_CFLAGS += -O3 -fstrict-aliasing -fprefetch-loop-arrays
-+LOCAL_CFLAGS += -O3 -fstrict-aliasing -fprefetch-loop-arrays $(EXTRA_CFLAGS)
- 
- LOCAL_SRC_FILES := $(notdir $(filter-out %/showimage.c, $(wildcard $(LOCAL_PATH)/*.c)))
- 
+                 -DLOAD_SVG -DLOAD_TGA -DLOAD_XCF -DLOAD_XPM -DLOAD_XV
++LOCAL_CFLAGS += $(EXTRA_CFLAGS)
++
+ LOCAL_LDLIBS :=
+ LOCAL_STATIC_LIBRARIES :=
+ LOCAL_SHARED_LIBRARIES := SDL2
diff --git a/pythonforandroid/recipes/sdl2_image/fix_with_ndk_15_plus.patch b/pythonforandroid/recipes/sdl2_image/fix_with_ndk_15_plus.patch
diff --git a/pythonforandroid/recipes/sdl2_image/toggle_jpg_png_webp.patch b/pythonforandroid/recipes/sdl2_image/toggle_jpg_png_webp.patch
@@ -1,25 +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 @@
- 
+--- SDL2_image-2.0.4/Android.mk.orig	2018-10-31 15:58:52.000000000 +0100
++++ SDL2_image-2.0.4/Android.mk	2019-02-07 23:51:51.740299680 +0100
+@@ -3,18 +3,18 @@ SDL_IMAGE_LOCAL_PATH := $(call my-dir)
+
  # 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
- 
+ JPG_LIBRARY_PATH := external/jpeg-9b
+
  # 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
- 
+ PNG_LIBRARY_PATH := external/libpng-1.6.32
+
  # 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
- 
- 
+-SUPPORT_WEBP ?= true
+-WEBP_LIBRARY_PATH := external/libwebp-0.6.0
++SUPPORT_WEBP := true
++WEBP_LIBRARY_PATH := external/libwebp-1.0.0
+
+
+ # Build the library
