Skip to content

Commit a2cfa1a

Browse files
inclementinclement
committed
Merge branch 'brussee-sdl2-2.0.4'
2 parents 1830608 + 7af8cf7 commit a2cfa1a

File tree

11 files changed

+55
-57
lines changed

11 files changed

+55
-57
lines changed

‎pythonforandroid/recipes/sdl2/__init__.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44

55

66
class LibSDL2Recipe(BootstrapNDKRecipe):
7-
version = "2.0.3"
7+
version = "2.0.4"
88
url = "https://www.libsdl.org/release/SDL2-{version}.tar.gz"
99

1010
dir_name = 'SDL'

‎pythonforandroid/recipes/sdl2/add_nativeSetEnv.patch

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,11 @@
1-
diff --git a/src/core/android/SDL_android.c b/src/core/android/SDL_android.c
2-
index d806208..0ff801b 100644
3-
--- a/src/core/android/SDL_android.c
4-
+++ b/src/core/android/SDL_android.c
5-
@@ -180,6 +180,19 @@ void Java_org_libsdl_app_SDLActivity_onNativeHat(
1+
--- orig/src/core/android/SDL_android.c 2016-01-02 20:56:31.000000000 +0100
2+
+++ patch/src/core/android/SDL_android.c 2016-04-15 22:21:13.985708267 +0200
3+
@@ -188,6 +188,19 @@
64
Android_OnHat(device_id, hat_id, x, y);
75
}
86

97
+/* Patched in env var setter for python-for-android */
10-
+void Java_org_libsdl_app_SDLActivity_nativeSetEnv(
8+
+JNIEXPORT void JNICALL Java_org_libsdl_app_SDLActivity_nativeSetEnv(
119
+ JNIEnv* env, jclass jcls,
1210
+ jstring j_name, jstring j_value)
1311
+{
@@ -20,5 +18,5 @@ index d806208..0ff801b 100644
2018
+}
2119
+
2220

23-
int Java_org_libsdl_app_SDLActivity_nativeAddJoystick(
21+
JNIEXPORT jint JNICALL Java_org_libsdl_app_SDLActivity_nativeAddJoystick(
2422
JNIEnv* env, jclass jcls,

‎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+

‎pythonforandroid/recipes/sdl2_mixer/__init__.py

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,10 @@
22

33

44
class LibSDL2Mixer(BootstrapNDKRecipe):
5-
version = '2.0.0'
5+
version = '2.0.1'
66
url = 'https://www.libsdl.org/projects/SDL_mixer/release/SDL2_mixer-{version}.tar.gz'
77
dir_name = 'SDL2_mixer'
88

9-
patches = ['disable_modplug_mikmod_smpeg.patch']
10-
9+
patches = ['toggle_modplug_mikmod_smpeg_ogg.patch']
1110

1211
recipe = LibSDL2Mixer()

‎pythonforandroid/recipes/sdl2_mixer/disable_modplug_mikmod_smpeg.patch renamed to ‎pythonforandroid/recipes/sdl2_mixer/toggle_modplug_mikmod_smpeg_ogg.patch

Lines changed: 12 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,25 +1,29 @@
1-
diff --git a/Android.mk b/Android.mk
2-
index 81c94b5..357500c 100644
3-
--- a/Android.mk
4-
+++ b/Android.mk
5-
@@ -6,17 +6,17 @@ LOCAL_MODULE := SDL2_mixer
1+
--- orig/Android.mk 2016-01-03 07:15:57.000000000 +0100
2+
+++ patch/Android.mk 2016-04-15 21:28:55.169697882 +0200
3+
@@ -6,22 +6,22 @@
64

75
# Enable this if you want to support loading MOD music via modplug
86
# The library path should be a relative path to this directory.
9-
-SUPPORT_MOD_MODPLUG := true
7+
-SUPPORT_MOD_MODPLUG ?= true
108
+SUPPORT_MOD_MODPLUG := false
119
MODPLUG_LIBRARY_PATH := external/libmodplug-0.8.8.4
1210

1311
# Enable this if you want to support loading MOD music via mikmod
1412
# The library path should be a relative path to this directory.
15-
-SUPPORT_MOD_MIKMOD := true
13+
-SUPPORT_MOD_MIKMOD ?= true
1614
+SUPPORT_MOD_MIKMOD := false
1715
MIKMOD_LIBRARY_PATH := external/libmikmod-3.1.12
1816

1917
# Enable this if you want to support loading MP3 music via SMPEG
2018
# The library path should be a relative path to this directory.
21-
-SUPPORT_MP3_SMPEG := true
19+
-SUPPORT_MP3_SMPEG ?= true
2220
+SUPPORT_MP3_SMPEG := false
2321
SMPEG_LIBRARY_PATH := external/smpeg2-2.0.0
2422

2523
# Enable this if you want to support loading OGG Vorbis music via Tremor
24+
# The library path should be a relative path to this directory.
25+
-SUPPORT_OGG ?= true
26+
+SUPPORT_OGG := true
27+
OGG_LIBRARY_PATH := external/libogg-1.3.1
28+
VORBIS_LIBRARY_PATH := external/libvorbisidec-1.2.1
29+

‎pythonforandroid/recipes/sdl2_ttf/__init__.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
from os.path import exists
33

44
class LibSDL2TTF(BootstrapNDKRecipe):
5-
version = '2.0.12'
5+
version = '2.0.14'
66
url = 'https://www.libsdl.org/projects/SDL_ttf/release/SDL2_ttf-{version}.tar.gz'
77
dir_name = 'SDL2_ttf'
88

0 commit comments

Comments
 (0)