diff options
| author | Sebastian Dröge <sebastian@centricular.com> | 2015-11-02 13:36:43 +0200 |
|---|---|---|
| committer | Sebastian Dröge <sebastian@centricular.com> | 2015-11-02 13:36:43 +0200 |
| commit | 42ed309fb494041404355f61ce61a80aff2181e3 (patch) | |
| tree | f6c9ea108e2973a4ba9c1adc650d92a1dbf04a2b | |
| parent | f7eee174dae67282cd2eec0ad9e0cbc45510efee (diff) | |
gst-plugins-bad-1.0: Actually ship the androidmedia Java class
| -rw-r--r-- | packages/gstreamer-1.0-codecs.package | 3 | ||||
| -rw-r--r-- | recipes/gst-plugins-bad-1.0-static.recipe | 9 |
2 files changed, 7 insertions, 5 deletions
diff --git a/packages/gstreamer-1.0-codecs.package b/packages/gstreamer-1.0-codecs.package index 3c80d2d2..91f45eb6 100644 --- a/packages/gstreamer-1.0-codecs.package +++ b/packages/gstreamer-1.0-codecs.package @@ -27,7 +27,8 @@ class Package(package.Package): files_devel = ['gst-plugins-base-1.0-static:plugins_codecs_devel', 'gst-plugins-good-1.0-static:plugins_codecs_devel', 'gst-plugins-bad-1.0-static:plugins_codecs_devel', - 'gst-plugins-ugly-1.0-static:plugins_codecs_devel'] + 'gst-plugins-ugly-1.0-static:plugins_codecs_devel', + 'gst-plugins-bad-1.0-static:codecs_devel'] platform_files = { Platform.ANDROID: ['tremor:libs'], Platform.IOS: ['tremor:libs'] diff --git a/recipes/gst-plugins-bad-1.0-static.recipe b/recipes/gst-plugins-bad-1.0-static.recipe index 54bd2410..36b2799f 100644 --- a/recipes/gst-plugins-bad-1.0-static.recipe +++ b/recipes/gst-plugins-bad-1.0-static.recipe @@ -169,7 +169,11 @@ class Recipe(custom.GStreamerStatic): files_plugins_sys = [] - files_devel = [] + platform_files_codecs_devel = { + Platform.ANDROID: [ + 'share/gst-android/ndk-build', + ] + } def prepare(self): self.append_env['CFLAGS'] = " -Wno-error -DGSTREAMER_GLIB_COCOA_NSAPPLICATION=1 " @@ -182,9 +186,6 @@ class Recipe(custom.GStreamerStatic): self.configure_options += \ ' --disable-cog --disable-sdl '\ '--disable-cdaudio' - if self.config.target_platform == Platform.ANDROID: - self.files_devel += \ - ['share/gst-android/ndk-build'] if self.config.variants.gtk3: self.deps.append("gtk+3") self.files_plugins_sys = ["libgstgtksink"] |