* gtk: backport from TechPool

git-svn-id: https://svn.pengutronix.de/svn/ptxdist/trunks/ptxdist-trunk@7341 33e552b5-05e3-0310-8538-816dae2090ed

1 files changed, 125 insertions, 17 deletions

diff --git a/rules/gtk.make b/rules/gtk.make
index 9777585ce..0e0169a14 100644
--- a/rules/gtk.make
+++ b/rules/gtk.make
@@ -2,7 +2,7 @@
 # $Id: template 5041 2006-03-09 08:45:49Z mkl $
 #
 # Copyright (C) 2006 by Marc Kleine-Budde <mkl@pengutronix.de>
-#          
+#
 # See CREDITS for details about who has contributed to this project.
 #
 # For further information about the PTXdist project and license conditions
@@ -17,21 +17,20 @@ PACKAGES-$(PTXCONF_GTK) += gtk
 #
 # Paths and names
 #
-GTK_VERSION	:= 2.8.16
+GTK_VERSION	:= 2.12.0
 GTK		:= gtk+-$(GTK_VERSION)
 GTK_SUFFIX	:= tar.bz2
-GTK_URL		:= ftp://ftp.gtk.org/pub/gtk/v2.8/$(GTK).$(GTK_SUFFIX)
+GTK_URL		:= ftp://ftp.gtk.org/pub/gtk/2.12/$(GTK).$(GTK_SUFFIX)
 GTK_SOURCE	:= $(SRCDIR)/$(GTK).$(GTK_SUFFIX)
 GTK_DIR		:= $(BUILDDIR)/$(GTK)
 
-
 # ----------------------------------------------------------------------------
 # Get
 # ----------------------------------------------------------------------------
 
 gtk_get: $(STATEDIR)/gtk.get
 
-$(STATEDIR)/gtk.get: $(gtk_get_deps_default)
+$(STATEDIR)/gtk.get:
 	@$(call targetinfo, $@)
 	@$(call touch, $@)
 
@@ -45,7 +44,7 @@ $(GTK_SOURCE):
 
 gtk_extract: $(STATEDIR)/gtk.extract
 
-$(STATEDIR)/gtk.extract: $(gtk_extract_deps_default)
+$(STATEDIR)/gtk.extract:
 	@$(call targetinfo, $@)
 	@$(call clean, $(GTK_DIR))
 	@$(call extract, GTK)
@@ -59,24 +58,86 @@ $(STATEDIR)/gtk.extract: $(gtk_extract_deps_default)
 gtk_prepare: $(STATEDIR)/gtk.prepare
 
 GTK_PATH	:= PATH=$(CROSS_PATH)
-GTK_ENV 	:= $(CROSS_ENV)
+
+# cups-config otherwhise picks up the host version
+GTK_ENV := \
+	$(CROSS_ENV) \
+	ac_cv_path_CUPS_CONFIG=no
+
+
+ifdef PTXCONF_GTK_LOADER_PNG
+GTK_LOADERS += png
+endif
+
+ifdef PTXCONF_GTK_LOADER_BMP
+GTK_LOADERS += bmp
+endif
+
+ifdef PTXCONF_GTK_LOADER_WBMP
+GTK_LOADERS += wbmp
+endif
+
+ifdef PTXCONF_GTK_LOADER_GIF
+GTK_LOADERS += gif
+endif
+
+ifdef PTXCONF_GTK_LOADER_ICO
+GTK_LOADERS += ico
+endif
+
+ifdef PTXCONF_GTK_LOADER_ANI
+GTK_LOADERS += ani
+endif
+
+ifdef PTXCONF_GTK_LOADER_JPEG
+GTK_LOADERS += jpeg
+endif
+
+ifdef PTXCONF_GTK_LOADER_PNM
+GTK_LOADERS += pnm
+endif
+
+ifdef PTXCONF_GTK_LOADER_RAS
+GTK_LOADERS += ras
+endif
+
+ifdef PTXCONF_GTK_LOADER_TIFF
+GTK_LOADERS += tiff
+endif
+
+ifdef PTXCONF_GTK_LOADER_XPM
+GTK_LOADERS += xpm
+endif
+
+ifdef PTXCONF_GTK_LOADER_TGA
+GTK_LOADERS += tga
+endif
+
+ifdef PTXCONF_GTK_LOADER_PCX
+GTK_LOADERS += pcx
+endif
+
 
 #
 # autoconf
 #
 GTK_AUTOCONF := \
 	$(CROSS_AUTOCONF_USR) \
-	--enable-explicit-deps=yes
+	--enable-static \
+	--enable-explicit-deps=yes \
+	--disable-glibtest \
+	--disable-modules \
+	--with-included-loaders=$(subst $(space),$(comma),$(GTK_LOADERS))
 
-ifndef PTXCONF_GTK_LIBPNG
+ifndef PTXCONF_GTK_LOADER_PNG
 GTK_AUTOCONF += --without-libpng
 endif
 
-ifndef PTXCONF_GTK_LIBTIFF
+ifndef PTXCONF_GTK_LOADER_TIFF
 GTK_AUTOCONF += --without-libtiff
 endif
 
-ifndef PTXCONF_GTK_LIBJPEG
+ifndef PTXCONF_GTK_LOADER_JPEG
 GTK_AUTOCONF += --without-libjpeg
 endif
 
@@ -84,7 +145,15 @@ ifdef PTXCONF_GTK_TARGET_X11
 GTK_AUTOCONF += --with-gdktarget=x11
 endif
 
-$(STATEDIR)/gtk.prepare: $(gtk_prepare_deps_default)
+ifdef PTXCONF_GTK_TARGET_DIRECTFB
+GTK_AUTOCONF += --with-gdktarget=directfb
+endif
+
+ifdef PTXCONF_GTK_TARGET_WIN32
+GTK_AUTOCONF += --with-gdktarget=win32
+endif
+
+$(STATEDIR)/gtk.prepare:
 	@$(call targetinfo, $@)
 	@$(call clean, $(GTK_DIR)/config.cache)
 	cd $(GTK_DIR) && \
@@ -98,9 +167,9 @@ $(STATEDIR)/gtk.prepare: $(gtk_prepare_deps_default)
 
 gtk_compile: $(STATEDIR)/gtk.compile
 
-$(STATEDIR)/gtk.compile: $(gtk_compile_deps_default)
+$(STATEDIR)/gtk.compile:
 	@$(call targetinfo, $@)
-	cd $(GTK_DIR) && $(GTK_PATH) make
+	cd $(GTK_DIR) && $(GTK_PATH) $(MAKE) $(PARALLELMFLAGS)
 	@$(call touch, $@)
 
 # ----------------------------------------------------------------------------
@@ -109,7 +178,7 @@ $(STATEDIR)/gtk.compile: $(gtk_compile_deps_default)
 
 gtk_install: $(STATEDIR)/gtk.install
 
-$(STATEDIR)/gtk.install: $(gtk_install_deps_default)
+$(STATEDIR)/gtk.install:
 	@$(call targetinfo, $@)
 	@$(call install, GTK)
 	@$(call touch, $@)
@@ -120,7 +189,7 @@ $(STATEDIR)/gtk.install: $(gtk_install_deps_default)
 
 gtk_targetinstall: $(STATEDIR)/gtk.targetinstall
 
-$(STATEDIR)/gtk.targetinstall: $(gtk_targetinstall_deps_default)
+$(STATEDIR)/gtk.targetinstall:
 	@$(call targetinfo, $@)
 
 	@$(call install_init, gtk)
@@ -132,7 +201,46 @@ $(STATEDIR)/gtk.targetinstall: $(gtk_targetinstall_deps_default)
 	@$(call install_fixup,gtk,DEPENDS,)
 	@$(call install_fixup,gtk,DESCRIPTION,missing)
 
-	@$(call install_copy, gtk, 0, 0, 0755, $(GTK_DIR)/foobar, /dev/null)
+ifdef PTXCONF_GTK_TARGET_DIRECTFB
+	@$(call install_copy, gtk, 0, 0, 0644, \
+		$(GTK_DIR)/gdk/.libs/libgdk-directfb-2.0.so.0.1000.14, \
+		/usr/lib/libgdk-directfb-2.0.so.0.1000.14)
+	@$(call install_link, gtk, libgdk-directfb-2.0.so.0.1000.14, /usr/lib/libgdk-directfb-2.0.so.0)
+	@$(call install_link, gtk, libgdk-directfb-2.0.so.0.1000.14, /usr/lib/libgdk-directfb-2.0.so)
+
+	@$(call install_copy, gtk, 0, 0, 0644, \
+		$(GTK_DIR)/gtk/.libs/libgtk-directfb-2.0.so.0.1000.14, \
+		/usr/lib/libgtk-directfb-2.0.so.0.1000.14)
+	@$(call install_link, gtk, libgtk-directfb-2.0.so.0.1000.14, /usr/lib/libgtk-directfb-2.0.so.0)
+	@$(call install_link, gtk, libgtk-directfb-2.0.so.0.1000.14, /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.1000.14, \
+		/usr/lib/libgdk-x11-2.0.so.0.1000.14)
+	@$(call install_link, gtk, libgdk-x11-2.0.so.0.1000.14, /usr/lib/libgdk-x11-2.0.so.0)
+	@$(call install_link, gtk, libgdk-x11-2.0.so.0.1000.14, /usr/lib/libgdk-x11-2.0.so)
+
+	@$(call install_copy, gtk, 0, 0, 0644, \
+		$(GTK_DIR)/gtk/.libs/libgtk-x11-2.0.so.0.1000.14, \
+		/usr/lib/libgtk-x11-2.0.so.0.1000.14)
+	@$(call install_link, gtk, libgtk-x11-2.0.so.0.1000.14, /usr/lib/libgtk-x11-2.0.so.0)
+	@$(call install_link, gtk, libgtk-x11-2.0.so.0.1000.14, /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.1000.14, \
+		/usr/lib/libgdk_pixbuf-2.0.so.0.1000.14)
+	@$(call install_link, gtk, libgdk_pixbuf-2.0.so.0.1000.14, /usr/lib/libgdk_pixbuf-2.0.so.0)
+	@$(call install_link, gtk, libgdk_pixbuf-2.0.so.0.1000.14, /usr/lib/libgdk_pixbuf-2.0.so)
+
+ifdef PTXCONF_GTK_DEMO
+	@$(call install_copy, gtk, 0, 0, 0755, \
+		$(GTK_DIR)/tests/.libs/testgtk, \
+		/usr/bin/testgtk)
+endif
 
 	@$(call install_finish,gtk)