make use of feature-flag "drawing backend" to choose whether linking e.g. against...

[openwrt/svn-archive/archive.git] / Xorg / lib / gtk2 / Makefile

diff --git a/Xorg/lib/gtk2/Makefile b/Xorg/lib/gtk2/Makefile
index 2eaa87af89783a270f7633d8ed9edf18b22aaf88..7e6b53b24d325fff30fa459b7d67d376952e14fe 100644 (file)
--- a/Xorg/lib/gtk2/Makefile
+++ b/Xorg/lib/gtk2/Makefile
@@ -1,5 +1,5 @@
 #
-# Copyright (C) 2008 OpenWrt.org
+# Copyright (C) 2008-2009 OpenWrt.org
 #
 # This is free software, licensed under the GNU General Public License v2.
 # See /LICENSE for more information.
@@ -8,13 +8,12 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=gtk2
-PKG_VERSION:=2.14.4
-PKG_RELEASE:=6
+PKG_VERSION:=2.17.0
+PKG_RELEASE:=1
 
 PKG_SOURCE:=gtk+-$(PKG_VERSION).tar.bz2
-PKG_SOURCE_URL:=@GNOME/gtk+/2.14
+PKG_SOURCE_URL:=@GNOME/gtk+/2.17
 PKG_BUILD_DIR=$(BUILD_DIR)/gtk+-$(PKG_VERSION)
-PKG_MD5SUM:=72bf65a54d2d29a6644dc0d28313ee67
 PKG_FIXUP:=libtool
 
 include $(INCLUDE_DIR)/package.mk
@@ -22,24 +21,34 @@ include $(INCLUDE_DIR)/package.mk
 PKG_INSTALL:=1
 
 TARGET_CFLAGS+=\
-       -I$(STAGING_DIR)/usr/lib/libintl/include/
+       -I$(STAGING_DIR)/usr/lib/libintl/include/ \
+       -I$(STAGING_DIR)/usr/lib/libiconv/include/
 
-EXTRA_LDFLAGS+=\
+TARGET_LDFLAGS+=\
        -Wl,-rpath-link=$(STAGING_DIR)/usr/lib \
        -L$(STAGING_DIR)/usr/lib/libintl/lib/ \
-       -L$(STAGING_DIR)/usr/lib/libiconv/lib/ \
-       -L$(STAGING_DIR)/usr/lib/
+       -L$(STAGING_DIR)/usr/lib/libiconv/lib/
 
 STAMP_CONFIGURED:=$(STAMP_CONFIGURED)_$(call confvar,CONFIG_PACKAGE_gtk2 CONFIG_PACKAGE_gtk2-cups)
 
+# We can _either_ compile gtk2 with directfb-support _or_ against libX11 (libX11 is preferred when both libs are selected)
+
 define Package/gtk2
   SECTION:=xorg-framework
   CATEGORY:=Xorg
   SUBMENU:=framework
   TITLE:=GTK+-2.0
-  DEPENDS:=+cairo +pango +libpng +libjpeg +atk +libtiff +libX11 +libXext \
-  +libXrender +libXfixes +libXrandr +libXcursor +libXdamage +libXcomposite \
-  +libXi
+  DEPENDS:=+cairo +pango +libpng +libjpeg +atk +libtiff \
+  +FEATURE_drawing-backend_DirectFB:DirectFB \
+  +FEATURE_drawing-backend_libX11:libX11 \
+  +FEATURE_drawing-backend_libX11:libXext \
+  +FEATURE_drawing-backend_libX11:libXrender \
+  +FEATURE_drawing-backend_libX11:libXfixes \
+  +FEATURE_drawing-backend_libX11:libXrandr \
+  +FEATURE_drawing-backend_libX11:libXcursor \
+  +FEATURE_drawing-backend_libX11:libXdamage \
+  +FEATURE_drawing-backend_libX11:libXcomposite \
+  +FEATURE_drawing-backend_libX11:libXi
 endef
 
 define Package/gtk2-cups
@@ -58,7 +67,9 @@ define Build/Configure
                --disable-gdiplus \
                --disable-xinerama \
                --without-libjasper \
-               --with-xinput \
+               --without-xinput \
+               $(if $(CONFIG_FEATURE_drawing-backend_DirectFB),--with-gdktarget=directfb,) \
+               $(if $(CONFIG_FEATURE_drawing-backend_libX11),--with-x --with-gdktarget=x11,--without-x) \
                $(if $(CONFIG_PACKAGE_gtk2-cups),--enable-cups=auto,--disable-cups), \
                gio_can_sniff=no \
        )
@@ -123,6 +134,3 @@ endef
 
 $(eval $(call BuildPackage,gtk2))
 $(eval $(call BuildPackage,gtk2-cups))
-$(eval $(call RequireCommand,gdk-pixbuf-csource, \
-       Please install gtk2.0-dev \
-))