diff options
author | Jan Schmidt <jan@centricular.com> | 2017-04-21 17:13:47 +1000 |
---|---|---|
committer | Jan Schmidt <jan@centricular.com> | 2017-04-21 17:13:47 +1000 |
commit | ed540073089d13862dcb0348733821cc2caa4c31 (patch) | |
tree | 7ef0159b443b0a156355a693e2de04328fd7e62d /recipes/gst-libav-1.0.recipe | |
parent | 98f20199666ea9dacc4aa4b9d6a5258f18598597 (diff) |
gst-libav: Use gas-preprocessor for assembly on iOS
Make the assembler for libav be built via gas-preprocessor
on iOS, as recommended by libav. The latest arm64 assembly
breaks in clang's internal assembler due to some bug
handling macro arguments, and this fixes it.
Add a patch reverting a commit in gst-libav so our
assembler setting is actually passed through to libav
instead of being overridden to be $CC
Diffstat (limited to 'recipes/gst-libav-1.0.recipe')
-rw-r--r-- | recipes/gst-libav-1.0.recipe | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/recipes/gst-libav-1.0.recipe b/recipes/gst-libav-1.0.recipe index ca9ab2b2..d2d6772b 100644 --- a/recipes/gst-libav-1.0.recipe +++ b/recipes/gst-libav-1.0.recipe @@ -10,6 +10,7 @@ class Recipe(custom.GStreamer): configure_options = "--enable-lgpl --disable-examples " remotes = {'origin': 'git://anongit.freedesktop.org/gstreamer/gst-libav'} deps = ['gstreamer-1.0', 'gst-plugins-base-1.0', 'bzip2', 'zlib' ] + patches = ['gst-libav/0001-Revert-configure-Set-the-assembler-used-for-libav-to.patch'] files_plugins_codecs_restricted = ['lib/gstreamer-1.0/libgstlibav%(mext)s'] @@ -31,6 +32,10 @@ class Recipe(custom.GStreamer): if self.config.target_arch == Architecture.X86: # libav internally aligns stacks, while Android doesn't self.configure_options += ' --with-libav-extra-configure="--extra-cflags=\'-mincoming-stack-boundary=4\'"' + elif self.config.target_platform == Platform.IOS: + if Architecture.is_arm(self.config.target_arch): + if 'GAS' in os.environ: + self.new_env = {'AS': os.environ['GAS']} if self.config.variants.nodebug: self.append_env['CFLAGS'] += ' -DGST_LEVEL_MAX=GST_LEVEL_FIXME' |