Update XOrg packages to 7.3

git-svn-id: svn://svn.openwrt.org/openwrt/packages@12468 3c298f89-4303-0410-b956-a3cf2f4a3e73
This commit is contained in:
lars
2008-09-01 21:31:52 +00:00
parent 40f3845abb
commit 3fea517e4b
114 changed files with 1174 additions and 1159 deletions

View File

@ -1,17 +1,17 @@
#
# Copyright (C) 2007-2008 OpenWrt.org
#
# Copyright (C) 2007 OpenWrt.org
#
# This is free software, licensed under the GNU General Public License v2.
# See /LICENSE for more information.
#
# blogic@openwrt.org
# blogic@openwrt.org
include $(TOPDIR)/rules.mk
PKG_BASE_NAME:=libXrender
PKG_NAME:=libXrender
PKG_RELEASE:=1
PKG_VERSION:=X11R7.2-0.9.2
PKG_SOURCE_URL:=http://xorg.freedesktop.org/releases/X11R7.2/src/lib/
PKG_RELEASE:=2
PKG_VERSION:=0.9.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,27 +21,27 @@ define Package/libXrender
SECTION:=xorg-libraries
CATEGORY:=Xorg
SUBMENU:=libraries
DEPENDS:=+xorg-headers-native +util-macros +libX11 +libfreetype +zlib +xproto +libfontenc +xtrans +fontsproto +renderproto @DISPLAY_SUPPORT
DEPENDS:=+xorg-headers-native +util-macros +libfreetype +zlib +xproto +libfontenc +xtrans +fontsproto +renderproto @DISPLAY_SUPPORT
TITLE:=libXrender
URL:=http://xorg.freedesktop.org/
endef
define Build/InstallDev
DESTDIR=$(1) $(MAKE) -C $(PKG_BUILD_DIR)/ $(MAKE_FLAGS) install
DESTDIR=$(STAGING_DIR) $(MAKE) -C $(PKG_BUILD_DIR)/ $(MAKE_FLAGS) install
endef
ifeq (libXrender,libX11)
CONFIGURE_ARGS_XTRA=--without-xcb
CONFIGURE_ARGS+=--without-xcb
endif
define libX11/Compile
$(MAKE_VARS) \
$(MAKE) -C $(PKG_BUILD_DIR)/src/util CFLAGS="" LDFLAGS="" CC="cc" makekeys
$(MAKE) -C $(PKG_BUILD_DIR)/src/util CFLAGS="" LDFLAGS="" CC="cc" makekeys
endef
define libXt/Compile
$(MAKE_VARS) \
$(MAKE) -C $(PKG_BUILD_DIR)/util CFLAGS="" LDFLAGS="" CC="cc"
$(MAKE) -C $(PKG_BUILD_DIR)/util CFLAGS="" LDFLAGS="" CC="cc"
endef
define Build/Compile
@ -53,21 +53,12 @@ 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/libXrender/install/Default
$(INSTALL_DIR) $(1)/usr/lib
find $(PKG_INSTALL_DIR)/usr/lib/ -name lib*so* | $(XARGS) -I % -t cp -P % $(1)/usr/lib
find $(PKG_INSTALL_DIR)/usr/lib/ -name lib*so* | $(XARGS) -i -t cp -P {} $(1)/usr/lib
endef
define Package/libXrender/install
@ -80,8 +71,7 @@ define Package/libXaw/install
endef
define Build/InstallDev
$(INSTALL_DIR) $(1)
$(CP) $(PKG_INSTALL_DIR)/* $(1)/
$(CP) $(PKG_INSTALL_DIR)/* $(STAGING_DIR)
endef
$(eval $(call BuildPackage,libXrender))