Switched SDL2_image to use its master branch

Author: inclement

pythonforandroid/archs.py

@@ -63,9 +63,6 @@ def get_env(self, with_flags_in_cc=True):
         if self.ctx.ndk == 'crystax':
             env['LDFLAGS'] += ' -L{}/sources/crystax/libs/{} -lcrystax'.format(self.ctx.ndk_dir, self.arch)
 
-        # Pass the ndk platform include dir to Android.mk files if necessary
-        env['NDK_PLATFORM_INCLUDE_DIR'] = join(self.ctx.ndk_platform, 'usr', 'include')
-
         py_platform = sys.platform
         if py_platform in ['linux2', 'linux3']:
             py_platform = 'linux'

pythonforandroid/recipes/sdl2_image/__init__.py

@@ -4,12 +4,12 @@
 
 class LibSDL2Image(BootstrapNDKRecipe):
     version = '2.0.1'
-    url = 'https://www.libsdl.org/projects/SDL_image/release/SDL2_image-{version}.tar.gz'
+    # url = 'https://www.libsdl.org/projects/SDL_image/release/SDL2_image-{version}.tar.gz'
+    url = 'https://hg.libsdl.org/SDL_image/archive/tip.tar.gz'
     dir_name = 'SDL2_image'
 
     patches = ['toggle_jpg_png_webp.patch',
                ('disable_jpg.patch', is_arch('x86')),
-               'extra_cflags.patch',
-               'add_ndk_platform_include_dir.patch']
+               'extra_cflags.patch']
 
 recipe = LibSDL2Image()