Update pango to 1.20.5 and add init script which calls pango-querymodules on the

[openwrt/svn-archive/archive.git] / XOrg / lib / libfontenc / Makefile

diff --git a/XOrg/lib/libfontenc/Makefile b/XOrg/lib/libfontenc/Makefile
index c8f8606c9a7cc628f5e4dd99b39563f157c2c189..3531449a9b9b57e89686d5ca984aa77d891f5234 100644 (file)
--- a/XOrg/lib/libfontenc/Makefile
+++ b/XOrg/lib/libfontenc/Makefile
@@ -9,9 +9,9 @@ include $(TOPDIR)/rules.mk
 
 PKG_BASE_NAME:=libfontenc
 PKG_NAME:=libfontenc
-PKG_RELEASE:=1
-PKG_VERSION:=X11R7.2-1.0.4
-PKG_SOURCE_URL:=http://xorg.freedesktop.org/releases/X11R7.2/src/lib/
+PKG_RELEASE:=2
+PKG_VERSION:=1.0.4
+PKG_SOURCE_URL:=http://xorg.freedesktop.org/releases/X11R7.3/src/lib/
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
 PKG_BUILD_DIR=$(BUILD_DIR)/Xorg/$(_CATEGORY)/${PKG_NAME}-$(PKG_VERSION)/
 
@@ -21,7 +21,7 @@ define Package/libfontenc
   SECTION:=xorg-libraries
   CATEGORY:=Xorg
   SUBMENU:=libraries
-  DEPENDS:=+xorg-headers-native +util-macros  +xproto +zlib @TARGET_x86
+  DEPENDS:=+xorg-headers-native +util-macros  +xproto +zlib @DISPLAY_SUPPORT
   TITLE:=libfontenc
   URL:=http://xorg.freedesktop.org/
 endef
@@ -31,7 +31,7 @@ define Build/InstallDev
 endef
 
 ifeq (libfontenc,libX11)
- CONFIGURE_ARGS_XTRA=--without-xcb
+ CONFIGURE_ARGS+=--without-xcb
 endif
 
 define libX11/Compile
@@ -53,16 +53,7 @@ define Build/Compile
 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) \
-               --enable-malloc0returnsnull; \
-       fi \
-       )
+       $(call Build/Configure/Default, --enable-malloc0returnsnull)
 endef
 
 define Package/libfontenc/install/Default