adjust dependencies regarding previous name change "DirectFB" -> "directfb"

[packages.git] / Xorg / lib / gtk2 / Makefile

diff --git a/Xorg/lib/gtk2/Makefile b/Xorg/lib/gtk2/Makefile
index af33145..9866781 100644 (file)
--- a/Xorg/lib/gtk2/Makefile
+++ b/Xorg/lib/gtk2/Makefile
@@ -1,44 +1,56 @@
 #
-# Copyright (C) 2008 OpenWrt.org
+# Copyright (C) 2008-2010 OpenWrt.org
 #
 # This is free software, licensed under the GNU General Public License v2.
 # See /LICENSE for more information.
 #
-# $Id: Makefile 12846 2008-10-03 22:38:55Z lars $
 
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=gtk2
-PKG_VERSION:=2.14.4
-PKG_RELEASE:=4
+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_MD5SUM:=a1a1f0b66a240c31cb2733643f9170ba
+
 PKG_FIXUP:=libtool
+PKG_INSTALL:=1
 
 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/libintl/lib/ \
+       -L$(STAGING_DIR)/usr/lib/libiconv/lib/
+
+STAMP_CONFIGURED:=$(STAMP_CONFIGURED)_$(call confvar,CONFIG_PACKAGE_gtk2 CONFIG_PACKAGE_gtk2-cups)
 
-STAMP_CONFIGURED:=$(STAMP_CONFIGURED)_$(call confvar,CONFIG_PACKAGE_gtk2 CONFIG_PACKAGE_gtk-cups2)
+# 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
+  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
+  URL:=http://www.gtk.org/
 endef
 
 define Package/gtk2-cups
@@ -51,10 +63,15 @@ endef
 
 define Build/Configure
        $(call Build/Configure/Default, \
+               --enable-shm \
+               --disable-xkb \
                --disable-glibtest \
                --disable-gdiplus \
                --disable-xinerama \
                --without-libjasper \
+               --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 \
        )
@@ -65,7 +82,7 @@ define Build/InstallDev
        $(CP) $(PKG_INSTALL_DIR)/usr/include/* $(1)/usr/include/
        $(CP) $(PKG_INSTALL_DIR)/usr/lib/gtk-2.0/include/* $(1)/usr/include/
 
-       $(INSTALL_DATA) \
+       $(CP) \
                $(PKG_INSTALL_DIR)/usr/lib/*.{so*,a,la} \
                $(1)/usr/lib/
 
@@ -81,7 +98,7 @@ define Package/gtk2/install
                $(1)/etc/gtk-2.0/
 
        $(INSTALL_DIR) $(1)/usr/lib
-       $(INSTALL_DATA) \
+       $(CP) \
                $(PKG_INSTALL_DIR)/usr/lib/*.so* \
                $(1)/usr/lib/
 
@@ -119,6 +136,3 @@ endef
 
 $(eval $(call BuildPackage,gtk2))
 $(eval $(call BuildPackage,gtk2-cups))
-$(eval $(call RequireCommand,gdk-pixbuf-csource, \
-       Please install gtk2.0-dev \
-))