10000 update sdl2_mixer 2.0.1 by brussee · Pull Request #709 · kivy/python-for-android · GitHub
[go: up one dir, main page]
Skip to content

update sdl2_mixer 2.0.1 #709

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 1 commit into from
May 7, 2016
Merged

update sdl2_mixer 2.0.1 #709

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
5 changes: 2 additions & 3 deletions pythonforandroid/recipes/sdl2_mixer/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,10 @@


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

patches = ['disable_modplug_mikmod_smpeg.patch']

patches = ['toggle_modplug_mikmod_smpeg_ogg.patch']

recipe = LibSDL2Mixer()
20 changes: 12 additions & 8 deletions ..._mixer/disable_modplug_mikmod_smpeg.patch → ...xer/toggle_modplug_mikmod_smpeg_ogg.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,25 +1,29 @@
diff --git a/Android.mk b/Android.mk
index 81c94b5..357500c 100644
--- a/Android.mk
+++ b/Android.mk
@@ -6,17 +6,17 @@ LOCAL_MODULE := SDL2_mixer
--- 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 @@

# 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 ?= 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 ?= 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 ?= 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

0