Merge branch 'sdl2-2.0.4' of https://github.com/brussee/python-for-android into brussee-sdl2-2.0.4

inclement · inclement · commit 3be6c388f8cf · 2016-05-07T22:27:39.000+01:00
diff --git a/pythonforandroid/recipes/sdl2/__init__.py b/pythonforandroid/recipes/sdl2/__init__.py
@@ -4,7 +4,7 @@
 
 
 class LibSDL2Recipe(BootstrapNDKRecipe):
-    version = "2.0.3"
+    version = "2.0.4"
     url = "https://www.libsdl.org/release/SDL2-{version}.tar.gz"
 
     dir_name = 'SDL'
diff --git a/pythonforandroid/recipes/sdl2/add_nativeSetEnv.patch b/pythonforandroid/recipes/sdl2/add_nativeSetEnv.patch
@@ -1,13 +1,11 @@
-diff --git a/src/core/android/SDL_android.c b/src/core/android/SDL_android.c
-index d806208..0ff801b 100644
---- a/src/core/android/SDL_android.c
-+++ b/src/core/android/SDL_android.c
-@@ -180,6 +180,19 @@ void Java_org_libsdl_app_SDLActivity_onNativeHat(
+--- orig/src/core/android/SDL_android.c	2016-01-02 20:56:31.000000000 +0100
++++ patch/src/core/android/SDL_android.c	2016-04-15 22:21:13.985708267 +0200
+@@ -188,6 +188,19 @@
      Android_OnHat(device_id, hat_id, x, y);
  }
  
 +/* Patched in env var setter for python-for-android */
-+void Java_org_libsdl_app_SDLActivity_nativeSetEnv(
++JNIEXPORT void JNICALL Java_org_libsdl_app_SDLActivity_nativeSetEnv(
 +                                    JNIEnv* env, jclass jcls,
 +                                    jstring j_name, jstring j_value)
 +{
@@ -20,5 +18,5 @@ index d806208..0ff801b 100644
 +}
 +
  
- int Java_org_libsdl_app_SDLActivity_nativeAddJoystick(
+ JNIEXPORT jint JNICALL Java_org_libsdl_app_SDLActivity_nativeAddJoystick(
      JNIEnv* env, jclass jcls,
