Fix libshine and re-enable it for ffmpeg & ffpyplayer_codecs (kivy#2027)

opacam · web-flow · commit 0c6acfc4254e · 2019-11-24T18:43:53.000+01:00
* [libs] Rework of libshine to be an shared library

- make it build as shared
- move to python3's f-strings
- fix linking when building the shared library

* [libs] Re-enable libshine for ffmpeg &amp; ffpyplayer_codecs
diff --git a/pythonforandroid/recipes/ffmpeg/__init__.py b/pythonforandroid/recipes/ffmpeg/__init__.py
@@ -51,17 +51,12 @@ def build_arch(self, arch):
                 cflags += ['-I' + build_dir + '/include/']
                 ldflags += ['-lx264', '-L' + build_dir + '/lib/']
 
-                """
-                WARNING: DISABLED during migration to ndk19, cause We're
-                getting a runtime error for a missing symbol.
-
                 # libshine
                 flags += ['--enable-libshine']
                 build_dir = Recipe.get_recipe('libshine', self.ctx).get_build_dir(arch.arch)
                 cflags += ['-I' + build_dir + '/include/']
                 ldflags += ['-lshine', '-L' + build_dir + '/lib/']
                 ldflags += ['-lm']
-                """
 
                 # Enable all codecs:
                 flags += [
diff --git a/pythonforandroid/recipes/ffpyplayer_codecs/__init__.py b/pythonforandroid/recipes/ffpyplayer_codecs/__init__.py
@@ -2,8 +2,7 @@
 
 
 class FFPyPlayerCodecsRecipe(Recipe):
-    depends = ['libx264']
-    # disabled libshine due a missing symbol error (see ffmpeg recipe)
+    depends = ['libx264', 'libshine']
 
     def build_arch(self, arch):
         pass
diff --git a/pythonforandroid/recipes/libshine/__init__.py b/pythonforandroid/recipes/libshine/__init__.py
@@ -10,19 +10,27 @@ class LibShineRecipe(Recipe):
     version = 'c72aba9031bde18a0995e7c01c9b53f2e08a0e46'
     url = 'https://github.com/toots/shine/archive/{version}.zip'
 
-    built_libraries = {'libshine.a': 'lib'}
+    built_libraries = {'libshine.so': 'lib'}
+
+    def get_recipe_env(self, arch=None, with_flags_in_cc=True):
+        env = super().get_recipe_env(arch, with_flags_in_cc)
+        # technically, libraries should go to `LDLIBS`, but it seems
+        # that libshine doesn't like so, and it will fail on linking stage
+        env['LDLIBS'] = env['LDLIBS'].replace(' -lm', '')
+        env['LDFLAGS'] += ' -lm'
+        return env
 
     def build_arch(self, arch):
         with current_directory(self.get_build_dir(arch.arch)):
             env = self.get_recipe_env(arch)
             shprint(sh.Command('./bootstrap'))
             configure = sh.Command('./configure')
             shprint(configure,
-                    '--host=arm-linux',
+                    f'--host={arch.command_prefix}',
                     '--enable-pic',
-                    '--disable-shared',
-                    '--enable-static',
-                    '--prefix={}'.format(realpath('.')),
+                    '--disable-static',
+                    '--enable-shared',
+                    f'--prefix={realpath(".")}',
                     _env=env)
             shprint(sh.make, '-j', str(cpu_count()), _env=env)
             shprint(sh.make, 'install', _env=env)
