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/gstreamer | |
| 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/gstreamer')
| -rw-r--r-- | package/multimedia/gstreamer/Config.in | 7 | ||||
| -rw-r--r-- | package/multimedia/gstreamer/gstreamer.mk | 12 |
2 files changed, 16 insertions, 3 deletions
diff --git a/package/multimedia/gstreamer/Config.in b/package/multimedia/gstreamer/Config.in index 213d65010..8c8080173 100644 --- a/package/multimedia/gstreamer/Config.in +++ b/package/multimedia/gstreamer/Config.in @@ -1,8 +1,13 @@ config BR2_PACKAGE_GSTREAMER bool "gstreamer" select BR2_PACKAGE_LIBGLIB2 - select BR2_PACKAGE_LIBXML2 help GStreamer is an open source multimedia framework. http://gstreamer.freedesktop.org/ + +config BR2_PACKAGE_GSTREAMER_LIBXML2 + bool "require libxml2 for registry and load/save" + default y + select BR2_PACKAGE_LIBXML2 + depends on BR2_PACKAGE_GSTREAMER diff --git a/package/multimedia/gstreamer/gstreamer.mk b/package/multimedia/gstreamer/gstreamer.mk index 8b30209b7..53f1f7563 100644 --- a/package/multimedia/gstreamer/gstreamer.mk +++ b/package/multimedia/gstreamer/gstreamer.mk @@ -3,7 +3,7 @@ # gstreamer # ############################################################# -GSTREAMER_VERSION = 0.10.22 +GSTREAMER_VERSION = 0.10.23 GSTREAMER_SOURCE = gstreamer-$(GSTREAMER_VERSION).tar.bz2 GSTREAMER_SITE = http://gstreamer.freedesktop.org/src/gstreamer GSTREAMER_INSTALL_STAGING = YES @@ -24,6 +24,14 @@ GSTREAMER_CONF_OPT = \ --disable-tests \ --disable-failing-tests -GSTREAMER_DEPENDENCIES = libglib2 libxml2 host-pkgconfig +GSTREAMER_DEPENDENCIES = libglib2 host-pkgconfig + +ifeq ($(BR2_PACKAGE_GSTREAMER_LIBXML2),y) +GSTREAMER_DEPENDENCIES += libxml2 +else +GSTREAMER_CONF_OPT += \ + --disable-registry \ + --disable-loadsave +endif $(eval $(call AUTOTARGETS,package/multimedia,gstreamer)) |