summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLubosz Sarnecki <lubosz@gmail.com>2013-02-16 05:11:56 +0100
committerSebastian Dröge <sebastian.droege@collabora.co.uk>2013-02-19 13:13:13 +0100
commitd56277d1e881d50a07f4909bacd5e5d786970861 (patch)
tree0a36f9fd48550c9e5719a2351b63608a1b611e7d
parent1f62a483137ccf630e710deb92ef34f50cc25a28 (diff)
android: there luckily is no x on android
-rw-r--r--recipes/gst-plugins-base-static.recipe2
-rw-r--r--recipes/gst-plugins-base.recipe2
-rw-r--r--recipes/gst-plugins-good.recipe2
-rw-r--r--recipes/pango.recipe2
4 files changed, 4 insertions, 4 deletions
diff --git a/recipes/gst-plugins-base-static.recipe b/recipes/gst-plugins-base-static.recipe
index ecfe5b3..eae5be9 100644
--- a/recipes/gst-plugins-base-static.recipe
+++ b/recipes/gst-plugins-base-static.recipe
@@ -78,7 +78,7 @@ class Recipe(custom.GStreamerStatic):
def prepare(self):
if self.config.target_platform == Platform.ANDROID:
- self.configure_options += ' --disable-alsa'
+ self.configure_options += ' --disable-alsa --disable-x'
if self.config.variants.nodebug:
self.configure_options += ' --disable-gst-debug'
custom.GStreamerStatic.prepare(self)
diff --git a/recipes/gst-plugins-base.recipe b/recipes/gst-plugins-base.recipe
index ec02193..0680729 100644
--- a/recipes/gst-plugins-base.recipe
+++ b/recipes/gst-plugins-base.recipe
@@ -126,6 +126,6 @@ class Recipe(recipe.Recipe):
if self.config.target_platform in [Platform.WINDOWS, Platform.DARWIN, Platform.ANDROID]:
self.configure_options += ' --disable-gtk-doc'
if self.config.target_platform == Platform.ANDROID:
- self.configure_options += ' --disable-alsa'
+ self.configure_options += ' --disable-alsa --disable-x'
if self.config.variants.nodebug:
self.configure_options += ' --disable-gst-debug'
diff --git a/recipes/gst-plugins-good.recipe b/recipes/gst-plugins-good.recipe
index 827a233..3455e4e 100644
--- a/recipes/gst-plugins-good.recipe
+++ b/recipes/gst-plugins-good.recipe
@@ -111,7 +111,7 @@ class Recipe(recipe.Recipe):
if self.config.target_platform == Platform.DARWIN:
self.configure_options += '--disable-gtk-doc'
if self.config.target_platform == Platform.ANDROID:
- self.configure_options += '--disable-pulse'
+ self.configure_options += '--disable-pulse --disable-x'
if self.config.target_platform == Platform.LINUX:
self.use_system_libs = True
if self.config.variants.nodebug:
diff --git a/recipes/pango.recipe b/recipes/pango.recipe
index be2dbf8..ee2684b 100644
--- a/recipes/pango.recipe
+++ b/recipes/pango.recipe
@@ -28,5 +28,5 @@ class Recipe(recipe.Recipe):
}
def prepare(self):
- if self.config.target_platform == Platform.DARWIN:
+ if self.config.target_platform in [Platform.DARWIN, Platform.ANDROID]:
self.configure_options += ' --without-x '