added libXfixes and libXcursor

git-svn-id: svn://svn.openwrt.org/openwrt/packages@9228 3c298f89-4303-0410-b956-a3cf2f4a3e73

diff --git a/XOrg/lib/libXcursor/Makefile b/XOrg/lib/libXcursor/Makefile
new file mode 100644 (file)
index 0000000..7f4d88f
--- /dev/null
+++ b/XOrg/lib/libXcursor/Makefile
@@ -0,0 +1,86 @@
+# 
+# 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 
+include $(TOPDIR)/rules.mk
+
+PKG_BASE_NAME:=libXcursor
+PKG_NAME:=libXcursor
+PKG_RELEASE:=1
+PKG_VERSION:=X11R7.2-1.1.8
+PKG_SOURCE_URL:=http://xorg.freedesktop.org/releases/X11R7.2/src/lib/
+PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
+PKG_BUILD_DIR=$(BUILD_DIR)/Xorg/$(_CATEGORY)/${PKG_NAME}-$(PKG_VERSION)/
+
+include $(INCLUDE_DIR)/package.mk
+
+define Package/libXcursor
+  SECTION:=xorg-libraries
+  CATEGORY:=Xorg
+  SUBMENU:=libraries
+  DEPENDS:=+xorg-headers-native +libXrender +libXfixes @TARGET_x86
+  TITLE:=libXcursor
+  URL:=http://xorg.freedesktop.org/
+endef
+
+define Build/InstallDev
+       DESTDIR=$(1) $(MAKE) -C $(PKG_BUILD_DIR)/ $(MAKE_FLAGS) install
+endef
+
+ifeq (libXcursor,libX11)
+ CONFIGURE_ARGS_XTRA=--without-xcb
+endif
+
+define libX11/Compile
+       $(MAKE_VARS) \
+               $(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" 
+endef
+
+define Build/Compile
+       $(call $(PKG_NAME)/Compile)
+       make -C $(PKG_BUILD_DIR)
+       mkdir -p $(PKG_INSTALL_DIR)
+       DESTDIR=$(PKG_INSTALL_DIR) $(MAKE) -C $(PKG_BUILD_DIR) $(MAKE_FLAGS) install
+       find $(PKG_INSTALL_DIR) -name *.la | xargs rm -rf
+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 \
+       )
+endef
+
+define Package/libXcursor/install/Default
+       $(INSTALL_DIR) $(1)/usr/lib
+       find $(PKG_INSTALL_DIR)/usr/lib/ -name lib*so* | $(XARGS) -i -t cp -P {} $(1)/usr/lib 
+endef
+
+define Package/libXcursor/install
+       $(call Package/libXcursor/install/Default,$(1))
+endef
+
+define Package/libXaw/install
+       $(call Package/libXcursor/install/Default,$(1))
+       cd $(1)/usr/lib; rm -f libXaw.so.7 libXaw.so.6; ln -s libXaw7.so.7.0.0 libXaw.so.7; ln -s libXaw6.so.6.0.1 libXaw.so.6
+endef
+
+define Build/InstallDev
+       $(CP) $(PKG_INSTALL_DIR)/* $(1)
+endef
+
+$(eval $(call BuildPackage,libXcursor))

diff --git a/XOrg/lib/libXfixes/Makefile b/XOrg/lib/libXfixes/Makefile
new file mode 100644 (file)
index 0000000..11646dd
--- /dev/null
+++ b/XOrg/lib/libXfixes/Makefile
@@ -0,0 +1,86 @@
+# 
+# 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 
+include $(TOPDIR)/rules.mk
+
+PKG_BASE_NAME:=libXfixes
+PKG_NAME:=libXfixes
+PKG_RELEASE:=1
+PKG_VERSION:=X11R7.2-4.0.3
+PKG_SOURCE_URL:=http://xorg.freedesktop.org/releases/X11R7.2/src/lib/
+PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
+PKG_BUILD_DIR=$(BUILD_DIR)/Xorg/$(_CATEGORY)/${PKG_NAME}-$(PKG_VERSION)/
+
+include $(INCLUDE_DIR)/package.mk
+
+define Package/libXfixes
+  SECTION:=xorg-libraries
+  CATEGORY:=Xorg
+  SUBMENU:=libraries
+  DEPENDS:=+xorg-headers-native +util-macros  +libfreetype +zlib +xproto +libfontenc +xtrans +fontsproto +renderproto @TARGET_x86
+  TITLE:=libXfixes
+  URL:=http://xorg.freedesktop.org/
+endef
+
+define Build/InstallDev
+       DESTDIR=$(1) $(MAKE) -C $(PKG_BUILD_DIR)/ $(MAKE_FLAGS) install
+endef
+
+ifeq (libXfixes,libX11)
+ CONFIGURE_ARGS_XTRA=--without-xcb
+endif
+
+define libX11/Compile
+       $(MAKE_VARS) \
+               $(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" 
+endef
+
+define Build/Compile
+       $(call $(PKG_NAME)/Compile)
+       make -C $(PKG_BUILD_DIR)
+       mkdir -p $(PKG_INSTALL_DIR)
+       DESTDIR=$(PKG_INSTALL_DIR) $(MAKE) -C $(PKG_BUILD_DIR) $(MAKE_FLAGS) install
+       find $(PKG_INSTALL_DIR) -name *.la | xargs rm -rf
+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 \
+       )
+endef
+
+define Package/libXfixes/install/Default
+       $(INSTALL_DIR) $(1)/usr/lib
+       find $(PKG_INSTALL_DIR)/usr/lib/ -name lib*so* | $(XARGS) -i -t cp -P {} $(1)/usr/lib 
+endef
+
+define Package/libXfixes/install
+       $(call Package/libXfixes/install/Default,$(1))
+endef
+
+define Package/libXaw/install
+       $(call Package/libXfixes/install/Default,$(1))
+       cd $(1)/usr/lib; rm -f libXaw.so.7 libXaw.so.6; ln -s libXaw7.so.7.0.0 libXaw.so.7; ln -s libXaw6.so.6.0.1 libXaw.so.6
+endef
+
+define Build/InstallDev
+       $(CP) $(PKG_INSTALL_DIR)/* $(1)
+endef
+
+$(eval $(call BuildPackage,libXfixes))

diff --git a/XOrg/lib/packages b/XOrg/lib/packages
index ea6bb26..ab1edd8 100644 (file)
--- a/XOrg/lib/packages
+++ b/XOrg/lib/packages
@@ -19,3 +19,5 @@ libXmu-X11R7.2-1.0.3|
 libXpm-X11R7.2-3.5.6|
 libXvMC-X11R7.2-1.0.4|+libXext+videoproto+libXv
 libXv-X11R7.2-1.0.3|+libXext+videoproto
+libXcursor-X11R7.2-1.1.8|+libXrender+libXfixes
+libXfixes-X11R7.2-4.0.3|