Skip to content

Updated sdl2_mixer version to 2.0.4 #1742

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Apr 7, 2019
Merged

Updated sdl2_mixer version to 2.0.4 #1742

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
ac72720
Updated sdl2_mixer version to 2.0.4
misl6 Mar 7, 2019
874c92c
Reverting flags to original state
misl6 Mar 7, 2019
803b433
Patching in the right way
misl6 Mar 8, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion pythonforandroid/recipes/sdl2_mixer/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@


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

Expand Down
48 changes: 22 additions & 26 deletions pythonforandroid/recipes/sdl2_mixer/toggle_modplug_mikmod_smpeg_ogg.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,29 +1,25 @@
--- orig/Android.mk 2016-01-03 07:15:57.000000000 +0100
+++ patch/Android.mk 2016-04-15 21:28:55.169697882 +0200
@@ -6,22 +6,22 @@

--- orig/Android.mk 2018-10-31 15:58:59.000000000 +0100
+++ patched/Android.mk 2019-03-08 12:11:35.271258500 +0100
@@ -3,7 +3,7 @@


# Enable this if you want to support loading FLAC music with libFLAC
-SUPPORT_FLAC ?= true
+SUPPORT_FLAC := false
FLAC_LIBRARY_PATH := external/flac-1.3.2

# Enable this if you want to support loading OGG Vorbis music via Tremor
@@ -12,11 +12,11 @@
VORBIS_LIBRARY_PATH := external/libvorbisidec-1.2.1

# Enable this if you want to support loading MP3 music via MPG123
-SUPPORT_MP3_MPG123 ?= true
+SUPPORT_MP3_MPG123 := false
MPG123_LIBRARY_PATH := external/mpg123-1.25.6

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

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

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

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

MODPLUG_LIBRARY_PATH := external/libmodplug-0.8.9.0

# Enable this if you want to support TiMidity