[packages] aodv-uu: resolve reference to CONFIG_LINUX_2_6

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

diff --git a/Xorg/lib/cairo/Makefile b/Xorg/lib/cairo/Makefile
index 511ce091dd4417d5ee26b0d05753d5c0164acbe9..bd695612df2f8d99e31d1e3d5f049e363686cf95 100644 (file)
--- a/Xorg/lib/cairo/Makefile
+++ b/Xorg/lib/cairo/Makefile
@@ -1,5 +1,5 @@
 #
-# Copyright (C) 2008-2009 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.
@@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=cairo
 PKG_VERSION:=1.8.8
-PKG_RELEASE:=1
+PKG_RELEASE:=2
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=http://cairographics.org/releases/
@@ -21,11 +21,14 @@ 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
@@ -38,8 +41,13 @@ 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+=$(TARGET_LDFLAGS)
+
+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/