summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPeter Korsgaard <jacmet@sunsite.dk>2011-01-01 14:31:47 +0100
committerPeter Korsgaard <jacmet@sunsite.dk>2011-01-01 14:31:47 +0100
commit06aa68394d4725c90500b35b75183ceec015c8fa (patch)
treea0b888a999b9c71907edb56a2f0e2b584ab30b83
parente18087a6011b1c1d474630df97a82e9b50baedac (diff)
gst-plugins-good: add option to build cairo plugin
Fixes build issue when cairo is built without png support. Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
-rw-r--r--package/multimedia/gst-plugins-good/Config.in5
-rw-r--r--package/multimedia/gst-plugins-good/gst-plugins-good.mk7
2 files changed, 12 insertions, 0 deletions
diff --git a/package/multimedia/gst-plugins-good/Config.in b/package/multimedia/gst-plugins-good/Config.in
index dd293e9c1..368642f6c 100644
--- a/package/multimedia/gst-plugins-good/Config.in
+++ b/package/multimedia/gst-plugins-good/Config.in
@@ -168,6 +168,11 @@ config BR2_PACKAGE_GST_PLUGINS_GOOD_PLUGIN_ANNODEX
bool "annodex (XML Library)"
select BR2_PACKAGE_LIBXML2
+config BR2_PACKAGE_GST_PLUGINS_GOOD_PLUGIN_CAIRO
+ bool "cairo"
+ select BR2_PACKAGE_CAIRO
+ select BR2_PACKAGE_CAIRO_PNG
+
config BR2_PACKAGE_GST_PLUGINS_GOOD_PLUGIN_FLAC
bool "flac (libFLAC)"
select BR2_PACKAGE_FLAC
diff --git a/package/multimedia/gst-plugins-good/gst-plugins-good.mk b/package/multimedia/gst-plugins-good/gst-plugins-good.mk
index 62d9d4701..f7a208724 100644
--- a/package/multimedia/gst-plugins-good/gst-plugins-good.mk
+++ b/package/multimedia/gst-plugins-good/gst-plugins-good.mk
@@ -302,6 +302,13 @@ else
GST_PLUGINS_GOOD_CONF_OPT += --disable-annodex
endif
+ifeq ($(BR2_PACKAGE_GST_PLUGINS_GOOD_PLUGIN_CAIRO),y)
+GST_PLUGINS_GOOD_CONF_OPT += --enable-cairo
+GST_PLUGINS_GOOD_DEPENDENCIES += cairo
+else
+GST_PLUGINS_GOOD_CONF_OPT += --disable-cairo
+endif
+
ifeq ($(BR2_PACKAGE_GST_PLUGINS_GOOD_PLUGIN_FLAC),y)
GST_PLUGINS_GOOD_CONF_OPT += --enable-flac
GST_PLUGINS_GOOD_DEPENDENCIES += flac