Update cairo to 1.8.2

SVN-Revision: 13246

diff --git a/Xorg/lib/cairo/Makefile b/Xorg/lib/cairo/Makefile
index ce8de5061b1e11956554fafe1727a060bebf87dd..c74f5d2d9107183da90856d1da2240b8c4c51c3c 100644 (file)
--- a/Xorg/lib/cairo/Makefile
+++ b/Xorg/lib/cairo/Makefile
@@ -1,4 +1,4 @@
-# 
+#
 # Copyright (C) 2008 OpenWrt.org
 #
 # This is free software, licensed under the GNU General Public License v2.
@@ -8,16 +8,18 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=cairo
-PKG_VERSION:=1.6.4
-PKG_RELEASE:=2
+PKG_VERSION:=1.8.2
+PKG_RELEASE:=3
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=http://cairographics.org/releases/
-PKG_MD5SUM:=a198d509f9e3a35b78de8bb02174ebb9
+PKG_MD5SUM:=44d406e199c338cb60f7db32ffb32bdb
 PKG_FIXUP:=libtool
 
 include $(INCLUDE_DIR)/package.mk
 
+PKG_INSTALL:=1
+
 define Package/cairo
   SECTION:=xorg-libs
   CATEGORY:=Xorg
@@ -39,14 +41,9 @@ 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
-
 define Build/InstallDev
        $(INSTALL_DIR) $(1)/usr/lib/
-       $(INSTALL_DATA) $(PKG_INSTALL_DIR)/usr/lib/*.{so*,la} $(1)/usr/lib/
+       $(INSTALL_DATA) $(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 +52,7 @@ endef
 
 define Package/cairo/install
        $(INSTALL_DIR) $(1)/usr/lib/
-       $(INSTALL_DATA) $(PKG_INSTALL_DIR)/usr/lib/*.{so*,a} $(1)/usr/lib/
+       $(INSTALL_DATA) $(PKG_INSTALL_DIR)/usr/lib/*.so* $(1)/usr/lib/
 endef
 
 $(eval $(call BuildPackage,cairo))