summaryrefslogtreecommitdiff
path: root/package/libgtk2
diff options
context:
space:
mode:
authorThomas Petazzoni <thomas.petazzoni@free-electrons.com>2010-10-18 09:21:52 -0400
committerThomas Petazzoni <thomas.petazzoni@free-electrons.com>2010-10-18 09:22:10 -0400
commitbb915b1d3583cb79b1f658886cf8d61471f743f0 (patch)
tree1984db5f01e88c649d905d97487dffc4ce8ee4a6 /package/libgtk2
parentf0e7dcab1ac286d1b8af3db1f10c769c0dcb4a02 (diff)
package: add gdk-pixbuf package (splitted out from GTK+)
Signed-off-by: Lionel Landwerlin <llandwerlin@gmail.com>
Diffstat (limited to 'package/libgtk2')
-rw-r--r--package/libgtk2/Config.in1
-rw-r--r--package/libgtk2/libgtk2.mk6
2 files changed, 3 insertions, 4 deletions
diff --git a/package/libgtk2/Config.in b/package/libgtk2/Config.in
index bc4ca9d76..bb01befab 100644
--- a/package/libgtk2/Config.in
+++ b/package/libgtk2/Config.in
@@ -6,6 +6,7 @@ config BR2_PACKAGE_LIBGTK2
select BR2_PACKAGE_CAIRO_PDF
select BR2_PACKAGE_LIBGLIB2
select BR2_PACKAGE_PANGO
+ select BR2_PACKAGE_GDK_PIXBUF
# libgtk2 on DirectFB is deprecated because it is no longer
# supported in recent versions of Gtk. We will remove support
# for Gtk over DirectFB in the next Buildroot version unless
diff --git a/package/libgtk2/libgtk2.mk b/package/libgtk2/libgtk2.mk
index d669622a8..d6f23248b 100644
--- a/package/libgtk2/libgtk2.mk
+++ b/package/libgtk2/libgtk2.mk
@@ -72,7 +72,7 @@ LIBGTK2_CONF_OPT = --enable-shared \
--enable-explicit-deps=no \
--disable-debug
-LIBGTK2_DEPENDENCIES = host-pkg-config host-libgtk2 libglib2 cairo pango atk
+LIBGTK2_DEPENDENCIES = host-pkg-config host-libgtk2 libglib2 cairo pango atk gdk-pixbuf
ifeq ($(BR2_PACKAGE_DIRECTFB),y)
LIBGTK2_CONF_OPT += --with-gdktarget=directfb
@@ -133,7 +133,7 @@ LIBGTK2_POST_INSTALL_TARGET_HOOKS += LIBGTK_POST_INSTALL_TWEAKS
# gtk-update-icon-cache, which are the host tools needed to build Gtk
# for the target.
-HOST_LIBGTK2_DEPENDENCIES = host-libglib2 host-libpng
+HOST_LIBGTK2_DEPENDENCIES = host-libglib2 host-libpng host-gdk-pixbuf
HOST_LIBGTK2_AUTORECONF = YES
HOST_LIBGTK2_CONF_OPT = \
--disable-static \
@@ -151,12 +151,10 @@ endef
HOST_LIBGTK2_POST_PATCH_HOOKS += HOST_LIBGTK2_PATCH_REDUCE_DEPENDENCIES_HOOK
define HOST_LIBGTK2_BUILD_CMDS
- $(HOST_MAKE_ENV) make -C $(@D)/gdk-pixbuf
$(HOST_MAKE_ENV) make -C $(@D)/gtk gtk-update-icon-cache
endef
define HOST_LIBGTK2_INSTALL_CMDS
- $(HOST_MAKE_ENV) make -C $(@D)/gdk-pixbuf install
cp $(@D)/gtk/gtk-update-icon-cache $(HOST_DIR)/usr/bin
endef