diff options
Diffstat (limited to 'package/libgtk2/libgtk2.mk')
| -rw-r--r-- | package/libgtk2/libgtk2.mk | 17 |
1 files changed, 5 insertions, 12 deletions
diff --git a/package/libgtk2/libgtk2.mk b/package/libgtk2/libgtk2.mk index d669622a8..e41fcc9f9 100644 --- a/package/libgtk2/libgtk2.mk +++ b/package/libgtk2/libgtk2.mk @@ -3,8 +3,8 @@ # libgtk2.0 # ############################################################# -LIBGTK2_VERSION_MAJOR:=2.12 -LIBGTK2_VERSION_MINOR:=12 +LIBGTK2_VERSION_MAJOR:=2.22 +LIBGTK2_VERSION_MINOR:=0 LIBGTK2_VERSION = $(LIBGTK2_VERSION_MAJOR).$(LIBGTK2_VERSION_MINOR) LIBGTK2_SOURCE = gtk+-$(LIBGTK2_VERSION).tar.bz2 @@ -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 @@ -90,11 +90,6 @@ else LIBGTK2_CONF_OPT += --without-x endif -# Buildroot does not support JPEG2000 library -ifeq ($(LIBGTK2_VERSION_MAJOR),2.15) -LIBGTK2_CONF_OPT += --without-libjasper -endif - ifeq ($(BR2_PACKAGE_LIBPNG),y) LIBGTK2_DEPENDENCIES += libpng else @@ -124,7 +119,7 @@ define LIBGTK2_POST_INSTALL_TWEAKS rm -rf $(TARGET_DIR)/usr/share/gtk-2.0/demo $(TARGET_DIR)/usr/bin/gtk-demo endef -LIBGTK2_POST_INSTALL_TARGET_HOOKS += LIBGTK_POST_INSTALL_TWEAKS +LIBGTK2_POST_INSTALL_TARGET_HOOKS += LIBGTK2_POST_INSTALL_TWEAKS # We do not build a full version of libgtk2 for the host, because that # requires compiling Cairo, Pango, ATK and X.org for the @@ -133,7 +128,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 +146,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 |