summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThomas Petazzoni <thomas.petazzoni@free-electrons.com>2012-12-28 15:37:36 (GMT)
committer Thomas Petazzoni <thomas.petazzoni@free-electrons.com>2012-12-30 06:21:58 (GMT)
commit99f711e9c9d6278ca7471d5ed7c21efb155da1bb (patch)
tree3de5f7d3dca4c3d68eed7d0ae45ae549eb051bb4
parentad2e427004f93d9f3d3f88991eb66898f8d25347 (diff)
downloadbuildroot-99f711e9c9d6278ca7471d5ed7c21efb155da1bb.tar.gz
buildroot-99f711e9c9d6278ca7471d5ed7c21efb155da1bb.tar.bz2
librsvg: relax dependency on Gtk, add gdk-pixbuf dependency
librsvg doesn't *require* Gtk, it can optionally build a Gtk theme engine, but it is not mandatory. Therefore, we make the Gtk dependency an optional dependency rather than a hard dependency. This will be useful as librsvg will become a dependency of libevas-generic-loaders, used in an EFL context in which building libgtk is not really what we want. However, gdk-pixbuf is a mandatory dependency to build librsvg, so we add this one. Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
-rw-r--r--package/librsvg/Config.in2
-rw-r--r--package/librsvg/librsvg.mk8
2 files changed, 8 insertions, 2 deletions
diff --git a/package/librsvg/Config.in b/package/librsvg/Config.in
index fdb7d31..855b3d6 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 e54c06c..745fcfa 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))