Fix cairo InstallDev and some package cleanups.

git-svn-id: svn://svn.openwrt.org/openwrt/packages@12473 3c298f89-4303-0410-b956-a3cf2f4a3e73
This commit is contained in:
lars 2008-09-01 23:21:08 +00:00
parent 6d79eb99c9
commit 61ff59ce81

View File

@ -9,12 +9,12 @@ include $(TOPDIR)/rules.mk
PKG_NAME:=cairo PKG_NAME:=cairo
PKG_VERSION:=1.6.4 PKG_VERSION:=1.6.4
PKG_RELEASE:=1 PKG_RELEASE:=2
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz 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 PKG_MD5SUM:=a198d509f9e3a35b78de8bb02174ebb9
PKG_FIXUP:=libtool
include $(INCLUDE_DIR)/package.mk include $(INCLUDE_DIR)/package.mk
@ -22,10 +22,19 @@ define Package/cairo
SECTION:=xorg-libs SECTION:=xorg-libs
CATEGORY:=Xorg CATEGORY:=Xorg
SUBMENU:=libraries 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 DEPENDS:=+xorg-server-essentials +fontconfig +libpng +libexpat +pixman
endef endef
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_VARS+=FONTCONFIG_LIBS="-lfreetype -lfontconfig -lz -lexpat"
CONFIGURE_ARGS+=--enable-freetype=yes CONFIGURE_ARGS+=--enable-freetype=yes
TARGET_CFLAGS+=-L$(STAGING_DIR)/usr/lib TARGET_CFLAGS+=-L$(STAGING_DIR)/usr/lib
@ -36,16 +45,17 @@ define Build/Compile
endef endef
define Build/InstallDev define Build/InstallDev
$(INSTALL_DIR) $(1) $(INSTALL_DIR) $(1)/usr/lib/
$(CP) $(PKG_INSTALL_DIR)/* $(1)/ $(INSTALL_DATA) $(PKG_INSTALL_DIR)/usr/lib/*.{so*,la} $(1)/usr/lib/
$(SED) "s,-L/usr/local/lib,,g" $(1)/usr/lib/libcairo.la $(INSTALL_DIR) $(1)/usr/lib/pkgconfig/
$(SED) "s,/usr/lib/libfontconfig.la,$(STAGING_DIR)/usr/lib/libfontconfig.la,g" $(1)/usr/lib/libcairo.la $(INSTALL_DATA) $(PKG_INSTALL_DIR)/usr/lib/pkgconfig/* $(1)/usr/lib/pkgconfig/
$(SED) "s,$(STAGING_DIR)$(STAGING_DIR),$(STAGING_DIR),g" $(1)/usr/lib/libcairo.la $(INSTALL_DIR) $(1)/usr/include/cairo/
$(INSTALL_DATA) $(PKG_INSTALL_DIR)/usr/include/cairo/* $(1)/usr/include/cairo/
endef endef
define Package/cairo/install define Package/cairo/install
$(INSTALL_DIR) $(1)/usr/lib $(INSTALL_DIR) $(1)/usr/lib/
$(CP) $(PKG_INSTALL_DIR)/usr/lib/lib*so* $(1)/usr/lib/ $(INSTALL_DATA) $(PKG_INSTALL_DIR)/usr/lib/*.{so*,a} $(1)/usr/lib/
endef endef
$(eval $(call BuildPackage,cairo)) $(eval $(call BuildPackage,cairo))