Skip to content

Commit ac72720

Browse files
committed
Updated sdl2_mixer version to 2.0.4
1 parent 287d191 commit ac72720

File tree

2 files changed

+30
-28
lines changed

2 files changed

+30
-28
lines changed

pythonforandroid/recipes/sdl2_mixer/__init__.py

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

33

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

Lines changed: 29 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -1,29 +1,31 @@
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 @@
4-
5-
# Enable this if you want to support loading MOD music via modplug
6-
# The library path should be a relative path to this directory.
7-
-SUPPORT_MOD_MODPLUG ?= true
8-
+SUPPORT_MOD_MODPLUG := false
9-
MODPLUG_LIBRARY_PATH := external/libmodplug-0.8.8.4
10-
11-
# Enable this if you want to support loading MOD music via mikmod
12-
# The library path should be a relative path to this directory.
13-
-SUPPORT_MOD_MIKMOD ?= true
14-
+SUPPORT_MOD_MIKMOD := false
15-
MIKMOD_LIBRARY_PATH := external/libmikmod-3.1.12
16-
17-
# Enable this if you want to support loading MP3 music via SMPEG
18-
# The library path should be a relative path to this directory.
19-
-SUPPORT_MP3_SMPEG ?= true
20-
+SUPPORT_MP3_SMPEG := false
21-
SMPEG_LIBRARY_PATH := external/smpeg2-2.0.0
22-
1+
diff -Naur SDL2_mixer/Android.mk SDL2_mixer-1/Android.mk
2+
--- SDL2_mixer/Android.mk 2019-03-07 16:14:49.468477800 +0100
3+
+++ SDL2_mixer-1/Android.mk 2019-03-07 16:10:22.371142900 +0100
4+
@@ -3,24 +3,24 @@
5+
6+
7+
# Enable this if you want to support loading FLAC music with libFLAC
8+
-SUPPORT_FLAC ?= false
9+
+SUPPORT_FLAC ?= true
10+
FLAC_LIBRARY_PATH := external/flac-1.3.2
11+
2312
# 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
13+
-SUPPORT_OGG ?= false
14+
+SUPPORT_OGG ?= true
15+
OGG_LIBRARY_PATH := external/libogg-1.3.2
2816
VORBIS_LIBRARY_PATH := external/libvorbisidec-1.2.1
29-
17+
18+
# Enable this if you want to support loading MP3 music via MPG123
19+
-SUPPORT_MP3_MPG123 ?= false
20+
+SUPPORT_MP3_MPG123 ?= true
21+
MPG123_LIBRARY_PATH := external/mpg123-1.25.6
22+
23+
# Enable this if you want to support loading MOD music via modplug
24+
-SUPPORT_MOD_MODPLUG ?= false
25+
+SUPPORT_MOD_MODPLUG ?= true
26+
MODPLUG_LIBRARY_PATH := external/libmodplug-0.8.9.0
27+
28+
# Enable this if you want to support TiMidity
29+
-SUPPORT_MID_TIMIDITY ?= false
30+
+SUPPORT_MID_TIMIDITY ?= true
31+
TIMIDITY_LIBRARY_PATH := timidity

0 commit comments

Comments
 (0)