Skip to content

Commit 9aea5bd

Browse files
committed
Cleanup and target a specific hash
1 parent e0aa0ce commit 9aea5bd

File tree

2 files changed

+9
-4
lines changed

2 files changed

+9
-4
lines changed

pythonforandroid/recipes/ffmpeg/__init__.py

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44

55

66
class FFMpegRecipe(Recipe):
7-
version = 'n4.3-dev'
7+
version = '007e03348dbd8d3de3eb09022d72c734a8608144'
88
# Moved to github.com instead of ffmpeg.org to improve download speed
99
url = 'https://github.com/FFmpeg/FFmpeg/archive/{version}.zip'
1010
depends = ['sdl2'] # Need this to build correct recipe order
@@ -48,13 +48,16 @@ def build_arch(self, arch):
4848
cflags += ['-I' + build_dir + '/include/']
4949
ldflags += ['-lx264', '-L' + build_dir + '/lib/']
5050

51-
# libshine
52-
5351
"""
52+
WARNING: DISABLED during migration to ndk19, cause We're
53+
getting a runtime error for a missing symbol.
54+
55+
# libshine
5456
flags += ['--enable-libshine']
5557
build_dir = Recipe.get_recipe('libshine', self.ctx).get_build_dir(arch.arch)
5658
cflags += ['-I' + build_dir + '/include/']
5759
ldflags += ['-lshine', '-L' + build_dir + '/lib/']
60+
ldflags += ['-lm']
5861
"""
5962

6063
# Enable all codecs:
@@ -95,6 +98,7 @@ def build_arch(self, arch):
9598
'--enable-gpl',
9699
'--enable-pic',
97100
'--disable-static',
101+
'--disable-debug',
98102
'--enable-shared',
99103
]
100104

pythonforandroid/recipes/ffpyplayer_codecs/__init__.py

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

33

44
class FFPyPlayerCodecsRecipe(Recipe):
5-
depends = ['libshine', 'libx264']
5+
depends = ['libx264']
6+
# disabled libshine due a missing symbol error (see ffmpeg recipe)
67

78
def build_arch(self, arch):
89
pass

0 commit comments

Comments
 (0)