summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNirbheek Chauhan <nirbheek@centricular.com>2020-02-05 16:12:36 +0530
committerNirbheek Chauhan <nirbheek@centricular.com>2020-02-05 16:12:36 +0530
commit0e928c6f52c76632f3cc2ea87fcd6b9fd41865f3 (patch)
tree4917651504a6a0c532500346fe0ed4f916baa7b0
parent491383df7aa5e6c86825dd82d729ce015a4ff639 (diff)
packages: Don't forget to package libiconv
This is needed for zbar. Also add it as an explicit dependency of libass since it uses it for translating subtitles from various codepages (such as UTF-16) to UTF-8 and it has an automagic dependency on it, which means it was already using it. Closes https://gitlab.freedesktop.org/gstreamer/cerbero/issues/221
-rw-r--r--packages/gstreamer-1.0-codecs-gpl.package5
-rw-r--r--packages/gstreamer-1.0-codecs.package4
-rw-r--r--recipes/libass.recipe3
3 files changed, 12 insertions, 0 deletions
diff --git a/packages/gstreamer-1.0-codecs-gpl.package b/packages/gstreamer-1.0-codecs-gpl.package
index 61b14fbd..723f8e78 100644
--- a/packages/gstreamer-1.0-codecs-gpl.package
+++ b/packages/gstreamer-1.0-codecs-gpl.package
@@ -19,3 +19,8 @@ class Package(custom.GStreamer, package.Package):
'gst-plugins-good-1.0:plugins_codecs_gpl_devel',
'gst-plugins-bad-1.0:plugins_codecs_gpl_devel',
'gst-plugins-ugly-1.0:plugins_codecs_gpl_devel']
+
+ def prepare(self):
+ if self.config.target_platform in (Platform.WINDOWS, Platform.ANDROID):
+ # Needed by libass
+ self.files.append('libiconv:libs')
diff --git a/packages/gstreamer-1.0-codecs.package b/packages/gstreamer-1.0-codecs.package
index fe8a5c97..e372b32a 100644
--- a/packages/gstreamer-1.0-codecs.package
+++ b/packages/gstreamer-1.0-codecs.package
@@ -40,3 +40,7 @@ class Package(custom.GStreamer, package.Package):
if self.config.variants.vaapi:
self.files.append('gstreamer-vaapi-1.0:plugins_codecs')
self.files_devel.append('gstreamer-vaapi-1.0:plugins_codecs_devel')
+
+ if self.config.target_platform in (Platform.WINDOWS, Platform.ANDROID):
+ # Needed by zbar library
+ self.files.append('libiconv:libs')
diff --git a/recipes/libass.recipe b/recipes/libass.recipe
index 76a39f57..60c31c79 100644
--- a/recipes/libass.recipe
+++ b/recipes/libass.recipe
@@ -19,3 +19,6 @@ class Recipe(recipe.Recipe):
if self.config.target_platform == Platform.IOS and \
self.config.target_arch in [Architecture.X86, Architecture.X86_64]:
self.append_env('LDFLAGS', '-Wl,-read_only_relocs,suppress')
+ if self.config.target_platform in (Platform.WINDOWS, Platform.ANDROID):
+ # Needed for codepage conversion support in subtitles
+ self.deps.append('libiconv')