From ac72720243b16e255c149c57a1d4b63f9b07beb2 Mon Sep 17 00:00:00 2001 From: Mirko Galimberti Date: Thu, 7 Mar 2019 19:26:50 +0100 Subject: [PATCH 1/3] Updated sdl2_mixer version to 2.0.4 --- .../recipes/sdl2_mixer/__init__.py | 2 +- .../toggle_modplug_mikmod_smpeg_ogg.patch | 56 ++++++++++--------- 2 files changed, 30 insertions(+), 28 deletions(-) diff --git a/pythonforandroid/recipes/sdl2_mixer/__init__.py b/pythonforandroid/recipes/sdl2_mixer/__init__.py index 1a8e0a9cda..32369f21ef 100644 --- a/pythonforandroid/recipes/sdl2_mixer/__init__.py +++ b/pythonforandroid/recipes/sdl2_mixer/__init__.py @@ -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' diff --git a/pythonforandroid/recipes/sdl2_mixer/toggle_modplug_mikmod_smpeg_ogg.patch b/pythonforandroid/recipes/sdl2_mixer/toggle_modplug_mikmod_smpeg_ogg.patch index 0d7b55459c..b9671cb9c7 100644 --- a/pythonforandroid/recipes/sdl2_mixer/toggle_modplug_mikmod_smpeg_ogg.patch +++ b/pythonforandroid/recipes/sdl2_mixer/toggle_modplug_mikmod_smpeg_ogg.patch @@ -1,29 +1,31 @@ ---- 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 := 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 - +diff -Naur SDL2_mixer/Android.mk SDL2_mixer-1/Android.mk +--- SDL2_mixer/Android.mk 2019-03-07 16:14:49.468477800 +0100 ++++ SDL2_mixer-1/Android.mk 2019-03-07 16:10:22.371142900 +0100 +@@ -3,24 +3,24 @@ + + + # Enable this if you want to support loading FLAC music with libFLAC +-SUPPORT_FLAC ?= false ++SUPPORT_FLAC ?= true + FLAC_LIBRARY_PATH := external/flac-1.3.2 + # 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 +-SUPPORT_OGG ?= false ++SUPPORT_OGG ?= true + OGG_LIBRARY_PATH := external/libogg-1.3.2 VORBIS_LIBRARY_PATH := external/libvorbisidec-1.2.1 - + + # Enable this if you want to support loading MP3 music via MPG123 +-SUPPORT_MP3_MPG123 ?= false ++SUPPORT_MP3_MPG123 ?= true + MPG123_LIBRARY_PATH := external/mpg123-1.25.6 + + # Enable this if you want to support loading MOD music via modplug +-SUPPORT_MOD_MODPLUG ?= false ++SUPPORT_MOD_MODPLUG ?= true + MODPLUG_LIBRARY_PATH := external/libmodplug-0.8.9.0 + + # Enable this if you want to support TiMidity +-SUPPORT_MID_TIMIDITY ?= false ++SUPPORT_MID_TIMIDITY ?= true + TIMIDITY_LIBRARY_PATH := timidity From 874c92c2b2f205a497314993490a7c3610c783cc Mon Sep 17 00:00:00 2001 From: Mirko Galimberti Date: Thu, 7 Mar 2019 21:39:26 +0100 Subject: [PATCH 2/3] Reverting flags to original state --- .../toggle_modplug_mikmod_smpeg_ogg.patch | 17 +++++++---------- 1 file changed, 7 insertions(+), 10 deletions(-) diff --git a/pythonforandroid/recipes/sdl2_mixer/toggle_modplug_mikmod_smpeg_ogg.patch b/pythonforandroid/recipes/sdl2_mixer/toggle_modplug_mikmod_smpeg_ogg.patch index b9671cb9c7..8a0b05b4b5 100644 --- a/pythonforandroid/recipes/sdl2_mixer/toggle_modplug_mikmod_smpeg_ogg.patch +++ b/pythonforandroid/recipes/sdl2_mixer/toggle_modplug_mikmod_smpeg_ogg.patch @@ -1,31 +1,28 @@ diff -Naur SDL2_mixer/Android.mk SDL2_mixer-1/Android.mk ---- SDL2_mixer/Android.mk 2019-03-07 16:14:49.468477800 +0100 -+++ SDL2_mixer-1/Android.mk 2019-03-07 16:10:22.371142900 +0100 -@@ -3,24 +3,24 @@ +--- SDL2_mixer/Android.mk 2019-03-07 21:07:42.149457400 +0100 ++++ SDL2_mixer-1/Android.mk 2019-03-07 21:05:06.851338800 +0100 +@@ -3,20 +3,20 @@ # Enable this if you want to support loading FLAC music with libFLAC --SUPPORT_FLAC ?= false +-SUPPORT_FLAC := false +SUPPORT_FLAC ?= true FLAC_LIBRARY_PATH := external/flac-1.3.2 # Enable this if you want to support loading OGG Vorbis music via Tremor --SUPPORT_OGG ?= false +-SUPPORT_OGG := true +SUPPORT_OGG ?= true OGG_LIBRARY_PATH := external/libogg-1.3.2 VORBIS_LIBRARY_PATH := external/libvorbisidec-1.2.1 # Enable this if you want to support loading MP3 music via MPG123 --SUPPORT_MP3_MPG123 ?= false +-SUPPORT_MP3_MPG123 := false +SUPPORT_MP3_MPG123 ?= true MPG123_LIBRARY_PATH := external/mpg123-1.25.6 # Enable this if you want to support loading MOD music via modplug --SUPPORT_MOD_MODPLUG ?= false +-SUPPORT_MOD_MODPLUG := false +SUPPORT_MOD_MODPLUG ?= true MODPLUG_LIBRARY_PATH := external/libmodplug-0.8.9.0 # Enable this if you want to support TiMidity --SUPPORT_MID_TIMIDITY ?= false -+SUPPORT_MID_TIMIDITY ?= true - TIMIDITY_LIBRARY_PATH := timidity From 803b43327afcaa24422d87a48bb12054d6e9fe63 Mon Sep 17 00:00:00 2001 From: Mirko Galimberti Date: Fri, 8 Mar 2019 12:21:20 +0100 Subject: [PATCH 3/3] Patching in the right way --- .../toggle_modplug_mikmod_smpeg_ogg.patch | 23 ++++++++----------- 1 file changed, 10 insertions(+), 13 deletions(-) diff --git a/pythonforandroid/recipes/sdl2_mixer/toggle_modplug_mikmod_smpeg_ogg.patch b/pythonforandroid/recipes/sdl2_mixer/toggle_modplug_mikmod_smpeg_ogg.patch index 8a0b05b4b5..9c3c9e52f4 100644 --- a/pythonforandroid/recipes/sdl2_mixer/toggle_modplug_mikmod_smpeg_ogg.patch +++ b/pythonforandroid/recipes/sdl2_mixer/toggle_modplug_mikmod_smpeg_ogg.patch @@ -1,28 +1,25 @@ -diff -Naur SDL2_mixer/Android.mk SDL2_mixer-1/Android.mk ---- SDL2_mixer/Android.mk 2019-03-07 21:07:42.149457400 +0100 -+++ SDL2_mixer-1/Android.mk 2019-03-07 21:05:06.851338800 +0100 -@@ -3,20 +3,20 @@ +--- 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 := false -+SUPPORT_FLAC ?= true +-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 --SUPPORT_OGG := true -+SUPPORT_OGG ?= true - OGG_LIBRARY_PATH := external/libogg-1.3.2 +@@ -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 := false -+SUPPORT_MP3_MPG123 ?= true +-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 --SUPPORT_MOD_MODPLUG := false -+SUPPORT_MOD_MODPLUG ?= true +-SUPPORT_MOD_MODPLUG ?= true ++SUPPORT_MOD_MODPLUG := false MODPLUG_LIBRARY_PATH := external/libmodplug-0.8.9.0 # Enable this if you want to support TiMidity