[PATCH]Âpackages: Update pango to 1.28.4

[openwrt/svn-archive/archive.git] / Xorg / lib / pango / Makefile

diff --git a/Xorg/lib/pango/Makefile b/Xorg/lib/pango/Makefile
index 6b589b1d57082aebae0a11373129347d4e9baf02..693b47ecb65c3c228ad12ab0db9285df5c8d6b7f 100644 (file)
--- a/Xorg/lib/pango/Makefile
+++ b/Xorg/lib/pango/Makefile
@@ -1,38 +1,40 @@
 #
-# Copyright (C) 2008 OpenWrt.org
+# Copyright (C) 2008-2010 OpenWrt.org
 #
 # This is free software, licensed under the GNU General Public License v2.
 # See /LICENSE for more information.
 #
 # blogic@openwrt.org
-# $Id: Makefile 12845 2008-10-03 21:55:24Z lars $
 
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=pango
-PKG_VERSION:=1.22.2
-PKG_RELEASE:=3
+PKG_VERSION:=1.28.4
+PKG_RELEASE:=1
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
-PKG_SOURCE_URL:=@GNOME/$(PKG_NAME)/1.22/
-PKG_MD5SUM:=0d4dc87f9b523e9030afccb2d05afe0b
-PKG_FIXUP:=libtool
+PKG_SOURCE_URL:=@GNOME/$(PKG_NAME)/1.28/
+PKG_MD5SUM:=3f3989700f04e9117d30544a9078b3a0
 
-include $(INCLUDE_DIR)/package.mk
+PKG_FIXUP:=autoreconf
+PKG_INSTALL:=1
+PKG_BUILD_PARALLEL:=0
 
-PKG_INSTALL=1
+include $(INCLUDE_DIR)/package.mk
+include $(INCLUDE_DIR)/nls.mk
 
 TARGET_LDFLAGS+= \
-       -Wl,-rpath-link=$(STAGING_DIR)/usr/lib \
-       -L$(STAGING_DIR)/usr/lib/libiconv/lib \
-       -L$(STAGING_DIR)/usr/lib/libintl/lib
+       -Wl,-rpath-link=$(STAGING_DIR)/usr/lib
 
 define Package/pango
-  SECTION:=xorg-libs
+  SECTION:=xorg-libraries
   CATEGORY:=Xorg
   SUBMENU:=libraries
   TITLE:=Text layout and rendering library
-  DEPENDS:=+cairo +glib2
+  DEPENDS:=+cairo +glib2 +fontconfig +libfreetype \
+  +FEATURE_drawing-backend_libX11:libX11 \
+  +FEATURE_drawing-backend_libX11:libXft
+  URL:=http://www.pango.org/
 endef
 
 define Package/pango/description
@@ -43,14 +45,24 @@ the GTK+ widget toolkit as a test platform. Pango forms the core of text
 and font handling for GTK+-2.x.
 endef
 
+CONFIGURE_ARGS += \
+       $(if $(CONFIG_PACKAGE_libX11), --with-x, --without-x)
+
+CONFIGURE_VARS += \
+       CXX="$(TARGET_CC)"
+
 define Build/InstallDev
-       $(INSTALL_DIR) $(1)/usr/{lib/pkgconfig,lib/pango/1.6.0/modules,include}
-       $(INSTALL_DATA) \
-               $(PKG_INSTALL_DIR)/usr/lib/*.{so*,a,la} \
+       $(INSTALL_DIR) \
+               $(1)/usr/lib/pkgconfig \
+               $(1)/usr/lib/pango/1.6.0/modules \
+               $(1)/usr/include
+
+       $(CP) \
+               $(PKG_INSTALL_DIR)/usr/lib/*.so* \
                $(1)/usr/lib
 
-       $(INSTALL_DATA) \
-               $(PKG_INSTALL_DIR)/usr/lib/pango/1.6.0/modules/*.{so*,a,la} \
+       $(CP) \
+               $(PKG_INSTALL_DIR)/usr/lib/pango/1.6.0/modules/*.so* \
                $(1)/usr/lib/pango/1.6.0/modules/
 
        $(INSTALL_DATA) \
@@ -63,12 +75,16 @@ define Build/InstallDev
 endef
 
 define Package/pango/install
-       $(INSTALL_DIR) $(1)/usr/{lib/pango/1.6.0/modules,bin}
-       $(INSTALL_DATA) \
+       $(INSTALL_DIR) \
+               $(1)/usr/lib/pango/1.6.0/modules \
+               $(1)/usr/bin \
+               $(1)/etc/init.d
+
+       $(CP) \
                $(PKG_INSTALL_DIR)/usr/lib/*.so* \
                $(1)/usr/lib/
 
-       $(INSTALL_DATA) \
+       $(CP) \
                $(PKG_INSTALL_DIR)/usr/lib/pango/1.6.0/modules/*.so* \
                $(1)/usr/lib/pango/1.6.0/modules/
 
@@ -76,8 +92,9 @@ define Package/pango/install
                $(PKG_INSTALL_DIR)/usr/bin/pango-querymodules \
                $(1)/usr/bin/
 
-       $(INSTALL_DIR) $(1)/etc/init.d/
-       $(INSTALL_BIN) ./files/pango-querymodules.init $(1)/etc/init.d/pango-querymodules
+       $(INSTALL_BIN) \
+               ./files/pango-querymodules.init \
+               $(1)/etc/init.d/pango-querymodules
 endef
 
 $(eval $(call BuildPackage,pango))