Skip to content

Fixes audiostream recipe on Python3 #1495

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
AndreMiras merged 2 commits into from
Dec 1, 2018
Merged

Fixes audiostream recipe on Python3 #1495

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
6e06b6d
Fixes audiostream recipe on Python3
misl6 Nov 29, 2018
6610a44
Added comment for future reference
misl6 Dec 1, 2018
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
6 changes: 4 additions & 2 deletions pythonforandroid/recipes/audiostream/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ class AudiostreamRecipe(CythonRecipe):
version = 'master'
url = 'https://github.com/kivy/audiostream/archive/{version}.zip'
name = 'audiostream'
depends = ['python2', ('sdl', 'sdl2'), 'pyjnius']
depends = [('python2', 'python3'), ('sdl', 'sdl2'), 'pyjnius']

def get_recipe_env(self, arch):
env = super(AudiostreamRecipe, self).get_recipe_env(arch)
Expand All @@ -18,12 +18,14 @@ def get_recipe_env(self, arch):
sdl_include = 'SDL2'
sdl_mixer_include = 'SDL2_mixer'
env['USE_SDL2'] = 'True'
env['SDL2_INCLUDE_DIR'] = '/home/kivy/.buildozer/android/platform/android-ndk-r9c/sources/android/support/include'
env['SDL2_INCLUDE_DIR'] = join(self.ctx.bootstrap.build_dir, 'jni', 'SDL', 'include')

env['CFLAGS'] += ' -I{jni_path}/{sdl_include}/include -I{jni_path}/{sdl_mixer_include}'.format(
jni_path=join(self.ctx.bootstrap.build_dir, 'jni'),
sdl_include=sdl_include,
sdl_mixer_include=sdl_mixer_include)
env['NDKPLATFORM'] = self.ctx.ndk_platform
env['LIBLINK'] = 'NOTNONE' # Hacky fix. Needed by audiostream setup.py
return env


Expand Down