From: Mirko Vogt <mirko@openwrt.org>
Date: Thu, 12 Nov 2009 01:06:35 +0000 (+0000)
Subject: make use of feature-flag "drawing backend" - link cairo e.g. against libX11 or libdir... 
X-Git-Url: http://git.openwrt.org/?p=openwrt%2Fsvn-archive%2Farchive.git;a=commitdiff_plain;h=96594952905cb3e0435ab4831e6944cf81e70ba2

make use of feature-flag "drawing backend" - link cairo e.g. against libX11 or libdirectfb


SVN-Revision: 18391
---

diff --git a/Xorg/lib/cairo/Makefile b/Xorg/lib/cairo/Makefile
index 511ce091dd..271dc1e403 100644
--- a/Xorg/lib/cairo/Makefile
+++ b/Xorg/lib/cairo/Makefile
@@ -25,7 +25,9 @@ define Package/cairo
   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
 endef
 
 define Package/cairo/description
@@ -38,8 +40,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/