Fix cairo InstallDev and some package cleanups.

SVN-Revision: 12473

diff --git a/XOrg/lib/cairo/Makefile b/XOrg/lib/cairo/Makefile
index af9dc3edddb425c5a8f1b02327809099bbacc1d4..cf92f060e98e2ead0c5be5b1e278b0ba87de758e 100644 (file)
--- a/XOrg/lib/cairo/Makefile
+++ b/XOrg/lib/cairo/Makefile
@@ -9,12 +9,12 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=cairo
 PKG_VERSION:=1.6.4
-PKG_RELEASE:=1
+PKG_RELEASE:=2
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=http://cairographics.org/releases/
-PKG_FIXUP = libtool
 PKG_MD5SUM:=a198d509f9e3a35b78de8bb02174ebb9
+PKG_FIXUP:=libtool
 
 include $(INCLUDE_DIR)/package.mk
 
@@ -22,13 +22,22 @@ define Package/cairo
   SECTION:=xorg-libs
   CATEGORY:=Xorg
   SUBMENU:=libraries
-  TITLE:=2D graphics library with support for multiple output devices
+  TITLE:=Multi-platform 2D graphics library
   DEPENDS:=+xorg-server-essentials +fontconfig +libpng +libexpat +pixman
 endef
 
-CONFIGURE_VARS += FONTCONFIG_LIBS="-lfreetype -lfontconfig -lz -lexpat"
-CONFIGURE_ARGS += --enable-freetype=yes
-TARGET_CFLAGS += -L$(STAGING_DIR)/usr/lib
+define Package/cairo/description
+Cairo is a 2D graphics library. The cairo API provides operations similar
+to the drawing operators of PostScript and PDF. Operations in cairo
+include stroking and filling cubic Bézier splines, transforming and
+compositing translucent images, and antialiased text rendering. All
+drawing operations can be transformed by any affine transformation
+(scale, rotation, shear, etc.).
+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)
@@ -36,16 +45,17 @@ define Build/Compile
 endef
 
 define Build/InstallDev
-       $(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
+       $(INSTALL_DIR) $(1)/usr/lib/
+       $(INSTALL_DATA) $(PKG_INSTALL_DIR)/usr/lib/*.{so*,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/
+       $(INSTALL_DATA) $(PKG_INSTALL_DIR)/usr/include/cairo/* $(1)/usr/include/cairo/
 endef
 
 define Package/cairo/install
-       $(INSTALL_DIR) $(1)/usr/lib
-       $(CP) $(PKG_INSTALL_DIR)/usr/lib/lib*so* $(1)/usr/lib/
+       $(INSTALL_DIR) $(1)/usr/lib/
+       $(INSTALL_DATA) $(PKG_INSTALL_DIR)/usr/lib/*.{so*,a} $(1)/usr/lib/
 endef
 
 $(eval $(call BuildPackage,cairo))