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

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

diff --git a/Xorg/lib/cairo/Makefile b/Xorg/lib/cairo/Makefile
index ce8de5061b1e11956554fafe1727a060bebf87dd..1bded155deaa51d04654e6b833ff5d98718d5a0c 100644 (file)
--- a/Xorg/lib/cairo/Makefile
+++ b/Xorg/lib/cairo/Makefile
@@ -1,5 +1,5 @@
-# 
-# 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.
@@ -8,22 +8,27 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=cairo
-PKG_VERSION:=1.6.4
-PKG_RELEASE:=2
+PKG_VERSION:=1.8.8
+PKG_RELEASE:=1
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=http://cairographics.org/releases/
-PKG_MD5SUM:=a198d509f9e3a35b78de8bb02174ebb9
+PKG_MD5SUM:=d3e1a1035ae563812d4dd44a74fb0dd0
 PKG_FIXUP:=libtool
 
 include $(INCLUDE_DIR)/package.mk
 
+PKG_INSTALL:=1
+
 define Package/cairo
-  SECTION:=xorg-libs
+  SECTION:=xorg-libraries
   CATEGORY:=Xorg
   SUBMENU:=libraries
   TITLE:=Multi-platform 2D graphics library
-  DEPENDS:=+fontconfig +libpng +libexpat +pixman
+  DEPENDS:=+fontconfig +libpng +libexpat +pixman \
+  +FEATURE_drawing-backend_DirectFB:directfb \
+  +FEATURE_drawing-backend_libX11:libX11
+  URL:=http://cairographics.org/
 endef
 
 define Package/cairo/description
@@ -36,17 +41,17 @@ drawing operations can be transformed by any affine transformation
 endef
 
 CONFIGURE_VARS+=FONTCONFIG_LIBS="-lfreetype -lfontconfig -lz -lexpat"
-CONFIGURE_ARGS+=--enable-freetype=yes
-TARGET_CFLAGS+=-L$(STAGING_DIR)/usr/lib
 
-define Build/Compile
-       $(MAKE) -C $(PKG_BUILD_DIR)
-       $(MAKE) -C $(PKG_BUILD_DIR)/ install DESTDIR=$(PKG_INSTALL_DIR)
-endef
+CONFIGURE_ARGS+= \
+       --enable-freetype=yes \
+       --disable-win32 \
+       --enable-xlib-xrender=no \
+       $(if $(CONFIG_FEATURE_drawing-backend_DirectFB), --enable-directfb, --disable-directfb) \
+       $(if $(CONFIG_FEATURE_drawing-backend_libX11), --enable-xlib --with-x, --disable-xlib --without-x)
 
 define Build/InstallDev
        $(INSTALL_DIR) $(1)/usr/lib/
-       $(INSTALL_DATA) $(PKG_INSTALL_DIR)/usr/lib/*.{so*,la} $(1)/usr/lib/
+       $(CP) $(PKG_INSTALL_DIR)/usr/lib/*.{so*,a,la} $(1)/usr/lib/
        $(INSTALL_DIR) $(1)/usr/lib/pkgconfig/
        $(INSTALL_DATA) $(PKG_INSTALL_DIR)/usr/lib/pkgconfig/* $(1)/usr/lib/pkgconfig/
        $(INSTALL_DIR) $(1)/usr/include/cairo/
@@ -55,7 +60,7 @@ endef
 
 define Package/cairo/install
        $(INSTALL_DIR) $(1)/usr/lib/
-       $(INSTALL_DATA) $(PKG_INSTALL_DIR)/usr/lib/*.{so*,a} $(1)/usr/lib/
+       $(CP) $(PKG_INSTALL_DIR)/usr/lib/*.so* $(1)/usr/lib/
 endef
 
 $(eval $(call BuildPackage,cairo))