Update XOrg packages to 7.3

author Lars-Peter Clausen <lars@metafoo.de>

Mon, 1 Sep 2008 21:31:52 +0000 (21:31 +0000)

committer Lars-Peter Clausen <lars@metafoo.de>

Mon, 1 Sep 2008 21:31:52 +0000 (21:31 +0000)
author Lars-Peter Clausen <lars@metafoo.de>
Mon, 1 Sep 2008 21:31:52 +0000 (21:31 +0000)
committer Lars-Peter Clausen <lars@metafoo.de>
Mon, 1 Sep 2008 21:31:52 +0000 (21:31 +0000)
diff --git a/XOrg/app/packages b/XOrg/app/packages

index df31465db46aefd4e270b651a23cef99aa92bb82..904bfa1e255bc8b902e35d09f7159a2b78b15ff3 100644 (file)
--- a/XOrg/app/packages
+++ b/XOrg/app/packages
@@ -1,9 +1,9 @@
-xinit-X11R7.2-1.0.3|
-xlogo-X11R7.0-1.0.1|
-xset-X11R7.1-1.0.2|
-xeyes-X11R7.0-1.0.1|
-xclipboard-X11R7.0-1.0.1|
-xcalc-X11R7.0-1.0.1|+font-misc-misc
-xdm-X11R7.2-1.1.3|
-xsetroot-X11R7.0-1.0.1|
-xmessage-X11R7.0-1.0.1|
+xcalc-1.0.2|+font-misc-misc
+xclipboard-1.0.1|
+xdm-1.1.6|
+xeyes-1.0.1|
+xinit-1.0.5|
+xlogo-1.0.1|
+xmessage-1.0.2|
+xset-1.0.3|
+xsetroot-1.0.2|
diff --git a/XOrg/app/template.mk b/XOrg/app/template.mk

index 38bad9a0c25dbf18aaac37c7f4e9a5d179aede42..d6d18690b295b3a46e07c417269dcc42a164fe25 100644 (file)
--- a/XOrg/app/template.mk
+++ b/XOrg/app/template.mk
@@ -10,9 +10,9 @@ include $(TOPDIR)/rules.mk
  
  PKG_BASE_NAME:=@BASE_NAME@
  PKG_NAME:=@NAME@
  
  PKG_BASE_NAME:=@BASE_NAME@
  PKG_NAME:=@NAME@
-PKG_RELEASE:=1
+PKG_RELEASE:=2
  PKG_VERSION:=@VER@
  PKG_VERSION:=@VER@
-PKG_SOURCE_URL:=http://xorg.freedesktop.org/releases/X11R7.2/src/app
+PKG_SOURCE_URL:=http://xorg.freedesktop.org/releases/X11R7.3/src/app
  PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
  PKG_BUILD_DIR=$(BUILD_DIR)/Xorg/$(_CATEGORY)/${PKG_NAME}-$(PKG_VERSION)/
  
  PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
  PKG_BUILD_DIR=$(BUILD_DIR)/Xorg/$(_CATEGORY)/${PKG_NAME}-$(PKG_VERSION)/
  
@@ -33,7 +33,7 @@ define Package/@NAME@
  endef
  
  define Build/InstallDev
  endef
  
  define Build/InstallDev
-       DESTDIR=$(STAGING_DIR) $(MAKE) -C $(PKG_BUILD_DIR)  $(MAKE_FLAGS) install
+       DESTDIR=$(1) $(MAKE) -C $(PKG_BUILD_DIR) $(MAKE_FLAGS) install
  endef
  
  ifeq (@NAME@,xdm)
  endef
  
  ifeq (@NAME@,xdm)
@@ -47,18 +47,6 @@ define Build/Compile
         make -C $(PKG_BUILD_DIR) DESTDIR=$(PKG_INSTALL_DIR) install
  endef
  
         make -C $(PKG_BUILD_DIR) DESTDIR=$(PKG_INSTALL_DIR) install
  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) ;\
-       fi \
-       )
-endef
-
  define Package/@NAME@/install
         $(INSTALL_DIR) $(1)
         $(CP) $(PKG_INSTALL_DIR)/* $(1)
  define Package/@NAME@/install
         $(INSTALL_DIR) $(1)
         $(CP) $(PKG_INSTALL_DIR)/* $(1)
diff --git a/XOrg/app/xcalc/Makefile b/XOrg/app/xcalc/Makefile

index 121ef4d1de3300465e44afa632c798de0b346fa4..7220d06efbd8a1d7ba4275299b09e8e08f515d02 100644 (file)
--- a/XOrg/app/xcalc/Makefile
+++ b/XOrg/app/xcalc/Makefile
@@ -10,9 +10,9 @@ include $(TOPDIR)/rules.mk
  
  PKG_BASE_NAME:=xcalc
  PKG_NAME:=xcalc
  
  PKG_BASE_NAME:=xcalc
  PKG_NAME:=xcalc
-PKG_RELEASE:=1
-PKG_VERSION:=X11R7.0-1.0.1
-PKG_SOURCE_URL:=http://xorg.freedesktop.org/releases/X11R7.2/src/app
+PKG_RELEASE:=2
+PKG_VERSION:=1.0.2
+PKG_SOURCE_URL:=http://xorg.freedesktop.org/releases/X11R7.3/src/app
  PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
  PKG_BUILD_DIR=$(BUILD_DIR)/Xorg/$(_CATEGORY)/${PKG_NAME}-$(PKG_VERSION)/
  
  PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
  PKG_BUILD_DIR=$(BUILD_DIR)/Xorg/$(_CATEGORY)/${PKG_NAME}-$(PKG_VERSION)/
  
@@ -33,7 +33,7 @@ define Package/xcalc
  endef
  
  define Build/InstallDev
  endef
  
  define Build/InstallDev
-       DESTDIR=$(1) $(MAKE) -C $(PKG_BUILD_DIR)  $(MAKE_FLAGS) install
+       DESTDIR=$(1) $(MAKE) -C $(PKG_BUILD_DIR) $(MAKE_FLAGS) install
  endef
  
  ifeq (xcalc,xdm)
  endef
  
  ifeq (xcalc,xdm)
@@ -47,18 +47,6 @@ define Build/Compile
         make -C $(PKG_BUILD_DIR) DESTDIR=$(PKG_INSTALL_DIR) install
  endef
  
         make -C $(PKG_BUILD_DIR) DESTDIR=$(PKG_INSTALL_DIR) install
  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) ;\
-       fi \
-       )
-endef
-
  define Package/xcalc/install
         $(INSTALL_DIR) $(1)
         $(CP) $(PKG_INSTALL_DIR)/* $(1)
  define Package/xcalc/install
         $(INSTALL_DIR) $(1)
         $(CP) $(PKG_INSTALL_DIR)/* $(1)
@@ -67,7 +55,7 @@ endef
  
  define Package/xinit/install
         $(INSTALL_DIR) $(1)/usr/bin
  
  define Package/xinit/install
         $(INSTALL_DIR) $(1)/usr/bin
-       $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/xinit $(1)/usr/bin/xinit
+       $(CP) $(PKG_INSTALL_DIR)/usr/bin/xinit $(1)/usr/bin/xinit
         cd $(1)/usr/bin/; ln -s xinit startx
  endef
  
         cd $(1)/usr/bin/; ln -s xinit startx
  endef
  
diff --git a/XOrg/app/xclipboard/Makefile b/XOrg/app/xclipboard/Makefile

index 18bc8b4ec03133d8658bfa5dbae127f5d001b77e..a09155c3dd10beba60d735ef58ff1ef2c4b79b5d 100644 (file)
--- a/XOrg/app/xclipboard/Makefile
+++ b/XOrg/app/xclipboard/Makefile
@@ -10,9 +10,9 @@ include $(TOPDIR)/rules.mk
  
  PKG_BASE_NAME:=xclipboard
  PKG_NAME:=xclipboard
  
  PKG_BASE_NAME:=xclipboard
  PKG_NAME:=xclipboard
-PKG_RELEASE:=1
-PKG_VERSION:=X11R7.0-1.0.1
-PKG_SOURCE_URL:=http://xorg.freedesktop.org/releases/X11R7.2/src/app
+PKG_RELEASE:=2
+PKG_VERSION:=1.0.1
+PKG_SOURCE_URL:=http://xorg.freedesktop.org/releases/X11R7.3/src/app
  PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
  PKG_BUILD_DIR=$(BUILD_DIR)/Xorg/$(_CATEGORY)/${PKG_NAME}-$(PKG_VERSION)/
  
  PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
  PKG_BUILD_DIR=$(BUILD_DIR)/Xorg/$(_CATEGORY)/${PKG_NAME}-$(PKG_VERSION)/
  
@@ -33,7 +33,7 @@ define Package/xclipboard
  endef
  
  define Build/InstallDev
  endef
  
  define Build/InstallDev
-       DESTDIR=$(1) $(MAKE) -C $(PKG_BUILD_DIR)  $(MAKE_FLAGS) install
+       DESTDIR=$(1) $(MAKE) -C $(PKG_BUILD_DIR) $(MAKE_FLAGS) install
  endef
  
  ifeq (xclipboard,xdm)
  endef
  
  ifeq (xclipboard,xdm)
@@ -47,18 +47,6 @@ define Build/Compile
         make -C $(PKG_BUILD_DIR) DESTDIR=$(PKG_INSTALL_DIR) install
  endef
  
         make -C $(PKG_BUILD_DIR) DESTDIR=$(PKG_INSTALL_DIR) install
  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) ;\
-       fi \
-       )
-endef
-
  define Package/xclipboard/install
         $(INSTALL_DIR) $(1)
         $(CP) $(PKG_INSTALL_DIR)/* $(1)
  define Package/xclipboard/install
         $(INSTALL_DIR) $(1)
         $(CP) $(PKG_INSTALL_DIR)/* $(1)
@@ -67,7 +55,7 @@ endef
  
  define Package/xinit/install
         $(INSTALL_DIR) $(1)/usr/bin
  
  define Package/xinit/install
         $(INSTALL_DIR) $(1)/usr/bin
-       $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/xinit $(1)/usr/bin/xinit
+       $(CP) $(PKG_INSTALL_DIR)/usr/bin/xinit $(1)/usr/bin/xinit
         cd $(1)/usr/bin/; ln -s xinit startx
  endef
  
         cd $(1)/usr/bin/; ln -s xinit startx
  endef
  
diff --git a/XOrg/app/xdm/Makefile b/XOrg/app/xdm/Makefile

index 61a603f10da455f8425ae4f38003b57017556d37..3b45e4dfe590291ff143549e2829a9b5749f2e1d 100644 (file)
--- a/XOrg/app/xdm/Makefile
+++ b/XOrg/app/xdm/Makefile
@@ -10,9 +10,9 @@ include $(TOPDIR)/rules.mk
  
  PKG_BASE_NAME:=xdm
  PKG_NAME:=xdm
  
  PKG_BASE_NAME:=xdm
  PKG_NAME:=xdm
-PKG_RELEASE:=1
-PKG_VERSION:=X11R7.2-1.1.3
-PKG_SOURCE_URL:=http://xorg.freedesktop.org/releases/X11R7.2/src/app
+PKG_RELEASE:=2
+PKG_VERSION:=1.1.6
+PKG_SOURCE_URL:=http://xorg.freedesktop.org/releases/X11R7.3/src/app
  PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
  PKG_BUILD_DIR=$(BUILD_DIR)/Xorg/$(_CATEGORY)/${PKG_NAME}-$(PKG_VERSION)/
  
  PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
  PKG_BUILD_DIR=$(BUILD_DIR)/Xorg/$(_CATEGORY)/${PKG_NAME}-$(PKG_VERSION)/
  
@@ -33,7 +33,7 @@ define Package/xdm
  endef
  
  define Build/InstallDev
  endef
  
  define Build/InstallDev
-       DESTDIR=$(1) $(MAKE) -C $(PKG_BUILD_DIR)  $(MAKE_FLAGS) install
+       DESTDIR=$(1) $(MAKE) -C $(PKG_BUILD_DIR) $(MAKE_FLAGS) install
  endef
  
  ifeq (xdm,xdm)
  endef
  
  ifeq (xdm,xdm)
@@ -47,18 +47,6 @@ define Build/Compile
         make -C $(PKG_BUILD_DIR) DESTDIR=$(PKG_INSTALL_DIR) install
  endef
  
         make -C $(PKG_BUILD_DIR) DESTDIR=$(PKG_INSTALL_DIR) install
  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) ;\
-       fi \
-       )
-endef
-
  define Package/xdm/install
         $(INSTALL_DIR) $(1)
         $(CP) $(PKG_INSTALL_DIR)/* $(1)
  define Package/xdm/install
         $(INSTALL_DIR) $(1)
         $(CP) $(PKG_INSTALL_DIR)/* $(1)
@@ -67,7 +55,7 @@ endef
  
  define Package/xinit/install
         $(INSTALL_DIR) $(1)/usr/bin
  
  define Package/xinit/install
         $(INSTALL_DIR) $(1)/usr/bin
-       $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/xinit $(1)/usr/bin/xinit
+       $(CP) $(PKG_INSTALL_DIR)/usr/bin/xinit $(1)/usr/bin/xinit
         cd $(1)/usr/bin/; ln -s xinit startx
  endef
  
         cd $(1)/usr/bin/; ln -s xinit startx
  endef
  
diff --git a/XOrg/app/xeyes/Makefile b/XOrg/app/xeyes/Makefile

index 4aeb787ca10b28cb8e848447ed5ae91d5b4ee9ac..3acc212eac0005a81cf85d3c0ebae026356e2c93 100644 (file)
--- a/XOrg/app/xeyes/Makefile
+++ b/XOrg/app/xeyes/Makefile
@@ -10,9 +10,9 @@ include $(TOPDIR)/rules.mk
  
  PKG_BASE_NAME:=xeyes
  PKG_NAME:=xeyes
  
  PKG_BASE_NAME:=xeyes
  PKG_NAME:=xeyes
-PKG_RELEASE:=1
-PKG_VERSION:=X11R7.0-1.0.1
-PKG_SOURCE_URL:=http://xorg.freedesktop.org/releases/X11R7.2/src/app
+PKG_RELEASE:=2
+PKG_VERSION:=1.0.1
+PKG_SOURCE_URL:=http://xorg.freedesktop.org/releases/X11R7.3/src/app
  PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
  PKG_BUILD_DIR=$(BUILD_DIR)/Xorg/$(_CATEGORY)/${PKG_NAME}-$(PKG_VERSION)/
  
  PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
  PKG_BUILD_DIR=$(BUILD_DIR)/Xorg/$(_CATEGORY)/${PKG_NAME}-$(PKG_VERSION)/
  
@@ -33,7 +33,7 @@ define Package/xeyes
  endef
  
  define Build/InstallDev
  endef
  
  define Build/InstallDev
-       DESTDIR=$(1) $(MAKE) -C $(PKG_BUILD_DIR)  $(MAKE_FLAGS) install
+       DESTDIR=$(1) $(MAKE) -C $(PKG_BUILD_DIR) $(MAKE_FLAGS) install
  endef
  
  ifeq (xeyes,xdm)
  endef
  
  ifeq (xeyes,xdm)
@@ -47,18 +47,6 @@ define Build/Compile
         make -C $(PKG_BUILD_DIR) DESTDIR=$(PKG_INSTALL_DIR) install
  endef
  
         make -C $(PKG_BUILD_DIR) DESTDIR=$(PKG_INSTALL_DIR) install
  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) ;\
-       fi \
-       )
-endef
-
  define Package/xeyes/install
         $(INSTALL_DIR) $(1)
         $(CP) $(PKG_INSTALL_DIR)/* $(1)
  define Package/xeyes/install
         $(INSTALL_DIR) $(1)
         $(CP) $(PKG_INSTALL_DIR)/* $(1)
@@ -67,7 +55,7 @@ endef
  
  define Package/xinit/install
         $(INSTALL_DIR) $(1)/usr/bin
  
  define Package/xinit/install
         $(INSTALL_DIR) $(1)/usr/bin
-       $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/xinit $(1)/usr/bin/xinit
+       $(CP) $(PKG_INSTALL_DIR)/usr/bin/xinit $(1)/usr/bin/xinit
         cd $(1)/usr/bin/; ln -s xinit startx
  endef
  
         cd $(1)/usr/bin/; ln -s xinit startx
  endef
  
diff --git a/XOrg/app/xinit/Makefile b/XOrg/app/xinit/Makefile

index db1c0ce3facbb6f640f6414bfaf87229d3d693bc..94d9bbb0597a524b60052b5fa95715dc9f338971 100644 (file)
--- a/XOrg/app/xinit/Makefile
+++ b/XOrg/app/xinit/Makefile
@@ -1,5 +1,5 @@
  # 
  # 
-# 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.
  #
  # This is free software, licensed under the GNU General Public License v2.
  # See /LICENSE for more information.
@@ -10,25 +10,30 @@ include $(TOPDIR)/rules.mk
  
  PKG_BASE_NAME:=xinit
  PKG_NAME:=xinit
  
  PKG_BASE_NAME:=xinit
  PKG_NAME:=xinit
-PKG_RELEASE:=1
-PKG_VERSION:=X11R7.2-1.0.3
-PKG_SOURCE_URL:=http://xorg.freedesktop.org/releases/X11R7.2/src/app
+PKG_RELEASE:=2
+PKG_VERSION:=1.0.5
+PKG_SOURCE_URL:=http://xorg.freedesktop.org/releases/X11R7.3/src/app
  PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
  PKG_BUILD_DIR=$(BUILD_DIR)/Xorg/$(_CATEGORY)/${PKG_NAME}-$(PKG_VERSION)/
  
  PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
  PKG_BUILD_DIR=$(BUILD_DIR)/Xorg/$(_CATEGORY)/${PKG_NAME}-$(PKG_VERSION)/
  
+_DEPEND:=
+ifneq (xinit,xinit)
+_DEPEND+=xorg-server-essentials
+endif
+
  include $(INCLUDE_DIR)/package.mk
  
  define Package/xinit
    SECTION:=xorg-app
    CATEGORY:=Xorg
    SUBMENU:=app
  include $(INCLUDE_DIR)/package.mk
  
  define Package/xinit
    SECTION:=xorg-app
    CATEGORY:=Xorg
    SUBMENU:=app
-  DEPENDS:=+libX11 @DISPLAY_SUPPORT
+  DEPENDS:=${_DEPEND} @DISPLAY_SUPPORT
    TITLE:=xinit
    URL:=http://xorg.freedesktop.org/
  endef
  
  define Build/InstallDev
    TITLE:=xinit
    URL:=http://xorg.freedesktop.org/
  endef
  
  define Build/InstallDev
-       DESTDIR=$(1) $(MAKE) -C $(PKG_BUILD_DIR)  $(MAKE_FLAGS) install
+       DESTDIR=$(1) $(MAKE) -C $(PKG_BUILD_DIR) $(MAKE_FLAGS) install
  endef
  
  ifeq (xinit,xdm)
  endef
  
  ifeq (xinit,xdm)
@@ -42,18 +47,6 @@ define Build/Compile
         make -C $(PKG_BUILD_DIR) DESTDIR=$(PKG_INSTALL_DIR) install
  endef
  
         make -C $(PKG_BUILD_DIR) DESTDIR=$(PKG_INSTALL_DIR) install
  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) ;\
-       fi \
-       )
-endef
-
  define Package/xinit/install
         $(INSTALL_DIR) $(1)
         $(CP) $(PKG_INSTALL_DIR)/* $(1)
  define Package/xinit/install
         $(INSTALL_DIR) $(1)
         $(CP) $(PKG_INSTALL_DIR)/* $(1)
@@ -62,8 +55,8 @@ endef
  
  define Package/xinit/install
         $(INSTALL_DIR) $(1)/usr/bin
  
  define Package/xinit/install
         $(INSTALL_DIR) $(1)/usr/bin
-       $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/xinit $(1)/usr/bin/xinit
-       cd $(1)/usr/bin/; ln -sf xinit startx
+       $(CP) $(PKG_INSTALL_DIR)/usr/bin/xinit $(1)/usr/bin/xinit
+       cd $(1)/usr/bin/; ln -s xinit startx
  endef
  
  $(eval $(call BuildPackage,xinit))
  endef
  
  $(eval $(call BuildPackage,xinit))
diff --git a/XOrg/app/xlogo/Makefile b/XOrg/app/xlogo/Makefile

index 6b78dd088999c7343193ae5bd780ea1845aab154..dbf4ddb54dcece0207664329e15679cf15303d36 100644 (file)
--- a/XOrg/app/xlogo/Makefile
+++ b/XOrg/app/xlogo/Makefile
@@ -10,9 +10,9 @@ include $(TOPDIR)/rules.mk
  
  PKG_BASE_NAME:=xlogo
  PKG_NAME:=xlogo
  
  PKG_BASE_NAME:=xlogo
  PKG_NAME:=xlogo
-PKG_RELEASE:=1
-PKG_VERSION:=X11R7.0-1.0.1
-PKG_SOURCE_URL:=http://xorg.freedesktop.org/releases/X11R7.2/src/app
+PKG_RELEASE:=2
+PKG_VERSION:=1.0.1
+PKG_SOURCE_URL:=http://xorg.freedesktop.org/releases/X11R7.3/src/app
  PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
  PKG_BUILD_DIR=$(BUILD_DIR)/Xorg/$(_CATEGORY)/${PKG_NAME}-$(PKG_VERSION)/
  
  PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
  PKG_BUILD_DIR=$(BUILD_DIR)/Xorg/$(_CATEGORY)/${PKG_NAME}-$(PKG_VERSION)/
  
@@ -33,7 +33,7 @@ define Package/xlogo
  endef
  
  define Build/InstallDev
  endef
  
  define Build/InstallDev
-       DESTDIR=$(1) $(MAKE) -C $(PKG_BUILD_DIR)  $(MAKE_FLAGS) install
+       DESTDIR=$(1) $(MAKE) -C $(PKG_BUILD_DIR) $(MAKE_FLAGS) install
  endef
  
  ifeq (xlogo,xdm)
  endef
  
  ifeq (xlogo,xdm)
@@ -47,18 +47,6 @@ define Build/Compile
         make -C $(PKG_BUILD_DIR) DESTDIR=$(PKG_INSTALL_DIR) install
  endef
  
         make -C $(PKG_BUILD_DIR) DESTDIR=$(PKG_INSTALL_DIR) install
  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) ;\
-       fi \
-       )
-endef
-
  define Package/xlogo/install
         $(INSTALL_DIR) $(1)
         $(CP) $(PKG_INSTALL_DIR)/* $(1)
  define Package/xlogo/install
         $(INSTALL_DIR) $(1)
         $(CP) $(PKG_INSTALL_DIR)/* $(1)
@@ -67,7 +55,7 @@ endef
  
  define Package/xinit/install
         $(INSTALL_DIR) $(1)/usr/bin
  
  define Package/xinit/install
         $(INSTALL_DIR) $(1)/usr/bin
-       $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/xinit $(1)/usr/bin/xinit
+       $(CP) $(PKG_INSTALL_DIR)/usr/bin/xinit $(1)/usr/bin/xinit
         cd $(1)/usr/bin/; ln -s xinit startx
  endef
  
         cd $(1)/usr/bin/; ln -s xinit startx
  endef
  
diff --git a/XOrg/app/xmessage/Makefile b/XOrg/app/xmessage/Makefile

index d34f2a185de65d1ab56bbf537741a3c058e691e1..91f17f0299a894e719a4fc79fe58a1dbb715eff0 100644 (file)
--- a/XOrg/app/xmessage/Makefile
+++ b/XOrg/app/xmessage/Makefile
@@ -10,9 +10,9 @@ include $(TOPDIR)/rules.mk
  
  PKG_BASE_NAME:=xmessage
  PKG_NAME:=xmessage
  
  PKG_BASE_NAME:=xmessage
  PKG_NAME:=xmessage
-PKG_RELEASE:=1
-PKG_VERSION:=X11R7.0-1.0.1
-PKG_SOURCE_URL:=http://xorg.freedesktop.org/releases/X11R7.2/src/app
+PKG_RELEASE:=2
+PKG_VERSION:=1.0.2
+PKG_SOURCE_URL:=http://xorg.freedesktop.org/releases/X11R7.3/src/app
  PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
  PKG_BUILD_DIR=$(BUILD_DIR)/Xorg/$(_CATEGORY)/${PKG_NAME}-$(PKG_VERSION)/
  
  PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
  PKG_BUILD_DIR=$(BUILD_DIR)/Xorg/$(_CATEGORY)/${PKG_NAME}-$(PKG_VERSION)/
  
@@ -33,7 +33,7 @@ define Package/xmessage
  endef
  
  define Build/InstallDev
  endef
  
  define Build/InstallDev
-       DESTDIR=$(1) $(MAKE) -C $(PKG_BUILD_DIR)  $(MAKE_FLAGS) install
+       DESTDIR=$(1) $(MAKE) -C $(PKG_BUILD_DIR) $(MAKE_FLAGS) install
  endef
  
  ifeq (xmessage,xdm)
  endef
  
  ifeq (xmessage,xdm)
@@ -47,18 +47,6 @@ define Build/Compile
         make -C $(PKG_BUILD_DIR) DESTDIR=$(PKG_INSTALL_DIR) install
  endef
  
         make -C $(PKG_BUILD_DIR) DESTDIR=$(PKG_INSTALL_DIR) install
  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) ;\
-       fi \
-       )
-endef
-
  define Package/xmessage/install
         $(INSTALL_DIR) $(1)
         $(CP) $(PKG_INSTALL_DIR)/* $(1)
  define Package/xmessage/install
         $(INSTALL_DIR) $(1)
         $(CP) $(PKG_INSTALL_DIR)/* $(1)
@@ -67,7 +55,7 @@ endef
  
  define Package/xinit/install
         $(INSTALL_DIR) $(1)/usr/bin
  
  define Package/xinit/install
         $(INSTALL_DIR) $(1)/usr/bin
-       $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/xinit $(1)/usr/bin/xinit
+       $(CP) $(PKG_INSTALL_DIR)/usr/bin/xinit $(1)/usr/bin/xinit
         cd $(1)/usr/bin/; ln -s xinit startx
  endef
  
         cd $(1)/usr/bin/; ln -s xinit startx
  endef
  
diff --git a/XOrg/app/xset/Makefile b/XOrg/app/xset/Makefile

index 8538210f038f7b1df3fdad089947b9bde37a1cb1..bad4d2a71f5cd86a0d20fa23cc89afd291bdff55 100644 (file)
--- a/XOrg/app/xset/Makefile
+++ b/XOrg/app/xset/Makefile
@@ -10,9 +10,9 @@ include $(TOPDIR)/rules.mk
  
  PKG_BASE_NAME:=xset
  PKG_NAME:=xset
  
  PKG_BASE_NAME:=xset
  PKG_NAME:=xset
-PKG_RELEASE:=1
-PKG_VERSION:=X11R7.1-1.0.2
-PKG_SOURCE_URL:=http://xorg.freedesktop.org/releases/X11R7.2/src/app
+PKG_RELEASE:=2
+PKG_VERSION:=1.0.3
+PKG_SOURCE_URL:=http://xorg.freedesktop.org/releases/X11R7.3/src/app
  PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
  PKG_BUILD_DIR=$(BUILD_DIR)/Xorg/$(_CATEGORY)/${PKG_NAME}-$(PKG_VERSION)/
  
  PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
  PKG_BUILD_DIR=$(BUILD_DIR)/Xorg/$(_CATEGORY)/${PKG_NAME}-$(PKG_VERSION)/
  
@@ -33,7 +33,7 @@ define Package/xset
  endef
  
  define Build/InstallDev
  endef
  
  define Build/InstallDev
-       DESTDIR=$(1) $(MAKE) -C $(PKG_BUILD_DIR)  $(MAKE_FLAGS) install
+       DESTDIR=$(1) $(MAKE) -C $(PKG_BUILD_DIR) $(MAKE_FLAGS) install
  endef
  
  ifeq (xset,xdm)
  endef
  
  ifeq (xset,xdm)
@@ -47,18 +47,6 @@ define Build/Compile
         make -C $(PKG_BUILD_DIR) DESTDIR=$(PKG_INSTALL_DIR) install
  endef
  
         make -C $(PKG_BUILD_DIR) DESTDIR=$(PKG_INSTALL_DIR) install
  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) ;\
-       fi \
-       )
-endef
-
  define Package/xset/install
         $(INSTALL_DIR) $(1)
         $(CP) $(PKG_INSTALL_DIR)/* $(1)
  define Package/xset/install
         $(INSTALL_DIR) $(1)
         $(CP) $(PKG_INSTALL_DIR)/* $(1)
@@ -67,7 +55,7 @@ endef
  
  define Package/xinit/install
         $(INSTALL_DIR) $(1)/usr/bin
  
  define Package/xinit/install
         $(INSTALL_DIR) $(1)/usr/bin
-       $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/xinit $(1)/usr/bin/xinit
+       $(CP) $(PKG_INSTALL_DIR)/usr/bin/xinit $(1)/usr/bin/xinit
         cd $(1)/usr/bin/; ln -s xinit startx
  endef
  
         cd $(1)/usr/bin/; ln -s xinit startx
  endef
  
diff --git a/XOrg/app/xsetroot/Makefile b/XOrg/app/xsetroot/Makefile

index bc4f0e946c3dd23f1d686c85ad9043cab7c6f20a..ea2a64a6531740fb0b941e8c3c0523eb7fada0d0 100644 (file)
--- a/XOrg/app/xsetroot/Makefile
+++ b/XOrg/app/xsetroot/Makefile
@@ -10,9 +10,9 @@ include $(TOPDIR)/rules.mk
  
  PKG_BASE_NAME:=xsetroot
  PKG_NAME:=xsetroot
  
  PKG_BASE_NAME:=xsetroot
  PKG_NAME:=xsetroot
-PKG_RELEASE:=1
-PKG_VERSION:=X11R7.0-1.0.1
-PKG_SOURCE_URL:=http://xorg.freedesktop.org/releases/X11R7.2/src/app
+PKG_RELEASE:=2
+PKG_VERSION:=1.0.2
+PKG_SOURCE_URL:=http://xorg.freedesktop.org/releases/X11R7.3/src/app
  PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
  PKG_BUILD_DIR=$(BUILD_DIR)/Xorg/$(_CATEGORY)/${PKG_NAME}-$(PKG_VERSION)/
  
  PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
  PKG_BUILD_DIR=$(BUILD_DIR)/Xorg/$(_CATEGORY)/${PKG_NAME}-$(PKG_VERSION)/
  
@@ -27,13 +27,13 @@ define Package/xsetroot
    SECTION:=xorg-app
    CATEGORY:=Xorg
    SUBMENU:=app
    SECTION:=xorg-app
    CATEGORY:=Xorg
    SUBMENU:=app
-  DEPENDS:=${_DEPEND} +xbitmaps @DISPLAY_SUPPORT
+  DEPENDS:=${_DEPEND} @DISPLAY_SUPPORT
    TITLE:=xsetroot
    URL:=http://xorg.freedesktop.org/
  endef
  
  define Build/InstallDev
    TITLE:=xsetroot
    URL:=http://xorg.freedesktop.org/
  endef
  
  define Build/InstallDev
-       DESTDIR=$(1) $(MAKE) -C $(PKG_BUILD_DIR)  $(MAKE_FLAGS) install
+       DESTDIR=$(1) $(MAKE) -C $(PKG_BUILD_DIR) $(MAKE_FLAGS) install
  endef
  
  ifeq (xsetroot,xdm)
  endef
  
  ifeq (xsetroot,xdm)
@@ -47,18 +47,6 @@ define Build/Compile
         make -C $(PKG_BUILD_DIR) DESTDIR=$(PKG_INSTALL_DIR) install
  endef
  
         make -C $(PKG_BUILD_DIR) DESTDIR=$(PKG_INSTALL_DIR) install
  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) ;\
-       fi \
-       )
-endef
-
  define Package/xsetroot/install
         $(INSTALL_DIR) $(1)
         $(CP) $(PKG_INSTALL_DIR)/* $(1)
  define Package/xsetroot/install
         $(INSTALL_DIR) $(1)
         $(CP) $(PKG_INSTALL_DIR)/* $(1)
@@ -67,7 +55,7 @@ endef
  
  define Package/xinit/install
         $(INSTALL_DIR) $(1)/usr/bin
  
  define Package/xinit/install
         $(INSTALL_DIR) $(1)/usr/bin
-       $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/xinit $(1)/usr/bin/xinit
+       $(CP) $(PKG_INSTALL_DIR)/usr/bin/xinit $(1)/usr/bin/xinit
         cd $(1)/usr/bin/; ln -s xinit startx
  endef
  
         cd $(1)/usr/bin/; ln -s xinit startx
  endef
  
diff --git a/XOrg/data/xbitmaps/Makefile b/XOrg/data/xbitmaps/Makefile

index fdcb95a9292dff488e2ea7c973290cf36a3f52a0..7c7ccb1c8b070e7b48bf1c36973d9ab98691f8c6 100644 (file)
--- a/XOrg/data/xbitmaps/Makefile
+++ b/XOrg/data/xbitmaps/Makefile
@@ -9,8 +9,8 @@ include $(TOPDIR)/rules.mk
  PKG_BASE_NAME:=xbitmaps
  PKG_NAME:=xbitmaps
  PKG_RELEASE:=1
  PKG_BASE_NAME:=xbitmaps
  PKG_NAME:=xbitmaps
  PKG_RELEASE:=1
-PKG_VERSION:=X11R7.0-1.0.1
-PKG_SOURCE_URL:=http://xorg.freedesktop.org/releases/X11R7.2/src/data/
+PKG_VERSION:=1.0.1
+PKG_SOURCE_URL:=http://xorg.freedesktop.org/releases/X11R7.3/src/data/
  PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
  PKG_BUILD_DIR=$(BUILD_DIR)/Xorg/$(_CATEGORY)/${PKG_NAME}-$(PKG_VERSION)/
  
  PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
  PKG_BUILD_DIR=$(BUILD_DIR)/Xorg/$(_CATEGORY)/${PKG_NAME}-$(PKG_VERSION)/
  
diff --git a/XOrg/driver/packages b/XOrg/driver/packages

index f140c8aae4da9244bc46931f04b37c2e62bbaa7b..8c4f393ae3e9e9847f605d269c306f0cec05b8e9 100644 (file)
--- a/XOrg/driver/packages
+++ b/XOrg/driver/packages
@@ -1,10 +1,9 @@
-xf86-input-evdev-X11R7.1-1.1.2|
-xf86-input-keyboard-X11R7.2-1.1.1|
-xf86-input-mouse-X11R7.2-1.1.2|
-xf86-input-mouse-X11R7.2-1.1.2|
-xf86-video-fbdev-X11R7.2-0.3.1|
-xf86-video-vesa-X11R7.2-1.3.0|
-xf86-video-vga-X11R7.1-4.1.0|
-xf86-video-i810-X11R7.2-1.6.5|+libXvMC
-xf86-video-nv-X11R7.2-1.2.2.1|
-xf86-video-ati-X11R7.2-6.6.3|
+xf86-input-evdev-1.1.2|
+xf86-input-keyboard-1.2.2|
+xf86-input-mouse-1.2.2|
+xf86-video-fbdev-0.3.1|
+xf86-video-vesa-1.3.0|
+xf86-video-vga-4.1.0|
+xf86-video-intel-2.1.1|
+xf86-video-nv-2.1.3|
+xf86-video-ati-6.6.3|@BROKEN
diff --git a/XOrg/driver/patches/xf86-input-evdev/001-fix-compile.patch b/XOrg/driver/patches/xf86-input-evdev/001-fix-compile.patch

new file mode 100644 (file)

index 0000000..adf20d1
--- /dev/null
+++ b/XOrg/driver/patches/xf86-input-evdev/001-fix-compile.patch
@@ -0,0 +1,46 @@
+--- xf86-input-evdev-1.1.2.orig/src/evdev.c.orig       2008-08-17 19:24:37.000000000 +0200
++++ xf86-input-evdev-1.1.2/src/evdev.c 2008-08-17 19:33:40.000000000 +0200
+@@ -234,10 +234,6 @@
+           else
+               return !Success;
+           break;
+-      case SendCoreEvents:
+-      case DontSendCoreEvents:
+-          xf86XInputSetSendCoreEvents (pInfo, (mode == SendCoreEvents));
+-          break;
+       default:
+           return !Success;
+     }
+@@ -264,7 +260,9 @@
+     pInfo->device_control = EvdevProc;
+     pInfo->read_input = EvdevReadInput;
+     pInfo->switch_mode = EvdevSwitchMode;
++#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) == 0
+     pInfo->motion_history_proc = xf86GetMotionEvents;
++#endif
+     pInfo->conf_idev = driver->dev;
+ 
+     pInfo->private = device;
+@@ -451,8 +449,6 @@
+     0
+ };
+ 
+-#ifdef XFree86LOADER
+-
+ static void
+ EvdevUnplug(pointer   p)
+ {
+@@ -474,7 +470,7 @@
+     MODULEVENDORSTRING,
+     MODINFOSTRING1,
+     MODINFOSTRING2,
+-    0, /* Missing from SDK: XORG_VERSION_CURRENT, */
++    XORG_VERSION_CURRENT,
+     1, 1, 0,
+     ABI_CLASS_XINPUT,
+     ABI_XINPUT_VERSION,
+@@ -488,4 +484,3 @@
+     EvdevPlug,
+     EvdevUnplug
+ };
+-#endif /* XFree86LOADER */
diff --git a/XOrg/driver/patches/xf86-input-evdev/002-mipointer-fix.patch b/XOrg/driver/patches/xf86-input-evdev/002-mipointer-fix.patch

new file mode 100644 (file)

index 0000000..5397577
--- /dev/null
+++ b/XOrg/driver/patches/xf86-input-evdev/002-mipointer-fix.patch
@@ -0,0 +1,30 @@
+diff -urN xf86-input-evdev-1.1.2.orig/src/evdev_axes.c xf86-input-evdev-1.1.2/src/evdev_axes.c
+--- xf86-input-evdev-1.1.2.orig/src/evdev_axes.c       2008-08-28 10:59:09.000000000 +0200
++++ xf86-input-evdev-1.1.2/src/evdev_axes.c    2008-08-28 10:55:52.000000000 +0200
+@@ -532,8 +532,14 @@
+       return Success;
+ 
+     if (!InitValuatorClassDeviceStruct(device, axes,
++#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) >= 1
++                                       GetMotionHistroy(),
++                                       GetMotionHistorSize(),
++#else
+                                        miPointerGetMotionEvents,
++                                       miPointerGetMotionBufferSize(),
++#endif
++                                       0))
+-                                       miPointerGetMotionBufferSize(), 0))
+         return !Success;
+ 
+     for (i = 0; i < axes; i++) {
+@@ -543,8 +549,9 @@
+ 
+     if (!InitPtrFeedbackClassDeviceStruct(device, EvdevPtrCtrlProc))
+         return !Success;
++#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) == 0
+-
+     xf86MotionHistoryAllocate (pInfo);
++#endif
+ 
+     return Success;
+ }
diff --git a/XOrg/driver/patches/xf86-video-i810/100-sdkdir.patch b/XOrg/driver/patches/xf86-video-i810/100-sdkdir.patch

deleted file mode 100644 (file)

index 1300a6a..0000000
--- a/XOrg/driver/patches/xf86-video-i810/100-sdkdir.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff -urN xf86-video-i810-X11R7.2-1.6.5.orig/configure.ac xf86-video-i810-X11R7.2-1.6.5/configure.ac
---- xf86-video-i810-X11R7.2-1.6.5.orig/configure.ac    2007-09-21 03:54:25.000000000 +0200
-+++ xf86-video-i810-X11R7.2-1.6.5/configure.ac 2007-09-21 03:55:08.000000000 +0200
-@@ -72,7 +72,8 @@
- 
- # Checks for pkg-config packages
- PKG_CHECK_MODULES(XORG, [xorg-server xproto xvmc fontsproto $REQUIRED_MODULES])
--sdkdir=$(pkg-config --variable=sdkdir xorg-server)
-+sdkdir=${SDKDIR}
-+#$(pkg-config --variable=sdkdir xorg-server)
- 
- # Checks for libraries.
- 
diff --git a/XOrg/driver/template.mk b/XOrg/driver/template.mk

index f54a2ef4ab97de3de68c549adfa37b5579f1b8f5..8375888dbca5be9944f38c2858c8eab19b47a521 100644 (file)
--- a/XOrg/driver/template.mk
+++ b/XOrg/driver/template.mk
@@ -9,9 +9,9 @@ include $(TOPDIR)/rules.mk
  
  PKG_BASE_NAME:=@BASE_NAME@
  PKG_NAME:=@NAME@
  
  PKG_BASE_NAME:=@BASE_NAME@
  PKG_NAME:=@NAME@
-PKG_RELEASE:=1
+PKG_RELEASE:=2
  PKG_VERSION:=@VER@
  PKG_VERSION:=@VER@
-PKG_SOURCE_URL:=http://xorg.freedesktop.org/releases/X11R7.2/src/driver
+PKG_SOURCE_URL:=http://xorg.freedesktop.org/releases/X11R7.3/src/driver
  PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
  PKG_BUILD_DIR=$(BUILD_DIR)/Xorg/$(_CATEGORY)/${PKG_NAME}-$(PKG_VERSION)/
  
  PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
  PKG_BUILD_DIR=$(BUILD_DIR)/Xorg/$(_CATEGORY)/${PKG_NAME}-$(PKG_VERSION)/
  
@@ -46,7 +46,7 @@ define Build/Configure
         (cd $(PKG_BUILD_DIR)/$(CONFIGURE_PATH); \
         if [ -x $(CONFIGURE_CMD) ]; then \
                 $(CP) $(SCRIPT_DIR)/config.{guess,sub} $(PKG_BUILD_DIR)/ && \
         (cd $(PKG_BUILD_DIR)/$(CONFIGURE_PATH); \
         if [ -x $(CONFIGURE_CMD) ]; then \
                 $(CP) $(SCRIPT_DIR)/config.{guess,sub} $(PKG_BUILD_DIR)/ && \
-               $(foreach a,dri.h sarea.h dristruct.h exa.h,export ac_cv_file_$(call acvar,$(STAGING_DIR)/usr/include/xorg/$(a))=yes;) \
+               $(foreach a,dri.h sarea.h dristruct.h exa.h damage.h,export ac_cv_file_$(call acvar,$(STAGING_DIR)/usr/include/xorg/$(a))=yes;) \
                 sed -i "s|sdkdir=.*|sdkdir=$(STAGING_DIR)/usr/include/xorg|g" $(PKG_BUILD_DIR)/configure ;\
                 $(CONFIGURE_VARS) \
                 $(CONFIGURE_CMD) \
                 sed -i "s|sdkdir=.*|sdkdir=$(STAGING_DIR)/usr/include/xorg|g" $(PKG_BUILD_DIR)/configure ;\
                 $(CONFIGURE_VARS) \
                 $(CONFIGURE_CMD) \
diff --git a/XOrg/driver/xf86-input-evdev/Makefile b/XOrg/driver/xf86-input-evdev/Makefile

index d9fd56cd984dee164d5bcb699b245d8fddb83974..7d739d7175f4d051d0f60ae5967f89b08811bc03 100644 (file)
--- a/XOrg/driver/xf86-input-evdev/Makefile
+++ b/XOrg/driver/xf86-input-evdev/Makefile
@@ -9,9 +9,9 @@ include $(TOPDIR)/rules.mk
  
  PKG_BASE_NAME:=xf86
  PKG_NAME:=xf86-input-evdev
  
  PKG_BASE_NAME:=xf86
  PKG_NAME:=xf86-input-evdev
-PKG_RELEASE:=1
-PKG_VERSION:=X11R7.1-1.1.2
-PKG_SOURCE_URL:=http://xorg.freedesktop.org/releases/X11R7.2/src/driver
+PKG_RELEASE:=2
+PKG_VERSION:=1.1.2
+PKG_SOURCE_URL:=http://xorg.freedesktop.org/releases/X11R7.3/src/driver
  PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
  PKG_BUILD_DIR=$(BUILD_DIR)/Xorg/$(_CATEGORY)/${PKG_NAME}-$(PKG_VERSION)/
  
  PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
  PKG_BUILD_DIR=$(BUILD_DIR)/Xorg/$(_CATEGORY)/${PKG_NAME}-$(PKG_VERSION)/
  
@@ -27,7 +27,7 @@ define Package/xf86-input-evdev
  endef
  
  define Build/InstallDev
  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
  
  EXTRA_CPPFLAGS= -I$(STAGING_DIR)/usr/include/xorg \
  endef
  
  EXTRA_CPPFLAGS= -I$(STAGING_DIR)/usr/include/xorg \
@@ -46,7 +46,7 @@ define Build/Configure
         (cd $(PKG_BUILD_DIR)/$(CONFIGURE_PATH); \
         if [ -x $(CONFIGURE_CMD) ]; then \
                 $(CP) $(SCRIPT_DIR)/config.{guess,sub} $(PKG_BUILD_DIR)/ && \
         (cd $(PKG_BUILD_DIR)/$(CONFIGURE_PATH); \
         if [ -x $(CONFIGURE_CMD) ]; then \
                 $(CP) $(SCRIPT_DIR)/config.{guess,sub} $(PKG_BUILD_DIR)/ && \
-               $(foreach a,dri.h sarea.h dristruct.h exa.h,export ac_cv_file_$(call acvar,$(STAGING_DIR)/usr/include/xorg/$(a))=yes;) \
+               $(foreach a,dri.h sarea.h dristruct.h exa.h damage.h,export ac_cv_file_$(call acvar,$(STAGING_DIR)/usr/include/xorg/$(a))=yes;) \
                 sed -i "s|sdkdir=.*|sdkdir=$(STAGING_DIR)/usr/include/xorg|g" $(PKG_BUILD_DIR)/configure ;\
                 $(CONFIGURE_VARS) \
                 $(CONFIGURE_CMD) \
                 sed -i "s|sdkdir=.*|sdkdir=$(STAGING_DIR)/usr/include/xorg|g" $(PKG_BUILD_DIR)/configure ;\
                 $(CONFIGURE_VARS) \
                 $(CONFIGURE_CMD) \
diff --git a/XOrg/driver/xf86-input-evdev/patches/001-fix-compile.patch b/XOrg/driver/xf86-input-evdev/patches/001-fix-compile.patch

new file mode 100644 (file)

index 0000000..adf20d1
--- /dev/null
+++ b/XOrg/driver/xf86-input-evdev/patches/001-fix-compile.patch
@@ -0,0 +1,46 @@
+--- xf86-input-evdev-1.1.2.orig/src/evdev.c.orig       2008-08-17 19:24:37.000000000 +0200
++++ xf86-input-evdev-1.1.2/src/evdev.c 2008-08-17 19:33:40.000000000 +0200
+@@ -234,10 +234,6 @@
+           else
+               return !Success;
+           break;
+-      case SendCoreEvents:
+-      case DontSendCoreEvents:
+-          xf86XInputSetSendCoreEvents (pInfo, (mode == SendCoreEvents));
+-          break;
+       default:
+           return !Success;
+     }
+@@ -264,7 +260,9 @@
+     pInfo->device_control = EvdevProc;
+     pInfo->read_input = EvdevReadInput;
+     pInfo->switch_mode = EvdevSwitchMode;
++#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) == 0
+     pInfo->motion_history_proc = xf86GetMotionEvents;
++#endif
+     pInfo->conf_idev = driver->dev;
+ 
+     pInfo->private = device;
+@@ -451,8 +449,6 @@
+     0
+ };
+ 
+-#ifdef XFree86LOADER
+-
+ static void
+ EvdevUnplug(pointer   p)
+ {
+@@ -474,7 +470,7 @@
+     MODULEVENDORSTRING,
+     MODINFOSTRING1,
+     MODINFOSTRING2,
+-    0, /* Missing from SDK: XORG_VERSION_CURRENT, */
++    XORG_VERSION_CURRENT,
+     1, 1, 0,
+     ABI_CLASS_XINPUT,
+     ABI_XINPUT_VERSION,
+@@ -488,4 +484,3 @@
+     EvdevPlug,
+     EvdevUnplug
+ };
+-#endif /* XFree86LOADER */
diff --git a/XOrg/driver/xf86-input-evdev/patches/002-mipointer-fix.patch b/XOrg/driver/xf86-input-evdev/patches/002-mipointer-fix.patch

new file mode 100644 (file)

index 0000000..5397577
--- /dev/null
+++ b/XOrg/driver/xf86-input-evdev/patches/002-mipointer-fix.patch
@@ -0,0 +1,30 @@
+diff -urN xf86-input-evdev-1.1.2.orig/src/evdev_axes.c xf86-input-evdev-1.1.2/src/evdev_axes.c
+--- xf86-input-evdev-1.1.2.orig/src/evdev_axes.c       2008-08-28 10:59:09.000000000 +0200
++++ xf86-input-evdev-1.1.2/src/evdev_axes.c    2008-08-28 10:55:52.000000000 +0200
+@@ -532,8 +532,14 @@
+       return Success;
+ 
+     if (!InitValuatorClassDeviceStruct(device, axes,
++#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) >= 1
++                                       GetMotionHistroy(),
++                                       GetMotionHistorSize(),
++#else
+                                        miPointerGetMotionEvents,
++                                       miPointerGetMotionBufferSize(),
++#endif
++                                       0))
+-                                       miPointerGetMotionBufferSize(), 0))
+         return !Success;
+ 
+     for (i = 0; i < axes; i++) {
+@@ -543,8 +549,9 @@
+ 
+     if (!InitPtrFeedbackClassDeviceStruct(device, EvdevPtrCtrlProc))
+         return !Success;
++#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) == 0
+-
+     xf86MotionHistoryAllocate (pInfo);
++#endif
+ 
+     return Success;
+ }
diff --git a/XOrg/driver/xf86-input-keyboard/Makefile b/XOrg/driver/xf86-input-keyboard/Makefile

index 32256387358befbc1c611e5552ccd123539a875a..461e23df57b415329d0f4cf6ff3b024977a20820 100644 (file)
--- a/XOrg/driver/xf86-input-keyboard/Makefile
+++ b/XOrg/driver/xf86-input-keyboard/Makefile
@@ -9,9 +9,9 @@ include $(TOPDIR)/rules.mk
  
  PKG_BASE_NAME:=xf86
  PKG_NAME:=xf86-input-keyboard
  
  PKG_BASE_NAME:=xf86
  PKG_NAME:=xf86-input-keyboard
-PKG_RELEASE:=1
-PKG_VERSION:=X11R7.2-1.1.1
-PKG_SOURCE_URL:=http://xorg.freedesktop.org/releases/X11R7.2/src/driver
+PKG_RELEASE:=2
+PKG_VERSION:=1.2.2
+PKG_SOURCE_URL:=http://xorg.freedesktop.org/releases/X11R7.3/src/driver
  PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
  PKG_BUILD_DIR=$(BUILD_DIR)/Xorg/$(_CATEGORY)/${PKG_NAME}-$(PKG_VERSION)/
  
  PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
  PKG_BUILD_DIR=$(BUILD_DIR)/Xorg/$(_CATEGORY)/${PKG_NAME}-$(PKG_VERSION)/
  
@@ -27,7 +27,7 @@ define Package/xf86-input-keyboard
  endef
  
  define Build/InstallDev
  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
  
  EXTRA_CPPFLAGS= -I$(STAGING_DIR)/usr/include/xorg \
  endef
  
  EXTRA_CPPFLAGS= -I$(STAGING_DIR)/usr/include/xorg \
@@ -46,7 +46,7 @@ define Build/Configure
         (cd $(PKG_BUILD_DIR)/$(CONFIGURE_PATH); \
         if [ -x $(CONFIGURE_CMD) ]; then \
                 $(CP) $(SCRIPT_DIR)/config.{guess,sub} $(PKG_BUILD_DIR)/ && \
         (cd $(PKG_BUILD_DIR)/$(CONFIGURE_PATH); \
         if [ -x $(CONFIGURE_CMD) ]; then \
                 $(CP) $(SCRIPT_DIR)/config.{guess,sub} $(PKG_BUILD_DIR)/ && \
-               $(foreach a,dri.h sarea.h dristruct.h exa.h,export ac_cv_file_$(call acvar,$(STAGING_DIR)/usr/include/xorg/$(a))=yes;) \
+               $(foreach a,dri.h sarea.h dristruct.h exa.h damage.h,export ac_cv_file_$(call acvar,$(STAGING_DIR)/usr/include/xorg/$(a))=yes;) \
                 sed -i "s|sdkdir=.*|sdkdir=$(STAGING_DIR)/usr/include/xorg|g" $(PKG_BUILD_DIR)/configure ;\
                 $(CONFIGURE_VARS) \
                 $(CONFIGURE_CMD) \
                 sed -i "s|sdkdir=.*|sdkdir=$(STAGING_DIR)/usr/include/xorg|g" $(PKG_BUILD_DIR)/configure ;\
                 $(CONFIGURE_VARS) \
                 $(CONFIGURE_CMD) \
diff --git a/XOrg/driver/xf86-input-mouse/Makefile b/XOrg/driver/xf86-input-mouse/Makefile

index 52a515979d85bee35539ba9dc0e545ad61fdb174..17200ffafabbc6527ed9fe334c7d8c8c9db3dc38 100644 (file)
--- a/XOrg/driver/xf86-input-mouse/Makefile
+++ b/XOrg/driver/xf86-input-mouse/Makefile
@@ -9,9 +9,9 @@ include $(TOPDIR)/rules.mk
  
  PKG_BASE_NAME:=xf86
  PKG_NAME:=xf86-input-mouse
  
  PKG_BASE_NAME:=xf86
  PKG_NAME:=xf86-input-mouse
-PKG_RELEASE:=1
-PKG_VERSION:=X11R7.2-1.1.2
-PKG_SOURCE_URL:=http://xorg.freedesktop.org/releases/X11R7.2/src/driver
+PKG_RELEASE:=2
+PKG_VERSION:=1.2.2
+PKG_SOURCE_URL:=http://xorg.freedesktop.org/releases/X11R7.3/src/driver
  PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
  PKG_BUILD_DIR=$(BUILD_DIR)/Xorg/$(_CATEGORY)/${PKG_NAME}-$(PKG_VERSION)/
  
  PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
  PKG_BUILD_DIR=$(BUILD_DIR)/Xorg/$(_CATEGORY)/${PKG_NAME}-$(PKG_VERSION)/
  
@@ -27,7 +27,7 @@ define Package/xf86-input-mouse
  endef
  
  define Build/InstallDev
  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
  
  EXTRA_CPPFLAGS= -I$(STAGING_DIR)/usr/include/xorg \
  endef
  
  EXTRA_CPPFLAGS= -I$(STAGING_DIR)/usr/include/xorg \
@@ -46,7 +46,7 @@ define Build/Configure
         (cd $(PKG_BUILD_DIR)/$(CONFIGURE_PATH); \
         if [ -x $(CONFIGURE_CMD) ]; then \
                 $(CP) $(SCRIPT_DIR)/config.{guess,sub} $(PKG_BUILD_DIR)/ && \
         (cd $(PKG_BUILD_DIR)/$(CONFIGURE_PATH); \
         if [ -x $(CONFIGURE_CMD) ]; then \
                 $(CP) $(SCRIPT_DIR)/config.{guess,sub} $(PKG_BUILD_DIR)/ && \
-               $(foreach a,dri.h sarea.h dristruct.h exa.h,export ac_cv_file_$(call acvar,$(STAGING_DIR)/usr/include/xorg/$(a))=yes;) \
+               $(foreach a,dri.h sarea.h dristruct.h exa.h damage.h,export ac_cv_file_$(call acvar,$(STAGING_DIR)/usr/include/xorg/$(a))=yes;) \
                 sed -i "s|sdkdir=.*|sdkdir=$(STAGING_DIR)/usr/include/xorg|g" $(PKG_BUILD_DIR)/configure ;\
                 $(CONFIGURE_VARS) \
                 $(CONFIGURE_CMD) \
                 sed -i "s|sdkdir=.*|sdkdir=$(STAGING_DIR)/usr/include/xorg|g" $(PKG_BUILD_DIR)/configure ;\
                 $(CONFIGURE_VARS) \
                 $(CONFIGURE_CMD) \
diff --git a/XOrg/driver/xf86-video-ati/Makefile b/XOrg/driver/xf86-video-ati/Makefile

index c34c3d970bb1b054c8e6dad65cc8a0a9ddeb5ea4..afbe58957e0ff80b6f39b3858bf66ddeea3dcf1e 100644 (file)
--- a/XOrg/driver/xf86-video-ati/Makefile
+++ b/XOrg/driver/xf86-video-ati/Makefile
@@ -9,9 +9,9 @@ include $(TOPDIR)/rules.mk
  
  PKG_BASE_NAME:=xf86
  PKG_NAME:=xf86-video-ati
  
  PKG_BASE_NAME:=xf86
  PKG_NAME:=xf86-video-ati
-PKG_RELEASE:=1
-PKG_VERSION:=X11R7.2-6.6.3
-PKG_SOURCE_URL:=http://xorg.freedesktop.org/releases/X11R7.2/src/driver
+PKG_RELEASE:=2
+PKG_VERSION:=6.6.3
+PKG_SOURCE_URL:=http://xorg.freedesktop.org/releases/X11R7.3/src/driver
  PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
  PKG_BUILD_DIR=$(BUILD_DIR)/Xorg/$(_CATEGORY)/${PKG_NAME}-$(PKG_VERSION)/
  
  PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
  PKG_BUILD_DIR=$(BUILD_DIR)/Xorg/$(_CATEGORY)/${PKG_NAME}-$(PKG_VERSION)/
  
@@ -21,13 +21,13 @@ define Package/xf86-video-ati
    SECTION:=xorg-driver
    CATEGORY:=Xorg
    SUBMENU:=driver
    SECTION:=xorg-driver
    CATEGORY:=Xorg
    SUBMENU:=driver
-  DEPENDS:=+xorg-server  @DISPLAY_SUPPORT
+  DEPENDS:=+xorg-server @BROKEN @DISPLAY_SUPPORT
    TITLE:=xf86-video-ati
    URL:=http://xorg.freedesktop.org/
  endef
  
  define Build/InstallDev
    TITLE:=xf86-video-ati
    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
  
  EXTRA_CPPFLAGS= -I$(STAGING_DIR)/usr/include/xorg \
  endef
  
  EXTRA_CPPFLAGS= -I$(STAGING_DIR)/usr/include/xorg \
@@ -46,7 +46,7 @@ define Build/Configure
         (cd $(PKG_BUILD_DIR)/$(CONFIGURE_PATH); \
         if [ -x $(CONFIGURE_CMD) ]; then \
                 $(CP) $(SCRIPT_DIR)/config.{guess,sub} $(PKG_BUILD_DIR)/ && \
         (cd $(PKG_BUILD_DIR)/$(CONFIGURE_PATH); \
         if [ -x $(CONFIGURE_CMD) ]; then \
                 $(CP) $(SCRIPT_DIR)/config.{guess,sub} $(PKG_BUILD_DIR)/ && \
-               $(foreach a,dri.h sarea.h dristruct.h exa.h,export ac_cv_file_$(call acvar,$(STAGING_DIR)/usr/include/xorg/$(a))=yes;) \
+               $(foreach a,dri.h sarea.h dristruct.h exa.h damage.h,export ac_cv_file_$(call acvar,$(STAGING_DIR)/usr/include/xorg/$(a))=yes;) \
                 sed -i "s|sdkdir=.*|sdkdir=$(STAGING_DIR)/usr/include/xorg|g" $(PKG_BUILD_DIR)/configure ;\
                 $(CONFIGURE_VARS) \
                 $(CONFIGURE_CMD) \
                 sed -i "s|sdkdir=.*|sdkdir=$(STAGING_DIR)/usr/include/xorg|g" $(PKG_BUILD_DIR)/configure ;\
                 $(CONFIGURE_VARS) \
                 $(CONFIGURE_CMD) \
diff --git a/XOrg/driver/xf86-video-fbdev/Makefile b/XOrg/driver/xf86-video-fbdev/Makefile

index 7cc884ec850d72a260b87df4745006775eaa3701..677060a98280c70597a64adb498957e02f700378 100644 (file)
--- a/XOrg/driver/xf86-video-fbdev/Makefile
+++ b/XOrg/driver/xf86-video-fbdev/Makefile
@@ -9,9 +9,9 @@ include $(TOPDIR)/rules.mk
  
  PKG_BASE_NAME:=xf86
  PKG_NAME:=xf86-video-fbdev
  
  PKG_BASE_NAME:=xf86
  PKG_NAME:=xf86-video-fbdev
-PKG_RELEASE:=1
-PKG_VERSION:=X11R7.2-0.3.1
-PKG_SOURCE_URL:=http://xorg.freedesktop.org/releases/X11R7.2/src/driver
+PKG_RELEASE:=2
+PKG_VERSION:=0.3.1
+PKG_SOURCE_URL:=http://xorg.freedesktop.org/releases/X11R7.3/src/driver
  PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
  PKG_BUILD_DIR=$(BUILD_DIR)/Xorg/$(_CATEGORY)/${PKG_NAME}-$(PKG_VERSION)/
  
  PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
  PKG_BUILD_DIR=$(BUILD_DIR)/Xorg/$(_CATEGORY)/${PKG_NAME}-$(PKG_VERSION)/
  
@@ -27,7 +27,7 @@ define Package/xf86-video-fbdev
  endef
  
  define Build/InstallDev
  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
  
  EXTRA_CPPFLAGS= -I$(STAGING_DIR)/usr/include/xorg \
  endef
  
  EXTRA_CPPFLAGS= -I$(STAGING_DIR)/usr/include/xorg \
@@ -46,7 +46,7 @@ define Build/Configure
         (cd $(PKG_BUILD_DIR)/$(CONFIGURE_PATH); \
         if [ -x $(CONFIGURE_CMD) ]; then \
                 $(CP) $(SCRIPT_DIR)/config.{guess,sub} $(PKG_BUILD_DIR)/ && \
         (cd $(PKG_BUILD_DIR)/$(CONFIGURE_PATH); \
         if [ -x $(CONFIGURE_CMD) ]; then \
                 $(CP) $(SCRIPT_DIR)/config.{guess,sub} $(PKG_BUILD_DIR)/ && \
-               $(foreach a,dri.h sarea.h dristruct.h exa.h,export ac_cv_file_$(call acvar,$(STAGING_DIR)/usr/include/xorg/$(a))=yes;) \
+               $(foreach a,dri.h sarea.h dristruct.h exa.h damage.h,export ac_cv_file_$(call acvar,$(STAGING_DIR)/usr/include/xorg/$(a))=yes;) \
                 sed -i "s|sdkdir=.*|sdkdir=$(STAGING_DIR)/usr/include/xorg|g" $(PKG_BUILD_DIR)/configure ;\
                 $(CONFIGURE_VARS) \
                 $(CONFIGURE_CMD) \
                 sed -i "s|sdkdir=.*|sdkdir=$(STAGING_DIR)/usr/include/xorg|g" $(PKG_BUILD_DIR)/configure ;\
                 $(CONFIGURE_VARS) \
                 $(CONFIGURE_CMD) \
diff --git a/XOrg/driver/xf86-video-i810/Makefile b/XOrg/driver/xf86-video-i810/Makefile

deleted file mode 100644 (file)

index f341d8f..0000000
--- a/XOrg/driver/xf86-video-i810/Makefile
+++ /dev/null
@@ -1,71 +0,0 @@
-# 
-# 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:=xf86
-PKG_NAME:=xf86-video-i810
-PKG_RELEASE:=1
-PKG_VERSION:=X11R7.2-1.6.5
-PKG_SOURCE_URL:=http://xorg.freedesktop.org/releases/X11R7.2/src/driver
-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/xf86-video-i810
-  SECTION:=xorg-driver
-  CATEGORY:=Xorg
-  SUBMENU:=driver
-  DEPENDS:=+xorg-server  +libXvMC @DISPLAY_SUPPORT
-  TITLE:=xf86-video-i810
-  URL:=http://xorg.freedesktop.org/
-endef
-
-define Build/InstallDev
-       DESTDIR=$(1) $(MAKE) -C $(PKG_BUILD_DIR)/ $(MAKE_FLAGS) install
-endef
-
-EXTRA_CPPFLAGS= -I$(STAGING_DIR)/usr/include/xorg \
-               -I$(STAGING_DIR)/usr/include/X11/ \
-               -I$(STAGING_DIR)/usr/include/ \
-               -I$(STAGING_DIR)/include/
-
-EXTRA_CFLAGS+= $(EXTRA_CPPFLAGS)
-
-acvar=$(subst -,_,$(subst .,_,$(subst /,_,$(1))))
-
-CONFIGURE_VARS +=DRI_CFLAGS="-I$(STAGING_DIR)/usr/include/X11/dri/" ac_cv_file__usr_share_sgml_X11_defs_ent=yes \
-       sdkdir=$(STAGING_DIR) 
-
-define Build/Configure
-       (cd $(PKG_BUILD_DIR)/$(CONFIGURE_PATH); \
-       if [ -x $(CONFIGURE_CMD) ]; then \
-               $(CP) $(SCRIPT_DIR)/config.{guess,sub} $(PKG_BUILD_DIR)/ && \
-               $(foreach a,dri.h sarea.h dristruct.h exa.h,export ac_cv_file_$(call acvar,$(STAGING_DIR)/usr/include/xorg/$(a))=yes;) \
-               sed -i "s|sdkdir=.*|sdkdir=$(STAGING_DIR)/usr/include/xorg|g" $(PKG_BUILD_DIR)/configure ;\
-               $(CONFIGURE_VARS) \
-               $(CONFIGURE_CMD) \
-               $(CONFIGURE_ARGS_XTRA) \
-               $(CONFIGURE_ARGS) \
-               CPPFLAGS="$(EXTRA_CPPFLAGS)" ;\
-       fi \
-       )
-endef
-
-define Build/Compile
-       make -C $(PKG_BUILD_DIR)
-       DESTDIR=$(PKG_INSTALL_DIR) $(MAKE) -C $(PKG_BUILD_DIR) $(MAKE_FLAGS) install
-       find $(PKG_INSTALL_DIR) -name *a | xargs rm -rf
-endef
-
-define Package/xf86-video-i810/install
-       $(INSTALL_DIR) $(1)/usr/lib/
-       $(CP) $(PKG_INSTALL_DIR)/usr/lib/* $(1)/usr/lib/
-endef
-
-$(eval $(call BuildPackage,xf86-video-i810))
diff --git a/XOrg/driver/xf86-video-i810/patches/100-sdkdir.patch b/XOrg/driver/xf86-video-i810/patches/100-sdkdir.patch

deleted file mode 100644 (file)

index 1300a6a..0000000
--- a/XOrg/driver/xf86-video-i810/patches/100-sdkdir.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff -urN xf86-video-i810-X11R7.2-1.6.5.orig/configure.ac xf86-video-i810-X11R7.2-1.6.5/configure.ac
---- xf86-video-i810-X11R7.2-1.6.5.orig/configure.ac    2007-09-21 03:54:25.000000000 +0200
-+++ xf86-video-i810-X11R7.2-1.6.5/configure.ac 2007-09-21 03:55:08.000000000 +0200
-@@ -72,7 +72,8 @@
- 
- # Checks for pkg-config packages
- PKG_CHECK_MODULES(XORG, [xorg-server xproto xvmc fontsproto $REQUIRED_MODULES])
--sdkdir=$(pkg-config --variable=sdkdir xorg-server)
-+sdkdir=${SDKDIR}
-+#$(pkg-config --variable=sdkdir xorg-server)
- 
- # Checks for libraries.
- 
diff --git a/XOrg/driver/xf86-video-intel/Makefile b/XOrg/driver/xf86-video-intel/Makefile

new file mode 100644 (file)

index 0000000..62f7ceb
--- /dev/null
+++ b/XOrg/driver/xf86-video-intel/Makefile
@@ -0,0 +1,71 @@
+# 
+# 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:=xf86
+PKG_NAME:=xf86-video-intel
+PKG_RELEASE:=2
+PKG_VERSION:=2.1.1
+PKG_SOURCE_URL:=http://xorg.freedesktop.org/releases/X11R7.3/src/driver
+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/xf86-video-intel
+  SECTION:=xorg-driver
+  CATEGORY:=Xorg
+  SUBMENU:=driver
+  DEPENDS:=+xorg-server  @DISPLAY_SUPPORT
+  TITLE:=xf86-video-intel
+  URL:=http://xorg.freedesktop.org/
+endef
+
+define Build/InstallDev
+       DESTDIR=$(STAGING_DIR) $(MAKE) -C $(PKG_BUILD_DIR)/ $(MAKE_FLAGS) install
+endef
+
+EXTRA_CPPFLAGS= -I$(STAGING_DIR)/usr/include/xorg \
+               -I$(STAGING_DIR)/usr/include/X11/ \
+               -I$(STAGING_DIR)/usr/include/ \
+               -I$(STAGING_DIR)/include/
+
+EXTRA_CFLAGS+= $(EXTRA_CPPFLAGS)
+
+acvar=$(subst -,_,$(subst .,_,$(subst /,_,$(1))))
+
+CONFIGURE_VARS +=DRI_CFLAGS="-I$(STAGING_DIR)/usr/include/X11/dri/" ac_cv_file__usr_share_sgml_X11_defs_ent=yes \
+       sdkdir=$(STAGING_DIR) 
+
+define Build/Configure
+       (cd $(PKG_BUILD_DIR)/$(CONFIGURE_PATH); \
+       if [ -x $(CONFIGURE_CMD) ]; then \
+               $(CP) $(SCRIPT_DIR)/config.{guess,sub} $(PKG_BUILD_DIR)/ && \
+               $(foreach a,dri.h sarea.h dristruct.h exa.h damage.h,export ac_cv_file_$(call acvar,$(STAGING_DIR)/usr/include/xorg/$(a))=yes;) \
+               sed -i "s|sdkdir=.*|sdkdir=$(STAGING_DIR)/usr/include/xorg|g" $(PKG_BUILD_DIR)/configure ;\
+               $(CONFIGURE_VARS) \
+               $(CONFIGURE_CMD) \
+               $(CONFIGURE_ARGS_XTRA) \
+               $(CONFIGURE_ARGS) \
+               CPPFLAGS="$(EXTRA_CPPFLAGS)" ;\
+       fi \
+       )
+endef
+
+define Build/Compile
+       make -C $(PKG_BUILD_DIR)
+       DESTDIR=$(PKG_INSTALL_DIR) $(MAKE) -C $(PKG_BUILD_DIR) $(MAKE_FLAGS) install
+       find $(PKG_INSTALL_DIR) -name *a | xargs rm -rf
+endef
+
+define Package/xf86-video-intel/install
+       $(INSTALL_DIR) $(1)/usr/lib/
+       $(CP) $(PKG_INSTALL_DIR)/usr/lib/* $(1)/usr/lib/
+endef
+
+$(eval $(call BuildPackage,xf86-video-intel))
diff --git a/XOrg/driver/xf86-video-intel/patches/100-sdkdir.patch b/XOrg/driver/xf86-video-intel/patches/100-sdkdir.patch

new file mode 100644 (file)

index 0000000..1300a6a
--- /dev/null
+++ b/XOrg/driver/xf86-video-intel/patches/100-sdkdir.patch
@@ -0,0 +1,13 @@
+diff -urN xf86-video-i810-X11R7.2-1.6.5.orig/configure.ac xf86-video-i810-X11R7.2-1.6.5/configure.ac
+--- xf86-video-i810-X11R7.2-1.6.5.orig/configure.ac    2007-09-21 03:54:25.000000000 +0200
++++ xf86-video-i810-X11R7.2-1.6.5/configure.ac 2007-09-21 03:55:08.000000000 +0200
+@@ -72,7 +72,8 @@
+ 
+ # Checks for pkg-config packages
+ PKG_CHECK_MODULES(XORG, [xorg-server xproto xvmc fontsproto $REQUIRED_MODULES])
+-sdkdir=$(pkg-config --variable=sdkdir xorg-server)
++sdkdir=${SDKDIR}
++#$(pkg-config --variable=sdkdir xorg-server)
+ 
+ # Checks for libraries.
+ 
diff --git a/XOrg/driver/xf86-video-nv/Makefile b/XOrg/driver/xf86-video-nv/Makefile

index 4ddb93259ac326ab3625620a53c521c28fdddab0..2b9535fe37e37afb099ff96c65940150967eec65 100644 (file)
--- a/XOrg/driver/xf86-video-nv/Makefile
+++ b/XOrg/driver/xf86-video-nv/Makefile
@@ -9,9 +9,9 @@ include $(TOPDIR)/rules.mk
  
  PKG_BASE_NAME:=xf86
  PKG_NAME:=xf86-video-nv
  
  PKG_BASE_NAME:=xf86
  PKG_NAME:=xf86-video-nv
-PKG_RELEASE:=1
-PKG_VERSION:=X11R7.2-1.2.2.1
-PKG_SOURCE_URL:=http://xorg.freedesktop.org/releases/X11R7.2/src/driver
+PKG_RELEASE:=2
+PKG_VERSION:=2.1.3
+PKG_SOURCE_URL:=http://xorg.freedesktop.org/releases/X11R7.3/src/driver
  PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
  PKG_BUILD_DIR=$(BUILD_DIR)/Xorg/$(_CATEGORY)/${PKG_NAME}-$(PKG_VERSION)/
  
  PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
  PKG_BUILD_DIR=$(BUILD_DIR)/Xorg/$(_CATEGORY)/${PKG_NAME}-$(PKG_VERSION)/
  
@@ -27,7 +27,7 @@ define Package/xf86-video-nv
  endef
  
  define Build/InstallDev
  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
  
  EXTRA_CPPFLAGS= -I$(STAGING_DIR)/usr/include/xorg \
  endef
  
  EXTRA_CPPFLAGS= -I$(STAGING_DIR)/usr/include/xorg \
@@ -46,7 +46,7 @@ define Build/Configure
         (cd $(PKG_BUILD_DIR)/$(CONFIGURE_PATH); \
         if [ -x $(CONFIGURE_CMD) ]; then \
                 $(CP) $(SCRIPT_DIR)/config.{guess,sub} $(PKG_BUILD_DIR)/ && \
         (cd $(PKG_BUILD_DIR)/$(CONFIGURE_PATH); \
         if [ -x $(CONFIGURE_CMD) ]; then \
                 $(CP) $(SCRIPT_DIR)/config.{guess,sub} $(PKG_BUILD_DIR)/ && \
-               $(foreach a,dri.h sarea.h dristruct.h exa.h,export ac_cv_file_$(call acvar,$(STAGING_DIR)/usr/include/xorg/$(a))=yes;) \
+               $(foreach a,dri.h sarea.h dristruct.h exa.h damage.h,export ac_cv_file_$(call acvar,$(STAGING_DIR)/usr/include/xorg/$(a))=yes;) \
                 sed -i "s|sdkdir=.*|sdkdir=$(STAGING_DIR)/usr/include/xorg|g" $(PKG_BUILD_DIR)/configure ;\
                 $(CONFIGURE_VARS) \
                 $(CONFIGURE_CMD) \
                 sed -i "s|sdkdir=.*|sdkdir=$(STAGING_DIR)/usr/include/xorg|g" $(PKG_BUILD_DIR)/configure ;\
                 $(CONFIGURE_VARS) \
                 $(CONFIGURE_CMD) \
diff --git a/XOrg/driver/xf86-video-vesa/Makefile b/XOrg/driver/xf86-video-vesa/Makefile

index dd69fb88d3b658348c0eee88efc24913f6cab266..e617190e45d7336f01f103b33a68bbe40ec58cb6 100644 (file)
--- a/XOrg/driver/xf86-video-vesa/Makefile
+++ b/XOrg/driver/xf86-video-vesa/Makefile
@@ -9,9 +9,9 @@ include $(TOPDIR)/rules.mk
  
  PKG_BASE_NAME:=xf86
  PKG_NAME:=xf86-video-vesa
  
  PKG_BASE_NAME:=xf86
  PKG_NAME:=xf86-video-vesa
-PKG_RELEASE:=1
-PKG_VERSION:=X11R7.2-1.3.0
-PKG_SOURCE_URL:=http://xorg.freedesktop.org/releases/X11R7.2/src/driver
+PKG_RELEASE:=2
+PKG_VERSION:=1.3.0
+PKG_SOURCE_URL:=http://xorg.freedesktop.org/releases/X11R7.3/src/driver
  PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
  PKG_BUILD_DIR=$(BUILD_DIR)/Xorg/$(_CATEGORY)/${PKG_NAME}-$(PKG_VERSION)/
  
  PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
  PKG_BUILD_DIR=$(BUILD_DIR)/Xorg/$(_CATEGORY)/${PKG_NAME}-$(PKG_VERSION)/
  
@@ -27,7 +27,7 @@ define Package/xf86-video-vesa
  endef
  
  define Build/InstallDev
  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
  
  EXTRA_CPPFLAGS= -I$(STAGING_DIR)/usr/include/xorg \
  endef
  
  EXTRA_CPPFLAGS= -I$(STAGING_DIR)/usr/include/xorg \
@@ -46,7 +46,7 @@ define Build/Configure
         (cd $(PKG_BUILD_DIR)/$(CONFIGURE_PATH); \
         if [ -x $(CONFIGURE_CMD) ]; then \
                 $(CP) $(SCRIPT_DIR)/config.{guess,sub} $(PKG_BUILD_DIR)/ && \
         (cd $(PKG_BUILD_DIR)/$(CONFIGURE_PATH); \
         if [ -x $(CONFIGURE_CMD) ]; then \
                 $(CP) $(SCRIPT_DIR)/config.{guess,sub} $(PKG_BUILD_DIR)/ && \
-               $(foreach a,dri.h sarea.h dristruct.h exa.h,export ac_cv_file_$(call acvar,$(STAGING_DIR)/usr/include/xorg/$(a))=yes;) \
+               $(foreach a,dri.h sarea.h dristruct.h exa.h damage.h,export ac_cv_file_$(call acvar,$(STAGING_DIR)/usr/include/xorg/$(a))=yes;) \
                 sed -i "s|sdkdir=.*|sdkdir=$(STAGING_DIR)/usr/include/xorg|g" $(PKG_BUILD_DIR)/configure ;\
                 $(CONFIGURE_VARS) \
                 $(CONFIGURE_CMD) \
                 sed -i "s|sdkdir=.*|sdkdir=$(STAGING_DIR)/usr/include/xorg|g" $(PKG_BUILD_DIR)/configure ;\
                 $(CONFIGURE_VARS) \
                 $(CONFIGURE_CMD) \
diff --git a/XOrg/driver/xf86-video-vga/Makefile b/XOrg/driver/xf86-video-vga/Makefile

index 48f4f70c33296901d2ca028d948f0890ed607673..c2879a196ecc437fec5263feb740c3c70e70dd89 100644 (file)
--- a/XOrg/driver/xf86-video-vga/Makefile
+++ b/XOrg/driver/xf86-video-vga/Makefile
@@ -9,9 +9,9 @@ include $(TOPDIR)/rules.mk
  
  PKG_BASE_NAME:=xf86
  PKG_NAME:=xf86-video-vga
  
  PKG_BASE_NAME:=xf86
  PKG_NAME:=xf86-video-vga
-PKG_RELEASE:=1
-PKG_VERSION:=X11R7.1-4.1.0
-PKG_SOURCE_URL:=http://xorg.freedesktop.org/releases/X11R7.2/src/driver
+PKG_RELEASE:=2
+PKG_VERSION:=4.1.0
+PKG_SOURCE_URL:=http://xorg.freedesktop.org/releases/X11R7.3/src/driver
  PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
  PKG_BUILD_DIR=$(BUILD_DIR)/Xorg/$(_CATEGORY)/${PKG_NAME}-$(PKG_VERSION)/
  
  PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
  PKG_BUILD_DIR=$(BUILD_DIR)/Xorg/$(_CATEGORY)/${PKG_NAME}-$(PKG_VERSION)/
  
@@ -27,7 +27,7 @@ define Package/xf86-video-vga
  endef
  
  define Build/InstallDev
  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
  
  EXTRA_CPPFLAGS= -I$(STAGING_DIR)/usr/include/xorg \
  endef
  
  EXTRA_CPPFLAGS= -I$(STAGING_DIR)/usr/include/xorg \
@@ -46,7 +46,7 @@ define Build/Configure
         (cd $(PKG_BUILD_DIR)/$(CONFIGURE_PATH); \
         if [ -x $(CONFIGURE_CMD) ]; then \
                 $(CP) $(SCRIPT_DIR)/config.{guess,sub} $(PKG_BUILD_DIR)/ && \
         (cd $(PKG_BUILD_DIR)/$(CONFIGURE_PATH); \
         if [ -x $(CONFIGURE_CMD) ]; then \
                 $(CP) $(SCRIPT_DIR)/config.{guess,sub} $(PKG_BUILD_DIR)/ && \
-               $(foreach a,dri.h sarea.h dristruct.h exa.h,export ac_cv_file_$(call acvar,$(STAGING_DIR)/usr/include/xorg/$(a))=yes;) \
+               $(foreach a,dri.h sarea.h dristruct.h exa.h damage.h,export ac_cv_file_$(call acvar,$(STAGING_DIR)/usr/include/xorg/$(a))=yes;) \
                 sed -i "s|sdkdir=.*|sdkdir=$(STAGING_DIR)/usr/include/xorg|g" $(PKG_BUILD_DIR)/configure ;\
                 $(CONFIGURE_VARS) \
                 $(CONFIGURE_CMD) \
                 sed -i "s|sdkdir=.*|sdkdir=$(STAGING_DIR)/usr/include/xorg|g" $(PKG_BUILD_DIR)/configure ;\
                 $(CONFIGURE_VARS) \
                 $(CONFIGURE_CMD) \
diff --git a/XOrg/font-native/font-util/Makefile b/XOrg/font-native/font-util/Makefile

index 8e96ac0845bff46485a5031ed4e2d4d6d360338b..1416be627c6170b1a548573e8a2c55df4585d17c 100644 (file)
--- a/XOrg/font-native/font-util/Makefile
+++ b/XOrg/font-native/font-util/Makefile
@@ -9,11 +9,11 @@
  include $(TOPDIR)/rules.mk
  
  PKG_NAME:=font-util
  include $(TOPDIR)/rules.mk
  
  PKG_NAME:=font-util
-PKG_VERSION:=X11R7.1-1.0.1
-PKG_RELEASE:=1
+PKG_VERSION:=1.0.1
+PKG_RELEASE:=2
  
  PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
  
  PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
-PKG_SOURCE_URL:=http://xorg.freedesktop.org/releases/X11R7.2/src/font
+PKG_SOURCE_URL:=http://xorg.freedesktop.org/releases/X11R7.3/src/font
  
  include $(INCLUDE_DIR)/package.mk
  
  
  include $(INCLUDE_DIR)/package.mk
  
diff --git a/XOrg/font/encodings/Makefile b/XOrg/font/encodings/Makefile

index f3383002cb8dc0775a73847ef92d8f84c07968ea..d6061ad6fabd8506683da7c324d8675a3ce7fc2f 100644 (file)
--- a/XOrg/font/encodings/Makefile
+++ b/XOrg/font/encodings/Makefile
@@ -9,11 +9,11 @@ include $(TOPDIR)/rules.mk
  
  PKG_BASE_NAME:=encodings
  PKG_NAME:=encodings
  
  PKG_BASE_NAME:=encodings
  PKG_NAME:=encodings
-PKG_RELEASE:=1
-PKG_VERSION:=X11R7.2-1.0.2
+PKG_RELEASE:=2
+PKG_VERSION:=1.0.2
  PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
  PKG_BUILD_DIR=$(BUILD_DIR)/Xorg/$(_CATEGORY)/${PKG_NAME}-$(PKG_VERSION)/
  PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
  PKG_BUILD_DIR=$(BUILD_DIR)/Xorg/$(_CATEGORY)/${PKG_NAME}-$(PKG_VERSION)/
-PKG_SOURCE_URL:=http://xorg.freedesktop.org/releases/X11R7.2/src/font
+PKG_SOURCE_URL:=http://xorg.freedesktop.org/releases/X11R7.3/src/font
  
  include $(INCLUDE_DIR)/package.mk
  
  
  include $(INCLUDE_DIR)/package.mk
  
@@ -27,10 +27,10 @@ define Package/encodings
  endef
  
  define Build/InstallDev
  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
  
  endef
  
-CONFIGURE_ARGS_XTRA+=--disable-iso8859-2 --disable-iso8859-3 --disable-iso8859-4  --disable-iso8859-5 --disable-iso8859-7 --disable-iso8859-8 --disable-iso8859-9 --disable-iso8859-10 --disable-iso8859-11 --disable-iso8859-13 --disable-iso8859-14 --disable-iso8859-16 --disable-koi8-r --disable-jisx0201
+CONFIGURE_ARGS+=--disable-iso8859-2 --disable-iso8859-3 --disable-iso8859-4  --disable-iso8859-5 --disable-iso8859-7 --disable-iso8859-8 --disable-iso8859-9 --disable-iso8859-10 --disable-iso8859-11 --disable-iso8859-13 --disable-iso8859-14 --disable-iso8859-16 --disable-koi8-r --disable-jisx0201
  
  define Build/Compile
         UTIL_DIR="$(STAGING_DIR)/usr/lib/X11/fonts/util/" make -e -C $(PKG_BUILD_DIR)
  
  define Build/Compile
         UTIL_DIR="$(STAGING_DIR)/usr/lib/X11/fonts/util/" make -e -C $(PKG_BUILD_DIR)
@@ -43,18 +43,6 @@ define Build/Compile
                         mv {} {}.encodings
  endef
  
                         mv {} {}.encodings
  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) ;\
-       fi \
-       )
-endef
-
  define Package/encodings/install
         $(INSTALL_DIR) $(1)/usr/lib/
         $(CP) $(PKG_INSTALL_DIR)/usr/lib/* $(1)/usr/lib/
  define Package/encodings/install
         $(INSTALL_DIR) $(1)/usr/lib/
         $(CP) $(PKG_INSTALL_DIR)/usr/lib/* $(1)/usr/lib/
diff --git a/XOrg/font/font-alias/Makefile b/XOrg/font/font-alias/Makefile

index 4db472e126293b38a3e2713f0688c8bab9304047..f730291cd735515facf515910fbacad7e818f0f0 100644 (file)
--- a/XOrg/font/font-alias/Makefile
+++ b/XOrg/font/font-alias/Makefile
@@ -9,11 +9,11 @@ include $(TOPDIR)/rules.mk
  
  PKG_BASE_NAME:=font
  PKG_NAME:=font-alias
  
  PKG_BASE_NAME:=font
  PKG_NAME:=font-alias
-PKG_RELEASE:=1
-PKG_VERSION:=X11R7.0-1.0.1
+PKG_RELEASE:=2
+PKG_VERSION:=1.0.1
  PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
  PKG_BUILD_DIR=$(BUILD_DIR)/Xorg/$(_CATEGORY)/${PKG_NAME}-$(PKG_VERSION)/
  PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
  PKG_BUILD_DIR=$(BUILD_DIR)/Xorg/$(_CATEGORY)/${PKG_NAME}-$(PKG_VERSION)/
-PKG_SOURCE_URL:=http://xorg.freedesktop.org/releases/X11R7.2/src/font
+PKG_SOURCE_URL:=http://xorg.freedesktop.org/releases/X11R7.3/src/font
  
  include $(INCLUDE_DIR)/package.mk
  
  
  include $(INCLUDE_DIR)/package.mk
  
@@ -27,10 +27,10 @@ define Package/font-alias
  endef
  
  define Build/InstallDev
  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
  
  endef
  
-CONFIGURE_ARGS_XTRA+=--disable-iso8859-2 --disable-iso8859-3 --disable-iso8859-4  --disable-iso8859-5 --disable-iso8859-7 --disable-iso8859-8 --disable-iso8859-9 --disable-iso8859-10 --disable-iso8859-11 --disable-iso8859-13 --disable-iso8859-14 --disable-iso8859-16 --disable-koi8-r --disable-jisx0201
+CONFIGURE_ARGS+=--disable-iso8859-2 --disable-iso8859-3 --disable-iso8859-4  --disable-iso8859-5 --disable-iso8859-7 --disable-iso8859-8 --disable-iso8859-9 --disable-iso8859-10 --disable-iso8859-11 --disable-iso8859-13 --disable-iso8859-14 --disable-iso8859-16 --disable-koi8-r --disable-jisx0201
  
  define Build/Compile
         UTIL_DIR="$(STAGING_DIR)/usr/lib/X11/fonts/util/" make -e -C $(PKG_BUILD_DIR)
  
  define Build/Compile
         UTIL_DIR="$(STAGING_DIR)/usr/lib/X11/fonts/util/" make -e -C $(PKG_BUILD_DIR)
@@ -43,18 +43,6 @@ define Build/Compile
                         mv {} {}.font-alias
  endef
  
                         mv {} {}.font-alias
  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) ;\
-       fi \
-       )
-endef
-
  define Package/font-alias/install
         $(INSTALL_DIR) $(1)/usr/lib/
         $(CP) $(PKG_INSTALL_DIR)/usr/lib/* $(1)/usr/lib/
  define Package/font-alias/install
         $(INSTALL_DIR) $(1)/usr/lib/
         $(CP) $(PKG_INSTALL_DIR)/usr/lib/* $(1)/usr/lib/
diff --git a/XOrg/font/font-bh-75dpi/Makefile b/XOrg/font/font-bh-75dpi/Makefile

index 3eb9e1de3be3cddb60759c379152fc0d9f2ba0b1..b4117d9a820f0985089fa9d132b37fd5a64546b7 100644 (file)
--- a/XOrg/font/font-bh-75dpi/Makefile
+++ b/XOrg/font/font-bh-75dpi/Makefile
@@ -9,11 +9,11 @@ include $(TOPDIR)/rules.mk
  
  PKG_BASE_NAME:=font
  PKG_NAME:=font-bh-75dpi
  
  PKG_BASE_NAME:=font
  PKG_NAME:=font-bh-75dpi
-PKG_RELEASE:=1
-PKG_VERSION:=X11R7.0-1.0.0
+PKG_RELEASE:=2
+PKG_VERSION:=1.0.0
  PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
  PKG_BUILD_DIR=$(BUILD_DIR)/Xorg/$(_CATEGORY)/${PKG_NAME}-$(PKG_VERSION)/
  PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
  PKG_BUILD_DIR=$(BUILD_DIR)/Xorg/$(_CATEGORY)/${PKG_NAME}-$(PKG_VERSION)/
-PKG_SOURCE_URL:=http://xorg.freedesktop.org/releases/X11R7.2/src/font
+PKG_SOURCE_URL:=http://xorg.freedesktop.org/releases/X11R7.3/src/font
  
  include $(INCLUDE_DIR)/package.mk
  
  
  include $(INCLUDE_DIR)/package.mk
  
@@ -27,10 +27,10 @@ define Package/font-bh-75dpi
  endef
  
  define Build/InstallDev
  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
  
  endef
  
-CONFIGURE_ARGS_XTRA+=--disable-iso8859-2 --disable-iso8859-3 --disable-iso8859-4  --disable-iso8859-5 --disable-iso8859-7 --disable-iso8859-8 --disable-iso8859-9 --disable-iso8859-10 --disable-iso8859-11 --disable-iso8859-13 --disable-iso8859-14 --disable-iso8859-16 --disable-koi8-r --disable-jisx0201
+CONFIGURE_ARGS+=--disable-iso8859-2 --disable-iso8859-3 --disable-iso8859-4  --disable-iso8859-5 --disable-iso8859-7 --disable-iso8859-8 --disable-iso8859-9 --disable-iso8859-10 --disable-iso8859-11 --disable-iso8859-13 --disable-iso8859-14 --disable-iso8859-16 --disable-koi8-r --disable-jisx0201
  
  define Build/Compile
         UTIL_DIR="$(STAGING_DIR)/usr/lib/X11/fonts/util/" make -e -C $(PKG_BUILD_DIR)
  
  define Build/Compile
         UTIL_DIR="$(STAGING_DIR)/usr/lib/X11/fonts/util/" make -e -C $(PKG_BUILD_DIR)
@@ -43,18 +43,6 @@ define Build/Compile
                         mv {} {}.font-bh-75dpi
  endef
  
                         mv {} {}.font-bh-75dpi
  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) ;\
-       fi \
-       )
-endef
-
  define Package/font-bh-75dpi/install
         $(INSTALL_DIR) $(1)/usr/lib/
         $(CP) $(PKG_INSTALL_DIR)/usr/lib/* $(1)/usr/lib/
  define Package/font-bh-75dpi/install
         $(INSTALL_DIR) $(1)/usr/lib/
         $(CP) $(PKG_INSTALL_DIR)/usr/lib/* $(1)/usr/lib/
diff --git a/XOrg/font/font-cursor-misc/Makefile b/XOrg/font/font-cursor-misc/Makefile

index 78a14ac7071072698f453fc6ed6a5fd100e3a651..07880767cd9d7dbae6041f74480b2f149da2a976 100644 (file)
--- a/XOrg/font/font-cursor-misc/Makefile
+++ b/XOrg/font/font-cursor-misc/Makefile
@@ -9,11 +9,11 @@ include $(TOPDIR)/rules.mk
  
  PKG_BASE_NAME:=font
  PKG_NAME:=font-cursor-misc
  
  PKG_BASE_NAME:=font
  PKG_NAME:=font-cursor-misc
-PKG_RELEASE:=1
-PKG_VERSION:=X11R7.0-1.0.0
+PKG_RELEASE:=2
+PKG_VERSION:=1.0.0
  PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
  PKG_BUILD_DIR=$(BUILD_DIR)/Xorg/$(_CATEGORY)/${PKG_NAME}-$(PKG_VERSION)/
  PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
  PKG_BUILD_DIR=$(BUILD_DIR)/Xorg/$(_CATEGORY)/${PKG_NAME}-$(PKG_VERSION)/
-PKG_SOURCE_URL:=http://xorg.freedesktop.org/releases/X11R7.2/src/font
+PKG_SOURCE_URL:=http://xorg.freedesktop.org/releases/X11R7.3/src/font
  
  include $(INCLUDE_DIR)/package.mk
  
  
  include $(INCLUDE_DIR)/package.mk
  
@@ -27,10 +27,10 @@ define Package/font-cursor-misc
  endef
  
  define Build/InstallDev
  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
  
  endef
  
-CONFIGURE_ARGS_XTRA+=--disable-iso8859-2 --disable-iso8859-3 --disable-iso8859-4  --disable-iso8859-5 --disable-iso8859-7 --disable-iso8859-8 --disable-iso8859-9 --disable-iso8859-10 --disable-iso8859-11 --disable-iso8859-13 --disable-iso8859-14 --disable-iso8859-16 --disable-koi8-r --disable-jisx0201
+CONFIGURE_ARGS+=--disable-iso8859-2 --disable-iso8859-3 --disable-iso8859-4  --disable-iso8859-5 --disable-iso8859-7 --disable-iso8859-8 --disable-iso8859-9 --disable-iso8859-10 --disable-iso8859-11 --disable-iso8859-13 --disable-iso8859-14 --disable-iso8859-16 --disable-koi8-r --disable-jisx0201
  
  define Build/Compile
         UTIL_DIR="$(STAGING_DIR)/usr/lib/X11/fonts/util/" make -e -C $(PKG_BUILD_DIR)
  
  define Build/Compile
         UTIL_DIR="$(STAGING_DIR)/usr/lib/X11/fonts/util/" make -e -C $(PKG_BUILD_DIR)
@@ -43,18 +43,6 @@ define Build/Compile
                         mv {} {}.font-cursor-misc
  endef
  
                         mv {} {}.font-cursor-misc
  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) ;\
-       fi \
-       )
-endef
-
  define Package/font-cursor-misc/install
         $(INSTALL_DIR) $(1)/usr/lib/
         $(CP) $(PKG_INSTALL_DIR)/usr/lib/* $(1)/usr/lib/
  define Package/font-cursor-misc/install
         $(INSTALL_DIR) $(1)/usr/lib/
         $(CP) $(PKG_INSTALL_DIR)/usr/lib/* $(1)/usr/lib/
diff --git a/XOrg/font/font-daewoo-misc/Makefile b/XOrg/font/font-daewoo-misc/Makefile

index 4f9b08e10aff6a04e83e0eff36814dcd46a0adbd..331503685eeec4fad67a7c6fa14ed21d0209d674 100644 (file)
--- a/XOrg/font/font-daewoo-misc/Makefile
+++ b/XOrg/font/font-daewoo-misc/Makefile
@@ -9,11 +9,11 @@ include $(TOPDIR)/rules.mk
  
  PKG_BASE_NAME:=font
  PKG_NAME:=font-daewoo-misc
  
  PKG_BASE_NAME:=font
  PKG_NAME:=font-daewoo-misc
-PKG_RELEASE:=1
-PKG_VERSION:=X11R7.0-1.0.0
+PKG_RELEASE:=2
+PKG_VERSION:=1.0.0
  PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
  PKG_BUILD_DIR=$(BUILD_DIR)/Xorg/$(_CATEGORY)/${PKG_NAME}-$(PKG_VERSION)/
  PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
  PKG_BUILD_DIR=$(BUILD_DIR)/Xorg/$(_CATEGORY)/${PKG_NAME}-$(PKG_VERSION)/
-PKG_SOURCE_URL:=http://xorg.freedesktop.org/releases/X11R7.2/src/font
+PKG_SOURCE_URL:=http://xorg.freedesktop.org/releases/X11R7.3/src/font
  
  include $(INCLUDE_DIR)/package.mk
  
  
  include $(INCLUDE_DIR)/package.mk
  
@@ -27,10 +27,10 @@ define Package/font-daewoo-misc
  endef
  
  define Build/InstallDev
  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
  
  endef
  
-CONFIGURE_ARGS_XTRA+=--disable-iso8859-2 --disable-iso8859-3 --disable-iso8859-4  --disable-iso8859-5 --disable-iso8859-7 --disable-iso8859-8 --disable-iso8859-9 --disable-iso8859-10 --disable-iso8859-11 --disable-iso8859-13 --disable-iso8859-14 --disable-iso8859-16 --disable-koi8-r --disable-jisx0201
+CONFIGURE_ARGS+=--disable-iso8859-2 --disable-iso8859-3 --disable-iso8859-4  --disable-iso8859-5 --disable-iso8859-7 --disable-iso8859-8 --disable-iso8859-9 --disable-iso8859-10 --disable-iso8859-11 --disable-iso8859-13 --disable-iso8859-14 --disable-iso8859-16 --disable-koi8-r --disable-jisx0201
  
  define Build/Compile
         UTIL_DIR="$(STAGING_DIR)/usr/lib/X11/fonts/util/" make -e -C $(PKG_BUILD_DIR)
  
  define Build/Compile
         UTIL_DIR="$(STAGING_DIR)/usr/lib/X11/fonts/util/" make -e -C $(PKG_BUILD_DIR)
@@ -43,18 +43,6 @@ define Build/Compile
                         mv {} {}.font-daewoo-misc
  endef
  
                         mv {} {}.font-daewoo-misc
  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) ;\
-       fi \
-       )
-endef
-
  define Package/font-daewoo-misc/install
         $(INSTALL_DIR) $(1)/usr/lib/
         $(CP) $(PKG_INSTALL_DIR)/usr/lib/* $(1)/usr/lib/
  define Package/font-daewoo-misc/install
         $(INSTALL_DIR) $(1)/usr/lib/
         $(CP) $(PKG_INSTALL_DIR)/usr/lib/* $(1)/usr/lib/
diff --git a/XOrg/font/font-dec-misc/Makefile b/XOrg/font/font-dec-misc/Makefile

index dc3b137d5903bf790f404d8bbf64e6f808ffe1cc..eb761b50eeb1452ad9bd386145aace0842139655 100644 (file)
--- a/XOrg/font/font-dec-misc/Makefile
+++ b/XOrg/font/font-dec-misc/Makefile
@@ -9,11 +9,11 @@ include $(TOPDIR)/rules.mk
  
  PKG_BASE_NAME:=font
  PKG_NAME:=font-dec-misc
  
  PKG_BASE_NAME:=font
  PKG_NAME:=font-dec-misc
-PKG_RELEASE:=1
-PKG_VERSION:=X11R7.0-1.0.0
+PKG_RELEASE:=2
+PKG_VERSION:=1.0.0
  PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
  PKG_BUILD_DIR=$(BUILD_DIR)/Xorg/$(_CATEGORY)/${PKG_NAME}-$(PKG_VERSION)/
  PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
  PKG_BUILD_DIR=$(BUILD_DIR)/Xorg/$(_CATEGORY)/${PKG_NAME}-$(PKG_VERSION)/
-PKG_SOURCE_URL:=http://xorg.freedesktop.org/releases/X11R7.2/src/font
+PKG_SOURCE_URL:=http://xorg.freedesktop.org/releases/X11R7.3/src/font
  
  include $(INCLUDE_DIR)/package.mk
  
  
  include $(INCLUDE_DIR)/package.mk
  
@@ -27,10 +27,10 @@ define Package/font-dec-misc
  endef
  
  define Build/InstallDev
  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
  
  endef
  
-CONFIGURE_ARGS_XTRA+=--disable-iso8859-2 --disable-iso8859-3 --disable-iso8859-4  --disable-iso8859-5 --disable-iso8859-7 --disable-iso8859-8 --disable-iso8859-9 --disable-iso8859-10 --disable-iso8859-11 --disable-iso8859-13 --disable-iso8859-14 --disable-iso8859-16 --disable-koi8-r --disable-jisx0201
+CONFIGURE_ARGS+=--disable-iso8859-2 --disable-iso8859-3 --disable-iso8859-4  --disable-iso8859-5 --disable-iso8859-7 --disable-iso8859-8 --disable-iso8859-9 --disable-iso8859-10 --disable-iso8859-11 --disable-iso8859-13 --disable-iso8859-14 --disable-iso8859-16 --disable-koi8-r --disable-jisx0201
  
  define Build/Compile
         UTIL_DIR="$(STAGING_DIR)/usr/lib/X11/fonts/util/" make -e -C $(PKG_BUILD_DIR)
  
  define Build/Compile
         UTIL_DIR="$(STAGING_DIR)/usr/lib/X11/fonts/util/" make -e -C $(PKG_BUILD_DIR)
@@ -43,18 +43,6 @@ define Build/Compile
                         mv {} {}.font-dec-misc
  endef
  
                         mv {} {}.font-dec-misc
  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) ;\
-       fi \
-       )
-endef
-
  define Package/font-dec-misc/install
         $(INSTALL_DIR) $(1)/usr/lib/
         $(CP) $(PKG_INSTALL_DIR)/usr/lib/* $(1)/usr/lib/
  define Package/font-dec-misc/install
         $(INSTALL_DIR) $(1)/usr/lib/
         $(CP) $(PKG_INSTALL_DIR)/usr/lib/* $(1)/usr/lib/
diff --git a/XOrg/font/font-ibm-type1/Makefile b/XOrg/font/font-ibm-type1/Makefile

index 21650ff8fff9e402f36e0b1b9b54a71c550cfcfd..9d462e13857f3d762b532f66d118771debfffa2d 100644 (file)
--- a/XOrg/font/font-ibm-type1/Makefile
+++ b/XOrg/font/font-ibm-type1/Makefile
@@ -9,11 +9,11 @@ include $(TOPDIR)/rules.mk
  
  PKG_BASE_NAME:=font
  PKG_NAME:=font-ibm-type1
  
  PKG_BASE_NAME:=font
  PKG_NAME:=font-ibm-type1
-PKG_RELEASE:=1
-PKG_VERSION:=X11R7.0-1.0.0
+PKG_RELEASE:=2
+PKG_VERSION:=1.0.0
  PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
  PKG_BUILD_DIR=$(BUILD_DIR)/Xorg/$(_CATEGORY)/${PKG_NAME}-$(PKG_VERSION)/
  PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
  PKG_BUILD_DIR=$(BUILD_DIR)/Xorg/$(_CATEGORY)/${PKG_NAME}-$(PKG_VERSION)/
-PKG_SOURCE_URL:=http://xorg.freedesktop.org/releases/X11R7.2/src/font
+PKG_SOURCE_URL:=http://xorg.freedesktop.org/releases/X11R7.3/src/font
  
  include $(INCLUDE_DIR)/package.mk
  
  
  include $(INCLUDE_DIR)/package.mk
  
@@ -27,10 +27,10 @@ define Package/font-ibm-type1
  endef
  
  define Build/InstallDev
  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
  
  endef
  
-CONFIGURE_ARGS_XTRA+=--disable-iso8859-2 --disable-iso8859-3 --disable-iso8859-4  --disable-iso8859-5 --disable-iso8859-7 --disable-iso8859-8 --disable-iso8859-9 --disable-iso8859-10 --disable-iso8859-11 --disable-iso8859-13 --disable-iso8859-14 --disable-iso8859-16 --disable-koi8-r --disable-jisx0201
+CONFIGURE_ARGS+=--disable-iso8859-2 --disable-iso8859-3 --disable-iso8859-4  --disable-iso8859-5 --disable-iso8859-7 --disable-iso8859-8 --disable-iso8859-9 --disable-iso8859-10 --disable-iso8859-11 --disable-iso8859-13 --disable-iso8859-14 --disable-iso8859-16 --disable-koi8-r --disable-jisx0201
  
  define Build/Compile
         UTIL_DIR="$(STAGING_DIR)/usr/lib/X11/fonts/util/" make -e -C $(PKG_BUILD_DIR)
  
  define Build/Compile
         UTIL_DIR="$(STAGING_DIR)/usr/lib/X11/fonts/util/" make -e -C $(PKG_BUILD_DIR)
@@ -43,18 +43,6 @@ define Build/Compile
                         mv {} {}.font-ibm-type1
  endef
  
                         mv {} {}.font-ibm-type1
  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) ;\
-       fi \
-       )
-endef
-
  define Package/font-ibm-type1/install
         $(INSTALL_DIR) $(1)/usr/lib/
         $(CP) $(PKG_INSTALL_DIR)/usr/lib/* $(1)/usr/lib/
  define Package/font-ibm-type1/install
         $(INSTALL_DIR) $(1)/usr/lib/
         $(CP) $(PKG_INSTALL_DIR)/usr/lib/* $(1)/usr/lib/
diff --git a/XOrg/font/font-isas-misc/Makefile b/XOrg/font/font-isas-misc/Makefile

index 5ea32e1958719db1756fd7e721b08efd1f4600d0..7697a791efed6b82a46586901a42f0935beadc25 100644 (file)
--- a/XOrg/font/font-isas-misc/Makefile
+++ b/XOrg/font/font-isas-misc/Makefile
@@ -9,11 +9,11 @@ include $(TOPDIR)/rules.mk
  
  PKG_BASE_NAME:=font
  PKG_NAME:=font-isas-misc
  
  PKG_BASE_NAME:=font
  PKG_NAME:=font-isas-misc
-PKG_RELEASE:=1
-PKG_VERSION:=X11R7.0-1.0.0
+PKG_RELEASE:=2
+PKG_VERSION:=1.0.0
  PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
  PKG_BUILD_DIR=$(BUILD_DIR)/Xorg/$(_CATEGORY)/${PKG_NAME}-$(PKG_VERSION)/
  PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
  PKG_BUILD_DIR=$(BUILD_DIR)/Xorg/$(_CATEGORY)/${PKG_NAME}-$(PKG_VERSION)/
-PKG_SOURCE_URL:=http://xorg.freedesktop.org/releases/X11R7.2/src/font
+PKG_SOURCE_URL:=http://xorg.freedesktop.org/releases/X11R7.3/src/font
  
  include $(INCLUDE_DIR)/package.mk
  
  
  include $(INCLUDE_DIR)/package.mk
  
@@ -27,10 +27,10 @@ define Package/font-isas-misc
  endef
  
  define Build/InstallDev
  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
  
  endef
  
-CONFIGURE_ARGS_XTRA+=--disable-iso8859-2 --disable-iso8859-3 --disable-iso8859-4  --disable-iso8859-5 --disable-iso8859-7 --disable-iso8859-8 --disable-iso8859-9 --disable-iso8859-10 --disable-iso8859-11 --disable-iso8859-13 --disable-iso8859-14 --disable-iso8859-16 --disable-koi8-r --disable-jisx0201
+CONFIGURE_ARGS+=--disable-iso8859-2 --disable-iso8859-3 --disable-iso8859-4  --disable-iso8859-5 --disable-iso8859-7 --disable-iso8859-8 --disable-iso8859-9 --disable-iso8859-10 --disable-iso8859-11 --disable-iso8859-13 --disable-iso8859-14 --disable-iso8859-16 --disable-koi8-r --disable-jisx0201
  
  define Build/Compile
         UTIL_DIR="$(STAGING_DIR)/usr/lib/X11/fonts/util/" make -e -C $(PKG_BUILD_DIR)
  
  define Build/Compile
         UTIL_DIR="$(STAGING_DIR)/usr/lib/X11/fonts/util/" make -e -C $(PKG_BUILD_DIR)
@@ -43,18 +43,6 @@ define Build/Compile
                         mv {} {}.font-isas-misc
  endef
  
                         mv {} {}.font-isas-misc
  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) ;\
-       fi \
-       )
-endef
-
  define Package/font-isas-misc/install
         $(INSTALL_DIR) $(1)/usr/lib/
         $(CP) $(PKG_INSTALL_DIR)/usr/lib/* $(1)/usr/lib/
  define Package/font-isas-misc/install
         $(INSTALL_DIR) $(1)/usr/lib/
         $(CP) $(PKG_INSTALL_DIR)/usr/lib/* $(1)/usr/lib/
diff --git a/XOrg/font/font-jis-misc/Makefile b/XOrg/font/font-jis-misc/Makefile

index b4c23c55625accacccbcb8704a3a4e42fa6c2b41..4e5dc865859ef48b6cd9b588d1a32783bf88e152 100644 (file)
--- a/XOrg/font/font-jis-misc/Makefile
+++ b/XOrg/font/font-jis-misc/Makefile
@@ -9,11 +9,11 @@ include $(TOPDIR)/rules.mk
  
  PKG_BASE_NAME:=font
  PKG_NAME:=font-jis-misc
  
  PKG_BASE_NAME:=font
  PKG_NAME:=font-jis-misc
-PKG_RELEASE:=1
-PKG_VERSION:=X11R7.0-1.0.0
+PKG_RELEASE:=2
+PKG_VERSION:=1.0.0
  PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
  PKG_BUILD_DIR=$(BUILD_DIR)/Xorg/$(_CATEGORY)/${PKG_NAME}-$(PKG_VERSION)/
  PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
  PKG_BUILD_DIR=$(BUILD_DIR)/Xorg/$(_CATEGORY)/${PKG_NAME}-$(PKG_VERSION)/
-PKG_SOURCE_URL:=http://xorg.freedesktop.org/releases/X11R7.2/src/font
+PKG_SOURCE_URL:=http://xorg.freedesktop.org/releases/X11R7.3/src/font
  
  include $(INCLUDE_DIR)/package.mk
  
  
  include $(INCLUDE_DIR)/package.mk
  
@@ -27,10 +27,10 @@ define Package/font-jis-misc
  endef
  
  define Build/InstallDev
  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
  
  endef
  
-CONFIGURE_ARGS_XTRA+=--disable-iso8859-2 --disable-iso8859-3 --disable-iso8859-4  --disable-iso8859-5 --disable-iso8859-7 --disable-iso8859-8 --disable-iso8859-9 --disable-iso8859-10 --disable-iso8859-11 --disable-iso8859-13 --disable-iso8859-14 --disable-iso8859-16 --disable-koi8-r --disable-jisx0201
+CONFIGURE_ARGS+=--disable-iso8859-2 --disable-iso8859-3 --disable-iso8859-4  --disable-iso8859-5 --disable-iso8859-7 --disable-iso8859-8 --disable-iso8859-9 --disable-iso8859-10 --disable-iso8859-11 --disable-iso8859-13 --disable-iso8859-14 --disable-iso8859-16 --disable-koi8-r --disable-jisx0201
  
  define Build/Compile
         UTIL_DIR="$(STAGING_DIR)/usr/lib/X11/fonts/util/" make -e -C $(PKG_BUILD_DIR)
  
  define Build/Compile
         UTIL_DIR="$(STAGING_DIR)/usr/lib/X11/fonts/util/" make -e -C $(PKG_BUILD_DIR)
@@ -43,18 +43,6 @@ define Build/Compile
                         mv {} {}.font-jis-misc
  endef
  
                         mv {} {}.font-jis-misc
  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) ;\
-       fi \
-       )
-endef
-
  define Package/font-jis-misc/install
         $(INSTALL_DIR) $(1)/usr/lib/
         $(CP) $(PKG_INSTALL_DIR)/usr/lib/* $(1)/usr/lib/
  define Package/font-jis-misc/install
         $(INSTALL_DIR) $(1)/usr/lib/
         $(CP) $(PKG_INSTALL_DIR)/usr/lib/* $(1)/usr/lib/
diff --git a/XOrg/font/font-micro-misc/Makefile b/XOrg/font/font-micro-misc/Makefile

index 2403de5e6337207311cb5a24eeee3b8b72ca6e0a..b1b94561928fa23680d1bc0594e8fdbdade5a07c 100644 (file)
--- a/XOrg/font/font-micro-misc/Makefile
+++ b/XOrg/font/font-micro-misc/Makefile
@@ -9,11 +9,11 @@ include $(TOPDIR)/rules.mk
  
  PKG_BASE_NAME:=font
  PKG_NAME:=font-micro-misc
  
  PKG_BASE_NAME:=font
  PKG_NAME:=font-micro-misc
-PKG_RELEASE:=1
-PKG_VERSION:=X11R7.0-1.0.0
+PKG_RELEASE:=2
+PKG_VERSION:=1.0.0
  PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
  PKG_BUILD_DIR=$(BUILD_DIR)/Xorg/$(_CATEGORY)/${PKG_NAME}-$(PKG_VERSION)/
  PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
  PKG_BUILD_DIR=$(BUILD_DIR)/Xorg/$(_CATEGORY)/${PKG_NAME}-$(PKG_VERSION)/
-PKG_SOURCE_URL:=http://xorg.freedesktop.org/releases/X11R7.2/src/font
+PKG_SOURCE_URL:=http://xorg.freedesktop.org/releases/X11R7.3/src/font
  
  include $(INCLUDE_DIR)/package.mk
  
  
  include $(INCLUDE_DIR)/package.mk
  
@@ -27,10 +27,10 @@ define Package/font-micro-misc
  endef
  
  define Build/InstallDev
  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
  
  endef
  
-CONFIGURE_ARGS_XTRA+=--disable-iso8859-2 --disable-iso8859-3 --disable-iso8859-4  --disable-iso8859-5 --disable-iso8859-7 --disable-iso8859-8 --disable-iso8859-9 --disable-iso8859-10 --disable-iso8859-11 --disable-iso8859-13 --disable-iso8859-14 --disable-iso8859-16 --disable-koi8-r --disable-jisx0201
+CONFIGURE_ARGS+=--disable-iso8859-2 --disable-iso8859-3 --disable-iso8859-4  --disable-iso8859-5 --disable-iso8859-7 --disable-iso8859-8 --disable-iso8859-9 --disable-iso8859-10 --disable-iso8859-11 --disable-iso8859-13 --disable-iso8859-14 --disable-iso8859-16 --disable-koi8-r --disable-jisx0201
  
  define Build/Compile
         UTIL_DIR="$(STAGING_DIR)/usr/lib/X11/fonts/util/" make -e -C $(PKG_BUILD_DIR)
  
  define Build/Compile
         UTIL_DIR="$(STAGING_DIR)/usr/lib/X11/fonts/util/" make -e -C $(PKG_BUILD_DIR)
@@ -43,18 +43,6 @@ define Build/Compile
                         mv {} {}.font-micro-misc
  endef
  
                         mv {} {}.font-micro-misc
  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) ;\
-       fi \
-       )
-endef
-
  define Package/font-micro-misc/install
         $(INSTALL_DIR) $(1)/usr/lib/
         $(CP) $(PKG_INSTALL_DIR)/usr/lib/* $(1)/usr/lib/
  define Package/font-micro-misc/install
         $(INSTALL_DIR) $(1)/usr/lib/
         $(CP) $(PKG_INSTALL_DIR)/usr/lib/* $(1)/usr/lib/
diff --git a/XOrg/font/font-misc-cyrillic/Makefile b/XOrg/font/font-misc-cyrillic/Makefile

index a87239023b89774c57a09f9b9b13c45ecf8f3c36..699f615e383ad463addeb0e06dd80988f30f144e 100644 (file)
--- a/XOrg/font/font-misc-cyrillic/Makefile
+++ b/XOrg/font/font-misc-cyrillic/Makefile
@@ -9,11 +9,11 @@ include $(TOPDIR)/rules.mk
  
  PKG_BASE_NAME:=font
  PKG_NAME:=font-misc-cyrillic
  
  PKG_BASE_NAME:=font
  PKG_NAME:=font-misc-cyrillic
-PKG_RELEASE:=1
-PKG_VERSION:=X11R7.0-1.0.0
+PKG_RELEASE:=2
+PKG_VERSION:=1.0.0
  PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
  PKG_BUILD_DIR=$(BUILD_DIR)/Xorg/$(_CATEGORY)/${PKG_NAME}-$(PKG_VERSION)/
  PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
  PKG_BUILD_DIR=$(BUILD_DIR)/Xorg/$(_CATEGORY)/${PKG_NAME}-$(PKG_VERSION)/
-PKG_SOURCE_URL:=http://xorg.freedesktop.org/releases/X11R7.2/src/font
+PKG_SOURCE_URL:=http://xorg.freedesktop.org/releases/X11R7.3/src/font
  
  include $(INCLUDE_DIR)/package.mk
  
  
  include $(INCLUDE_DIR)/package.mk
  
@@ -27,10 +27,10 @@ define Package/font-misc-cyrillic
  endef
  
  define Build/InstallDev
  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
  
  endef
  
-CONFIGURE_ARGS_XTRA+=--disable-iso8859-2 --disable-iso8859-3 --disable-iso8859-4  --disable-iso8859-5 --disable-iso8859-7 --disable-iso8859-8 --disable-iso8859-9 --disable-iso8859-10 --disable-iso8859-11 --disable-iso8859-13 --disable-iso8859-14 --disable-iso8859-16 --disable-koi8-r --disable-jisx0201
+CONFIGURE_ARGS+=--disable-iso8859-2 --disable-iso8859-3 --disable-iso8859-4  --disable-iso8859-5 --disable-iso8859-7 --disable-iso8859-8 --disable-iso8859-9 --disable-iso8859-10 --disable-iso8859-11 --disable-iso8859-13 --disable-iso8859-14 --disable-iso8859-16 --disable-koi8-r --disable-jisx0201
  
  define Build/Compile
         UTIL_DIR="$(STAGING_DIR)/usr/lib/X11/fonts/util/" make -e -C $(PKG_BUILD_DIR)
  
  define Build/Compile
         UTIL_DIR="$(STAGING_DIR)/usr/lib/X11/fonts/util/" make -e -C $(PKG_BUILD_DIR)
@@ -43,18 +43,6 @@ define Build/Compile
                         mv {} {}.font-misc-cyrillic
  endef
  
                         mv {} {}.font-misc-cyrillic
  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) ;\
-       fi \
-       )
-endef
-
  define Package/font-misc-cyrillic/install
         $(INSTALL_DIR) $(1)/usr/lib/
         $(CP) $(PKG_INSTALL_DIR)/usr/lib/* $(1)/usr/lib/
  define Package/font-misc-cyrillic/install
         $(INSTALL_DIR) $(1)/usr/lib/
         $(CP) $(PKG_INSTALL_DIR)/usr/lib/* $(1)/usr/lib/
diff --git a/XOrg/font/font-misc-misc/Makefile b/XOrg/font/font-misc-misc/Makefile

index 37aa3d6a9dcbff58bc88228a137561c5adb1dd11..a481ef43004a283db55d0e936f70766ccd1ed547 100644 (file)
--- a/XOrg/font/font-misc-misc/Makefile
+++ b/XOrg/font/font-misc-misc/Makefile
@@ -11,10 +11,9 @@ include $(TOPDIR)/rules.mk
  PKG_BASE_NAME:=font-base
  PKG_NAME:=font-misc-misc
  PKG_RELEASE:=1
  PKG_BASE_NAME:=font-base
  PKG_NAME:=font-misc-misc
  PKG_RELEASE:=1
-PKG_VERSION:=X11R7.0-1.0.0
-PKG_SOURCE_URL:=http://xorg.freedesktop.org/releases/X11R7.2/src/font
-PKG_SOURCE:=font-misc-misc-X11R7.0-1.0.0.tar.bz2
-PKG_BUILD_DIR=$(BUILD_DIR)/Xorg/fonts/font-misc-misc-X11R7.0-1.0.0/
+PKG_VERSION:=1.0.0
+PKG_SOURCE_URL:=http://xorg.freedesktop.org/releases/X11R7.3/src/font
+PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
  
  include $(INCLUDE_DIR)/package.mk
  
  
  include $(INCLUDE_DIR)/package.mk
  
diff --git a/XOrg/font/font-xfree86-type1/Makefile b/XOrg/font/font-xfree86-type1/Makefile

index 5688116673c77b8fd4fb54378720b4b880c6a6bb..d469198bc28c8e30db5ce30f590135a7368a14ac 100644 (file)
--- a/XOrg/font/font-xfree86-type1/Makefile
+++ b/XOrg/font/font-xfree86-type1/Makefile
@@ -9,11 +9,11 @@ include $(TOPDIR)/rules.mk
  
  PKG_BASE_NAME:=font
  PKG_NAME:=font-xfree86-type1
  
  PKG_BASE_NAME:=font
  PKG_NAME:=font-xfree86-type1
-PKG_RELEASE:=1
-PKG_VERSION:=X11R7.0-1.0.0
+PKG_RELEASE:=2
+PKG_VERSION:=1.0.0
  PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
  PKG_BUILD_DIR=$(BUILD_DIR)/Xorg/$(_CATEGORY)/${PKG_NAME}-$(PKG_VERSION)/
  PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
  PKG_BUILD_DIR=$(BUILD_DIR)/Xorg/$(_CATEGORY)/${PKG_NAME}-$(PKG_VERSION)/
-PKG_SOURCE_URL:=http://xorg.freedesktop.org/releases/X11R7.2/src/font
+PKG_SOURCE_URL:=http://xorg.freedesktop.org/releases/X11R7.3/src/font
  
  include $(INCLUDE_DIR)/package.mk
  
  
  include $(INCLUDE_DIR)/package.mk
  
@@ -27,10 +27,10 @@ define Package/font-xfree86-type1
  endef
  
  define Build/InstallDev
  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
  
  endef
  
-CONFIGURE_ARGS_XTRA+=--disable-iso8859-2 --disable-iso8859-3 --disable-iso8859-4  --disable-iso8859-5 --disable-iso8859-7 --disable-iso8859-8 --disable-iso8859-9 --disable-iso8859-10 --disable-iso8859-11 --disable-iso8859-13 --disable-iso8859-14 --disable-iso8859-16 --disable-koi8-r --disable-jisx0201
+CONFIGURE_ARGS+=--disable-iso8859-2 --disable-iso8859-3 --disable-iso8859-4  --disable-iso8859-5 --disable-iso8859-7 --disable-iso8859-8 --disable-iso8859-9 --disable-iso8859-10 --disable-iso8859-11 --disable-iso8859-13 --disable-iso8859-14 --disable-iso8859-16 --disable-koi8-r --disable-jisx0201
  
  define Build/Compile
         UTIL_DIR="$(STAGING_DIR)/usr/lib/X11/fonts/util/" make -e -C $(PKG_BUILD_DIR)
  
  define Build/Compile
         UTIL_DIR="$(STAGING_DIR)/usr/lib/X11/fonts/util/" make -e -C $(PKG_BUILD_DIR)
@@ -43,18 +43,6 @@ define Build/Compile
                         mv {} {}.font-xfree86-type1
  endef
  
                         mv {} {}.font-xfree86-type1
  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) ;\
-       fi \
-       )
-endef
-
  define Package/font-xfree86-type1/install
         $(INSTALL_DIR) $(1)/usr/lib/
         $(CP) $(PKG_INSTALL_DIR)/usr/lib/* $(1)/usr/lib/
  define Package/font-xfree86-type1/install
         $(INSTALL_DIR) $(1)/usr/lib/
         $(CP) $(PKG_INSTALL_DIR)/usr/lib/* $(1)/usr/lib/
diff --git a/XOrg/font/packages b/XOrg/font/packages

index 9a976e2eea2e1a0e16d3d532e396c77a13983212..1766b9b034c6526b66417fbf433c57948357a5e7 100644 (file)
--- a/XOrg/font/packages
+++ b/XOrg/font/packages
@@ -1,13 +1,12 @@
-dejavu-fonts-ttf-2.23|
-encodings-X11R7.2-1.0.2|
-font-xfree86-type1-X11R7.0-1.0.0|
-font-cursor-misc-X11R7.0-1.0.0|
-font-daewoo-misc-X11R7.0-1.0.0|
-font-dec-misc-X11R7.0-1.0.0|
-font-ibm-type1-X11R7.0-1.0.0|
-font-isas-misc-X11R7.0-1.0.0|
-font-jis-misc-X11R7.0-1.0.0|
-font-micro-misc-X11R7.0-1.0.0|
-font-misc-cyrillic-X11R7.0-1.0.0|
-font-bh-75dpi-X11R7.0-1.0.0|
-font-alias-X11R7.0-1.0.1|
+encodings-1.0.2|
+font-xfree86-type1-1.0.0|
+font-cursor-misc-1.0.0|
+font-daewoo-misc-1.0.0|
+font-dec-misc-1.0.0|
+font-ibm-type1-1.0.0|
+font-isas-misc-1.0.0|
+font-jis-misc-1.0.0|
+font-micro-misc-1.0.0|
+font-misc-cyrillic-1.0.0|
+font-bh-75dpi-1.0.0|
+font-alias-1.0.1|
diff --git a/XOrg/font/template.mk b/XOrg/font/template.mk

index a3c69aff47e201c1b1bd0475b57bdfdec5344aab..f6abfccf0a9fa13861a8e8e6521864d8e2ebff0a 100644 (file)
--- a/XOrg/font/template.mk
+++ b/XOrg/font/template.mk
@@ -9,11 +9,11 @@ include $(TOPDIR)/rules.mk
  
  PKG_BASE_NAME:=@BASE_NAME@
  PKG_NAME:=@NAME@
  
  PKG_BASE_NAME:=@BASE_NAME@
  PKG_NAME:=@NAME@
-PKG_RELEASE:=1
+PKG_RELEASE:=2
  PKG_VERSION:=@VER@
  PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
  PKG_BUILD_DIR=$(BUILD_DIR)/Xorg/$(_CATEGORY)/${PKG_NAME}-$(PKG_VERSION)/
  PKG_VERSION:=@VER@
  PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
  PKG_BUILD_DIR=$(BUILD_DIR)/Xorg/$(_CATEGORY)/${PKG_NAME}-$(PKG_VERSION)/
-PKG_SOURCE_URL:=http://xorg.freedesktop.org/releases/X11R7.2/src/font
+PKG_SOURCE_URL:=http://xorg.freedesktop.org/releases/X11R7.3/src/font
  
  include $(INCLUDE_DIR)/package.mk
  
  
  include $(INCLUDE_DIR)/package.mk
  
@@ -30,7 +30,7 @@ define Build/InstallDev
         DESTDIR=$(STAGING_DIR) $(MAKE) -C $(PKG_BUILD_DIR) $(MAKE_FLAGS) install
  endef
  
         DESTDIR=$(STAGING_DIR) $(MAKE) -C $(PKG_BUILD_DIR) $(MAKE_FLAGS) install
  endef
  
-CONFIGURE_ARGS_XTRA+=--disable-iso8859-2 --disable-iso8859-3 --disable-iso8859-4  --disable-iso8859-5 --disable-iso8859-7 --disable-iso8859-8 --disable-iso8859-9 --disable-iso8859-10 --disable-iso8859-11 --disable-iso8859-13 --disable-iso8859-14 --disable-iso8859-16 --disable-koi8-r --disable-jisx0201
+CONFIGURE_ARGS+=--disable-iso8859-2 --disable-iso8859-3 --disable-iso8859-4  --disable-iso8859-5 --disable-iso8859-7 --disable-iso8859-8 --disable-iso8859-9 --disable-iso8859-10 --disable-iso8859-11 --disable-iso8859-13 --disable-iso8859-14 --disable-iso8859-16 --disable-koi8-r --disable-jisx0201
  
  define Build/Compile
         UTIL_DIR="$(STAGING_DIR)/usr/lib/X11/fonts/util/" make -e -C $(PKG_BUILD_DIR)
  
  define Build/Compile
         UTIL_DIR="$(STAGING_DIR)/usr/lib/X11/fonts/util/" make -e -C $(PKG_BUILD_DIR)
@@ -43,18 +43,6 @@ define Build/Compile
                         mv {} {}.@NAME@
  endef
  
                         mv {} {}.@NAME@
  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) ;\
-       fi \
-       )
-endef
-
  define Package/@NAME@/install
         $(INSTALL_DIR) $(1)/usr/lib/
         $(CP) $(PKG_INSTALL_DIR)/usr/lib/* $(1)/usr/lib/
  define Package/@NAME@/install
         $(INSTALL_DIR) $(1)/usr/lib/
         $(CP) $(PKG_INSTALL_DIR)/usr/lib/* $(1)/usr/lib/
diff --git a/XOrg/generate.sh b/XOrg/generate.sh

index 814e28e990155e39f15704401b31238cb256afd9..9a99ba33d129377523ef73728b3873d46f29d571 100755 (executable)
--- a/XOrg/generate.sh
+++ b/XOrg/generate.sh
@@ -4,15 +4,17 @@ for d in `find . -name packages`; do
         echo "Entering "`dirname $d`
         for p in `cat packages`; do
                 _NAME=${p%%|*}
         echo "Entering "`dirname $d`
         for p in `cat packages`; do
                 _NAME=${p%%|*}
-               NAME=${_NAME%-X11*}
+               NAME=${_NAME%-*}
                 BASE_NAME=${NAME%%-*}
                 BASE_NAME=${NAME%%-*}
-               _VER=${_NAME##*-X}
-               VER=X${_VER%%|*}
+               VER=${_NAME##*-}
                 DEP=`echo ${p##*|} | sed "s/+/ +/g"`
                 echo generating Makefile for ${NAME}-${VER} with deps : ${DEP}
                 DEP=`echo ${p##*|} | sed "s/+/ +/g"`
                 echo generating Makefile for ${NAME}-${VER} with deps : ${DEP}
-               rm -rf ${NAME} 
-               if [ "$1" == "gen" ]; then
-                       mkdir ${NAME}
+               rm -f ${NAME}/Makefile
+        rm -f ${NAME}/patches/*
+               if [ "$1" = "gen" ]; then
+                       if [ ! -e ${NAME} ]; then
+                mkdir ${NAME}
+            fi
                         sed "s/@VER@/${VER}/g" template.mk | sed "s/@DEP@/${DEP}/g" | sed "s/@NAME@/${NAME}/g" | sed "s/@BASE_NAME@/${BASE_NAME}/g" > ${NAME}/Makefile
                         if [ -d `pwd`/patches/${NAME} ]; then
                                 mkdir ${NAME}/patches
                         sed "s/@VER@/${VER}/g" template.mk | sed "s/@DEP@/${DEP}/g" | sed "s/@NAME@/${NAME}/g" | sed "s/@BASE_NAME@/${BASE_NAME}/g" > ${NAME}/Makefile
                         if [ -d `pwd`/patches/${NAME} ]; then
                                 mkdir ${NAME}/patches
diff --git a/XOrg/headers/native/Makefile b/XOrg/headers/native/Makefile

index 71b1289e49a9303408662fb29da13072455a32b7..425ce59245ccd85092b5eb8e826b10790c963d96 100644 (file)
--- a/XOrg/headers/native/Makefile
+++ b/XOrg/headers/native/Makefile
@@ -8,8 +8,8 @@
  
  include $(TOPDIR)/rules.mk
  
  
  include $(TOPDIR)/rules.mk
  
-PKG_RELEASE:=1
-PKG_VERSION:=7.1
+PKG_RELEASE:=2
+PKG_VERSION:=7.3
  PKG_BUILD_DIR=$(BUILD_DIR)/Xorg/headers/xorg-headers-native-$(PKG_VERSION)/
  
  include $(INCLUDE_DIR)/package.mk
  PKG_BUILD_DIR=$(BUILD_DIR)/Xorg/headers/xorg-headers-native-$(PKG_VERSION)/
  
  include $(INCLUDE_DIR)/package.mk
diff --git a/XOrg/lib/libICE/Makefile b/XOrg/lib/libICE/Makefile

index 1785dd15542422e7a66a790104b987cb0d7674e0..d2d012cb3a960953fb114d9003fd2e8368341706 100644 (file)
--- a/XOrg/lib/libICE/Makefile
+++ b/XOrg/lib/libICE/Makefile
@@ -9,9 +9,9 @@ include $(TOPDIR)/rules.mk
  
  PKG_BASE_NAME:=libICE
  PKG_NAME:=libICE
  
  PKG_BASE_NAME:=libICE
  PKG_NAME:=libICE
-PKG_RELEASE:=1
-PKG_VERSION:=X11R7.2-1.0.3
-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)/
  
  PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
  PKG_BUILD_DIR=$(BUILD_DIR)/Xorg/$(_CATEGORY)/${PKG_NAME}-$(PKG_VERSION)/
  
@@ -27,11 +27,11 @@ define Package/libICE
  endef
  
  define Build/InstallDev
  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 (libICE,libX11)
  endef
  
  ifeq (libICE,libX11)
- CONFIGURE_ARGS_XTRA=--without-xcb
+ CONFIGURE_ARGS+=--without-xcb
  endif
  
  define libX11/Compile
  endif
  
  define libX11/Compile
@@ -53,21 +53,12 @@ define Build/Compile
  endef
  
  define Build/Configure
  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/libICE/install/Default
         $(INSTALL_DIR) $(1)/usr/lib
  endef
  
  define Package/libICE/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/libICE/install
  endef
  
  define Package/libICE/install
@@ -80,8 +71,7 @@ define Package/libXaw/install
  endef
  
  define Build/InstallDev
  endef
  
  define Build/InstallDev
-       $(INSTALL_DIR) $(1)
-       $(CP) $(PKG_INSTALL_DIR)/* $(1)/
+       $(CP) $(PKG_INSTALL_DIR)/* $(STAGING_DIR)
  endef
  
  $(eval $(call BuildPackage,libICE))
  endef
  
  $(eval $(call BuildPackage,libICE))
diff --git a/XOrg/lib/libSM/Makefile b/XOrg/lib/libSM/Makefile

index 839e015b2a665f7dce4494de0bab7685c4f656a4..c6622ac06137c174dffd498c9f9ac4583dbba59e 100644 (file)
--- a/XOrg/lib/libSM/Makefile
+++ b/XOrg/lib/libSM/Makefile
@@ -9,9 +9,9 @@ include $(TOPDIR)/rules.mk
  
  PKG_BASE_NAME:=libSM
  PKG_NAME:=libSM
  
  PKG_BASE_NAME:=libSM
  PKG_NAME:=libSM
-PKG_RELEASE:=1
-PKG_VERSION:=X11R7.2-1.0.2
-PKG_SOURCE_URL:=http://xorg.freedesktop.org/releases/X11R7.2/src/lib/
+PKG_RELEASE:=2
+PKG_VERSION:=1.0.3
+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)/
  
  PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
  PKG_BUILD_DIR=$(BUILD_DIR)/Xorg/$(_CATEGORY)/${PKG_NAME}-$(PKG_VERSION)/
  
@@ -27,11 +27,11 @@ define Package/libSM
  endef
  
  define Build/InstallDev
  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 (libSM,libX11)
  endef
  
  ifeq (libSM,libX11)
- CONFIGURE_ARGS_XTRA=--without-xcb
+ CONFIGURE_ARGS+=--without-xcb
  endif
  
  define libX11/Compile
  endif
  
  define libX11/Compile
@@ -53,21 +53,12 @@ define Build/Compile
  endef
  
  define Build/Configure
  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/libSM/install/Default
         $(INSTALL_DIR) $(1)/usr/lib
  endef
  
  define Package/libSM/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/libSM/install
  endef
  
  define Package/libSM/install
@@ -80,8 +71,7 @@ define Package/libXaw/install
  endef
  
  define Build/InstallDev
  endef
  
  define Build/InstallDev
-       $(INSTALL_DIR) $(1)
-       $(CP) $(PKG_INSTALL_DIR)/* $(1)/
+       $(CP) $(PKG_INSTALL_DIR)/* $(STAGING_DIR)
  endef
  
  $(eval $(call BuildPackage,libSM))
  endef
  
  $(eval $(call BuildPackage,libSM))
diff --git a/XOrg/lib/libX11/Makefile b/XOrg/lib/libX11/Makefile

index bfb6a1f70e810ed29e2852d9c0f14399c00365ff..bba1a3ebb66ecaccd999318de47eef4149517a5e 100644 (file)
--- a/XOrg/lib/libX11/Makefile
+++ b/XOrg/lib/libX11/Makefile
@@ -9,14 +9,12 @@ include $(TOPDIR)/rules.mk
  
  PKG_BASE_NAME:=libX11
  PKG_NAME:=libX11
  
  PKG_BASE_NAME:=libX11
  PKG_NAME:=libX11
-PKG_RELEASE:=1
-PKG_VERSION:=X11R7.2-1.1.1
-PKG_SOURCE_URL:=http://xorg.freedesktop.org/releases/X11R7.2/src/lib/
+PKG_RELEASE:=2
+PKG_VERSION:=1.1.3
+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)/
  
  PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
  PKG_BUILD_DIR=$(BUILD_DIR)/Xorg/$(_CATEGORY)/${PKG_NAME}-$(PKG_VERSION)/
  
-PKG_FIXUP = libtool
-
  include $(INCLUDE_DIR)/package.mk
  
  define Package/libX11
  include $(INCLUDE_DIR)/package.mk
  
  define Package/libX11
@@ -29,11 +27,11 @@ define Package/libX11
  endef
  
  define Build/InstallDev
  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 (libX11,libX11)
  endef
  
  ifeq (libX11,libX11)
- CONFIGURE_ARGS_XTRA=--without-xcb
+ CONFIGURE_ARGS+=--without-xcb
  endif
  
  define libX11/Compile
  endif
  
  define libX11/Compile
@@ -51,24 +49,16 @@ define Build/Compile
         make -C $(PKG_BUILD_DIR)
         mkdir -p $(PKG_INSTALL_DIR)
         DESTDIR=$(PKG_INSTALL_DIR) $(MAKE) -C $(PKG_BUILD_DIR) $(MAKE_FLAGS) install
         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
  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/libX11/install/Default
         $(INSTALL_DIR) $(1)/usr/lib
  endef
  
  define Package/libX11/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/libX11/install
  endef
  
  define Package/libX11/install
@@ -81,8 +71,7 @@ define Package/libXaw/install
  endef
  
  define Build/InstallDev
  endef
  
  define Build/InstallDev
-       $(INSTALL_DIR) $(1)
-       $(CP) $(PKG_INSTALL_DIR)/* $(1)/
+       $(CP) $(PKG_INSTALL_DIR)/* $(STAGING_DIR)
  endef
  
  $(eval $(call BuildPackage,libX11))
  endef
  
  $(eval $(call BuildPackage,libX11))
diff --git a/XOrg/lib/libXau/Makefile b/XOrg/lib/libXau/Makefile

index b7e0180856a72f8a494f543b7bc0727f7e8dcc45..ffa277576ca3c84e6c3dd12b89d694073fb309ae 100644 (file)
--- a/XOrg/lib/libXau/Makefile
+++ b/XOrg/lib/libXau/Makefile
@@ -9,9 +9,9 @@ include $(TOPDIR)/rules.mk
  
  PKG_BASE_NAME:=libXau
  PKG_NAME:=libXau
  
  PKG_BASE_NAME:=libXau
  PKG_NAME:=libXau
-PKG_RELEASE:=1
-PKG_VERSION:=X11R7.2-1.0.3
-PKG_SOURCE_URL:=http://xorg.freedesktop.org/releases/X11R7.2/src/lib/
+PKG_RELEASE:=2
+PKG_VERSION:=1.0.3
+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)/
  
  PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
  PKG_BUILD_DIR=$(BUILD_DIR)/Xorg/$(_CATEGORY)/${PKG_NAME}-$(PKG_VERSION)/
  
@@ -27,11 +27,11 @@ define Package/libXau
  endef
  
  define Build/InstallDev
  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 (libXau,libX11)
  endef
  
  ifeq (libXau,libX11)
- CONFIGURE_ARGS_XTRA=--without-xcb
+ CONFIGURE_ARGS+=--without-xcb
  endif
  
  define libX11/Compile
  endif
  
  define libX11/Compile
@@ -53,21 +53,12 @@ define Build/Compile
  endef
  
  define Build/Configure
  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/libXau/install/Default
         $(INSTALL_DIR) $(1)/usr/lib
  endef
  
  define Package/libXau/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/libXau/install
  endef
  
  define Package/libXau/install
@@ -80,8 +71,7 @@ define Package/libXaw/install
  endef
  
  define Build/InstallDev
  endef
  
  define Build/InstallDev
-       $(INSTALL_DIR) $(1)
-       $(CP) $(PKG_INSTALL_DIR)/* $(1)/
+       $(CP) $(PKG_INSTALL_DIR)/* $(STAGING_DIR)
  endef
  
  $(eval $(call BuildPackage,libXau))
  endef
  
  $(eval $(call BuildPackage,libXau))
diff --git a/XOrg/lib/libXaw/Makefile b/XOrg/lib/libXaw/Makefile

index 4e4363f9072ead96c2d95b0117e7fc0367aa1933..676c3ad415d218a72c56d7da9a75c6174dee071b 100644 (file)
--- a/XOrg/lib/libXaw/Makefile
+++ b/XOrg/lib/libXaw/Makefile
@@ -9,9 +9,9 @@ include $(TOPDIR)/rules.mk
  
  PKG_BASE_NAME:=libXaw
  PKG_NAME:=libXaw
  
  PKG_BASE_NAME:=libXaw
  PKG_NAME:=libXaw
-PKG_RELEASE:=1
-PKG_VERSION:=X11R7.1-1.0.2
-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)/
  
  PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
  PKG_BUILD_DIR=$(BUILD_DIR)/Xorg/$(_CATEGORY)/${PKG_NAME}-$(PKG_VERSION)/
  
@@ -27,11 +27,11 @@ define Package/libXaw
  endef
  
  define Build/InstallDev
  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 (libXaw,libX11)
  endef
  
  ifeq (libXaw,libX11)
- CONFIGURE_ARGS_XTRA=--without-xcb
+ CONFIGURE_ARGS+=--without-xcb
  endif
  
  define libX11/Compile
  endif
  
  define libX11/Compile
@@ -53,21 +53,12 @@ define Build/Compile
  endef
  
  define Build/Configure
  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/libXaw/install/Default
         $(INSTALL_DIR) $(1)/usr/lib
  endef
  
  define Package/libXaw/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/libXaw/install
  endef
  
  define Package/libXaw/install
@@ -80,8 +71,7 @@ define Package/libXaw/install
  endef
  
  define Build/InstallDev
  endef
  
  define Build/InstallDev
-       $(INSTALL_DIR) $(1)
-       $(CP) $(PKG_INSTALL_DIR)/* $(1)/
+       $(CP) $(PKG_INSTALL_DIR)/* $(STAGING_DIR)
  endef
  
  $(eval $(call BuildPackage,libXaw))
  endef
  
  $(eval $(call BuildPackage,libXaw))
diff --git a/XOrg/lib/libXcursor/Makefile b/XOrg/lib/libXcursor/Makefile

index dd99b772962430da77f2edb23eacddd065a08214..88e3cc9b6f43461f3cc73c239be23264f44f641b 100644 (file)
--- a/XOrg/lib/libXcursor/Makefile
+++ b/XOrg/lib/libXcursor/Makefile
@@ -9,9 +9,9 @@ include $(TOPDIR)/rules.mk
  
  PKG_BASE_NAME:=libXcursor
  PKG_NAME:=libXcursor
  
  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_RELEASE:=2
+PKG_VERSION:=1.1.9
+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)/
  
  PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
  PKG_BUILD_DIR=$(BUILD_DIR)/Xorg/$(_CATEGORY)/${PKG_NAME}-$(PKG_VERSION)/
  
@@ -21,17 +21,17 @@ define Package/libXcursor
    SECTION:=xorg-libraries
    CATEGORY:=Xorg
    SUBMENU:=libraries
    SECTION:=xorg-libraries
    CATEGORY:=Xorg
    SUBMENU:=libraries
-  DEPENDS:=+xorg-headers-native +libXrender +libXfixes @DISPLAY_SUPPORT
+  DEPENDS:=+xorg-headers-native +util-macros  +libXrender +libXfixes @DISPLAY_SUPPORT
    TITLE:=libXcursor
    URL:=http://xorg.freedesktop.org/
  endef
  
  define Build/InstallDev
    TITLE:=libXcursor
    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 (libXcursor,libX11)
  endef
  
  ifeq (libXcursor,libX11)
- CONFIGURE_ARGS_XTRA=--without-xcb
+ CONFIGURE_ARGS+=--without-xcb
  endif
  
  define libX11/Compile
  endif
  
  define libX11/Compile
@@ -53,16 +53,7 @@ define Build/Compile
  endef
  
  define Build/Configure
  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/libXcursor/install/Default
  endef
  
  define Package/libXcursor/install/Default
@@ -80,8 +71,7 @@ define Package/libXaw/install
  endef
  
  define Build/InstallDev
  endef
  
  define Build/InstallDev
-       $(INSTALL_DIR) $(1)
-       $(CP) $(PKG_INSTALL_DIR)/* $(1)/
+       $(CP) $(PKG_INSTALL_DIR)/* $(STAGING_DIR)
  endef
  
  $(eval $(call BuildPackage,libXcursor))
  endef
  
  $(eval $(call BuildPackage,libXcursor))
diff --git a/XOrg/lib/libXdmcp/Makefile b/XOrg/lib/libXdmcp/Makefile

index f08cbd21e7cd527b4704a6d0e65e67958cf7f2ff..6f41cdc8d4e79b4702b4e96fb1a8c8ff4fbe2a7b 100644 (file)
--- a/XOrg/lib/libXdmcp/Makefile
+++ b/XOrg/lib/libXdmcp/Makefile
@@ -9,9 +9,9 @@ include $(TOPDIR)/rules.mk
  
  PKG_BASE_NAME:=libXdmcp
  PKG_NAME:=libXdmcp
  
  PKG_BASE_NAME:=libXdmcp
  PKG_NAME:=libXdmcp
-PKG_RELEASE:=1
-PKG_VERSION:=X11R7.2-1.0.2
-PKG_SOURCE_URL:=http://xorg.freedesktop.org/releases/X11R7.2/src/lib/
+PKG_RELEASE:=2
+PKG_VERSION:=1.0.2
+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)/
  
  PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
  PKG_BUILD_DIR=$(BUILD_DIR)/Xorg/$(_CATEGORY)/${PKG_NAME}-$(PKG_VERSION)/
  
@@ -27,11 +27,11 @@ define Package/libXdmcp
  endef
  
  define Build/InstallDev
  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 (libXdmcp,libX11)
  endef
  
  ifeq (libXdmcp,libX11)
- CONFIGURE_ARGS_XTRA=--without-xcb
+ CONFIGURE_ARGS+=--without-xcb
  endif
  
  define libX11/Compile
  endif
  
  define libX11/Compile
@@ -53,21 +53,12 @@ define Build/Compile
  endef
  
  define Build/Configure
  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/libXdmcp/install/Default
         $(INSTALL_DIR) $(1)/usr/lib
  endef
  
  define Package/libXdmcp/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/libXdmcp/install
  endef
  
  define Package/libXdmcp/install
@@ -80,8 +71,7 @@ define Package/libXaw/install
  endef
  
  define Build/InstallDev
  endef
  
  define Build/InstallDev
-       $(INSTALL_DIR) $(1)
-       $(CP) $(PKG_INSTALL_DIR)/* $(1)/
+       $(CP) $(PKG_INSTALL_DIR)/* $(STAGING_DIR)
  endef
  
  $(eval $(call BuildPackage,libXdmcp))
  endef
  
  $(eval $(call BuildPackage,libXdmcp))
diff --git a/XOrg/lib/libXext/Makefile b/XOrg/lib/libXext/Makefile

index a99e915f0de322ee3fa62230c10ab5a405944cbe..ee456865db639d061dfd4d7f60dac9497db0165a 100644 (file)
--- a/XOrg/lib/libXext/Makefile
+++ b/XOrg/lib/libXext/Makefile
@@ -9,14 +9,12 @@ include $(TOPDIR)/rules.mk
  
  PKG_BASE_NAME:=libXext
  PKG_NAME:=libXext
  
  PKG_BASE_NAME:=libXext
  PKG_NAME:=libXext
-PKG_RELEASE:=1
-PKG_VERSION:=X11R7.2-1.0.2
-PKG_SOURCE_URL:=http://xorg.freedesktop.org/releases/X11R7.2/src/lib/
+PKG_RELEASE:=2
+PKG_VERSION:=1.0.2
+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)/
  
  PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
  PKG_BUILD_DIR=$(BUILD_DIR)/Xorg/$(_CATEGORY)/${PKG_NAME}-$(PKG_VERSION)/
  
-PKG_FIXUP = libtool
-
  include $(INCLUDE_DIR)/package.mk
  
  define Package/libXext
  include $(INCLUDE_DIR)/package.mk
  
  define Package/libXext
@@ -29,11 +27,11 @@ define Package/libXext
  endef
  
  define Build/InstallDev
  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 (libXext,libX11)
  endef
  
  ifeq (libXext,libX11)
- CONFIGURE_ARGS_XTRA=--without-xcb
+ CONFIGURE_ARGS+=--without-xcb
  endif
  
  define libX11/Compile
  endif
  
  define libX11/Compile
@@ -51,24 +49,16 @@ define Build/Compile
         make -C $(PKG_BUILD_DIR)
         mkdir -p $(PKG_INSTALL_DIR)
         DESTDIR=$(PKG_INSTALL_DIR) $(MAKE) -C $(PKG_BUILD_DIR) $(MAKE_FLAGS) install
         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
  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/libXext/install/Default
         $(INSTALL_DIR) $(1)/usr/lib
  endef
  
  define Package/libXext/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/libXext/install
  endef
  
  define Package/libXext/install
@@ -81,8 +71,7 @@ define Package/libXaw/install
  endef
  
  define Build/InstallDev
  endef
  
  define Build/InstallDev
-       $(INSTALL_DIR) $(1)
-       $(CP) $(PKG_INSTALL_DIR)/* $(1)/
+       $(CP) $(PKG_INSTALL_DIR)/* $(STAGING_DIR)
  endef
  
  $(eval $(call BuildPackage,libXext))
  endef
  
  $(eval $(call BuildPackage,libXext))
diff --git a/XOrg/lib/libXfixes/Makefile b/XOrg/lib/libXfixes/Makefile

index 2971a21e62fb17287e09c5534f4798196f65768c..1c092d8ec15e33096e733e12bda2aa68a1b5637e 100644 (file)
--- a/XOrg/lib/libXfixes/Makefile
+++ b/XOrg/lib/libXfixes/Makefile
@@ -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.
  #
  #
  # 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:=libXfixes
  PKG_NAME:=libXfixes
  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_RELEASE:=2
+PKG_VERSION:=4.0.3
+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)/
  
  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/libXfixes
    SECTION:=xorg-libraries
    CATEGORY:=Xorg
    SUBMENU:=libraries
    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  @DISPLAY_SUPPORT
    TITLE:=libXfixes
    URL:=http://xorg.freedesktop.org/
  endef
  
  define Build/InstallDev
    TITLE:=libXfixes
    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 (libXfixes,libX11)
  endef
  
  ifeq (libXfixes,libX11)
- CONFIGURE_ARGS_XTRA=--without-xcb
+ CONFIGURE_ARGS+=--without-xcb
  endif
  
  define libX11/Compile
         $(MAKE_VARS) \
  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) \
  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
  endef
  
  define Build/Compile
@@ -53,21 +53,12 @@ define Build/Compile
  endef
  
  define Build/Configure
  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/libXfixes/install/Default
         $(INSTALL_DIR) $(1)/usr/lib
  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
+       find $(PKG_INSTALL_DIR)/usr/lib/ -name lib*so* | $(XARGS) -i -t cp -P {} $(1)/usr/lib 
  endef
  
  define Package/libXfixes/install
  endef
  
  define Package/libXfixes/install
@@ -80,8 +71,7 @@ define Package/libXaw/install
  endef
  
  define Build/InstallDev
  endef
  
  define Build/InstallDev
-       $(INSTALL_DIR) $(1)
-       $(CP) $(PKG_INSTALL_DIR)/* $(1)/
+       $(CP) $(PKG_INSTALL_DIR)/* $(STAGING_DIR)
  endef
  
  $(eval $(call BuildPackage,libXfixes))
  endef
  
  $(eval $(call BuildPackage,libXfixes))
diff --git a/XOrg/lib/libXfont/Makefile b/XOrg/lib/libXfont/Makefile

index e8299d128689a494d9d39073ed8c91cbe555372a..80bf7166ec2a306296bc8769dc858af38fd8846b 100644 (file)
--- a/XOrg/lib/libXfont/Makefile
+++ b/XOrg/lib/libXfont/Makefile
@@ -9,9 +9,9 @@ include $(TOPDIR)/rules.mk
  
  PKG_BASE_NAME:=libXfont
  PKG_NAME:=libXfont
  
  PKG_BASE_NAME:=libXfont
  PKG_NAME:=libXfont
-PKG_RELEASE:=1
-PKG_VERSION:=1.3.0
-PKG_SOURCE_URL:=http://xorg.freedesktop.org/archive/individual/lib/
+PKG_RELEASE:=2
+PKG_VERSION:=1.3.1
+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)/
  
  PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
  PKG_BUILD_DIR=$(BUILD_DIR)/Xorg/$(_CATEGORY)/${PKG_NAME}-$(PKG_VERSION)/
  
@@ -27,11 +27,11 @@ define Package/libXfont
  endef
  
  define Build/InstallDev
  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 (libXfont,libX11)
  endef
  
  ifeq (libXfont,libX11)
- CONFIGURE_ARGS_XTRA=--without-xcb
+ CONFIGURE_ARGS+=--without-xcb
  endif
  
  define libX11/Compile
  endif
  
  define libX11/Compile
@@ -53,21 +53,12 @@ define Build/Compile
  endef
  
  define Build/Configure
  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/libXfont/install/Default
         $(INSTALL_DIR) $(1)/usr/lib
  endef
  
  define Package/libXfont/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/libXfont/install
  endef
  
  define Package/libXfont/install
@@ -80,8 +71,7 @@ define Package/libXaw/install
  endef
  
  define Build/InstallDev
  endef
  
  define Build/InstallDev
-       $(INSTALL_DIR) $(1)
-       $(CP) $(PKG_INSTALL_DIR)/* $(1)/
+       $(CP) $(PKG_INSTALL_DIR)/* $(STAGING_DIR)
  endef
  
  $(eval $(call BuildPackage,libXfont))
  endef
  
  $(eval $(call BuildPackage,libXfont))
diff --git a/XOrg/lib/libXft/Makefile b/XOrg/lib/libXft/Makefile

index 7e8d2ebe19f50e65d82051e17b59a73195c20dad..4d1162450ebc8bc4af37186c2eb0b815c709b2c9 100644 (file)
--- a/XOrg/lib/libXft/Makefile
+++ b/XOrg/lib/libXft/Makefile
@@ -9,9 +9,9 @@ include $(TOPDIR)/rules.mk
  
  PKG_BASE_NAME:=libXft
  PKG_NAME:=libXft
  
  PKG_BASE_NAME:=libXft
  PKG_NAME:=libXft
-PKG_RELEASE:=1
-PKG_VERSION:=X11R7.2-2.1.12
-PKG_SOURCE_URL:=http://xorg.freedesktop.org/releases/X11R7.2/src/lib/
+PKG_RELEASE:=2
+PKG_VERSION:=2.1.12
+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)/
  
  PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
  PKG_BUILD_DIR=$(BUILD_DIR)/Xorg/$(_CATEGORY)/${PKG_NAME}-$(PKG_VERSION)/
  
diff --git a/XOrg/lib/libXmu/Makefile b/XOrg/lib/libXmu/Makefile

index 193c3013646e5de1016e2e470762b203c7f839fd..136d16633b8c8ad8c8257831e4900ad716cd4f70 100644 (file)
--- a/XOrg/lib/libXmu/Makefile
+++ b/XOrg/lib/libXmu/Makefile
@@ -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.
  #
  #
  # 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:=libXmu
  PKG_NAME:=libXmu
  include $(TOPDIR)/rules.mk
  
  PKG_BASE_NAME:=libXmu
  PKG_NAME:=libXmu
-PKG_RELEASE:=1
-PKG_VERSION:=X11R7.2-1.0.3
-PKG_SOURCE_URL:=http://xorg.freedesktop.org/releases/X11R7.2/src/lib/
+PKG_RELEASE:=2
+PKG_VERSION:=1.0.3
+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)/
  
  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/libXmu
    SECTION:=xorg-libraries
    CATEGORY:=Xorg
    SUBMENU:=libraries
    SECTION:=xorg-libraries
    CATEGORY:=Xorg
    SUBMENU:=libraries
-  DEPENDS:=+xorg-headers-native +util-macros +libXt +libXext @DISPLAY_SUPPORT
+  DEPENDS:=+xorg-headers-native +util-macros  @DISPLAY_SUPPORT
    TITLE:=libXmu
    URL:=http://xorg.freedesktop.org/
  endef
  
  define Build/InstallDev
    TITLE:=libXmu
    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 (libXmu,libX11)
  endef
  
  ifeq (libXmu,libX11)
- CONFIGURE_ARGS_XTRA=--without-xcb
+ CONFIGURE_ARGS+=--without-xcb
  endif
  
  define libX11/Compile
         $(MAKE_VARS) \
  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) \
  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
  endef
  
  define Build/Compile
@@ -53,21 +53,12 @@ define Build/Compile
  endef
  
  define Build/Configure
  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/libXmu/install/Default
         $(INSTALL_DIR) $(1)/usr/lib
  endef
  
  define Package/libXmu/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/libXmu/install
  endef
  
  define Package/libXmu/install
@@ -80,8 +71,7 @@ define Package/libXaw/install
  endef
  
  define Build/InstallDev
  endef
  
  define Build/InstallDev
-       $(INSTALL_DIR) $(1)
-       $(CP) $(PKG_INSTALL_DIR)/* $(1)/
+       $(CP) $(PKG_INSTALL_DIR)/* $(STAGING_DIR)
  endef
  
  $(eval $(call BuildPackage,libXmu))
  endef
  
  $(eval $(call BuildPackage,libXmu))
diff --git a/XOrg/lib/libXpm/Makefile b/XOrg/lib/libXpm/Makefile

index db9c250f72a80ba7038fb3c834e97f2838d0abc0..e92fee3512ab527aecac6c9c54feab0bc0bcd502 100644 (file)
--- a/XOrg/lib/libXpm/Makefile
+++ b/XOrg/lib/libXpm/Makefile
@@ -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.
  #
  #
  # 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:=libXpm
  PKG_NAME:=libXpm
  include $(TOPDIR)/rules.mk
  
  PKG_BASE_NAME:=libXpm
  PKG_NAME:=libXpm
-PKG_RELEASE:=1
-PKG_VERSION:=X11R7.2-3.5.6
-PKG_SOURCE_URL:=http://xorg.freedesktop.org/releases/X11R7.2/src/lib/
+PKG_RELEASE:=2
+PKG_VERSION:=3.5.7
+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)/
  
  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/libXpm
    SECTION:=xorg-libraries
    CATEGORY:=Xorg
    SUBMENU:=libraries
    SECTION:=xorg-libraries
    CATEGORY:=Xorg
    SUBMENU:=libraries
-  DEPENDS:=+xorg-headers-native +util-macros +libX11 @DISPLAY_SUPPORT
+  DEPENDS:=+xorg-headers-native +util-macros  @DISPLAY_SUPPORT
    TITLE:=libXpm
    URL:=http://xorg.freedesktop.org/
  endef
  
  define Build/InstallDev
    TITLE:=libXpm
    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 (libXpm,libX11)
  endef
  
  ifeq (libXpm,libX11)
- CONFIGURE_ARGS_XTRA=--without-xcb
+ CONFIGURE_ARGS+=--without-xcb
  endif
  
  define libX11/Compile
         $(MAKE_VARS) \
  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) \
  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
  endef
  
  define Build/Compile
@@ -53,21 +53,12 @@ define Build/Compile
  endef
  
  define Build/Configure
  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/libXpm/install/Default
         $(INSTALL_DIR) $(1)/usr/lib
  endef
  
  define Package/libXpm/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/libXpm/install
  endef
  
  define Package/libXpm/install
@@ -80,8 +71,7 @@ define Package/libXaw/install
  endef
  
  define Build/InstallDev
  endef
  
  define Build/InstallDev
-       $(INSTALL_DIR) $(1)
-       $(CP) $(PKG_INSTALL_DIR)/* $(1)/
+       $(CP) $(PKG_INSTALL_DIR)/* $(STAGING_DIR)
  endef
  
  $(eval $(call BuildPackage,libXpm))
  endef
  
  $(eval $(call BuildPackage,libXpm))
diff --git a/XOrg/lib/libXrandr/Makefile b/XOrg/lib/libXrandr/Makefile

index 5a445a9451dd72983ee4cfa0e21e65c3b8d60f37..184cffad827d3d35a77d8b3cc5d3faa1252c46d3 100644 (file)
--- a/XOrg/lib/libXrandr/Makefile
+++ b/XOrg/lib/libXrandr/Makefile
@@ -9,9 +9,9 @@ include $(TOPDIR)/rules.mk
  
  PKG_BASE_NAME:=libXrandr
  PKG_NAME:=libXrandr
  
  PKG_BASE_NAME:=libXrandr
  PKG_NAME:=libXrandr
-PKG_RELEASE:=1
-PKG_VERSION:=X11R7.2-1.1.2
-PKG_SOURCE_URL:=http://xorg.freedesktop.org/releases/X11R7.2/src/lib/
+PKG_RELEASE:=2
+PKG_VERSION:=1.2.2
+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)/
  
  PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
  PKG_BUILD_DIR=$(BUILD_DIR)/Xorg/$(_CATEGORY)/${PKG_NAME}-$(PKG_VERSION)/
  
@@ -27,11 +27,11 @@ define Package/libXrandr
  endef
  
  define Build/InstallDev
  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 (libXrandr,libX11)
  endef
  
  ifeq (libXrandr,libX11)
- CONFIGURE_ARGS_XTRA=--without-xcb
+ CONFIGURE_ARGS+=--without-xcb
  endif
  
  define libX11/Compile
  endif
  
  define libX11/Compile
@@ -53,21 +53,12 @@ define Build/Compile
  endef
  
  define Build/Configure
  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/libXrandr/install/Default
         $(INSTALL_DIR) $(1)/usr/lib
  endef
  
  define Package/libXrandr/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/libXrandr/install
  endef
  
  define Package/libXrandr/install
@@ -80,8 +71,7 @@ define Package/libXaw/install
  endef
  
  define Build/InstallDev
  endef
  
  define Build/InstallDev
-       $(INSTALL_DIR) $(1)
-       $(CP) $(PKG_INSTALL_DIR)/* $(1)/
+       $(CP) $(PKG_INSTALL_DIR)/* $(STAGING_DIR)
  endef
  
  $(eval $(call BuildPackage,libXrandr))
  endef
  
  $(eval $(call BuildPackage,libXrandr))
diff --git a/XOrg/lib/libXrender/Makefile b/XOrg/lib/libXrender/Makefile

index c7fb2ad6c9e9765f9f32d7c8882b173679ebabb7..c3203e5dd2195f6597f21aa171ee21db4f080d09 100644 (file)
--- a/XOrg/lib/libXrender/Makefile
+++ b/XOrg/lib/libXrender/Makefile
@@ -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.
  #
  #
  # 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
  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)/
  
  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
    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
    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)
  endef
  
  ifeq (libXrender,libX11)
- CONFIGURE_ARGS_XTRA=--without-xcb
+ CONFIGURE_ARGS+=--without-xcb
  endif
  
  define libX11/Compile
         $(MAKE_VARS) \
  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) \
  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
  endef
  
  define Build/Compile
@@ -53,21 +53,12 @@ define Build/Compile
  endef
  
  define Build/Configure
  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
  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
  endef
  
  define Package/libXrender/install
@@ -80,8 +71,7 @@ define Package/libXaw/install
  endef
  
  define Build/InstallDev
  endef
  
  define Build/InstallDev
-       $(INSTALL_DIR) $(1)
-       $(CP) $(PKG_INSTALL_DIR)/* $(1)/
+       $(CP) $(PKG_INSTALL_DIR)/* $(STAGING_DIR)
  endef
  
  $(eval $(call BuildPackage,libXrender))
  endef
  
  $(eval $(call BuildPackage,libXrender))
diff --git a/XOrg/lib/libXt/Makefile b/XOrg/lib/libXt/Makefile

index 56d2403da783ed06d58c3b2775e2daaf807195af..2069839fb138a9cccd069cc81a72d40c7bf43461 100644 (file)
--- a/XOrg/lib/libXt/Makefile
+++ b/XOrg/lib/libXt/Makefile
@@ -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.
  #
  #
  # 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:=libXt
  PKG_NAME:=libXt
  include $(TOPDIR)/rules.mk
  
  PKG_BASE_NAME:=libXt
  PKG_NAME:=libXt
-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)/
  
  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/libXt
    SECTION:=xorg-libraries
    CATEGORY:=Xorg
    SUBMENU:=libraries
    SECTION:=xorg-libraries
    CATEGORY:=Xorg
    SUBMENU:=libraries
-  DEPENDS:=+xorg-headers-native +util-macros +libX11 +libSM @DISPLAY_SUPPORT
+  DEPENDS:=+xorg-headers-native +util-macros  +libSM @DISPLAY_SUPPORT
    TITLE:=libXt
    URL:=http://xorg.freedesktop.org/
  endef
  
  define Build/InstallDev
    TITLE:=libXt
    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 (libXt,libX11)
  endef
  
  ifeq (libXt,libX11)
- CONFIGURE_ARGS_XTRA=--without-xcb
+ CONFIGURE_ARGS+=--without-xcb
  endif
  
  define libX11/Compile
         $(MAKE_VARS) \
  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) \
  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
  endef
  
  define Build/Compile
@@ -53,21 +53,12 @@ define Build/Compile
  endef
  
  define Build/Configure
  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/libXt/install/Default
         $(INSTALL_DIR) $(1)/usr/lib
  endef
  
  define Package/libXt/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/libXt/install
  endef
  
  define Package/libXt/install
@@ -80,10 +71,7 @@ define Package/libXaw/install
  endef
  
  define Build/InstallDev
  endef
  
  define Build/InstallDev
-       $(INSTALL_DIR) $(1)
-       $(CP) $(PKG_INSTALL_DIR)/* $(1)/
-       $(INSTALL_DIR) $(2)/bin
-       mv $(1)/usr/bin/makestrs $(2)/bin
+       $(CP) $(PKG_INSTALL_DIR)/* $(STAGING_DIR)
  endef
  
  $(eval $(call BuildPackage,libXt))
  endef
  
  $(eval $(call BuildPackage,libXt))
diff --git a/XOrg/lib/libXv/Makefile b/XOrg/lib/libXv/Makefile

index 29ef1f3a93a1ab429aecc4ce00080ad2f017dd95..1ac79adba37ca7d3c93dcac820e34fee09cee1f5 100644 (file)
--- a/XOrg/lib/libXv/Makefile
+++ b/XOrg/lib/libXv/Makefile
@@ -9,9 +9,9 @@ include $(TOPDIR)/rules.mk
  
  PKG_BASE_NAME:=libXv
  PKG_NAME:=libXv
  
  PKG_BASE_NAME:=libXv
  PKG_NAME:=libXv
-PKG_RELEASE:=1
-PKG_VERSION:=X11R7.2-1.0.3
-PKG_SOURCE_URL:=http://xorg.freedesktop.org/releases/X11R7.2/src/lib/
+PKG_RELEASE:=2
+PKG_VERSION:=1.0.3
+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)/
  
  PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
  PKG_BUILD_DIR=$(BUILD_DIR)/Xorg/$(_CATEGORY)/${PKG_NAME}-$(PKG_VERSION)/
  
@@ -27,11 +27,11 @@ define Package/libXv
  endef
  
  define Build/InstallDev
  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 (libXv,libX11)
  endef
  
  ifeq (libXv,libX11)
- CONFIGURE_ARGS_XTRA=--without-xcb
+ CONFIGURE_ARGS+=--without-xcb
  endif
  
  define libX11/Compile
  endif
  
  define libX11/Compile
@@ -53,16 +53,7 @@ define Build/Compile
  endef
  
  define Build/Configure
  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/libXv/install/Default
  endef
  
  define Package/libXv/install/Default
@@ -80,8 +71,7 @@ define Package/libXaw/install
  endef
  
  define Build/InstallDev
  endef
  
  define Build/InstallDev
-       $(INSTALL_DIR) $(1)
-       $(CP) $(PKG_INSTALL_DIR)/* $(1)/
+       $(CP) $(PKG_INSTALL_DIR)/* $(STAGING_DIR)
  endef
  
  $(eval $(call BuildPackage,libXv))
  endef
  
  $(eval $(call BuildPackage,libXv))
diff --git a/XOrg/lib/libXvMC/Makefile b/XOrg/lib/libXvMC/Makefile

index 072b65af2e9aa69ccee70482a1594ca82f5d0cf3..157a81c261b30e6a7bc5958fcc6442c481f2c08b 100644 (file)
--- a/XOrg/lib/libXvMC/Makefile
+++ b/XOrg/lib/libXvMC/Makefile
@@ -9,9 +9,9 @@ include $(TOPDIR)/rules.mk
  
  PKG_BASE_NAME:=libXvMC
  PKG_NAME:=libXvMC
  
  PKG_BASE_NAME:=libXvMC
  PKG_NAME:=libXvMC
-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)/
  
  PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
  PKG_BUILD_DIR=$(BUILD_DIR)/Xorg/$(_CATEGORY)/${PKG_NAME}-$(PKG_VERSION)/
  
@@ -27,11 +27,11 @@ define Package/libXvMC
  endef
  
  define Build/InstallDev
  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 (libXvMC,libX11)
  endef
  
  ifeq (libXvMC,libX11)
- CONFIGURE_ARGS_XTRA=--without-xcb
+ CONFIGURE_ARGS+=--without-xcb
  endif
  
  define libX11/Compile
  endif
  
  define libX11/Compile
@@ -53,16 +53,7 @@ define Build/Compile
  endef
  
  define Build/Configure
  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/libXvMC/install/Default
  endef
  
  define Package/libXvMC/install/Default
@@ -80,8 +71,7 @@ define Package/libXaw/install
  endef
  
  define Build/InstallDev
  endef
  
  define Build/InstallDev
-       $(INSTALL_DIR) $(1)
-       $(CP) $(PKG_INSTALL_DIR)/* $(1)/
+       $(CP) $(PKG_INSTALL_DIR)/* $(STAGING_DIR)
  endef
  
  $(eval $(call BuildPackage,libXvMC))
  endef
  
  $(eval $(call BuildPackage,libXvMC))
diff --git a/XOrg/lib/libXxf86misc/Makefile b/XOrg/lib/libXxf86misc/Makefile

index 875fb2e91714f8979fb7ec99e595e35c591cc2f4..4ba01f455afbf5ab03c79668f9ee5d15c5a1cfdf 100644 (file)
--- a/XOrg/lib/libXxf86misc/Makefile
+++ b/XOrg/lib/libXxf86misc/Makefile
@@ -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.
  #
  #
  # 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:=libXxf86misc
  PKG_NAME:=libXxf86misc
  include $(TOPDIR)/rules.mk
  
  PKG_BASE_NAME:=libXxf86misc
  PKG_NAME:=libXxf86misc
-PKG_RELEASE:=1
-PKG_VERSION:=X11R7.1-1.0.1
-PKG_SOURCE_URL:=http://xorg.freedesktop.org/releases/X11R7.2/src/lib/
+PKG_RELEASE:=2
+PKG_VERSION:=1.0.1
+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)/
  
  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/libXxf86misc
    SECTION:=xorg-libraries
    CATEGORY:=Xorg
    SUBMENU:=libraries
    SECTION:=xorg-libraries
    CATEGORY:=Xorg
    SUBMENU:=libraries
-  DEPENDS:=+xorg-headers-native +util-macros +libXt +libXext @DISPLAY_SUPPORT
+  DEPENDS:=+xorg-headers-native +util-macros  @DISPLAY_SUPPORT
    TITLE:=libXxf86misc
    URL:=http://xorg.freedesktop.org/
  endef
  
  define Build/InstallDev
    TITLE:=libXxf86misc
    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 (libXxf86misc,libX11)
  endef
  
  ifeq (libXxf86misc,libX11)
- CONFIGURE_ARGS_XTRA=--without-xcb
+ CONFIGURE_ARGS+=--without-xcb
  endif
  
  define libX11/Compile
         $(MAKE_VARS) \
  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) \
  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
  endef
  
  define Build/Compile
@@ -53,21 +53,12 @@ define Build/Compile
  endef
  
  define Build/Configure
  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/libXxf86misc/install/Default
         $(INSTALL_DIR) $(1)/usr/lib
  endef
  
  define Package/libXxf86misc/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/libXxf86misc/install
  endef
  
  define Package/libXxf86misc/install
@@ -80,8 +71,7 @@ define Package/libXaw/install
  endef
  
  define Build/InstallDev
  endef
  
  define Build/InstallDev
-       $(INSTALL_DIR) $(1)
-       $(CP) $(PKG_INSTALL_DIR)/* $(1)/
+       $(CP) $(PKG_INSTALL_DIR)/* $(STAGING_DIR)
  endef
  
  $(eval $(call BuildPackage,libXxf86misc))
  endef
  
  $(eval $(call BuildPackage,libXxf86misc))
diff --git a/XOrg/lib/libXxf86vm/Makefile b/XOrg/lib/libXxf86vm/Makefile

index c85135cd480ad0870c7b763830bdddacc7a8e4ad..4cc0b15b2367b713e3d0ede88caf9bacafe1a670 100644 (file)
--- a/XOrg/lib/libXxf86vm/Makefile
+++ b/XOrg/lib/libXxf86vm/Makefile
@@ -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.
  #
  #
  # 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:=libXxf86vm
  PKG_NAME:=libXxf86vm
  include $(TOPDIR)/rules.mk
  
  PKG_BASE_NAME:=libXxf86vm
  PKG_NAME:=libXxf86vm
-PKG_RELEASE:=1
-PKG_VERSION:=X11R7.1-1.0.1
-PKG_SOURCE_URL:=http://xorg.freedesktop.org/releases/X11R7.2/src/lib/
+PKG_RELEASE:=2
+PKG_VERSION:=1.0.1
+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)/
  
  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/libXxf86vm
    SECTION:=xorg-libraries
    CATEGORY:=Xorg
    SUBMENU:=libraries
    SECTION:=xorg-libraries
    CATEGORY:=Xorg
    SUBMENU:=libraries
-  DEPENDS:=+xorg-headers-native +util-macros +libX11 +libXext @DISPLAY_SUPPORT
+  DEPENDS:=+xorg-headers-native +util-macros  @DISPLAY_SUPPORT
    TITLE:=libXxf86vm
    URL:=http://xorg.freedesktop.org/
  endef
  
  define Build/InstallDev
    TITLE:=libXxf86vm
    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 (libXxf86vm,libX11)
  endef
  
  ifeq (libXxf86vm,libX11)
- CONFIGURE_ARGS_XTRA=--without-xcb
+ CONFIGURE_ARGS+=--without-xcb
  endif
  
  define libX11/Compile
         $(MAKE_VARS) \
  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) \
  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
  endef
  
  define Build/Compile
@@ -53,21 +53,12 @@ define Build/Compile
  endef
  
  define Build/Configure
  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/libXxf86vm/install/Default
         $(INSTALL_DIR) $(1)/usr/lib
  endef
  
  define Package/libXxf86vm/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/libXxf86vm/install
  endef
  
  define Package/libXxf86vm/install
@@ -80,8 +71,7 @@ define Package/libXaw/install
  endef
  
  define Build/InstallDev
  endef
  
  define Build/InstallDev
-       $(INSTALL_DIR) $(1)
-       $(CP) $(PKG_INSTALL_DIR)/* $(1)/
+       $(CP) $(PKG_INSTALL_DIR)/* $(STAGING_DIR)
  endef
  
  $(eval $(call BuildPackage,libXxf86vm))
  endef
  
  $(eval $(call BuildPackage,libXxf86vm))
diff --git a/XOrg/lib/libfontenc/Makefile b/XOrg/lib/libfontenc/Makefile

index 3b525bdbda7f1bdc1e1c4b493ec390dbcbf86c6d..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_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)/
  
  PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
  PKG_BUILD_DIR=$(BUILD_DIR)/Xorg/$(_CATEGORY)/${PKG_NAME}-$(PKG_VERSION)/
  
@@ -27,11 +27,11 @@ define Package/libfontenc
  endef
  
  define Build/InstallDev
  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 (libfontenc,libX11)
  endef
  
  ifeq (libfontenc,libX11)
- CONFIGURE_ARGS_XTRA=--without-xcb
+ CONFIGURE_ARGS+=--without-xcb
  endif
  
  define libX11/Compile
  endif
  
  define libX11/Compile
@@ -53,21 +53,12 @@ define Build/Compile
  endef
  
  define Build/Configure
  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
         $(INSTALL_DIR) $(1)/usr/lib
  endef
  
  define Package/libfontenc/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/libfontenc/install
  endef
  
  define Package/libfontenc/install
@@ -80,8 +71,7 @@ define Package/libXaw/install
  endef
  
  define Build/InstallDev
  endef
  
  define Build/InstallDev
-       $(INSTALL_DIR) $(1)
-       $(CP) $(PKG_INSTALL_DIR)/* $(1)/
+       $(CP) $(PKG_INSTALL_DIR)/* $(STAGING_DIR)
  endef
  
  $(eval $(call BuildPackage,libfontenc))
  endef
  
  $(eval $(call BuildPackage,libfontenc))
diff --git a/XOrg/lib/libxkbfile/Makefile b/XOrg/lib/libxkbfile/Makefile

index af66b0e976905f0f95548a545f4f47f4eb46837f..a376ea1040d2c353b18381e27bfa95bfbf00cd8e 100644 (file)
--- a/XOrg/lib/libxkbfile/Makefile
+++ b/XOrg/lib/libxkbfile/Makefile
@@ -9,9 +9,9 @@ include $(TOPDIR)/rules.mk
  
  PKG_BASE_NAME:=libxkbfile
  PKG_NAME:=libxkbfile
  
  PKG_BASE_NAME:=libxkbfile
  PKG_NAME:=libxkbfile
-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)/
  
  PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
  PKG_BUILD_DIR=$(BUILD_DIR)/Xorg/$(_CATEGORY)/${PKG_NAME}-$(PKG_VERSION)/
  
@@ -21,17 +21,17 @@ define Package/libxkbfile
    SECTION:=xorg-libraries
    CATEGORY:=Xorg
    SUBMENU:=libraries
    SECTION:=xorg-libraries
    CATEGORY:=Xorg
    SUBMENU:=libraries
-  DEPENDS:=+xorg-headers-native +util-macros +libX11 @DISPLAY_SUPPORT
+  DEPENDS:=+xorg-headers-native +util-macros  @DISPLAY_SUPPORT
    TITLE:=libxkbfile
    URL:=http://xorg.freedesktop.org/
  endef
  
  define Build/InstallDev
    TITLE:=libxkbfile
    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 (libxkbfile,libX11)
  endef
  
  ifeq (libxkbfile,libX11)
- CONFIGURE_ARGS_XTRA=--without-xcb
+ CONFIGURE_ARGS+=--without-xcb
  endif
  
  define libX11/Compile
  endif
  
  define libX11/Compile
@@ -53,21 +53,12 @@ define Build/Compile
  endef
  
  define Build/Configure
  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/libxkbfile/install/Default
         $(INSTALL_DIR) $(1)/usr/lib
  endef
  
  define Package/libxkbfile/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/libxkbfile/install
  endef
  
  define Package/libxkbfile/install
@@ -80,8 +71,7 @@ define Package/libXaw/install
  endef
  
  define Build/InstallDev
  endef
  
  define Build/InstallDev
-       $(INSTALL_DIR) $(1)
-       $(CP) $(PKG_INSTALL_DIR)/* $(1)/
+       $(CP) $(PKG_INSTALL_DIR)/* $(STAGING_DIR)
  endef
  
  $(eval $(call BuildPackage,libxkbfile))
  endef
  
  $(eval $(call BuildPackage,libxkbfile))
diff --git a/XOrg/lib/packages b/XOrg/lib/packages

index ab1edd82bb314166e49086f6883766703e4188f8..ad41861bcd7014c726d6d6a5d395976e70336c7a 100644 (file)
--- a/XOrg/lib/packages
+++ b/XOrg/lib/packages
@@ -1,23 +1,23 @@
-libXau-X11R7.2-1.0.3|+xproto
-xtrans-X11R7.2-1.0.3|
-libXdmcp-X11R7.2-1.0.2|+xproto
-libX11-X11R7.2-1.1.1|+bigreqsproto+xproto+xextproto+libXau+xtrans+xcmiscproto+libXdmcp+xf86bigfontproto+kbproto+inputproto
-libfontenc-X11R7.2-1.0.4|+xproto+zlib
-libXfont-X11R7.2-1.2.7|+zlib+libfontenc+fontcacheproto+fontsproto+libfreetype
-libXrender-X11R7.2-0.9.2|+libfreetype+zlib+xproto+libfontenc+xtrans+fontsproto+renderproto
-libXrandr-X11R7.2-1.1.2|+libXext+libXrender+randrproto+renderproto+xextproto+libX11
-libXext-X11R7.2-1.0.2|+xproto+xextproto+libXau+libX11
-libxkbfile-X11R7.2-1.0.4|
-libXt-X11R7.2-1.0.4|+libSM
-libSM-X11R7.2-1.0.2|+libICE
-libICE-X11R7.2-1.0.3|+xproto+xtrans
-libxkbui-X11R7.1-1.0.2|
-libXxf86misc-X11R7.1-1.0.1|
-libXxf86vm-X11R7.1-1.0.1|
-libXaw-X11R7.1-1.0.2|+libXmu+libXpm+libXau+libXdmcp
-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|
+libfontenc-1.0.4|+xproto+zlib
+libICE-1.0.4|+xproto+xtrans
+libSM-1.0.3|+libICE
+libX11-1.1.3|+bigreqsproto+xproto+xextproto+libXau+xtrans+xcmiscproto+libXdmcp+xf86bigfontproto+kbproto+inputproto
+libXau-1.0.3|+xproto
+libXaw-1.0.4|+libXmu+libXpm+libXau+libXdmcp
+libXcursor-1.1.9|+libXrender+libXfixes
+libXdmcp-1.0.2|+xproto
+libXext-1.0.2|+xproto+xextproto+libXau+libX11
+libXfixes-4.0.3|
+libXfont-1.3.1|+zlib+libfontenc+fontcacheproto+fontsproto+libfreetype
+libxkbfile-1.0.4|
+libxkbui-1.0.2|
+libXmu-1.0.3|
+libXpm-3.5.7|
+libXrandr-1.2.2|+libXext+libXrender+randrproto+renderproto+xextproto+libX11
+libXrender-0.9.4|+libfreetype+zlib+xproto+libfontenc+xtrans+fontsproto+renderproto
+libXt-1.0.4|+libSM
+libXv-1.0.3|+libXext+videoproto
+libXvMC-1.0.4|+libXext+videoproto+libXv
+libXxf86misc-1.0.1|
+libXxf86vm-1.0.1|
+xtrans-1.0.4|
diff --git a/XOrg/lib/template.mk b/XOrg/lib/template.mk

index 9d4bd68546d5f16652570144a0ec634c27d7b4df..40a8fd46e53704a70c2a616a3e61a412e201de5c 100644 (file)
--- a/XOrg/lib/template.mk
+++ b/XOrg/lib/template.mk
@@ -9,9 +9,9 @@ include $(TOPDIR)/rules.mk
  
  PKG_BASE_NAME:=@BASE_NAME@
  PKG_NAME:=@NAME@
  
  PKG_BASE_NAME:=@BASE_NAME@
  PKG_NAME:=@NAME@
-PKG_RELEASE:=1
+PKG_RELEASE:=2
  PKG_VERSION:=@VER@
  PKG_VERSION:=@VER@
-PKG_SOURCE_URL:=http://xorg.freedesktop.org/releases/X11R7.2/src/lib/
+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)/
  
  PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
  PKG_BUILD_DIR=$(BUILD_DIR)/Xorg/$(_CATEGORY)/${PKG_NAME}-$(PKG_VERSION)/
  
@@ -31,7 +31,7 @@ define Build/InstallDev
  endef
  
  ifeq (@NAME@,libX11)
  endef
  
  ifeq (@NAME@,libX11)
- CONFIGURE_ARGS_XTRA=--without-xcb
+ CONFIGURE_ARGS+=--without-xcb
  endif
  
  define libX11/Compile
  endif
  
  define libX11/Compile
@@ -53,16 +53,7 @@ define Build/Compile
  endef
  
  define Build/Configure
  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/@NAME@/install/Default
  endef
  
  define Package/@NAME@/install/Default
diff --git a/XOrg/lib/xtrans/Makefile b/XOrg/lib/xtrans/Makefile

index cfe59370fe68cc3fe74c6d163df90651f302c859..e9ef224711a41585cc052fa29221625783a15af7 100644 (file)
--- a/XOrg/lib/xtrans/Makefile
+++ b/XOrg/lib/xtrans/Makefile
@@ -9,9 +9,9 @@ include $(TOPDIR)/rules.mk
  
  PKG_BASE_NAME:=xtrans
  PKG_NAME:=xtrans
  
  PKG_BASE_NAME:=xtrans
  PKG_NAME:=xtrans
-PKG_RELEASE:=1
-PKG_VERSION:=X11R7.2-1.0.3
-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)/
  
  PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
  PKG_BUILD_DIR=$(BUILD_DIR)/Xorg/$(_CATEGORY)/${PKG_NAME}-$(PKG_VERSION)/
  
@@ -27,11 +27,11 @@ define Package/xtrans
  endef
  
  define Build/InstallDev
  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 (xtrans,libX11)
  endef
  
  ifeq (xtrans,libX11)
- CONFIGURE_ARGS_XTRA=--without-xcb
+ CONFIGURE_ARGS+=--without-xcb
  endif
  
  define libX11/Compile
  endif
  
  define libX11/Compile
@@ -53,21 +53,12 @@ define Build/Compile
  endef
  
  define Build/Configure
  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/xtrans/install/Default
         $(INSTALL_DIR) $(1)/usr/lib
  endef
  
  define Package/xtrans/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/xtrans/install
  endef
  
  define Package/xtrans/install
@@ -80,8 +71,7 @@ define Package/libXaw/install
  endef
  
  define Build/InstallDev
  endef
  
  define Build/InstallDev
-       $(INSTALL_DIR) $(1)
-       $(CP) $(PKG_INSTALL_DIR)/* $(1)/
+       $(CP) $(PKG_INSTALL_DIR)/* $(STAGING_DIR)
  endef
  
  $(eval $(call BuildPackage,xtrans))
  endef
  
  $(eval $(call BuildPackage,xtrans))
diff --git a/XOrg/proto/applewmproto/Makefile b/XOrg/proto/applewmproto/Makefile

index ddcbe00465ce2361ec95fbf8478e56f76e09b1c8..7f086c4217b4d3b825e84aab73c314cd0b17688a 100644 (file)
--- a/XOrg/proto/applewmproto/Makefile
+++ b/XOrg/proto/applewmproto/Makefile
@@ -8,9 +8,9 @@
  include $(TOPDIR)/rules.mk
  
  PKG_NAME:=applewmproto
  include $(TOPDIR)/rules.mk
  
  PKG_NAME:=applewmproto
-PKG_RELEASE:=1
-PKG_VERSION:=X11R7.0-1.0.3
-PKG_SOURCE_URL:=http://xorg.freedesktop.org/releases/X11R7.2/src/proto/
+PKG_RELEASE:=2
+PKG_VERSION:=1.0.3
+PKG_SOURCE_URL:=http://xorg.freedesktop.org/releases/X11R7.3/src/proto/
  PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
  PKG_BUILD_DIR=$(BUILD_DIR)/Xorg/$(_CATEGORY)/${PKG_NAME}-$(PKG_VERSION)/
  
  PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
  PKG_BUILD_DIR=$(BUILD_DIR)/Xorg/$(_CATEGORY)/${PKG_NAME}-$(PKG_VERSION)/
  
@@ -26,7 +26,7 @@ define Package/applewmproto
  endef
  
  define Build/InstallDev
  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
  
  define Build/Compile
  endef
  
  define Build/Compile
diff --git a/XOrg/proto/bigreqsproto/Makefile b/XOrg/proto/bigreqsproto/Makefile

index dd5bf54d12cc797bdadf12ac74022684bc7b3f58..485fb7a8cddd4d58a45a9062c1187e8cbc1ae8cc 100644 (file)
--- a/XOrg/proto/bigreqsproto/Makefile
+++ b/XOrg/proto/bigreqsproto/Makefile
@@ -8,9 +8,9 @@
  include $(TOPDIR)/rules.mk
  
  PKG_NAME:=bigreqsproto
  include $(TOPDIR)/rules.mk
  
  PKG_NAME:=bigreqsproto
-PKG_RELEASE:=1
-PKG_VERSION:=X11R7.0-1.0.2
-PKG_SOURCE_URL:=http://xorg.freedesktop.org/releases/X11R7.2/src/proto/
+PKG_RELEASE:=2
+PKG_VERSION:=1.0.2
+PKG_SOURCE_URL:=http://xorg.freedesktop.org/releases/X11R7.3/src/proto/
  PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
  PKG_BUILD_DIR=$(BUILD_DIR)/Xorg/$(_CATEGORY)/${PKG_NAME}-$(PKG_VERSION)/
  
  PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
  PKG_BUILD_DIR=$(BUILD_DIR)/Xorg/$(_CATEGORY)/${PKG_NAME}-$(PKG_VERSION)/
  
@@ -26,7 +26,7 @@ define Package/bigreqsproto
  endef
  
  define Build/InstallDev
  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
  
  define Build/Compile
  endef
  
  define Build/Compile
diff --git a/XOrg/proto/compositeproto/Makefile b/XOrg/proto/compositeproto/Makefile

index dd94f55d06568ce5716db8d750569291e1e3fb14..cda993f4762c6b5f8ec6c9e5db442cbb8468f7d2 100644 (file)
--- a/XOrg/proto/compositeproto/Makefile
+++ b/XOrg/proto/compositeproto/Makefile
@@ -8,9 +8,9 @@
  include $(TOPDIR)/rules.mk
  
  PKG_NAME:=compositeproto
  include $(TOPDIR)/rules.mk
  
  PKG_NAME:=compositeproto
-PKG_RELEASE:=1
-PKG_VERSION:=X11R7.1-0.3.1
-PKG_SOURCE_URL:=http://xorg.freedesktop.org/releases/X11R7.2/src/proto/
+PKG_RELEASE:=2
+PKG_VERSION:=0.4
+PKG_SOURCE_URL:=http://xorg.freedesktop.org/releases/X11R7.3/src/proto/
  PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
  PKG_BUILD_DIR=$(BUILD_DIR)/Xorg/$(_CATEGORY)/${PKG_NAME}-$(PKG_VERSION)/
  
  PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
  PKG_BUILD_DIR=$(BUILD_DIR)/Xorg/$(_CATEGORY)/${PKG_NAME}-$(PKG_VERSION)/
  
@@ -26,7 +26,7 @@ define Package/compositeproto
  endef
  
  define Build/InstallDev
  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
  
  define Build/Compile
  endef
  
  define Build/Compile
diff --git a/XOrg/proto/damageproto/Makefile b/XOrg/proto/damageproto/Makefile

index 0590667a2130d98fdd9f8e70029253e7d747da15..799ca788ee2989854202a56f63b0a4a101c21584 100644 (file)
--- a/XOrg/proto/damageproto/Makefile
+++ b/XOrg/proto/damageproto/Makefile
@@ -8,9 +8,9 @@
  include $(TOPDIR)/rules.mk
  
  PKG_NAME:=damageproto
  include $(TOPDIR)/rules.mk
  
  PKG_NAME:=damageproto
-PKG_RELEASE:=1
-PKG_VERSION:=X11R7.0-1.0.3
-PKG_SOURCE_URL:=http://xorg.freedesktop.org/releases/X11R7.2/src/proto/
+PKG_RELEASE:=2
+PKG_VERSION:=1.1.0
+PKG_SOURCE_URL:=http://xorg.freedesktop.org/releases/X11R7.3/src/proto/
  PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
  PKG_BUILD_DIR=$(BUILD_DIR)/Xorg/$(_CATEGORY)/${PKG_NAME}-$(PKG_VERSION)/
  
  PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
  PKG_BUILD_DIR=$(BUILD_DIR)/Xorg/$(_CATEGORY)/${PKG_NAME}-$(PKG_VERSION)/
  
@@ -26,7 +26,7 @@ define Package/damageproto
  endef
  
  define Build/InstallDev
  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
  
  define Build/Compile
  endef
  
  define Build/Compile
diff --git a/XOrg/proto/dmxproto/Makefile b/XOrg/proto/dmxproto/Makefile

index bc710361bfefb1e78070cd90e8f543224a16c07c..925f72cc15cd336f5950b3ecaca23089890a9875 100644 (file)
--- a/XOrg/proto/dmxproto/Makefile
+++ b/XOrg/proto/dmxproto/Makefile
@@ -8,9 +8,9 @@
  include $(TOPDIR)/rules.mk
  
  PKG_NAME:=dmxproto
  include $(TOPDIR)/rules.mk
  
  PKG_NAME:=dmxproto
-PKG_RELEASE:=1
-PKG_VERSION:=X11R7.0-2.2.2
-PKG_SOURCE_URL:=http://xorg.freedesktop.org/releases/X11R7.2/src/proto/
+PKG_RELEASE:=2
+PKG_VERSION:=2.2.2
+PKG_SOURCE_URL:=http://xorg.freedesktop.org/releases/X11R7.3/src/proto/
  PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
  PKG_BUILD_DIR=$(BUILD_DIR)/Xorg/$(_CATEGORY)/${PKG_NAME}-$(PKG_VERSION)/
  
  PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
  PKG_BUILD_DIR=$(BUILD_DIR)/Xorg/$(_CATEGORY)/${PKG_NAME}-$(PKG_VERSION)/
  
@@ -26,7 +26,7 @@ define Package/dmxproto
  endef
  
  define Build/InstallDev
  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
  
  define Build/Compile
  endef
  
  define Build/Compile
diff --git a/XOrg/proto/evieext/Makefile b/XOrg/proto/evieext/Makefile

index 4b083c3046f14809c39914387c82b5f8fd32eec0..35bf46bb16551dd6845ede14cbb8d56bfac0edf5 100644 (file)
--- a/XOrg/proto/evieext/Makefile
+++ b/XOrg/proto/evieext/Makefile
@@ -8,9 +8,9 @@
  include $(TOPDIR)/rules.mk
  
  PKG_NAME:=evieext
  include $(TOPDIR)/rules.mk
  
  PKG_NAME:=evieext
-PKG_RELEASE:=1
-PKG_VERSION:=X11R7.0-1.0.2
-PKG_SOURCE_URL:=http://xorg.freedesktop.org/releases/X11R7.2/src/proto/
+PKG_RELEASE:=2
+PKG_VERSION:=1.0.2
+PKG_SOURCE_URL:=http://xorg.freedesktop.org/releases/X11R7.3/src/proto/
  PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
  PKG_BUILD_DIR=$(BUILD_DIR)/Xorg/$(_CATEGORY)/${PKG_NAME}-$(PKG_VERSION)/
  
  PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
  PKG_BUILD_DIR=$(BUILD_DIR)/Xorg/$(_CATEGORY)/${PKG_NAME}-$(PKG_VERSION)/
  
@@ -26,7 +26,7 @@ define Package/evieext
  endef
  
  define Build/InstallDev
  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
  
  define Build/Compile
  endef
  
  define Build/Compile
diff --git a/XOrg/proto/fixesproto/Makefile b/XOrg/proto/fixesproto/Makefile

index 3fb9812fe0072e2550af2f3c156a668857626360..f7c307ea2e2598e58c05f4e6e36232852c50c1ca 100644 (file)
--- a/XOrg/proto/fixesproto/Makefile
+++ b/XOrg/proto/fixesproto/Makefile
@@ -8,9 +8,9 @@
  include $(TOPDIR)/rules.mk
  
  PKG_NAME:=fixesproto
  include $(TOPDIR)/rules.mk
  
  PKG_NAME:=fixesproto
-PKG_RELEASE:=1
-PKG_VERSION:=X11R7.1-4.0
-PKG_SOURCE_URL:=http://xorg.freedesktop.org/releases/X11R7.2/src/proto/
+PKG_RELEASE:=2
+PKG_VERSION:=4.0
+PKG_SOURCE_URL:=http://xorg.freedesktop.org/releases/X11R7.3/src/proto/
  PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
  PKG_BUILD_DIR=$(BUILD_DIR)/Xorg/$(_CATEGORY)/${PKG_NAME}-$(PKG_VERSION)/
  
  PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
  PKG_BUILD_DIR=$(BUILD_DIR)/Xorg/$(_CATEGORY)/${PKG_NAME}-$(PKG_VERSION)/
  
@@ -26,7 +26,7 @@ define Package/fixesproto
  endef
  
  define Build/InstallDev
  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
  
  define Build/Compile
  endef
  
  define Build/Compile
diff --git a/XOrg/proto/fontcacheproto/Makefile b/XOrg/proto/fontcacheproto/Makefile

index bdf8bfff88719bfdfacb540f22e115e843e0e96f..db66be57ac7c481e324f000336ebb22d33c06ef7 100644 (file)
--- a/XOrg/proto/fontcacheproto/Makefile
+++ b/XOrg/proto/fontcacheproto/Makefile
@@ -8,9 +8,9 @@
  include $(TOPDIR)/rules.mk
  
  PKG_NAME:=fontcacheproto
  include $(TOPDIR)/rules.mk
  
  PKG_NAME:=fontcacheproto
-PKG_RELEASE:=1
-PKG_VERSION:=X11R7.0-0.1.2
-PKG_SOURCE_URL:=http://xorg.freedesktop.org/releases/X11R7.2/src/proto/
+PKG_RELEASE:=2
+PKG_VERSION:=0.1.2
+PKG_SOURCE_URL:=http://xorg.freedesktop.org/releases/X11R7.3/src/proto/
  PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
  PKG_BUILD_DIR=$(BUILD_DIR)/Xorg/$(_CATEGORY)/${PKG_NAME}-$(PKG_VERSION)/
  
  PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
  PKG_BUILD_DIR=$(BUILD_DIR)/Xorg/$(_CATEGORY)/${PKG_NAME}-$(PKG_VERSION)/
  
@@ -26,7 +26,7 @@ define Package/fontcacheproto
  endef
  
  define Build/InstallDev
  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
  
  define Build/Compile
  endef
  
  define Build/Compile
diff --git a/XOrg/proto/fontsproto/Makefile b/XOrg/proto/fontsproto/Makefile

index 62c54289eb97be525c14ecf7b1bd78afbb7eb89a..4bbc0fc4a3b669fd17e0198f1bc2acfec1ee837a 100644 (file)
--- a/XOrg/proto/fontsproto/Makefile
+++ b/XOrg/proto/fontsproto/Makefile
@@ -8,9 +8,9 @@
  include $(TOPDIR)/rules.mk
  
  PKG_NAME:=fontsproto
  include $(TOPDIR)/rules.mk
  
  PKG_NAME:=fontsproto
-PKG_RELEASE:=1
-PKG_VERSION:=X11R7.0-2.0.2
-PKG_SOURCE_URL:=http://xorg.freedesktop.org/releases/X11R7.2/src/proto/
+PKG_RELEASE:=2
+PKG_VERSION:=2.0.2
+PKG_SOURCE_URL:=http://xorg.freedesktop.org/releases/X11R7.3/src/proto/
  PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
  PKG_BUILD_DIR=$(BUILD_DIR)/Xorg/$(_CATEGORY)/${PKG_NAME}-$(PKG_VERSION)/
  
  PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
  PKG_BUILD_DIR=$(BUILD_DIR)/Xorg/$(_CATEGORY)/${PKG_NAME}-$(PKG_VERSION)/
  
@@ -26,7 +26,7 @@ define Package/fontsproto
  endef
  
  define Build/InstallDev
  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
  
  define Build/Compile
  endef
  
  define Build/Compile
diff --git a/XOrg/proto/glproto/Makefile b/XOrg/proto/glproto/Makefile

index ebc3fc022cf405e6e63dd6a2a0eb3ed9e763a8b8..2179f95faddfda7c332c1cb86698bb91b43fc988 100644 (file)
--- a/XOrg/proto/glproto/Makefile
+++ b/XOrg/proto/glproto/Makefile
@@ -8,9 +8,9 @@
  include $(TOPDIR)/rules.mk
  
  PKG_NAME:=glproto
  include $(TOPDIR)/rules.mk
  
  PKG_NAME:=glproto
-PKG_RELEASE:=1
-PKG_VERSION:=X11R7.2-1.4.8
-PKG_SOURCE_URL:=http://xorg.freedesktop.org/releases/X11R7.2/src/proto/
+PKG_RELEASE:=2
+PKG_VERSION:=1.4.8
+PKG_SOURCE_URL:=http://xorg.freedesktop.org/releases/X11R7.3/src/proto/
  PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
  PKG_BUILD_DIR=$(BUILD_DIR)/Xorg/$(_CATEGORY)/${PKG_NAME}-$(PKG_VERSION)/
  
  PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
  PKG_BUILD_DIR=$(BUILD_DIR)/Xorg/$(_CATEGORY)/${PKG_NAME}-$(PKG_VERSION)/
  
@@ -26,7 +26,7 @@ define Package/glproto
  endef
  
  define Build/InstallDev
  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
  
  define Build/Compile
  endef
  
  define Build/Compile
diff --git a/XOrg/proto/inputproto/Makefile b/XOrg/proto/inputproto/Makefile

index 43f7c6db275de716c39e0264ea4c6496ed8beb2a..5ef6445302bb87e6e3791d1275061456952f19c1 100644 (file)
--- a/XOrg/proto/inputproto/Makefile
+++ b/XOrg/proto/inputproto/Makefile
@@ -8,9 +8,9 @@
  include $(TOPDIR)/rules.mk
  
  PKG_NAME:=inputproto
  include $(TOPDIR)/rules.mk
  
  PKG_NAME:=inputproto
-PKG_RELEASE:=1
-PKG_VERSION:=X11R7.0-1.3.2
-PKG_SOURCE_URL:=http://xorg.freedesktop.org/releases/X11R7.2/src/proto/
+PKG_RELEASE:=2
+PKG_VERSION:=1.4.2.1
+PKG_SOURCE_URL:=http://xorg.freedesktop.org/releases/X11R7.3/src/proto/
  PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
  PKG_BUILD_DIR=$(BUILD_DIR)/Xorg/$(_CATEGORY)/${PKG_NAME}-$(PKG_VERSION)/
  
  PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
  PKG_BUILD_DIR=$(BUILD_DIR)/Xorg/$(_CATEGORY)/${PKG_NAME}-$(PKG_VERSION)/
  
@@ -26,7 +26,7 @@ define Package/inputproto
  endef
  
  define Build/InstallDev
  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
  
  define Build/Compile
  endef
  
  define Build/Compile
diff --git a/XOrg/proto/kbproto/Makefile b/XOrg/proto/kbproto/Makefile

index 014b755c35fd79e0ed47601452ff2a0c69022495..5cd2b5ae1719870abd5db18c785ca1af0ccfc4b8 100644 (file)
--- a/XOrg/proto/kbproto/Makefile
+++ b/XOrg/proto/kbproto/Makefile
@@ -8,9 +8,9 @@
  include $(TOPDIR)/rules.mk
  
  PKG_NAME:=kbproto
  include $(TOPDIR)/rules.mk
  
  PKG_NAME:=kbproto
-PKG_RELEASE:=1
-PKG_VERSION:=X11R7.2-1.0.3
-PKG_SOURCE_URL:=http://xorg.freedesktop.org/releases/X11R7.2/src/proto/
+PKG_RELEASE:=2
+PKG_VERSION:=1.0.3
+PKG_SOURCE_URL:=http://xorg.freedesktop.org/releases/X11R7.3/src/proto/
  PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
  PKG_BUILD_DIR=$(BUILD_DIR)/Xorg/$(_CATEGORY)/${PKG_NAME}-$(PKG_VERSION)/
  
  PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
  PKG_BUILD_DIR=$(BUILD_DIR)/Xorg/$(_CATEGORY)/${PKG_NAME}-$(PKG_VERSION)/
  
@@ -26,7 +26,7 @@ define Package/kbproto
  endef
  
  define Build/InstallDev
  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
  
  define Build/Compile
  endef
  
  define Build/Compile
diff --git a/XOrg/proto/packages b/XOrg/proto/packages

index 990a6ceb3150eeef4042c71928970ce23877fe29..d2710f6d530fda98745afe5098b61a50be4fcf53 100644 (file)
--- a/XOrg/proto/packages
+++ b/XOrg/proto/packages
@@ -1,32 +1,32 @@
-compositeproto-X11R7.1-0.3.1|
-damageproto-X11R7.0-1.0.3|
-fixesproto-X11R7.1-4.0|
-recordproto-X11R7.0-1.13.2|
-resourceproto-X11R7.0-1.0.2|
-scrnsaverproto-X11R7.1-1.1.0|
-videoproto-X11R7.0-2.2.2|
-xextproto-X11R7.0-7.0.2|
-xproto-X11R7.2-7.0.10|
-bigreqsproto-X11R7.0-1.0.2|
-xcmiscproto-X11R7.0-1.1.2|
-xf86bigfontproto-X11R7.0-1.1.2|
-kbproto-X11R7.2-1.0.3|
-inputproto-X11R7.0-1.3.2|
-fontcacheproto-X11R7.0-0.1.2|
-fontsproto-X11R7.0-2.0.2|
-randrproto-X11R7.0-1.1.2|
-renderproto-X11R7.0-0.9.2|
-xf86driproto-X11R7.0-2.0.3|
-glproto-X11R7.2-1.4.8|
-xf86miscproto-X11R7.0-0.9.2|
-xf86vidmodeproto-X11R7.0-2.2.2|
-xf86dgaproto-X11R7.0-2.0.2|
-trapproto-X11R7.0-3.4.3|
-xineramaproto-X11R7.0-1.1.2|
-evieext-X11R7.0-1.0.2|
-applewmproto-X11R7.0-1.0.3|
-dmxproto-X11R7.0-2.2.2|
-printproto-X11R7.0-1.0.3|
-windowswmproto-X11R7.0-1.0.3|
-xf86rushproto-X11R7.0-1.1.2|
-xproxymanagementprotocol-X11R7.0-1.0.2|
+applewmproto-1.0.3|
+bigreqsproto-1.0.2|
+compositeproto-0.4|
+damageproto-1.1.0|
+dmxproto-2.2.2|
+evieext-1.0.2|
+fixesproto-4.0|
+fontcacheproto-0.1.2|
+fontsproto-2.0.2|
+glproto-1.4.8|
+inputproto-1.4.2.1|
+kbproto-1.0.3|
+printproto-1.0.3|
+randrproto-1.2.1|
+recordproto-1.13.2|
+renderproto-0.9.3|
+resourceproto-1.0.2|
+scrnsaverproto-1.1.0|
+trapproto-3.4.3|
+videoproto-2.2.2|
+windowswmproto-1.0.3|
+xcmiscproto-1.1.2|
+xextproto-7.0.2|
+xf86bigfontproto-1.1.2|
+xf86dgaproto-2.0.3|
+xf86driproto-2.0.3|
+xf86miscproto-0.9.2|
+xf86rushproto-1.1.2|
+xf86vidmodeproto-2.2.2|
+xineramaproto-1.1.2|
+xproto-7.0.10|
+xproxymanagementprotocol-1.0.2|
diff --git a/XOrg/proto/printproto/Makefile b/XOrg/proto/printproto/Makefile

index 7c04074fecd25b28586626adc996777107b7045a..dd9efec37c023be5ea13f61d577daf4dfb8cfc9e 100644 (file)
--- a/XOrg/proto/printproto/Makefile
+++ b/XOrg/proto/printproto/Makefile
@@ -8,9 +8,9 @@
  include $(TOPDIR)/rules.mk
  
  PKG_NAME:=printproto
  include $(TOPDIR)/rules.mk
  
  PKG_NAME:=printproto
-PKG_RELEASE:=1
-PKG_VERSION:=X11R7.0-1.0.3
-PKG_SOURCE_URL:=http://xorg.freedesktop.org/releases/X11R7.2/src/proto/
+PKG_RELEASE:=2
+PKG_VERSION:=1.0.3
+PKG_SOURCE_URL:=http://xorg.freedesktop.org/releases/X11R7.3/src/proto/
  PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
  PKG_BUILD_DIR=$(BUILD_DIR)/Xorg/$(_CATEGORY)/${PKG_NAME}-$(PKG_VERSION)/
  
  PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
  PKG_BUILD_DIR=$(BUILD_DIR)/Xorg/$(_CATEGORY)/${PKG_NAME}-$(PKG_VERSION)/
  
@@ -26,7 +26,7 @@ define Package/printproto
  endef
  
  define Build/InstallDev
  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
  
  define Build/Compile
  endef
  
  define Build/Compile
diff --git a/XOrg/proto/randrproto/Makefile b/XOrg/proto/randrproto/Makefile

index ea262ffdc1651d95852a9d9b4a237d432f39270d..e6ac38bc03f3b9006a29204984a3c5b3bdb166bf 100644 (file)
--- a/XOrg/proto/randrproto/Makefile
+++ b/XOrg/proto/randrproto/Makefile
@@ -8,9 +8,9 @@
  include $(TOPDIR)/rules.mk
  
  PKG_NAME:=randrproto
  include $(TOPDIR)/rules.mk
  
  PKG_NAME:=randrproto
-PKG_RELEASE:=1
-PKG_VERSION:=X11R7.0-1.1.2
-PKG_SOURCE_URL:=http://xorg.freedesktop.org/releases/X11R7.2/src/proto/
+PKG_RELEASE:=2
+PKG_VERSION:=1.2.1
+PKG_SOURCE_URL:=http://xorg.freedesktop.org/releases/X11R7.3/src/proto/
  PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
  PKG_BUILD_DIR=$(BUILD_DIR)/Xorg/$(_CATEGORY)/${PKG_NAME}-$(PKG_VERSION)/
  
  PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
  PKG_BUILD_DIR=$(BUILD_DIR)/Xorg/$(_CATEGORY)/${PKG_NAME}-$(PKG_VERSION)/
  
@@ -26,7 +26,7 @@ define Package/randrproto
  endef
  
  define Build/InstallDev
  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
  
  define Build/Compile
  endef
  
  define Build/Compile
diff --git a/XOrg/proto/recordproto/Makefile b/XOrg/proto/recordproto/Makefile

index 755d4354d9240bd679fd2894c5826c5ab033560c..c3061808eb73c9adf126311d92df0dcd57e3a08a 100644 (file)
--- a/XOrg/proto/recordproto/Makefile
+++ b/XOrg/proto/recordproto/Makefile
@@ -8,9 +8,9 @@
  include $(TOPDIR)/rules.mk
  
  PKG_NAME:=recordproto
  include $(TOPDIR)/rules.mk
  
  PKG_NAME:=recordproto
-PKG_RELEASE:=1
-PKG_VERSION:=X11R7.0-1.13.2
-PKG_SOURCE_URL:=http://xorg.freedesktop.org/releases/X11R7.2/src/proto/
+PKG_RELEASE:=2
+PKG_VERSION:=1.13.2
+PKG_SOURCE_URL:=http://xorg.freedesktop.org/releases/X11R7.3/src/proto/
  PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
  PKG_BUILD_DIR=$(BUILD_DIR)/Xorg/$(_CATEGORY)/${PKG_NAME}-$(PKG_VERSION)/
  
  PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
  PKG_BUILD_DIR=$(BUILD_DIR)/Xorg/$(_CATEGORY)/${PKG_NAME}-$(PKG_VERSION)/
  
@@ -26,7 +26,7 @@ define Package/recordproto
  endef
  
  define Build/InstallDev
  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
  
  define Build/Compile
  endef
  
  define Build/Compile
diff --git a/XOrg/proto/renderproto/Makefile b/XOrg/proto/renderproto/Makefile

index 28a41088ba9f631ff24f07393c5a5600e1b269ef..542f4c089086eca86247b10dff06bd10401db6cd 100644 (file)
--- a/XOrg/proto/renderproto/Makefile
+++ b/XOrg/proto/renderproto/Makefile
@@ -8,9 +8,9 @@
  include $(TOPDIR)/rules.mk
  
  PKG_NAME:=renderproto
  include $(TOPDIR)/rules.mk
  
  PKG_NAME:=renderproto
-PKG_RELEASE:=1
-PKG_VERSION:=X11R7.0-0.9.2
-PKG_SOURCE_URL:=http://xorg.freedesktop.org/releases/X11R7.2/src/proto/
+PKG_RELEASE:=2
+PKG_VERSION:=0.9.3
+PKG_SOURCE_URL:=http://xorg.freedesktop.org/releases/X11R7.3/src/proto/
  PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
  PKG_BUILD_DIR=$(BUILD_DIR)/Xorg/$(_CATEGORY)/${PKG_NAME}-$(PKG_VERSION)/
  
  PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
  PKG_BUILD_DIR=$(BUILD_DIR)/Xorg/$(_CATEGORY)/${PKG_NAME}-$(PKG_VERSION)/
  
@@ -26,7 +26,7 @@ define Package/renderproto
  endef
  
  define Build/InstallDev
  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
  
  define Build/Compile
  endef
  
  define Build/Compile
diff --git a/XOrg/proto/resourceproto/Makefile b/XOrg/proto/resourceproto/Makefile

index 03bde5cd74ed76c03c93568a394bd58b2277d4f8..e37ec4a52de466e0cefec4debd71ff02a165e152 100644 (file)
--- a/XOrg/proto/resourceproto/Makefile
+++ b/XOrg/proto/resourceproto/Makefile
@@ -8,9 +8,9 @@
  include $(TOPDIR)/rules.mk
  
  PKG_NAME:=resourceproto
  include $(TOPDIR)/rules.mk
  
  PKG_NAME:=resourceproto
-PKG_RELEASE:=1
-PKG_VERSION:=X11R7.0-1.0.2
-PKG_SOURCE_URL:=http://xorg.freedesktop.org/releases/X11R7.2/src/proto/
+PKG_RELEASE:=2
+PKG_VERSION:=1.0.2
+PKG_SOURCE_URL:=http://xorg.freedesktop.org/releases/X11R7.3/src/proto/
  PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
  PKG_BUILD_DIR=$(BUILD_DIR)/Xorg/$(_CATEGORY)/${PKG_NAME}-$(PKG_VERSION)/
  
  PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
  PKG_BUILD_DIR=$(BUILD_DIR)/Xorg/$(_CATEGORY)/${PKG_NAME}-$(PKG_VERSION)/
  
@@ -26,7 +26,7 @@ define Package/resourceproto
  endef
  
  define Build/InstallDev
  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
  
  define Build/Compile
  endef
  
  define Build/Compile
diff --git a/XOrg/proto/scrnsaverproto/Makefile b/XOrg/proto/scrnsaverproto/Makefile

index 083aeceb685f6b5cc165ec14ee725e1382eec01a..83356a04412772873e9941dddf46b79ecd687d6a 100644 (file)
--- a/XOrg/proto/scrnsaverproto/Makefile
+++ b/XOrg/proto/scrnsaverproto/Makefile
@@ -8,9 +8,9 @@
  include $(TOPDIR)/rules.mk
  
  PKG_NAME:=scrnsaverproto
  include $(TOPDIR)/rules.mk
  
  PKG_NAME:=scrnsaverproto
-PKG_RELEASE:=1
-PKG_VERSION:=X11R7.1-1.1.0
-PKG_SOURCE_URL:=http://xorg.freedesktop.org/releases/X11R7.2/src/proto/
+PKG_RELEASE:=2
+PKG_VERSION:=1.1.0
+PKG_SOURCE_URL:=http://xorg.freedesktop.org/releases/X11R7.3/src/proto/
  PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
  PKG_BUILD_DIR=$(BUILD_DIR)/Xorg/$(_CATEGORY)/${PKG_NAME}-$(PKG_VERSION)/
  
  PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
  PKG_BUILD_DIR=$(BUILD_DIR)/Xorg/$(_CATEGORY)/${PKG_NAME}-$(PKG_VERSION)/
  
@@ -26,7 +26,7 @@ define Package/scrnsaverproto
  endef
  
  define Build/InstallDev
  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
  
  define Build/Compile
  endef
  
  define Build/Compile
diff --git a/XOrg/proto/template.mk b/XOrg/proto/template.mk

index a93069c9202f2b531d0615cbe8ae59f6537f58cb..c470ca7bf6b9aadf2e670b11ce91963f28a256f4 100644 (file)
--- a/XOrg/proto/template.mk
+++ b/XOrg/proto/template.mk
@@ -8,9 +8,9 @@
  include $(TOPDIR)/rules.mk
  
  PKG_NAME:=@NAME@
  include $(TOPDIR)/rules.mk
  
  PKG_NAME:=@NAME@
-PKG_RELEASE:=1
+PKG_RELEASE:=2
  PKG_VERSION:=@VER@
  PKG_VERSION:=@VER@
-PKG_SOURCE_URL:=http://xorg.freedesktop.org/releases/X11R7.2/src/proto/
+PKG_SOURCE_URL:=http://xorg.freedesktop.org/releases/X11R7.3/src/proto/
  PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
  PKG_BUILD_DIR=$(BUILD_DIR)/Xorg/$(_CATEGORY)/${PKG_NAME}-$(PKG_VERSION)/
  
  PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
  PKG_BUILD_DIR=$(BUILD_DIR)/Xorg/$(_CATEGORY)/${PKG_NAME}-$(PKG_VERSION)/
  
diff --git a/XOrg/proto/trapproto/Makefile b/XOrg/proto/trapproto/Makefile

index 117328d3d717b472766ce63ae7b551b97bfa186e..1de23faeaeb5f609113c740d8a31564240311cc6 100644 (file)
--- a/XOrg/proto/trapproto/Makefile
+++ b/XOrg/proto/trapproto/Makefile
@@ -8,9 +8,9 @@
  include $(TOPDIR)/rules.mk
  
  PKG_NAME:=trapproto
  include $(TOPDIR)/rules.mk
  
  PKG_NAME:=trapproto
-PKG_RELEASE:=1
-PKG_VERSION:=X11R7.0-3.4.3
-PKG_SOURCE_URL:=http://xorg.freedesktop.org/releases/X11R7.2/src/proto/
+PKG_RELEASE:=2
+PKG_VERSION:=3.4.3
+PKG_SOURCE_URL:=http://xorg.freedesktop.org/releases/X11R7.3/src/proto/
  PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
  PKG_BUILD_DIR=$(BUILD_DIR)/Xorg/$(_CATEGORY)/${PKG_NAME}-$(PKG_VERSION)/
  
  PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
  PKG_BUILD_DIR=$(BUILD_DIR)/Xorg/$(_CATEGORY)/${PKG_NAME}-$(PKG_VERSION)/
  
@@ -26,7 +26,7 @@ define Package/trapproto
  endef
  
  define Build/InstallDev
  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
  
  define Build/Compile
  endef
  
  define Build/Compile
diff --git a/XOrg/proto/videoproto/Makefile b/XOrg/proto/videoproto/Makefile

index 3c0c7e5a53cba0eb149fededc5b60f699db1dca3..cd5b20a2449c4d6e49adaeeaebd50b4c70084506 100644 (file)
--- a/XOrg/proto/videoproto/Makefile
+++ b/XOrg/proto/videoproto/Makefile
@@ -8,9 +8,9 @@
  include $(TOPDIR)/rules.mk
  
  PKG_NAME:=videoproto
  include $(TOPDIR)/rules.mk
  
  PKG_NAME:=videoproto
-PKG_RELEASE:=1
-PKG_VERSION:=X11R7.0-2.2.2
-PKG_SOURCE_URL:=http://xorg.freedesktop.org/releases/X11R7.2/src/proto/
+PKG_RELEASE:=2
+PKG_VERSION:=2.2.2
+PKG_SOURCE_URL:=http://xorg.freedesktop.org/releases/X11R7.3/src/proto/
  PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
  PKG_BUILD_DIR=$(BUILD_DIR)/Xorg/$(_CATEGORY)/${PKG_NAME}-$(PKG_VERSION)/
  
  PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
  PKG_BUILD_DIR=$(BUILD_DIR)/Xorg/$(_CATEGORY)/${PKG_NAME}-$(PKG_VERSION)/
  
@@ -26,7 +26,7 @@ define Package/videoproto
  endef
  
  define Build/InstallDev
  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
  
  define Build/Compile
  endef
  
  define Build/Compile
diff --git a/XOrg/proto/windowswmproto/Makefile b/XOrg/proto/windowswmproto/Makefile

index 018c5fd8b49e469961353bf7675988fb06c38064..c3de8d44d103002b3105ed7d97bf2d1030c494e4 100644 (file)
--- a/XOrg/proto/windowswmproto/Makefile
+++ b/XOrg/proto/windowswmproto/Makefile
@@ -8,9 +8,9 @@
  include $(TOPDIR)/rules.mk
  
  PKG_NAME:=windowswmproto
  include $(TOPDIR)/rules.mk
  
  PKG_NAME:=windowswmproto
-PKG_RELEASE:=1
-PKG_VERSION:=X11R7.0-1.0.3
-PKG_SOURCE_URL:=http://xorg.freedesktop.org/releases/X11R7.2/src/proto/
+PKG_RELEASE:=2
+PKG_VERSION:=1.0.3
+PKG_SOURCE_URL:=http://xorg.freedesktop.org/releases/X11R7.3/src/proto/
  PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
  PKG_BUILD_DIR=$(BUILD_DIR)/Xorg/$(_CATEGORY)/${PKG_NAME}-$(PKG_VERSION)/
  
  PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
  PKG_BUILD_DIR=$(BUILD_DIR)/Xorg/$(_CATEGORY)/${PKG_NAME}-$(PKG_VERSION)/
  
@@ -26,7 +26,7 @@ define Package/windowswmproto
  endef
  
  define Build/InstallDev
  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
  
  define Build/Compile
  endef
  
  define Build/Compile
diff --git a/XOrg/proto/xcmiscproto/Makefile b/XOrg/proto/xcmiscproto/Makefile

index b72ef9c21c36525127f6ccb6c3756453e428cba4..0b88e6b0618c61e3f976c139b482ced260abf2bc 100644 (file)
--- a/XOrg/proto/xcmiscproto/Makefile
+++ b/XOrg/proto/xcmiscproto/Makefile
@@ -8,9 +8,9 @@
  include $(TOPDIR)/rules.mk
  
  PKG_NAME:=xcmiscproto
  include $(TOPDIR)/rules.mk
  
  PKG_NAME:=xcmiscproto
-PKG_RELEASE:=1
-PKG_VERSION:=X11R7.0-1.1.2
-PKG_SOURCE_URL:=http://xorg.freedesktop.org/releases/X11R7.2/src/proto/
+PKG_RELEASE:=2
+PKG_VERSION:=1.1.2
+PKG_SOURCE_URL:=http://xorg.freedesktop.org/releases/X11R7.3/src/proto/
  PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
  PKG_BUILD_DIR=$(BUILD_DIR)/Xorg/$(_CATEGORY)/${PKG_NAME}-$(PKG_VERSION)/
  
  PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
  PKG_BUILD_DIR=$(BUILD_DIR)/Xorg/$(_CATEGORY)/${PKG_NAME}-$(PKG_VERSION)/
  
@@ -26,7 +26,7 @@ define Package/xcmiscproto
  endef
  
  define Build/InstallDev
  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
  
  define Build/Compile
  endef
  
  define Build/Compile
diff --git a/XOrg/proto/xextproto/Makefile b/XOrg/proto/xextproto/Makefile

index c67aadbadaa6a68d837d826f82ac1d224343b78a..7caff6df7da350510eb7e9902a4305d8c4699650 100644 (file)
--- a/XOrg/proto/xextproto/Makefile
+++ b/XOrg/proto/xextproto/Makefile
@@ -8,9 +8,9 @@
  include $(TOPDIR)/rules.mk
  
  PKG_NAME:=xextproto
  include $(TOPDIR)/rules.mk
  
  PKG_NAME:=xextproto
-PKG_RELEASE:=1
-PKG_VERSION:=X11R7.0-7.0.2
-PKG_SOURCE_URL:=http://xorg.freedesktop.org/releases/X11R7.2/src/proto/
+PKG_RELEASE:=2
+PKG_VERSION:=7.0.2
+PKG_SOURCE_URL:=http://xorg.freedesktop.org/releases/X11R7.3/src/proto/
  PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
  PKG_BUILD_DIR=$(BUILD_DIR)/Xorg/$(_CATEGORY)/${PKG_NAME}-$(PKG_VERSION)/
  
  PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
  PKG_BUILD_DIR=$(BUILD_DIR)/Xorg/$(_CATEGORY)/${PKG_NAME}-$(PKG_VERSION)/
  
@@ -26,7 +26,7 @@ define Package/xextproto
  endef
  
  define Build/InstallDev
  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
  
  define Build/Compile
  endef
  
  define Build/Compile
diff --git a/XOrg/proto/xf86bigfontproto/Makefile b/XOrg/proto/xf86bigfontproto/Makefile

index 9f33250f80d9a93cf3a610be39eafabc96a15cd7..91995bdd669a5bc61e5f4a0dca6ea16960a17f9d 100644 (file)
--- a/XOrg/proto/xf86bigfontproto/Makefile
+++ b/XOrg/proto/xf86bigfontproto/Makefile
@@ -8,9 +8,9 @@
  include $(TOPDIR)/rules.mk
  
  PKG_NAME:=xf86bigfontproto
  include $(TOPDIR)/rules.mk
  
  PKG_NAME:=xf86bigfontproto
-PKG_RELEASE:=1
-PKG_VERSION:=X11R7.0-1.1.2
-PKG_SOURCE_URL:=http://xorg.freedesktop.org/releases/X11R7.2/src/proto/
+PKG_RELEASE:=2
+PKG_VERSION:=1.1.2
+PKG_SOURCE_URL:=http://xorg.freedesktop.org/releases/X11R7.3/src/proto/
  PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
  PKG_BUILD_DIR=$(BUILD_DIR)/Xorg/$(_CATEGORY)/${PKG_NAME}-$(PKG_VERSION)/
  
  PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
  PKG_BUILD_DIR=$(BUILD_DIR)/Xorg/$(_CATEGORY)/${PKG_NAME}-$(PKG_VERSION)/
  
@@ -26,7 +26,7 @@ define Package/xf86bigfontproto
  endef
  
  define Build/InstallDev
  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
  
  define Build/Compile
  endef
  
  define Build/Compile
diff --git a/XOrg/proto/xf86dgaproto/Makefile b/XOrg/proto/xf86dgaproto/Makefile

index a91cf32dc29efa7c756aaa58d94a0869649cb6dd..1660343df092a5beb49f0c7cd64386f71dea3dad 100644 (file)
--- a/XOrg/proto/xf86dgaproto/Makefile
+++ b/XOrg/proto/xf86dgaproto/Makefile
@@ -8,9 +8,9 @@
  include $(TOPDIR)/rules.mk
  
  PKG_NAME:=xf86dgaproto
  include $(TOPDIR)/rules.mk
  
  PKG_NAME:=xf86dgaproto
-PKG_RELEASE:=1
-PKG_VERSION:=X11R7.0-2.0.2
-PKG_SOURCE_URL:=http://xorg.freedesktop.org/releases/X11R7.2/src/proto/
+PKG_RELEASE:=2
+PKG_VERSION:=2.0.3
+PKG_SOURCE_URL:=http://xorg.freedesktop.org/releases/X11R7.3/src/proto/
  PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
  PKG_BUILD_DIR=$(BUILD_DIR)/Xorg/$(_CATEGORY)/${PKG_NAME}-$(PKG_VERSION)/
  
  PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
  PKG_BUILD_DIR=$(BUILD_DIR)/Xorg/$(_CATEGORY)/${PKG_NAME}-$(PKG_VERSION)/
  
@@ -26,7 +26,7 @@ define Package/xf86dgaproto
  endef
  
  define Build/InstallDev
  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
  
  define Build/Compile
  endef
  
  define Build/Compile
diff --git a/XOrg/proto/xf86driproto/Makefile b/XOrg/proto/xf86driproto/Makefile

index 37213153370894eb8ea55037b059d7020d403e87..cda2f057e6864aae7d6070ecc29a094260fc5139 100644 (file)
--- a/XOrg/proto/xf86driproto/Makefile
+++ b/XOrg/proto/xf86driproto/Makefile
@@ -8,9 +8,9 @@
  include $(TOPDIR)/rules.mk
  
  PKG_NAME:=xf86driproto
  include $(TOPDIR)/rules.mk
  
  PKG_NAME:=xf86driproto
-PKG_RELEASE:=1
-PKG_VERSION:=X11R7.0-2.0.3
-PKG_SOURCE_URL:=http://xorg.freedesktop.org/releases/X11R7.2/src/proto/
+PKG_RELEASE:=2
+PKG_VERSION:=2.0.3
+PKG_SOURCE_URL:=http://xorg.freedesktop.org/releases/X11R7.3/src/proto/
  PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
  PKG_BUILD_DIR=$(BUILD_DIR)/Xorg/$(_CATEGORY)/${PKG_NAME}-$(PKG_VERSION)/
  
  PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
  PKG_BUILD_DIR=$(BUILD_DIR)/Xorg/$(_CATEGORY)/${PKG_NAME}-$(PKG_VERSION)/
  
@@ -26,7 +26,7 @@ define Package/xf86driproto
  endef
  
  define Build/InstallDev
  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
  
  define Build/Compile
  endef
  
  define Build/Compile
diff --git a/XOrg/proto/xf86miscproto/Makefile b/XOrg/proto/xf86miscproto/Makefile

index b64431132fcea6773255404b7e84743609833ae7..181f39b7cca50725c36b337f34db331e4d2695c3 100644 (file)
--- a/XOrg/proto/xf86miscproto/Makefile
+++ b/XOrg/proto/xf86miscproto/Makefile
@@ -8,9 +8,9 @@
  include $(TOPDIR)/rules.mk
  
  PKG_NAME:=xf86miscproto
  include $(TOPDIR)/rules.mk
  
  PKG_NAME:=xf86miscproto
-PKG_RELEASE:=1
-PKG_VERSION:=X11R7.0-0.9.2
-PKG_SOURCE_URL:=http://xorg.freedesktop.org/releases/X11R7.2/src/proto/
+PKG_RELEASE:=2
+PKG_VERSION:=0.9.2
+PKG_SOURCE_URL:=http://xorg.freedesktop.org/releases/X11R7.3/src/proto/
  PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
  PKG_BUILD_DIR=$(BUILD_DIR)/Xorg/$(_CATEGORY)/${PKG_NAME}-$(PKG_VERSION)/
  
  PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
  PKG_BUILD_DIR=$(BUILD_DIR)/Xorg/$(_CATEGORY)/${PKG_NAME}-$(PKG_VERSION)/
  
@@ -26,7 +26,7 @@ define Package/xf86miscproto
  endef
  
  define Build/InstallDev
  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
  
  define Build/Compile
  endef
  
  define Build/Compile
diff --git a/XOrg/proto/xf86rushproto/Makefile b/XOrg/proto/xf86rushproto/Makefile

index ba2c0c29855784602de18e1966d351b356ebc680..47b76a6cdf10f48f2ff2580fd994de969bc2ba04 100644 (file)
--- a/XOrg/proto/xf86rushproto/Makefile
+++ b/XOrg/proto/xf86rushproto/Makefile
@@ -8,9 +8,9 @@
  include $(TOPDIR)/rules.mk
  
  PKG_NAME:=xf86rushproto
  include $(TOPDIR)/rules.mk
  
  PKG_NAME:=xf86rushproto
-PKG_RELEASE:=1
-PKG_VERSION:=X11R7.0-1.1.2
-PKG_SOURCE_URL:=http://xorg.freedesktop.org/releases/X11R7.2/src/proto/
+PKG_RELEASE:=2
+PKG_VERSION:=1.1.2
+PKG_SOURCE_URL:=http://xorg.freedesktop.org/releases/X11R7.3/src/proto/
  PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
  PKG_BUILD_DIR=$(BUILD_DIR)/Xorg/$(_CATEGORY)/${PKG_NAME}-$(PKG_VERSION)/
  
  PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
  PKG_BUILD_DIR=$(BUILD_DIR)/Xorg/$(_CATEGORY)/${PKG_NAME}-$(PKG_VERSION)/
  
@@ -26,7 +26,7 @@ define Package/xf86rushproto
  endef
  
  define Build/InstallDev
  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
  
  define Build/Compile
  endef
  
  define Build/Compile
diff --git a/XOrg/proto/xf86vidmodeproto/Makefile b/XOrg/proto/xf86vidmodeproto/Makefile

index fd90798e5642ab57f13db4f08f27e5d2b012fc25..e9966b381300a3a48e14d458263b40122022c603 100644 (file)
--- a/XOrg/proto/xf86vidmodeproto/Makefile
+++ b/XOrg/proto/xf86vidmodeproto/Makefile
@@ -8,9 +8,9 @@
  include $(TOPDIR)/rules.mk
  
  PKG_NAME:=xf86vidmodeproto
  include $(TOPDIR)/rules.mk
  
  PKG_NAME:=xf86vidmodeproto
-PKG_RELEASE:=1
-PKG_VERSION:=X11R7.0-2.2.2
-PKG_SOURCE_URL:=http://xorg.freedesktop.org/releases/X11R7.2/src/proto/
+PKG_RELEASE:=2
+PKG_VERSION:=2.2.2
+PKG_SOURCE_URL:=http://xorg.freedesktop.org/releases/X11R7.3/src/proto/
  PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
  PKG_BUILD_DIR=$(BUILD_DIR)/Xorg/$(_CATEGORY)/${PKG_NAME}-$(PKG_VERSION)/
  
  PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
  PKG_BUILD_DIR=$(BUILD_DIR)/Xorg/$(_CATEGORY)/${PKG_NAME}-$(PKG_VERSION)/
  
@@ -26,7 +26,7 @@ define Package/xf86vidmodeproto
  endef
  
  define Build/InstallDev
  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
  
  define Build/Compile
  endef
  
  define Build/Compile
diff --git a/XOrg/proto/xineramaproto/Makefile b/XOrg/proto/xineramaproto/Makefile

index 66fbdbf5a11c4f14461f2dc6e845d20c50e69ab3..65d09377b9f20934d82badc93afa20e3b6c131db 100644 (file)
--- a/XOrg/proto/xineramaproto/Makefile
+++ b/XOrg/proto/xineramaproto/Makefile
@@ -8,9 +8,9 @@
  include $(TOPDIR)/rules.mk
  
  PKG_NAME:=xineramaproto
  include $(TOPDIR)/rules.mk
  
  PKG_NAME:=xineramaproto
-PKG_RELEASE:=1
-PKG_VERSION:=X11R7.0-1.1.2
-PKG_SOURCE_URL:=http://xorg.freedesktop.org/releases/X11R7.2/src/proto/
+PKG_RELEASE:=2
+PKG_VERSION:=1.1.2
+PKG_SOURCE_URL:=http://xorg.freedesktop.org/releases/X11R7.3/src/proto/
  PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
  PKG_BUILD_DIR=$(BUILD_DIR)/Xorg/$(_CATEGORY)/${PKG_NAME}-$(PKG_VERSION)/
  
  PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
  PKG_BUILD_DIR=$(BUILD_DIR)/Xorg/$(_CATEGORY)/${PKG_NAME}-$(PKG_VERSION)/
  
@@ -26,7 +26,7 @@ define Package/xineramaproto
  endef
  
  define Build/InstallDev
  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
  
  define Build/Compile
  endef
  
  define Build/Compile
diff --git a/XOrg/proto/xproto/Makefile b/XOrg/proto/xproto/Makefile

index daaefce76813b0da910708c98e66e72d46162e1a..4109f9c7a86248297b6b97aaf8b578a2f1ef0e50 100644 (file)
--- a/XOrg/proto/xproto/Makefile
+++ b/XOrg/proto/xproto/Makefile
@@ -8,9 +8,9 @@
  include $(TOPDIR)/rules.mk
  
  PKG_NAME:=xproto
  include $(TOPDIR)/rules.mk
  
  PKG_NAME:=xproto
-PKG_RELEASE:=1
-PKG_VERSION:=X11R7.2-7.0.10
-PKG_SOURCE_URL:=http://xorg.freedesktop.org/releases/X11R7.2/src/proto/
+PKG_RELEASE:=2
+PKG_VERSION:=7.0.10
+PKG_SOURCE_URL:=http://xorg.freedesktop.org/releases/X11R7.3/src/proto/
  PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
  PKG_BUILD_DIR=$(BUILD_DIR)/Xorg/$(_CATEGORY)/${PKG_NAME}-$(PKG_VERSION)/
  
  PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
  PKG_BUILD_DIR=$(BUILD_DIR)/Xorg/$(_CATEGORY)/${PKG_NAME}-$(PKG_VERSION)/
  
@@ -26,7 +26,7 @@ define Package/xproto
  endef
  
  define Build/InstallDev
  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
  
  define Build/Compile
  endef
  
  define Build/Compile
diff --git a/XOrg/proto/xproxymanagementprotocol/Makefile b/XOrg/proto/xproxymanagementprotocol/Makefile

index bb3dc247c5280ad66815db5cb8a2084783922e58..31219e256d29485251f44ff0379256f65643326f 100644 (file)
--- a/XOrg/proto/xproxymanagementprotocol/Makefile
+++ b/XOrg/proto/xproxymanagementprotocol/Makefile
@@ -8,9 +8,9 @@
  include $(TOPDIR)/rules.mk
  
  PKG_NAME:=xproxymanagementprotocol
  include $(TOPDIR)/rules.mk
  
  PKG_NAME:=xproxymanagementprotocol
-PKG_RELEASE:=1
-PKG_VERSION:=X11R7.0-1.0.2
-PKG_SOURCE_URL:=http://xorg.freedesktop.org/releases/X11R7.2/src/proto/
+PKG_RELEASE:=2
+PKG_VERSION:=1.0.2
+PKG_SOURCE_URL:=http://xorg.freedesktop.org/releases/X11R7.3/src/proto/
  PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
  PKG_BUILD_DIR=$(BUILD_DIR)/Xorg/$(_CATEGORY)/${PKG_NAME}-$(PKG_VERSION)/
  
  PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
  PKG_BUILD_DIR=$(BUILD_DIR)/Xorg/$(_CATEGORY)/${PKG_NAME}-$(PKG_VERSION)/
  
@@ -26,7 +26,7 @@ define Package/xproxymanagementprotocol
  endef
  
  define Build/InstallDev
  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
  
  define Build/Compile
  endef
  
  define Build/Compile
diff --git a/XOrg/server/xorg-server-X11R7.3/Makefile b/XOrg/server/xorg-server-X11R7.3/Makefile

new file mode 100644 (file)

index 0000000..8c93bed
--- /dev/null
+++ b/XOrg/server/xorg-server-X11R7.3/Makefile
@@ -0,0 +1,178 @@
+# 
+# Copyright (C) 2006 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_NAME:=xorg-server
+PKG_RELEASE:=1
+PKG_VERSION:=1.4
+PKG_SOURCE_URL:=http://xorg.freedesktop.org/releases/X11R7.3/src/xserver/
+PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
+PKG_BUILD_DIR=$(BUILD_DIR)/Xorg/server/xorg-server-$(PKG_VERSION)/
+
+include $(INCLUDE_DIR)/package.mk
+
+EXTRA_CFLAGS+= -I${STAGING_DIR}/usr/include/X11/GL -I${STAGING_DIR}/usr/include/X11/dri/ -I${STAGING_DIR}/usr/include/X11/ -Wl,-rpath-link=$(STAGING_DIR)/usr/lib
+
+#CONFIGURE_ARGS_KDRIVE=--enable-composite --enable-kdrive \
+#              --disable-dga --disable-dri --disable-xinerama \
+#              --disable-xf86misc --disable-xf86vidmode \
+#              --disable-xorg --disable-xorgcfg \
+#              --disable-xkb --disable-xnest --disable-xvfb \
+#              --disable-xevie --disable-xprint --disable-xtrap \
+#              --disable-dmx --disable-w100 \
+#              --with-default-font-path=built-ins \
+#              --enable-tslib --enable-xcalibrate
+
+CONFIGURE_VARS+=ac_cv_file__usr_share_sgml_X11_defs_ent=yes
+#CONFIGURE_ARGS+=$(if $(CONFIG_XORG_BUILD_KDRIVE), $(CONFIGURE_ARGS_KDRIVE))
+
+DEPENDS_SERVER:=+calibrateproto \
+               +compositeproto \
+               +damageproto \
+               +fixesproto \
+               +recordproto \
+               +resourceproto \
+               +scrnsaverproto \
+               +videoproto \
+               +xextproto \
+               +xproto \
+               +libXext \
+               +libXdmcp \
+               +libXfont \
+               +libXrandr \
+               +xtrans \
+               +libX11 \
+               +glproto \
+               +xf86driproto \
+               +applewmproto \
+               +dmxproto \
+               +printproto \
+               +windowswmproto \
+               +xf86rushproto \
+               +xproxymanagementprotocol \
+               +libdrm \
+               +xf86miscproto \
+               +xf86vidmodeproto \
+               +xf86dgaproto \
+               +trapproto \
+               +xineramaproto \
+               +evieext \
+               +libxkbfile \
+               +libXt \
+               +libSM \
+               +libxkbui \
+               +libXxf86misc \
+               +libXxf86vm \
+               +libXaw \
+               +libXmu \
+               +libXpm \
+               +libnotimpl \
+               +Mesa \
+               +pixman \
+               @DISPLAY_SUPPORT
+
+#DEPENDS_KDRIVE:=+calibrateproto \
+#              +compositeproto \
+#              +damageproto \
+#              +fixesproto \
+#              +recordproto \
+#              +resourceproto \
+#              +scrnsaverproto \
+#              +videoproto \
+#              +xextproto \
+#              +xproto \
+#              +libXext \
+#              +libXdmcp \
+#              +libXfont \
+#              +libXrandr \
+#              +xtrans \
+#              +libX11 \
+#              @DISPLAY_SUPPORT
+
+
+ifeq ($(CONFIG_TARGET_olpc),y)
+  XORG_CONFIG_FILE=xorg-olpc.conf
+else
+  XORG_CONFIG_FILE=xorg.conf
+endif
+
+#define Package/xorg-server/config
+#      config XORG_BUILD_KDRIVE
+#              bool "Build kdrive instead of xserver"
+#              depends PACKAGE_xorg-server || BROKEN
+#endef
+
+define Package/xorg-server/Default
+  SECTION:=xorg-server
+  CATEGORY:=Xorg
+  URL:=http://xorg.freedesktop.org/
+endef
+
+define Package/xorg-server
+$(call Package/xorg-server/Default) 
+  TITLE:=Xorg server
+  MENU:=1
+  DEPENDS:=$(if $(CONFIG_XORG_BUILD_KDRIVE), $(DEPENDS_KDRIVE), $(DEPENDS_SERVER))
+endef
+
+define Package/xorg-server-config
+$(call Package/xorg-server/Default) 
+  TITLE:=Xorg server configuration tools 
+  DEPENDS:=xorg-server
+endef
+
+define Build/Configure
+       (cd $(PKG_BUILD_DIR) \
+               $(CP) $(SCRIPT_DIR)/config.{guess,sub} $(PKG_BUILD_DIR)/ && \
+               $(CONFIGURE_VARS) \
+               $(CONFIGURE_CMD) \
+               $(CONFIGURE_ARGS_XTRA) \
+               $(CONFIGURE_ARGS) \
+               --with-default-font-path=built-ins \
+               );
+endef
+
+define Build/Compile
+       $(MAKE) -C $(PKG_BUILD_DIR)
+       $(MAKE) -C $(PKG_BUILD_DIR) DESTDIR="$(PKG_INSTALL_DIR)" install
+
+endef
+
+define Package/xorg-server/install
+       $(INSTALL_DIR) $(1)/usr/bin
+       $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/Xorg $(1)/usr/bin/
+       cd $(1)/usr/bin; ln -sf Xorg X
+       $(INSTALL_DIR) $(1)/usr/share
+       $(CP) $(PKG_INSTALL_DIR)/usr/share/* $(1)/usr/share/
+       $(INSTALL_DIR) $(1)/usr/lib/xserver
+       $(CP) $(PKG_INSTALL_DIR)/usr/lib/xserver/* $(1)/usr/lib/xserver
+       $(INSTALL_DIR) $(1)/usr/lib/xorg/
+       $(CP) -r $(PKG_INSTALL_DIR)/usr/lib/xorg/* $(1)/usr/lib/xorg/
+       find $(1)/usr/lib/xorg/ -name *.la | xargs rm -rf
+       $(INSTALL_DIR) $(1)/usr/lib/X11/
+       $(CP) -r $(PKG_INSTALL_DIR)/usr/lib/X11/* $(1)/usr/lib/X11/
+       rm -rf $(1)/usr/share/X11 $(1)/usr/lib/X11/xserver      
+       $(INSTALL_DIR) $(1)/var/log/
+       $(INSTALL_DIR) $(1)/etc/X11/
+       $(CP) files/$(XORG_CONFIG_FILE) $(1)/etc/X11/xorg.conf
+endef
+
+define Packages/xorg-server-config/install
+       $(INSTALL_DIR) $(1)/usr/bin
+    $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/xorgconfig $(1)/usr/bin/
+endef
+
+define Build/InstallDev
+       $(INSTALL_DIR) $(1)/usr/include $(1)/usr/lib/pkgconfig
+       $(CP) $(PKG_INSTALL_DIR)/usr/include/* $(1)/usr/include/
+       $(CP) $(PKG_BUILD_DIR)/xorg-server.pc $(1)/usr/lib/pkgconfig/
+endef
+
+$(eval $(call BuildPackage,xorg-server))
+$(eval $(call BuildPackage,xorg-server-config))
diff --git a/XOrg/server/xorg-server-X11R7.3/files/xorg-olpc.conf b/XOrg/server/xorg-server-X11R7.3/files/xorg-olpc.conf

new file mode 100644 (file)

index 0000000..0bbb1ae
--- /dev/null
+++ b/XOrg/server/xorg-server-X11R7.3/files/xorg-olpc.conf
@@ -0,0 +1,78 @@
+# xorg configuration
+
+Section "ServerLayout"
+       Identifier     "Default Layout"
+       Screen      0  "Screen0" 0 0
+       InputDevice    "Mouse0" "CorePointer"
+       InputDevice    "Keyboard0" "CoreKeyboard"
+EndSection
+
+Section "Files"
+       FontPath     "/usr/lib/X11/fonts/misc"
+EndSection
+
+Section "Module"
+       Load  "dbe"
+       Load  "extmod"
+       Load  "fbdevhw"
+#      Load  "glx"
+       Load  "record"
+       Load  "freetype"
+       Load  "type1"
+EndSection
+
+Section "InputDevice"
+       Identifier  "Keyboard0"
+       Driver      "keyboard"
+       Option      "XkbModel" "pc105"
+       Option      "XkbLayout" "us"
+EndSection
+
+Section "InputDevice"
+       Identifier  "Mouse0"
+       Driver      "mouse"
+#      Option      "Protocol" "PS/2"
+       Option      "Protocol" "IMPS/2"
+#      Option      "Device" "/dev/psaux"
+       Option      "Device" "/dev/mice"
+#      Option      "ZAxisMapping" "4 5"
+#      Option      "Emulate3Buttons" "yes"
+EndSection
+
+Section "Monitor"
+       Identifier   "Monitor0"
+       HorizSync    30-67
+       VertRefresh  48-52
+       DisplaySize  152 114
+       Mode "1200x900"
+               DotClock 57.275
+               HTimings 1200 1208 1216 1240
+               VTimings 900 905 908 912
+               Flags    "-HSync" "-VSync"
+       EndMode
+EndSection
+
+Section "Device"
+       Identifier  "Videocard0"
+       Driver      "geode"
+       Option      "PanelGeometry" "1200x900"
+EndSection
+
+Section "Screen"
+    Identifier "Screen0"
+    Device     "Videocard0"
+    Monitor    "Monitor0"
+    DefaultDepth 16
+
+    SubSection "Display"
+        Depth          16
+        Modes          "1200x900"
+    EndSubsection
+
+EndSection
+
+Section "DRI"
+       Group        0
+       Mode         0666
+EndSection
+
diff --git a/XOrg/server/xorg-server-X11R7.3/files/xorg.conf b/XOrg/server/xorg-server-X11R7.3/files/xorg.conf

new file mode 100644 (file)

index 0000000..ee03228
--- /dev/null
+++ b/XOrg/server/xorg-server-X11R7.3/files/xorg.conf
@@ -0,0 +1,93 @@
+# xorg configuration
+
+Section "ServerLayout"
+       Identifier     "Default Layout"
+       Screen      0  "Screen0" 0 0
+       InputDevice    "Mouse0" "CorePointer"
+       InputDevice    "Keyboard0" "CoreKeyboard"
+EndSection
+
+Section "Files"
+       FontPath     "/usr/lib/X11/fonts/misc"
+EndSection
+
+Section "Module"
+       Load  "dbe"
+       Load  "extmod"
+       Load  "fbdevhw"
+#      Load  "glx"
+       Load  "record"
+       Load  "freetype"
+       Load  "type1"
+EndSection
+
+Section "InputDevice"
+       Identifier  "Keyboard0"
+       Driver      "keyboard"
+       Option      "XkbModel" "pc105"
+       Option      "XkbLayout" "us"
+EndSection
+
+Section "InputDevice"
+       Identifier  "Mouse0"
+       Driver      "mouse"
+       Option      "Protocol" "PS/2"
+#      Option      "Protocol" "IMPS/2"
+       Option      "Device" "/dev/psaux"
+#      Option      "Device" "/dev/input/mice"
+       Option      "ZAxisMapping" "4 5"
+       Option      "Emulate3Buttons" "yes"
+EndSection
+
+Section "Monitor"
+       Identifier   "Monitor0"
+       VendorName   "Monitor Vendor"
+       ModelName    "OWRT"
+       Option       "dpms"
+EndSection
+
+Section "Device"
+       Identifier  "Videocard0"
+       Driver      "vesa"
+       VendorName  "Videocard vendor"
+       BoardName   "Vesa driver"
+EndSection
+
+Section "Device"
+       Identifier  "FBDev"
+       Driver      "fbdev"
+       #Option     "shadowfb" "off"
+       VideoRam    4096
+EndSection
+
+Section "Screen"
+    Identifier "Screen0"
+    Device     "Videocard0"
+    Monitor    "Monitor0"
+#    DefaultDepth 8
+    DefaultDepth 16
+#    DefaultDepth 24
+
+    SubSection "Display"
+        Depth          8
+        Modes          "1024x768" "800x600" "640x480"
+    EndSubsection
+
+    SubSection "Display"
+        Depth          16
+        Modes          "1024x768" "800x600" "640x480"
+    EndSubsection
+
+    SubSection "Display"
+        Depth          24
+       FbBpp           32
+        Modes          "1024x768" "800x600" "640x480"
+    EndSubsection
+
+EndSection
+
+Section "DRI"
+       Group        0
+       Mode         0666
+EndSection
+
diff --git a/XOrg/server/xorg-server-X11R7.3/patches/001-fix_avr32_compile b/XOrg/server/xorg-server-X11R7.3/patches/001-fix_avr32_compile

new file mode 100644 (file)

index 0000000..4072e94
--- /dev/null
+++ b/XOrg/server/xorg-server-X11R7.3/patches/001-fix_avr32_compile
@@ -0,0 +1,20 @@
+--- xorg-server-X11R7.2-1.4.0/config.sub.orig  2008-05-14 22:56:34.000000000 -0500
++++ xorg-server-X11R7.2-1.4.0/config.sub       2008-05-14 22:57:00.000000000 -0500
+@@ -228,7 +228,7 @@
+       | a29k \
+       | alpha | alphaev[4-8] | alphaev56 | alphaev6[78] | alphapca5[67] \
+       | alpha64 | alpha64ev[4-8] | alpha64ev56 | alpha64ev6[78] | alpha64pca5[67] \
+-      | arc | arm | arm[bl]e | arme[lb] | armv[2345] | armv[345][lb] | avr \
++      | arc | arm | arm[bl]e | arme[lb] | armv[2345] | armv[345][lb] | avr | avr32 \
+       | c4x | clipper \
+       | d10v | d30v | dlx | dsp16xx \
+       | fr30 | frv \
+@@ -295,7 +295,7 @@
+       | alpha64-* | alpha64ev[4-8]-* | alpha64ev56-* | alpha64ev6[78]-* \
+       | alphapca5[67]-* | alpha64pca5[67]-* | arc-* \
+       | arm-*  | armbe-* | armle-* | armeb-* | armv*-* \
+-      | avr-* \
++      | avr-* | avr32-* \
+       | bs2000-* \
+       | c[123]* | c30-* | [cjt]90-* | c4x-* | c54x-* | c55x-* | c6x-* \
+       | clipper-* | cydra-* \
diff --git a/XOrg/server/xorg-server-X11R7.3/patches/100-uclibc-lm.patch b/XOrg/server/xorg-server-X11R7.3/patches/100-uclibc-lm.patch

new file mode 100644 (file)

index 0000000..8409f1c
--- /dev/null
+++ b/XOrg/server/xorg-server-X11R7.3/patches/100-uclibc-lm.patch
@@ -0,0 +1,12 @@
+diff -urN xorg-server-X11R7.2-1.4.0.orig/hw/xfree86/utils/gtf/Makefile.in xorg-server-X11R7.2-1.4.0/hw/xfree86/utils/gtf/Makefile.in
+--- xorg-server-X11R7.2-1.4.0.orig/hw/xfree86/utils/gtf/Makefile.in    2007-09-14 21:23:18.000000000 +0200
++++ xorg-server-X11R7.2-1.4.0/hw/xfree86/utils/gtf/Makefile.in 2007-09-14 21:23:42.000000000 +0200
+@@ -576,7 +576,7 @@
+ xpconfigdir = @xpconfigdir@
+ gtf_SOURCES = gtf.c
+ gtf_CFLAGS = $(XORG_CFLAGS)
+-gtf_LDADD = -lm
++gtf_LDADD = -lm -lnotimpl
+ appmandir = $(APP_MAN_DIR)
+ appman_PRE = gtf.man
+ appman_DATA = $(appman_PRE:man=@APP_MAN_SUFFIX@)
diff --git a/XOrg/utils/packages b/XOrg/utils/packages

index ec64a06d308d712328a8f28d0a0148946cde1fd4..ba7853c453619470b2580e8a7701f489d3f17abc 100644 (file)
--- a/XOrg/utils/packages
+++ b/XOrg/utils/packages
@@ -1 +1 @@
-util-macros-X11R7.2-1.1.5|
+util-macros-1.1.5|
diff --git a/XOrg/utils/template.mk b/XOrg/utils/template.mk

index 989393b134657077c1647675e5606e38f1ced8fa..c9735e5d99d949efc7fb50400f1e19f18d43923b 100644 (file)
--- a/XOrg/utils/template.mk
+++ b/XOrg/utils/template.mk
@@ -8,9 +8,9 @@
  include $(TOPDIR)/rules.mk
  
  PKG_NAME:=@NAME@
  include $(TOPDIR)/rules.mk
  
  PKG_NAME:=@NAME@
-PKG_RELEASE:=1
+PKG_RELEASE:=2
  PKG_VERSION:=@VER@
  PKG_VERSION:=@VER@
-PKG_SOURCE_URL:=http://xorg.freedesktop.org/releases/X11R7.2/src/util/
+PKG_SOURCE_URL:=http://xorg.freedesktop.org/releases/X11R7.3/src/util/
  PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
  PKG_BUILD_DIR=$(BUILD_DIR)/Xorg/$(_CATEGORY)/${PKG_NAME}-$(PKG_VERSION)/
  
  PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
  PKG_BUILD_DIR=$(BUILD_DIR)/Xorg/$(_CATEGORY)/${PKG_NAME}-$(PKG_VERSION)/
  
diff --git a/XOrg/utils/util-macros/Makefile b/XOrg/utils/util-macros/Makefile

index 180b53ff191c2a463bd2f9fbae25d8f956698249..d11731c8a6e02d7176706b35593bad3a35691803 100644 (file)
--- a/XOrg/utils/util-macros/Makefile
+++ b/XOrg/utils/util-macros/Makefile
@@ -8,9 +8,9 @@
  include $(TOPDIR)/rules.mk
  
  PKG_NAME:=util-macros
  include $(TOPDIR)/rules.mk
  
  PKG_NAME:=util-macros
-PKG_RELEASE:=1
-PKG_VERSION:=X11R7.2-1.1.5
-PKG_SOURCE_URL:=http://xorg.freedesktop.org/releases/X11R7.2/src/util/
+PKG_RELEASE:=2
+PKG_VERSION:=1.1.5
+PKG_SOURCE_URL:=http://xorg.freedesktop.org/releases/X11R7.3/src/util/
  PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
  PKG_BUILD_DIR=$(BUILD_DIR)/Xorg/$(_CATEGORY)/${PKG_NAME}-$(PKG_VERSION)/
  
  PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
  PKG_BUILD_DIR=$(BUILD_DIR)/Xorg/$(_CATEGORY)/${PKG_NAME}-$(PKG_VERSION)/
  
@@ -26,7 +26,7 @@ define Package/util-macros
  endef
  
  define Build/InstallDev
  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
  
  define Build/Configure
  endef
  
  define Build/Configure
author	Lars-Peter Clausen <lars@metafoo.de>
	Mon, 1 Sep 2008 21:31:52 +0000 (21:31 +0000)
committer	Lars-Peter Clausen <lars@metafoo.de>
	Mon, 1 Sep 2008 21:31:52 +0000 (21:31 +0000)
XOrg/app/packages		patch \| blob \| history
XOrg/app/template.mk		patch \| blob \| history
XOrg/app/xcalc/Makefile		patch \| blob \| history
XOrg/app/xclipboard/Makefile		patch \| blob \| history
XOrg/app/xdm/Makefile		patch \| blob \| history
XOrg/app/xeyes/Makefile		patch \| blob \| history
XOrg/app/xinit/Makefile		patch \| blob \| history
XOrg/app/xlogo/Makefile		patch \| blob \| history
XOrg/app/xmessage/Makefile		patch \| blob \| history
XOrg/app/xset/Makefile		patch \| blob \| history
XOrg/app/xsetroot/Makefile		patch \| blob \| history
XOrg/data/xbitmaps/Makefile		patch \| blob \| history
XOrg/driver/packages		patch \| blob \| history
XOrg/driver/patches/xf86-input-evdev/001-fix-compile.patch	[new file with mode: 0644]	patch \| blob
XOrg/driver/patches/xf86-input-evdev/002-mipointer-fix.patch	[new file with mode: 0644]	patch \| blob
XOrg/driver/patches/xf86-video-i810/100-sdkdir.patch	[deleted file]	patch \| blob \| history
XOrg/driver/template.mk		patch \| blob \| history
XOrg/driver/xf86-input-evdev/Makefile		patch \| blob \| history
XOrg/driver/xf86-input-evdev/patches/001-fix-compile.patch	[new file with mode: 0644]	patch \| blob
XOrg/driver/xf86-input-evdev/patches/002-mipointer-fix.patch	[new file with mode: 0644]	patch \| blob
XOrg/driver/xf86-input-keyboard/Makefile		patch \| blob \| history
XOrg/driver/xf86-input-mouse/Makefile		patch \| blob \| history
XOrg/driver/xf86-video-ati/Makefile		patch \| blob \| history
XOrg/driver/xf86-video-fbdev/Makefile		patch \| blob \| history
XOrg/driver/xf86-video-i810/Makefile	[deleted file]	patch \| blob \| history
XOrg/driver/xf86-video-i810/patches/100-sdkdir.patch	[deleted file]	patch \| blob \| history
XOrg/driver/xf86-video-intel/Makefile	[new file with mode: 0644]	patch \| blob
XOrg/driver/xf86-video-intel/patches/100-sdkdir.patch	[new file with mode: 0644]	patch \| blob
XOrg/driver/xf86-video-nv/Makefile		patch \| blob \| history
XOrg/driver/xf86-video-vesa/Makefile		patch \| blob \| history
XOrg/driver/xf86-video-vga/Makefile		patch \| blob \| history
XOrg/font-native/font-util/Makefile		patch \| blob \| history
XOrg/font/encodings/Makefile		patch \| blob \| history
XOrg/font/font-alias/Makefile		patch \| blob \| history
XOrg/font/font-bh-75dpi/Makefile		patch \| blob \| history
XOrg/font/font-cursor-misc/Makefile		patch \| blob \| history
XOrg/font/font-daewoo-misc/Makefile		patch \| blob \| history
XOrg/font/font-dec-misc/Makefile		patch \| blob \| history
XOrg/font/font-ibm-type1/Makefile		patch \| blob \| history
XOrg/font/font-isas-misc/Makefile		patch \| blob \| history
XOrg/font/font-jis-misc/Makefile		patch \| blob \| history
XOrg/font/font-micro-misc/Makefile		patch \| blob \| history
XOrg/font/font-misc-cyrillic/Makefile		patch \| blob \| history
XOrg/font/font-misc-misc/Makefile		patch \| blob \| history
XOrg/font/font-xfree86-type1/Makefile		patch \| blob \| history
XOrg/font/packages		patch \| blob \| history
XOrg/font/template.mk		patch \| blob \| history
XOrg/generate.sh		patch \| blob \| history
XOrg/headers/native/Makefile		patch \| blob \| history
XOrg/lib/libICE/Makefile		patch \| blob \| history
XOrg/lib/libSM/Makefile		patch \| blob \| history
XOrg/lib/libX11/Makefile		patch \| blob \| history
XOrg/lib/libXau/Makefile		patch \| blob \| history
XOrg/lib/libXaw/Makefile		patch \| blob \| history
XOrg/lib/libXcursor/Makefile		patch \| blob \| history
XOrg/lib/libXdmcp/Makefile		patch \| blob \| history
XOrg/lib/libXext/Makefile		patch \| blob \| history
XOrg/lib/libXfixes/Makefile		patch \| blob \| history
XOrg/lib/libXfont/Makefile		patch \| blob \| history
XOrg/lib/libXft/Makefile		patch \| blob \| history
XOrg/lib/libXmu/Makefile		patch \| blob \| history
XOrg/lib/libXpm/Makefile		patch \| blob \| history
XOrg/lib/libXrandr/Makefile		patch \| blob \| history
XOrg/lib/libXrender/Makefile		patch \| blob \| history
XOrg/lib/libXt/Makefile		patch \| blob \| history
XOrg/lib/libXv/Makefile		patch \| blob \| history
XOrg/lib/libXvMC/Makefile		patch \| blob \| history
XOrg/lib/libXxf86misc/Makefile		patch \| blob \| history
XOrg/lib/libXxf86vm/Makefile		patch \| blob \| history
XOrg/lib/libfontenc/Makefile		patch \| blob \| history
XOrg/lib/libxkbfile/Makefile		patch \| blob \| history
XOrg/lib/packages		patch \| blob \| history
XOrg/lib/template.mk		patch \| blob \| history
XOrg/lib/xtrans/Makefile		patch \| blob \| history
XOrg/proto/applewmproto/Makefile		patch \| blob \| history
XOrg/proto/bigreqsproto/Makefile		patch \| blob \| history
XOrg/proto/compositeproto/Makefile		patch \| blob \| history
XOrg/proto/damageproto/Makefile		patch \| blob \| history
XOrg/proto/dmxproto/Makefile		patch \| blob \| history
XOrg/proto/evieext/Makefile		patch \| blob \| history
XOrg/proto/fixesproto/Makefile		patch \| blob \| history
XOrg/proto/fontcacheproto/Makefile		patch \| blob \| history
XOrg/proto/fontsproto/Makefile		patch \| blob \| history
XOrg/proto/glproto/Makefile		patch \| blob \| history
XOrg/proto/inputproto/Makefile		patch \| blob \| history
XOrg/proto/kbproto/Makefile		patch \| blob \| history
XOrg/proto/packages		patch \| blob \| history
XOrg/proto/printproto/Makefile		patch \| blob \| history
XOrg/proto/randrproto/Makefile		patch \| blob \| history
XOrg/proto/recordproto/Makefile		patch \| blob \| history
XOrg/proto/renderproto/Makefile		patch \| blob \| history
XOrg/proto/resourceproto/Makefile		patch \| blob \| history
XOrg/proto/scrnsaverproto/Makefile		patch \| blob \| history
XOrg/proto/template.mk		patch \| blob \| history
XOrg/proto/trapproto/Makefile		patch \| blob \| history
XOrg/proto/videoproto/Makefile		patch \| blob \| history
XOrg/proto/windowswmproto/Makefile		patch \| blob \| history
XOrg/proto/xcmiscproto/Makefile		patch \| blob \| history
XOrg/proto/xextproto/Makefile		patch \| blob \| history
XOrg/proto/xf86bigfontproto/Makefile		patch \| blob \| history
XOrg/proto/xf86dgaproto/Makefile		patch \| blob \| history
XOrg/proto/xf86driproto/Makefile		patch \| blob \| history
XOrg/proto/xf86miscproto/Makefile		patch \| blob \| history
XOrg/proto/xf86rushproto/Makefile		patch \| blob \| history
XOrg/proto/xf86vidmodeproto/Makefile		patch \| blob \| history
XOrg/proto/xineramaproto/Makefile		patch \| blob \| history
XOrg/proto/xproto/Makefile		patch \| blob \| history
XOrg/proto/xproxymanagementprotocol/Makefile		patch \| blob \| history
XOrg/server/xorg-server-X11R7.3/Makefile	[new file with mode: 0644]	patch \| blob
XOrg/server/xorg-server-X11R7.3/files/xorg-olpc.conf	[new file with mode: 0644]	patch \| blob
XOrg/server/xorg-server-X11R7.3/files/xorg.conf	[new file with mode: 0644]	patch \| blob
XOrg/server/xorg-server-X11R7.3/patches/001-fix_avr32_compile	[new file with mode: 0644]	patch \| blob
XOrg/server/xorg-server-X11R7.3/patches/100-uclibc-lm.patch	[new file with mode: 0644]	patch \| blob
XOrg/utils/packages		patch \| blob \| history
XOrg/utils/template.mk		patch \| blob \| history
XOrg/utils/util-macros/Makefile		patch \| blob \| history