Buildroot Archive on lore.kernel.org
 help / color / mirror / Atom feed
From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
To: buildroot@busybox.net
Subject: [Buildroot] [git commit] librsvg: relax dependency on Gtk, add gdk-pixbuf dependency
Date: Sun, 30 Dec 2012 07:21:58 +0100	[thread overview]
Message-ID: <20121230112958.663679A53C@busybox.osuosl.org> (raw)

commit: http://git.buildroot.net/buildroot/commit/?id=99f711e9c9d6278ca7471d5ed7c21efb155da1bb
branch: http://git.buildroot.net/buildroot/commit/?id=refs/heads/master

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>
---
 package/librsvg/Config.in  |    2 +-
 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 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))

                 reply	other threads:[~2012-12-30  6:21 UTC|newest]

Thread overview: [no followups] expand[flat|nested]  mbox.gz  Atom feed

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20121230112958.663679A53C@busybox.osuosl.org \
    --to=thomas.petazzoni@free-electrons.com \
    --cc=buildroot@busybox.net \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox