diff options
author | Peter Korsgaard <jacmet@sunsite.dk> | 2009-06-18 10:57:16 +0200 |
---|---|---|
committer | Peter Korsgaard <jacmet@sunsite.dk> | 2009-06-18 10:57:16 +0200 |
commit | 21da1419116c5e24d97d15ed5abdc6bc6a92f918 (patch) | |
tree | f07c496dca265d3220208362a17b4b82956d71b8 /package/multimedia/gst-plugins-good | |
parent | 95076c1ac491b77321049c521283f6a693a3406f (diff) | |
parent | 157d1c46395cda85322f287fa59915721bd7e41b (diff) | |
download | buildroot-novena-21da1419116c5e24d97d15ed5abdc6bc6a92f918.tar.gz buildroot-novena-21da1419116c5e24d97d15ed5abdc6bc6a92f918.zip |
Merge branch 'master' of git://github.com/willnewton/buildroot
Diffstat (limited to 'package/multimedia/gst-plugins-good')
-rw-r--r-- | package/multimedia/gst-plugins-good/Config.in | 4 | ||||
-rw-r--r-- | package/multimedia/gst-plugins-good/gst-plugins-good.mk | 7 |
2 files changed, 11 insertions, 0 deletions
diff --git a/package/multimedia/gst-plugins-good/Config.in b/package/multimedia/gst-plugins-good/Config.in index 5c5696cb2..b96f15d97 100644 --- a/package/multimedia/gst-plugins-good/Config.in +++ b/package/multimedia/gst-plugins-good/Config.in @@ -156,4 +156,8 @@ config BR2_PACKAGE_GST_PLUGINS_GOOD_PLUGIN_FLAC config BR2_PACKAGE_GST_PLUGINS_GOOD_PLUGIN_OSS bool "ossaudio (OSS audio)" +config BR2_PACKAGE_GST_PLUGINS_GOOD_PLUGIN_SOUPHTTPSRC + bool "souphttpsrc (http client)" + select BR2_PACKAGE_LIBSOUP + endif diff --git a/package/multimedia/gst-plugins-good/gst-plugins-good.mk b/package/multimedia/gst-plugins-good/gst-plugins-good.mk index 68acdeebd..75d25c88d 100644 --- a/package/multimedia/gst-plugins-good/gst-plugins-good.mk +++ b/package/multimedia/gst-plugins-good/gst-plugins-good.mk @@ -286,4 +286,11 @@ else GST_PLUGINS_GOOD_CONF_OPT += --disable-oss endif +ifeq ($(BR2_PACKAGE_GST_PLUGINS_GOOD_PLUGIN_SOUPHTTPSRC),y) +GST_PLUGINS_GOOD_CONF_OPT += --enable-soup +GST_PLUGINS_GOOD_DEPENDENCIES += libsoup +else +GST_PLUGINS_GOOD_CONF_OPT += --disable-soup +endif + $(eval $(call AUTOTARGETS,package/multimedia,gst-plugins-good)) |