diff options
| author | Peter Korsgaard <jacmet@sunsite.dk> | 2012-12-30 11:52:15 +0100 |
|---|---|---|
| committer | Peter Korsgaard <jacmet@sunsite.dk> | 2012-12-30 11:52:15 +0100 |
| commit | e67a6cebcda671e34ff006029948dbf93fce5291 (patch) | |
| tree | 7a4956064fadf725fb2d79022750a958ef956b7c /package/librsvg | |
| parent | 8850c522172acc6586c32a30f2dee79501293636 (diff) | |
| parent | 473af436480f08e78377154783276b1c348b2625 (diff) | |
| download | buildroot-novena-e67a6cebcda671e34ff006029948dbf93fce5291.tar.gz buildroot-novena-e67a6cebcda671e34ff006029948dbf93fce5291.zip | |
Merge branch 'e17' of git://git.free-electrons.com/users/thomas-petazzoni/buildroot
Diffstat (limited to 'package/librsvg')
| -rw-r--r-- | package/librsvg/Config.in | 2 | ||||
| -rw-r--r-- | package/librsvg/librsvg.mk | 8 |
2 files changed, 8 insertions, 2 deletions
diff --git a/package/librsvg/Config.in b/package/librsvg/Config.in index fdb7d3109..855b3d643 100644 --- a/package/librsvg/Config.in +++ b/package/librsvg/Config.in @@ -5,7 +5,7 @@ config BR2_PACKAGE_LIBRSVG select BR2_PACKAGE_CAIRO_PNG select BR2_PACKAGE_PANGO select BR2_PACKAGE_LIBGLIB2 - depends on BR2_PACKAGE_LIBGTK2 + select BR2_PACKAGE_GDK_PIXBUF depends on BR2_USE_WCHAR # glib2 help The rsvg library is an efficient renderer for Scalable diff --git a/package/librsvg/librsvg.mk b/package/librsvg/librsvg.mk index e54c06c37..745fcfa45 100644 --- a/package/librsvg/librsvg.mk +++ b/package/librsvg/librsvg.mk @@ -11,6 +11,12 @@ LIBRSVG_SOURCE:=librsvg-$(LIBRSVG_VERSION).tar.gz LIBRSVG_SITE:=http://ftp.gnome.org/pub/GNOME/sources/librsvg/$(LIBRSVG_VERSION_MAJOR)/ LIBRSVG_INSTALL_STAGING = YES LIBRSVG_CONF_OPT = --disable-tools -LIBRSVG_DEPENDENCIES = libxml2 cairo pango libglib2 libgtk2 +LIBRSVG_DEPENDENCIES = libxml2 cairo pango libglib2 gdk-pixbuf + +# If we have Gtk2, let's build it first to benefit from librsvg Gtk +# support. +ifeq ($(BR2_PACKAGE_LIBGTK2),y) +LIBRSVG_DEPENDENCIES += libgtk2 +endif $(eval $(autotools-package)) |