X-Git-Url: http://git.archive.openwrt.org/?a=blobdiff_plain;f=XOrg%2Flib%2Fcairo%2FMakefile;h=97ace217295564bbe34d6b848fc18252f43b934c;hb=32a4def34f8b3ee1857f51ef2b615b078683024e;hp=31f5e327db2803107611a866695ccabbde370dae;hpb=ef6b16d4d51d0675261ede95d8e4e53ad73dfc9d;p=packages.git

diff --git a/XOrg/lib/cairo/Makefile b/XOrg/lib/cairo/Makefile
index 31f5e327d..97ace2172 100644
--- a/XOrg/lib/cairo/Makefile
+++ b/XOrg/lib/cairo/Makefile
@@ -1,43 +1,34 @@
 # 
-# Copyright (C) 2006 OpenWrt.org
+# Copyright (C) 2008 OpenWrt.org
 #
 # This is free software, licensed under the GNU General Public License v2.
 # See /LICENSE for more information.
 #
-# blogic@openwrt.org
 
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=cairo
-PKG_VERSION:=1.2.4
+PKG_VERSION:=1.6.4
 PKG_RELEASE:=1
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
-PKG_SOURCE_URL:= http://cairographics.org/releases/
+PKG_SOURCE_URL:=http://cairographics.org/releases/
+PKG_FIXUP = libtool
+PKG_MD5SUM:=a198d509f9e3a35b78de8bb02174ebb9
 
 include $(INCLUDE_DIR)/package.mk
 
-EXTRA_LDFLAGS:="-Wl,-rpath-link=$(STAGING_DIR)/usr/lib"
-
 define Package/cairo
   SECTION:=xorg-libs
   CATEGORY:=Xorg
   SUBMENU:=libraries
   TITLE:=2D graphics library with support for multiple output devices
-  DEPENDS:=+xorg-server-essentials +fontconfig +libpng
+  DEPENDS:=+xorg-server-essentials +fontconfig +libpng +libexpat
 endef
 
-define Build/Configure
-	(cd $(PKG_BUILD_DIR)/$(CONFIGURE_PATH); \
-		if [ -x $(CONFIGURE_CMD) ]; then \
-			$(CP) $(SCRIPT_DIR)/config.{guess,sub} $(PKG_BUILD_DIR)/ && \
-			$(CONFIGURE_VARS) \
-			$(CONFIGURE_CMD) \
-			$(CONFIGURE_ARGS_XTRA) \
-			$(CONFIGURE_ARGS) ;\
-		fi \
-	)
-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)
@@ -45,11 +36,11 @@ define Build/Compile
 endef
 
 define Build/InstallDev
-	$(CP) $(PKG_INSTALL_DIR)/* $(STAGING_DIR)/
-	$(SED) "s,-L/usr/local/lib,,g" $(STAGING_DIR)/usr/lib/libcairo.la
-	$(SED) "s,/usr/lib/libfontconfig.la,$(STAGING_DIR)/usr/lib/libfontconfig.la,g" $(STAGING_DIR)/usr/lib/libcairo.la
-	$(SED)  "s,$(STAGING_DIR)$(STAGING_DIR),$(STAGING_DIR),g" $(STAGING_DIR)/usr/lib/libcairo.la
-	$(SED)  "s,"libdir\=\'/usr/lib\'",libdir='$(STAGING_DIR)/usr/lib\'," $(STAGING_DIR)/usr/lib/libcairo.la
+	$(INSTALL_DIR) $(1)
+	$(CP) $(PKG_INSTALL_DIR)/* $(1)/
+	$(SED) "s,-L/usr/local/lib,,g" $(1)/usr/lib/libcairo.la
+	$(SED) "s,/usr/lib/libfontconfig.la,$(STAGING_DIR)/usr/lib/libfontconfig.la,g" $(1)/usr/lib/libcairo.la
+	$(SED)  "s,$(STAGING_DIR)$(STAGING_DIR),$(STAGING_DIR),g" $(1)/usr/lib/libcairo.la
 endef
 
 define Package/cairo/Install