diff options
| author | Robert Schwebel <r.schwebel@pengutronix.de> | 2009-03-02 23:57:54 +0000 |
|---|---|---|
| committer | Robert Schwebel <r.schwebel@pengutronix.de> | 2009-03-02 23:57:54 +0000 |
| commit | 6cf69d8b35e17e5fbed8b5abd1ebe4cb4205d7ae (patch) | |
| tree | 92116d7c93e168820f1c7de8281bc4c3a3966cab /rules/gtk.make | |
| parent | 2b8b13b3946c2f8a8121940d6ce274a5395d0f42 (diff) | |
| download | ptxdist-6cf69d8b35e17e5fbed8b5abd1ebe4cb4205d7ae.tar.gz ptxdist-6cf69d8b35e17e5fbed8b5abd1ebe4cb4205d7ae.tar.xz | |
* gtk: updated all gtk stack components to latest stable
git-svn-id: https://svn.pengutronix.de/svn/ptxdist/trunks/ptxdist-trunk@9906 33e552b5-05e3-0310-8538-816dae2090ed
Diffstat (limited to 'rules/gtk.make')
| -rw-r--r-- | rules/gtk.make | 63 |
1 files changed, 40 insertions, 23 deletions
diff --git a/rules/gtk.make b/rules/gtk.make index eb4cafef6..b89529a51 100644 --- a/rules/gtk.make +++ b/rules/gtk.make @@ -17,10 +17,10 @@ PACKAGES-$(PTXCONF_GTK) += gtk # # Paths and names # -GTK_VERSION := 2.12.12 +GTK_VERSION := 2.14.7 GTK := gtk+-$(GTK_VERSION) GTK_SUFFIX := tar.bz2 -GTK_URL := http://ftp.gtk.org/pub/gtk/2.12/$(GTK).$(GTK_SUFFIX) +GTK_URL := http://ftp.gtk.org/pub/gtk/2.14/$(GTK).$(GTK_SUFFIX) GTK_SOURCE := $(SRCDIR)/$(GTK).$(GTK_SUFFIX) GTK_DIR := $(BUILDDIR)/$(GTK) @@ -66,7 +66,8 @@ GTK_AUTOCONF := \ --enable-explicit-deps=yes \ --disable-glibtest \ --disable-modules \ - --with-included-loaders=$(subst $(space),$(comma),$(GTK_LOADER-y)) + --with-included-loaders=$(subst $(space),$(comma),$(GTK_LOADER-y)) \ + gio_can_sniff=yes ifndef PTXCONF_GTK_LOADER_PNG GTK_AUTOCONF += --without-libpng @@ -80,6 +81,10 @@ ifndef PTXCONF_GTK_LOADER_JPEG GTK_AUTOCONF += --without-libjpeg endif +ifndef PTXCONF_GTK_LOADER_JPEG2000 +GTK_AUTOCONF += --without-libjasper +endif + ifdef PTXCONF_GTK_TARGET_X11 GTK_AUTOCONF += --with-gdktarget=x11 endif @@ -92,6 +97,18 @@ ifdef PTXCONF_GTK_TARGET_WIN32 GTK_AUTOCONF += --with-gdktarget=win32 endif + +# ---------------------------------------------------------------------------- +# Compile +# ---------------------------------------------------------------------------- + +gtk_compile: $(STATEDIR)/gtk.compile + +$(STATEDIR)/gtk.compile: $(gtk_compile_deps_default) + @$(call targetinfo, $@) + cd $(GTK_DIR) && $(GTK_ENV) $(GTK_PATH) make $(PARALLELMFLAGS) + @$(call touch, $@) + # ---------------------------------------------------------------------------- # Target-Install # ---------------------------------------------------------------------------- @@ -110,37 +127,37 @@ $(STATEDIR)/gtk.targetinstall: ifdef PTXCONF_GTK_TARGET_DIRECTFB @$(call install_copy, gtk, 0, 0, 0644, \ - $(GTK_DIR)/gdk/.libs/libgdk-directfb-2.0.so.0.1200.12, \ - /usr/lib/libgdk-directfb-2.0.so.0.1200.12) - @$(call install_link, gtk, libgdk-directfb-2.0.so.0.1200.12, /usr/lib/libgdk-directfb-2.0.so.0) - @$(call install_link, gtk, libgdk-directfb-2.0.so.0.1200.12, /usr/lib/libgdk-directfb-2.0.so) + $(GTK_DIR)/gdk/.libs/libgdk-directfb-2.0.so.0.1400.8, \ + /usr/lib/libgdk-directfb-2.0.so.0.1400.8) + @$(call install_link, gtk, libgdk-directfb-2.0.so.0.1400.8, /usr/lib/libgdk-directfb-2.0.so.0) + @$(call install_link, gtk, libgdk-directfb-2.0.so.0.1400.8, /usr/lib/libgdk-directfb-2.0.so) @$(call install_copy, gtk, 0, 0, 0644, \ - $(GTK_DIR)/gtk/.libs/libgtk-directfb-2.0.so.0.1200.12, \ - /usr/lib/libgtk-directfb-2.0.so.0.1200.12) - @$(call install_link, gtk, libgtk-directfb-2.0.so.0.1200.12, /usr/lib/libgtk-directfb-2.0.so.0) - @$(call install_link, gtk, libgtk-directfb-2.0.so.0.1200.12, /usr/lib/libgtk-directfb-2.0.so) + $(GTK_DIR)/gtk/.libs/libgtk-directfb-2.0.so.0.1400.8, \ + /usr/lib/libgtk-directfb-2.0.so.0.1400.8) + @$(call install_link, gtk, libgtk-directfb-2.0.so.0.1400.8, /usr/lib/libgtk-directfb-2.0.so.0) + @$(call install_link, gtk, libgtk-directfb-2.0.so.0.1400.8, /usr/lib/libgtk-directfb-2.0.so) endif ifdef PTXCONF_GTK_TARGET_X11 @$(call install_copy, gtk, 0, 0, 0644, \ - $(GTK_DIR)/gdk/.libs/libgdk-x11-2.0.so.0.1200.12, \ - /usr/lib/libgdk-x11-2.0.so.0.1200.12) - @$(call install_link, gtk, libgdk-x11-2.0.so.0.1200.12, /usr/lib/libgdk-x11-2.0.so.0) - @$(call install_link, gtk, libgdk-x11-2.0.so.0.1200.12, /usr/lib/libgdk-x11-2.0.so) + $(GTK_DIR)/gdk/.libs/libgdk-x11-2.0.so.0.1400.8, \ + /usr/lib/libgdk-x11-2.0.so.0.1400.8) + @$(call install_link, gtk, libgdk-x11-2.0.so.0.1400.8, /usr/lib/libgdk-x11-2.0.so.0) + @$(call install_link, gtk, libgdk-x11-2.0.so.0.1400.8, /usr/lib/libgdk-x11-2.0.so) @$(call install_copy, gtk, 0, 0, 0644, \ - $(GTK_DIR)/gtk/.libs/libgtk-x11-2.0.so.0.1200.12, \ - /usr/lib/libgtk-x11-2.0.so.0.1200.12) - @$(call install_link, gtk, libgtk-x11-2.0.so.0.1200.12, /usr/lib/libgtk-x11-2.0.so.0) - @$(call install_link, gtk, libgtk-x11-2.0.so.0.1200.12, /usr/lib/libgtk-x11-2.0.so) + $(GTK_DIR)/gtk/.libs/libgtk-x11-2.0.so.0.1400.8, \ + /usr/lib/libgtk-x11-2.0.so.0.1400.8) + @$(call install_link, gtk, libgtk-x11-2.0.so.0.1400.8, /usr/lib/libgtk-x11-2.0.so.0) + @$(call install_link, gtk, libgtk-x11-2.0.so.0.1400.8, /usr/lib/libgtk-x11-2.0.so) endif @$(call install_copy, gtk, 0, 0, 0644, \ - $(GTK_DIR)/gdk-pixbuf/.libs/libgdk_pixbuf-2.0.so.0.1200.12, \ - /usr/lib/libgdk_pixbuf-2.0.so.0.1200.12) - @$(call install_link, gtk, libgdk_pixbuf-2.0.so.0.1200.12, /usr/lib/libgdk_pixbuf-2.0.so.0) - @$(call install_link, gtk, libgdk_pixbuf-2.0.so.0.1200.12, /usr/lib/libgdk_pixbuf-2.0.so) + $(GTK_DIR)/gdk-pixbuf/.libs/libgdk_pixbuf-2.0.so.0.1400.8, \ + /usr/lib/libgdk_pixbuf-2.0.so.0.1400.8) + @$(call install_link, gtk, libgdk_pixbuf-2.0.so.0.1400.8, /usr/lib/libgdk_pixbuf-2.0.so.0) + @$(call install_link, gtk, libgdk_pixbuf-2.0.so.0.1400.8, /usr/lib/libgdk_pixbuf-2.0.so) ifdef PTXCONF_GTK_DEMO @$(call install_copy, gtk, 0, 0, 0755, \ |