[packages] Update xorg proto packages to Xorg 7.5

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

diff --git a/Xorg/xorg/proto/applewmproto/Makefile b/Xorg/xorg/proto/applewmproto/Makefile
index a0b2de6..b04675a 100644 (file)
--- a/Xorg/xorg/proto/applewmproto/Makefile
+++ b/Xorg/xorg/proto/applewmproto/Makefile
@@ -1,5 +1,5 @@
-# 
-# Copyright (C) 2006-2008 OpenWrt.org
+#
+# Copyright (C) 2006-2009 OpenWrt.org
 #
 # This is free software, licensed under the GNU General Public License v2.
 # See /LICENSE for more information.
@@ -8,11 +8,11 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=applewmproto
-PKG_RELEASE:=3
-PKG_VERSION:=1.0.3
-PKG_SOURCE_URL:=http://xorg.freedesktop.org/releases/X11R7.4/src/proto/
+PKG_RELEASE:=1
+PKG_VERSION:=1.4.1
+PKG_SOURCE_URL:=http://xorg.freedesktop.org/releases/individual/proto/
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
-PKG_BUILD_DIR=$(BUILD_DIR)/Xorg/$(_CATEGORY)/$(PKG_NAME)-$(PKG_VERSION)/
+PKG_BUILD_DIR:=$(BUILD_DIR)/Xorg/$(PKG_NAME)-$(PKG_VERSION)/
 
 include $(INCLUDE_DIR)/package.mk
 

diff --git a/Xorg/xorg/proto/bigreqsproto/Makefile b/Xorg/xorg/proto/bigreqsproto/Makefile
index 8d510c4..3d5b699 100644 (file)
--- a/Xorg/xorg/proto/bigreqsproto/Makefile
+++ b/Xorg/xorg/proto/bigreqsproto/Makefile
@@ -1,5 +1,5 @@
-# 
-# Copyright (C) 2006-2008 OpenWrt.org
+#
+# Copyright (C) 2006-2009 OpenWrt.org
 #
 # This is free software, licensed under the GNU General Public License v2.
 # See /LICENSE for more information.
@@ -8,11 +8,11 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=bigreqsproto
-PKG_RELEASE:=3
-PKG_VERSION:=1.0.2
-PKG_SOURCE_URL:=http://xorg.freedesktop.org/releases/X11R7.4/src/proto/
+PKG_RELEASE:=1
+PKG_VERSION:=1.1.0
+PKG_SOURCE_URL:=http://xorg.freedesktop.org/releases/individual/proto/
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
-PKG_BUILD_DIR=$(BUILD_DIR)/Xorg/$(_CATEGORY)/$(PKG_NAME)-$(PKG_VERSION)/
+PKG_BUILD_DIR:=$(BUILD_DIR)/Xorg/$(PKG_NAME)-$(PKG_VERSION)/
 
 include $(INCLUDE_DIR)/package.mk
 

diff --git a/Xorg/xorg/proto/calibrateproto/Makefile b/Xorg/xorg/proto/calibrateproto/Makefile
index 9a7fa66..40d812e 100644 (file)
--- a/Xorg/xorg/proto/calibrateproto/Makefile
+++ b/Xorg/xorg/proto/calibrateproto/Makefile
@@ -1,11 +1,9 @@
-# 
-# Copyright (C) 2006-2008 OpenWrt.org
+#
+# Copyright (C) 2006-2009 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
 

diff --git a/Xorg/xorg/proto/compositeproto/Makefile b/Xorg/xorg/proto/compositeproto/Makefile
index c624a1d..b52e466 100644 (file)
--- a/Xorg/xorg/proto/compositeproto/Makefile
+++ b/Xorg/xorg/proto/compositeproto/Makefile
@@ -1,5 +1,5 @@
-# 
-# Copyright (C) 2006-2008 OpenWrt.org
+#
+# Copyright (C) 2006-2009 OpenWrt.org
 #
 # This is free software, licensed under the GNU General Public License v2.
 # See /LICENSE for more information.
@@ -8,11 +8,11 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=compositeproto
-PKG_RELEASE:=3
-PKG_VERSION:=0.4
-PKG_SOURCE_URL:=http://xorg.freedesktop.org/releases/X11R7.4/src/proto/
+PKG_RELEASE:=1
+PKG_VERSION:=0.4.1
+PKG_SOURCE_URL:=http://xorg.freedesktop.org/releases/individual/proto/
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
-PKG_BUILD_DIR=$(BUILD_DIR)/Xorg/$(_CATEGORY)/$(PKG_NAME)-$(PKG_VERSION)/
+PKG_BUILD_DIR:=$(BUILD_DIR)/Xorg/$(PKG_NAME)-$(PKG_VERSION)/
 
 include $(INCLUDE_DIR)/package.mk
 

diff --git a/Xorg/xorg/proto/damageproto/Makefile b/Xorg/xorg/proto/damageproto/Makefile
index e078cfe..54320da 100644 (file)
--- a/Xorg/xorg/proto/damageproto/Makefile
+++ b/Xorg/xorg/proto/damageproto/Makefile
@@ -1,5 +1,5 @@
-# 
-# Copyright (C) 2006-2008 OpenWrt.org
+#
+# Copyright (C) 2006-2009 OpenWrt.org
 #
 # This is free software, licensed under the GNU General Public License v2.
 # See /LICENSE for more information.
@@ -8,11 +8,11 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=damageproto
-PKG_RELEASE:=3
-PKG_VERSION:=1.1.0
-PKG_SOURCE_URL:=http://xorg.freedesktop.org/releases/X11R7.4/src/proto/
+PKG_RELEASE:=1
+PKG_VERSION:=1.2.0
+PKG_SOURCE_URL:=http://xorg.freedesktop.org/releases/individual/proto/
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
-PKG_BUILD_DIR=$(BUILD_DIR)/Xorg/$(_CATEGORY)/$(PKG_NAME)-$(PKG_VERSION)/
+PKG_BUILD_DIR:=$(BUILD_DIR)/Xorg/$(PKG_NAME)-$(PKG_VERSION)/
 
 include $(INCLUDE_DIR)/package.mk
 

diff --git a/Xorg/xorg/proto/dmxproto/Makefile b/Xorg/xorg/proto/dmxproto/Makefile
index 857ad32..a3d6a38 100644 (file)
--- a/Xorg/xorg/proto/dmxproto/Makefile
+++ b/Xorg/xorg/proto/dmxproto/Makefile
@@ -1,18 +1,20 @@
-# 
-# Copyright (C) 2006-2008 OpenWrt.org
+#
+# Copyright (C) 2006-2009 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:=dmxproto
-PKG_RELEASE:=3
-PKG_VERSION:=2.2.2
-PKG_SOURCE_URL:=http://xorg.freedesktop.org/releases/X11R7.4/src/proto/
+PKG_RELEASE:=1
+PKG_VERSION:=2.3
+
+PKG_SOURCE_URL:=http://xorg.freedesktop.org/releases/individual/proto/
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
-PKG_BUILD_DIR=$(BUILD_DIR)/Xorg/$(_CATEGORY)/$(PKG_NAME)-$(PKG_VERSION)/
+PKG_BUILD_DIR:=$(BUILD_DIR)/Xorg/$(PKG_NAME)-$(PKG_VERSION)/
+PKG_MD5SUM:=
 
 include $(INCLUDE_DIR)/package.mk
 

diff --git a/Xorg/xorg/proto/dri2proto/Makefile b/Xorg/xorg/proto/dri2proto/Makefile
new file mode 100644 (file)
index 0000000..dd7471f
--- /dev/null
+++ b/Xorg/xorg/proto/dri2proto/Makefile
@@ -0,0 +1,35 @@
+#
+# Copyright (C) 2009 OpenWrt.org
+#
+# This is free software, licensed under the GNU General Public License v2.
+# See /LICENSE for more information.
+#
+
+include $(TOPDIR)/rules.mk
+
+PKG_NAME:=dri2proto
+PKG_RELEASE:=1
+PKG_VERSION:=2.1
+PKG_SOURCE_URL:=http://xorg.freedesktop.org/releases/individual/proto/
+PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
+PKG_BUILD_DIR:=$(BUILD_DIR)/Xorg/$(PKG_NAME)-$(PKG_VERSION)/
+
+include $(INCLUDE_DIR)/package.mk
+
+define Package/dri2proto
+  SECTION:=xorg-proto
+  CATEGORY:=Xorg
+  SUBMENU:=proto
+  TITLE:=dri2proto
+  URL:=http://xorg.freedesktop.org/
+endef
+
+define Build/InstallDev
+       DESTDIR="$(1)" $(MAKE) -C $(PKG_BUILD_DIR)/ $(MAKE_FLAGS) install
+endef
+
+define Build/Compile
+       true
+endef
+
+$(eval $(call BuildPackage,dri2proto))

diff --git a/Xorg/xorg/proto/evieext/Makefile b/Xorg/xorg/proto/evieext/Makefile
deleted file mode 100644 (file)
index 5cc0bbe..0000000
--- a/Xorg/xorg/proto/evieext/Makefile
+++ /dev/null
@@ -1,36 +0,0 @@
-# 
-# Copyright (C) 2006-2008 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:=evieext
-PKG_RELEASE:=3
-PKG_VERSION:=1.0.2
-PKG_SOURCE_URL:=http://xorg.freedesktop.org/releases/X11R7.4/src/proto/
-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/evieext
-  SECTION:=xorg-proto
-  CATEGORY:=Xorg
-  SUBMENU:=proto
-  DEPENDS:=
-  TITLE:=evieext
-  URL:=http://xorg.freedesktop.org/
-endef
-
-define Build/InstallDev
-       DESTDIR="$(1)" $(MAKE) -C $(PKG_BUILD_DIR)/ $(MAKE_FLAGS) install
-endef
-
-define Build/Compile
-       true
-endef
-
-$(eval $(call BuildPackage,evieext))

diff --git a/Xorg/xorg/proto/fixesproto/Makefile b/Xorg/xorg/proto/fixesproto/Makefile
index 0e2851d..f53e703 100644 (file)
--- a/Xorg/xorg/proto/fixesproto/Makefile
+++ b/Xorg/xorg/proto/fixesproto/Makefile
@@ -1,5 +1,5 @@
-# 
-# Copyright (C) 2006-2008 OpenWrt.org
+#
+# Copyright (C) 2006-2009 OpenWrt.org
 #
 # This is free software, licensed under the GNU General Public License v2.
 # See /LICENSE for more information.
@@ -8,11 +8,11 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=fixesproto
-PKG_RELEASE:=3
-PKG_VERSION:=4.0
-PKG_SOURCE_URL:=http://xorg.freedesktop.org/releases/X11R7.4/src/proto/
+PKG_RELEASE:=1
+PKG_VERSION:=4.1.1
+PKG_SOURCE_URL:=http://xorg.freedesktop.org/releases/individual/proto/
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
-PKG_BUILD_DIR=$(BUILD_DIR)/Xorg/$(_CATEGORY)/$(PKG_NAME)-$(PKG_VERSION)/
+PKG_BUILD_DIR:=$(BUILD_DIR)/Xorg/$(PKG_NAME)-$(PKG_VERSION)/
 
 include $(INCLUDE_DIR)/package.mk
 

diff --git a/Xorg/xorg/proto/fontcacheproto/Makefile b/Xorg/xorg/proto/fontcacheproto/Makefile
index 08cfc70..2bfb772 100644 (file)
--- a/Xorg/xorg/proto/fontcacheproto/Makefile
+++ b/Xorg/xorg/proto/fontcacheproto/Makefile
@@ -1,5 +1,5 @@
-# 
-# Copyright (C) 2006-2008 OpenWrt.org
+#
+# Copyright (C) 2006-2009 OpenWrt.org
 #
 # This is free software, licensed under the GNU General Public License v2.
 # See /LICENSE for more information.
@@ -8,11 +8,11 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=fontcacheproto
-PKG_RELEASE:=3
-PKG_VERSION:=0.1.2
-PKG_SOURCE_URL:=http://xorg.freedesktop.org/releases/X11R7.4/src/proto/
+PKG_RELEASE:=1
+PKG_VERSION:=0.1.3
+PKG_SOURCE_URL:=http://xorg.freedesktop.org/releases/individual/proto/
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
-PKG_BUILD_DIR=$(BUILD_DIR)/Xorg/$(_CATEGORY)/$(PKG_NAME)-$(PKG_VERSION)/
+PKG_BUILD_DIR:=$(BUILD_DIR)/Xorg/$(PKG_NAME)-$(PKG_VERSION)/
 
 include $(INCLUDE_DIR)/package.mk
 

diff --git a/Xorg/xorg/proto/fontsproto/Makefile b/Xorg/xorg/proto/fontsproto/Makefile
index b79c4b0..6592eec 100644 (file)
--- a/Xorg/xorg/proto/fontsproto/Makefile
+++ b/Xorg/xorg/proto/fontsproto/Makefile
@@ -1,18 +1,20 @@
-# 
-# Copyright (C) 2006-2008 OpenWrt.org
+#
+# Copyright (C) 2006-2009 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:=fontsproto
-PKG_RELEASE:=3
-PKG_VERSION:=2.0.2
-PKG_SOURCE_URL:=http://xorg.freedesktop.org/releases/X11R7.4/src/proto/
+PKG_RELEASE:=1
+PKG_VERSION:=2.1.0
+
+PKG_SOURCE_URL:=http://xorg.freedesktop.org/releases/individual/proto/
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
-PKG_BUILD_DIR=$(BUILD_DIR)/Xorg/$(_CATEGORY)/$(PKG_NAME)-$(PKG_VERSION)/
+PKG_BUILD_DIR:=$(BUILD_DIR)/Xorg/$(PKG_NAME)-$(PKG_VERSION)/
+PKG_MD5SUM:=f3a857deadca3144fba041af1dbf7603
 
 include $(INCLUDE_DIR)/package.mk
 

diff --git a/Xorg/xorg/proto/glproto/Makefile b/Xorg/xorg/proto/glproto/Makefile
index b1b066a..138a109 100644 (file)
--- a/Xorg/xorg/proto/glproto/Makefile
+++ b/Xorg/xorg/proto/glproto/Makefile
@@ -1,5 +1,5 @@
-# 
-# Copyright (C) 2006-2008 OpenWrt.org
+#
+# Copyright (C) 2006-2009 OpenWrt.org
 #
 # This is free software, licensed under the GNU General Public License v2.
 # See /LICENSE for more information.
@@ -8,11 +8,11 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=glproto
-PKG_RELEASE:=3
-PKG_VERSION:=1.4.9
-PKG_SOURCE_URL:=http://xorg.freedesktop.org/releases/X11R7.4/src/proto/
+PKG_RELEASE:=1
+PKG_VERSION:=1.4.10
+PKG_SOURCE_URL:=http://xorg.freedesktop.org/releases/individual/proto/
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
-PKG_BUILD_DIR=$(BUILD_DIR)/Xorg/$(_CATEGORY)/$(PKG_NAME)-$(PKG_VERSION)/
+PKG_BUILD_DIR:=$(BUILD_DIR)/Xorg/$(PKG_NAME)-$(PKG_VERSION)/
 
 include $(INCLUDE_DIR)/package.mk
 

diff --git a/Xorg/xorg/proto/inputproto/Makefile b/Xorg/xorg/proto/inputproto/Makefile
index ed5611c..0e3e78a 100644 (file)
--- a/Xorg/xorg/proto/inputproto/Makefile
+++ b/Xorg/xorg/proto/inputproto/Makefile
@@ -1,5 +1,5 @@
-# 
-# Copyright (C) 2006-2008 OpenWrt.org
+#
+# Copyright (C) 2006-2009 OpenWrt.org
 #
 # This is free software, licensed under the GNU General Public License v2.
 # See /LICENSE for more information.
@@ -8,11 +8,11 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=inputproto
-PKG_RELEASE:=3
-PKG_VERSION:=1.4.4
-PKG_SOURCE_URL:=http://xorg.freedesktop.org/releases/X11R7.4/src/proto/
+PKG_RELEASE:=1
+PKG_VERSION:=2.0
+PKG_SOURCE_URL:=http://xorg.freedesktop.org/releases/individual/proto/
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
-PKG_BUILD_DIR=$(BUILD_DIR)/Xorg/$(_CATEGORY)/$(PKG_NAME)-$(PKG_VERSION)/
+PKG_BUILD_DIR:=$(BUILD_DIR)/Xorg/$(PKG_NAME)-$(PKG_VERSION)/
 
 include $(INCLUDE_DIR)/package.mk
 

diff --git a/Xorg/xorg/proto/kbproto/Makefile b/Xorg/xorg/proto/kbproto/Makefile
index ba560e4..91065c2 100644 (file)
--- a/Xorg/xorg/proto/kbproto/Makefile
+++ b/Xorg/xorg/proto/kbproto/Makefile
@@ -1,5 +1,5 @@
-# 
-# Copyright (C) 2006-2008 OpenWrt.org
+#
+# Copyright (C) 2006-2009 OpenWrt.org
 #
 # This is free software, licensed under the GNU General Public License v2.
 # See /LICENSE for more information.
@@ -8,11 +8,11 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=kbproto
-PKG_RELEASE:=3
-PKG_VERSION:=1.0.3
-PKG_SOURCE_URL:=http://xorg.freedesktop.org/releases/X11R7.4/src/proto/
+PKG_RELEASE:=1
+PKG_VERSION:=1.0.4
+PKG_SOURCE_URL:=http://xorg.freedesktop.org/releases/individual/proto/
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
-PKG_BUILD_DIR=$(BUILD_DIR)/Xorg/$(_CATEGORY)/$(PKG_NAME)-$(PKG_VERSION)/
+PKG_BUILD_DIR:=$(BUILD_DIR)/Xorg/$(PKG_NAME)-$(PKG_VERSION)/
 
 include $(INCLUDE_DIR)/package.mk
 

diff --git a/Xorg/xorg/proto/packages b/Xorg/xorg/proto/packages
deleted file mode 100644 (file)
index 23e1ccc..0000000
--- a/Xorg/xorg/proto/packages
+++ /dev/null
@@ -1,31 +0,0 @@
-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.9|
-inputproto-1.4.4|
-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.3|
-xf86bigfontproto-1.1.2|
-xf86dgaproto-2.0.3|
-xf86driproto-2.0.4|
-xf86miscproto-0.9.2|
-xf86rushproto-1.1.2|
-xf86vidmodeproto-2.2.2|
-xineramaproto-1.1.2|
-xproto-7.0.13|

diff --git a/Xorg/xorg/proto/printproto/Makefile b/Xorg/xorg/proto/printproto/Makefile
index 114de7b..8596e78 100644 (file)
--- a/Xorg/xorg/proto/printproto/Makefile
+++ b/Xorg/xorg/proto/printproto/Makefile
@@ -1,5 +1,5 @@
-# 
-# Copyright (C) 2006-2008 OpenWrt.org
+#
+# Copyright (C) 2006-2009 OpenWrt.org
 #
 # This is free software, licensed under the GNU General Public License v2.
 # See /LICENSE for more information.
@@ -8,11 +8,11 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=printproto
-PKG_RELEASE:=3
-PKG_VERSION:=1.0.3
-PKG_SOURCE_URL:=http://xorg.freedesktop.org/releases/X11R7.4/src/proto/
+PKG_RELEASE:=1
+PKG_VERSION:=1.0.4
+PKG_SOURCE_URL:=http://xorg.freedesktop.org/releases/individual/proto/
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
-PKG_BUILD_DIR=$(BUILD_DIR)/Xorg/$(_CATEGORY)/$(PKG_NAME)-$(PKG_VERSION)/
+PKG_BUILD_DIR:=$(BUILD_DIR)/Xorg/$(PKG_NAME)-$(PKG_VERSION)/
 
 include $(INCLUDE_DIR)/package.mk
 

diff --git a/Xorg/xorg/proto/randrproto/Makefile b/Xorg/xorg/proto/randrproto/Makefile
index 186d907..90b93c4 100644 (file)
--- a/Xorg/xorg/proto/randrproto/Makefile
+++ b/Xorg/xorg/proto/randrproto/Makefile
@@ -1,5 +1,5 @@
-# 
-# Copyright (C) 2006-2008 OpenWrt.org
+#
+# Copyright (C) 2006-2009 OpenWrt.org
 #
 # This is free software, licensed under the GNU General Public License v2.
 # See /LICENSE for more information.
@@ -8,11 +8,11 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=randrproto
-PKG_RELEASE:=3
-PKG_VERSION:=1.2.1
-PKG_SOURCE_URL:=http://xorg.freedesktop.org/releases/X11R7.4/src/proto/
+PKG_RELEASE:=1
+PKG_VERSION:=1.3.1
+PKG_SOURCE_URL:=http://xorg.freedesktop.org/releases/individual/proto/
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
-PKG_BUILD_DIR=$(BUILD_DIR)/Xorg/$(_CATEGORY)/$(PKG_NAME)-$(PKG_VERSION)/
+PKG_BUILD_DIR:=$(BUILD_DIR)/Xorg/$(PKG_NAME)-$(PKG_VERSION)/
 
 include $(INCLUDE_DIR)/package.mk
 

diff --git a/Xorg/xorg/proto/randrproto/patches/010-fix-warning.patch b/Xorg/xorg/proto/randrproto/patches/010-fix-warning.patch
deleted file mode 100644 (file)
index 6406ada..0000000
--- a/Xorg/xorg/proto/randrproto/patches/010-fix-warning.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-diff --git a/randrproto.h b/randrproto.h
-index abca369..cbbf6a8 100644
---- a/randrproto.h
-+++ b/randrproto.h
-@@ -564,8 +564,8 @@ typedef struct {
-     CARD8 type;                               /* always evBase + ScreenChangeNotify */
-     CARD8 rotation;                   /* new rotation */
-     CARD16 sequenceNumber B16;
--    Time timestamp B32; B32;                  /* time screen was changed */
--    Time configTimestamp B32; B32;            /* time config data was changed */
-+    Time timestamp B32;                       /* time screen was changed */
-+    Time configTimestamp B32;         /* time config data was changed */
-     Window root B32;                  /* root window */
-     Window window B32;                        /* window requesting notification */
-     SizeID sizeID B16;                        /* new size ID */

diff --git a/Xorg/xorg/proto/recordproto/Makefile b/Xorg/xorg/proto/recordproto/Makefile
index f7a32ce..b354079 100644 (file)
--- a/Xorg/xorg/proto/recordproto/Makefile
+++ b/Xorg/xorg/proto/recordproto/Makefile
@@ -1,5 +1,5 @@
-# 
-# Copyright (C) 2006-2008 OpenWrt.org
+#
+# Copyright (C) 2006-2009 OpenWrt.org
 #
 # This is free software, licensed under the GNU General Public License v2.
 # See /LICENSE for more information.
@@ -8,11 +8,11 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=recordproto
-PKG_RELEASE:=3
-PKG_VERSION:=1.13.2
-PKG_SOURCE_URL:=http://xorg.freedesktop.org/releases/X11R7.4/src/proto/
+PKG_RELEASE:=1
+PKG_VERSION:=1.14
+PKG_SOURCE_URL:=http://xorg.freedesktop.org/releases/individual/proto/
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
-PKG_BUILD_DIR=$(BUILD_DIR)/Xorg/$(_CATEGORY)/$(PKG_NAME)-$(PKG_VERSION)/
+PKG_BUILD_DIR:=$(BUILD_DIR)/Xorg/$(PKG_NAME)-$(PKG_VERSION)/
 
 include $(INCLUDE_DIR)/package.mk
 

diff --git a/Xorg/xorg/proto/renderproto/Makefile b/Xorg/xorg/proto/renderproto/Makefile
index 9d720e0..749193a 100644 (file)
--- a/Xorg/xorg/proto/renderproto/Makefile
+++ b/Xorg/xorg/proto/renderproto/Makefile
@@ -1,5 +1,5 @@
-# 
-# Copyright (C) 2006-2008 OpenWrt.org
+#
+# Copyright (C) 2006-2009 OpenWrt.org
 #
 # This is free software, licensed under the GNU General Public License v2.
 # See /LICENSE for more information.
@@ -8,11 +8,11 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=renderproto
-PKG_RELEASE:=3
-PKG_VERSION:=0.9.3
-PKG_SOURCE_URL:=http://xorg.freedesktop.org/releases/X11R7.4/src/proto/
+PKG_RELEASE:=1
+PKG_VERSION:=0.11
+PKG_SOURCE_URL:=http://xorg.freedesktop.org/releases/individual/proto/
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
-PKG_BUILD_DIR=$(BUILD_DIR)/Xorg/$(_CATEGORY)/$(PKG_NAME)-$(PKG_VERSION)/
+PKG_BUILD_DIR:=$(BUILD_DIR)/Xorg/$(PKG_NAME)-$(PKG_VERSION)/
 
 include $(INCLUDE_DIR)/package.mk
 

diff --git a/Xorg/xorg/proto/resourceproto/Makefile b/Xorg/xorg/proto/resourceproto/Makefile
index 9bba047..ec35485 100644 (file)
--- a/Xorg/xorg/proto/resourceproto/Makefile
+++ b/Xorg/xorg/proto/resourceproto/Makefile
@@ -1,5 +1,5 @@
-# 
-# Copyright (C) 2006-2008 OpenWrt.org
+#
+# Copyright (C) 2006-2009 OpenWrt.org
 #
 # This is free software, licensed under the GNU General Public License v2.
 # See /LICENSE for more information.
@@ -8,11 +8,11 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=resourceproto
-PKG_RELEASE:=3
-PKG_VERSION:=1.0.2
-PKG_SOURCE_URL:=http://xorg.freedesktop.org/releases/X11R7.4/src/proto/
+PKG_RELEASE:=1
+PKG_VERSION:=1.1.0
+PKG_SOURCE_URL:=http://xorg.freedesktop.org/releases/individual/proto/
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
-PKG_BUILD_DIR=$(BUILD_DIR)/Xorg/$(_CATEGORY)/$(PKG_NAME)-$(PKG_VERSION)/
+PKG_BUILD_DIR:=$(BUILD_DIR)/Xorg/$(PKG_NAME)-$(PKG_VERSION)/
 
 include $(INCLUDE_DIR)/package.mk
 

diff --git a/Xorg/xorg/proto/scrnsaverproto/Makefile b/Xorg/xorg/proto/scrnsaverproto/Makefile
index 7194c36..a117735 100644 (file)
--- a/Xorg/xorg/proto/scrnsaverproto/Makefile
+++ b/Xorg/xorg/proto/scrnsaverproto/Makefile
@@ -1,5 +1,5 @@
-# 
-# Copyright (C) 2006-2008 OpenWrt.org
+#
+# Copyright (C) 2006-2009 OpenWrt.org
 #
 # This is free software, licensed under the GNU General Public License v2.
 # See /LICENSE for more information.
@@ -8,11 +8,11 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=scrnsaverproto
-PKG_RELEASE:=3
-PKG_VERSION:=1.1.0
-PKG_SOURCE_URL:=http://xorg.freedesktop.org/releases/X11R7.4/src/proto/
+PKG_RELEASE:=1
+PKG_VERSION:=1.2.0
+PKG_SOURCE_URL:=http://xorg.freedesktop.org/releases/individual/proto/
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
-PKG_BUILD_DIR=$(BUILD_DIR)/Xorg/$(_CATEGORY)/$(PKG_NAME)-$(PKG_VERSION)/
+PKG_BUILD_DIR:=$(BUILD_DIR)/Xorg/$(PKG_NAME)-$(PKG_VERSION)/
 
 include $(INCLUDE_DIR)/package.mk
 

diff --git a/Xorg/xorg/proto/template.mk b/Xorg/xorg/proto/template.mk
deleted file mode 100644 (file)
index 47a269f..0000000
--- a/Xorg/xorg/proto/template.mk
+++ /dev/null
@@ -1,36 +0,0 @@
-# 
-# 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:=@NAME@
-PKG_RELEASE:=3
-PKG_VERSION:=@VER@
-PKG_SOURCE_URL:=http://xorg.freedesktop.org/releases/X11R7.4/src/proto/
-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/@NAME@
-  SECTION:=xorg-proto
-  CATEGORY:=Xorg
-  SUBMENU:=proto
-  DEPENDS:=@DEP@ @DISPLAY_SUPPORT
-  TITLE:=@NAME@
-  URL:=http://xorg.freedesktop.org/
-endef
-
-define Build/InstallDev
-       DESTDIR="$(1)" $(MAKE) -C $(PKG_BUILD_DIR)/ $(MAKE_FLAGS) install
-endef
-
-define Build/Compile
-       true
-endef
-
-$(eval $(call BuildPackage,@NAME@))

diff --git a/Xorg/xorg/proto/trapproto/Makefile b/Xorg/xorg/proto/trapproto/Makefile
deleted file mode 100644 (file)
index cfb280e..0000000
--- a/Xorg/xorg/proto/trapproto/Makefile
+++ /dev/null
@@ -1,36 +0,0 @@
-# 
-# Copyright (C) 2006-2008 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:=trapproto
-PKG_RELEASE:=3
-PKG_VERSION:=3.4.3
-PKG_SOURCE_URL:=http://xorg.freedesktop.org/releases/X11R7.4/src/proto/
-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/trapproto
-  SECTION:=xorg-proto
-  CATEGORY:=Xorg
-  SUBMENU:=proto
-  DEPENDS:=
-  TITLE:=trapproto
-  URL:=http://xorg.freedesktop.org/
-endef
-
-define Build/InstallDev
-       DESTDIR="$(1)" $(MAKE) -C $(PKG_BUILD_DIR)/ $(MAKE_FLAGS) install
-endef
-
-define Build/Compile
-       true
-endef
-
-$(eval $(call BuildPackage,trapproto))

diff --git a/Xorg/xorg/proto/videoproto/Makefile b/Xorg/xorg/proto/videoproto/Makefile
index 5b78a10..f031186 100644 (file)
--- a/Xorg/xorg/proto/videoproto/Makefile
+++ b/Xorg/xorg/proto/videoproto/Makefile
@@ -1,5 +1,5 @@
-# 
-# Copyright (C) 2006-2008 OpenWrt.org
+#
+# Copyright (C) 2006-2009 OpenWrt.org
 #
 # This is free software, licensed under the GNU General Public License v2.
 # See /LICENSE for more information.
@@ -8,11 +8,11 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=videoproto
-PKG_RELEASE:=3
-PKG_VERSION:=2.2.2
-PKG_SOURCE_URL:=http://xorg.freedesktop.org/releases/X11R7.4/src/proto/
+PKG_RELEASE:=1
+PKG_VERSION:=2.3.0
+PKG_SOURCE_URL:=http://xorg.freedesktop.org/releases/individual/proto/
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
-PKG_BUILD_DIR=$(BUILD_DIR)/Xorg/$(_CATEGORY)/$(PKG_NAME)-$(PKG_VERSION)/
+PKG_BUILD_DIR:=$(BUILD_DIR)/Xorg/$(PKG_NAME)-$(PKG_VERSION)/
 
 include $(INCLUDE_DIR)/package.mk
 

diff --git a/Xorg/xorg/proto/windowswmproto/Makefile b/Xorg/xorg/proto/windowswmproto/Makefile
index a1b808f..21b05d5 100644 (file)
--- a/Xorg/xorg/proto/windowswmproto/Makefile
+++ b/Xorg/xorg/proto/windowswmproto/Makefile
@@ -1,5 +1,5 @@
-# 
-# Copyright (C) 2006-2008 OpenWrt.org
+#
+# Copyright (C) 2006-2009 OpenWrt.org
 #
 # This is free software, licensed under the GNU General Public License v2.
 # See /LICENSE for more information.
@@ -8,11 +8,11 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=windowswmproto
-PKG_RELEASE:=3
-PKG_VERSION:=1.0.3
-PKG_SOURCE_URL:=http://xorg.freedesktop.org/releases/X11R7.4/src/proto/
+PKG_RELEASE:=1
+PKG_VERSION:=1.0.4
+PKG_SOURCE_URL:=http://xorg.freedesktop.org/releases/individual/proto/
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
-PKG_BUILD_DIR=$(BUILD_DIR)/Xorg/$(_CATEGORY)/$(PKG_NAME)-$(PKG_VERSION)/
+PKG_BUILD_DIR:=$(BUILD_DIR)/Xorg/$(PKG_NAME)-$(PKG_VERSION)/
 
 include $(INCLUDE_DIR)/package.mk
 

diff --git a/Xorg/xorg/proto/xcmiscproto/Makefile b/Xorg/xorg/proto/xcmiscproto/Makefile
index 6f06a04..d344f7a 100644 (file)
--- a/Xorg/xorg/proto/xcmiscproto/Makefile
+++ b/Xorg/xorg/proto/xcmiscproto/Makefile
@@ -1,5 +1,5 @@
-# 
-# Copyright (C) 2006-2008 OpenWrt.org
+#
+# Copyright (C) 2006-2009 OpenWrt.org
 #
 # This is free software, licensed under the GNU General Public License v2.
 # See /LICENSE for more information.
@@ -8,11 +8,11 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=xcmiscproto
-PKG_RELEASE:=3
-PKG_VERSION:=1.1.2
-PKG_SOURCE_URL:=http://xorg.freedesktop.org/releases/X11R7.4/src/proto/
+PKG_RELEASE:=1
+PKG_VERSION:=1.2.0
+PKG_SOURCE_URL:=http://xorg.freedesktop.org/releases/individual/proto/
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
-PKG_BUILD_DIR=$(BUILD_DIR)/Xorg/$(_CATEGORY)/$(PKG_NAME)-$(PKG_VERSION)/
+PKG_BUILD_DIR:=$(BUILD_DIR)/Xorg/$(PKG_NAME)-$(PKG_VERSION)/
 
 include $(INCLUDE_DIR)/package.mk
 

diff --git a/Xorg/xorg/proto/xextproto/Makefile b/Xorg/xorg/proto/xextproto/Makefile
index 0cea026..aafa112 100644 (file)
--- a/Xorg/xorg/proto/xextproto/Makefile
+++ b/Xorg/xorg/proto/xextproto/Makefile
@@ -1,5 +1,5 @@
-# 
-# Copyright (C) 2006-2008 OpenWrt.org
+#
+# Copyright (C) 2006-2009 OpenWrt.org
 #
 # This is free software, licensed under the GNU General Public License v2.
 # See /LICENSE for more information.
@@ -8,11 +8,11 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=xextproto
-PKG_RELEASE:=3
-PKG_VERSION:=7.0.3
-PKG_SOURCE_URL:=http://xorg.freedesktop.org/releases/X11R7.4/src/proto/
+PKG_RELEASE:=1
+PKG_VERSION:=7.1.1
+PKG_SOURCE_URL:=http://xorg.freedesktop.org/releases/individual/proto/
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
-PKG_BUILD_DIR=$(BUILD_DIR)/Xorg/$(_CATEGORY)/$(PKG_NAME)-$(PKG_VERSION)/
+PKG_BUILD_DIR:=$(BUILD_DIR)/Xorg/$(PKG_NAME)-$(PKG_VERSION)/
 
 include $(INCLUDE_DIR)/package.mk
 

diff --git a/Xorg/xorg/proto/xf86bigfontproto/Makefile b/Xorg/xorg/proto/xf86bigfontproto/Makefile
index 569bf69..f2dc4ad 100644 (file)
--- a/Xorg/xorg/proto/xf86bigfontproto/Makefile
+++ b/Xorg/xorg/proto/xf86bigfontproto/Makefile
@@ -1,5 +1,5 @@
-# 
-# Copyright (C) 2006-2008 OpenWrt.org
+#
+# Copyright (C) 2006-2009 OpenWrt.org
 #
 # This is free software, licensed under the GNU General Public License v2.
 # See /LICENSE for more information.
@@ -9,10 +9,10 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=xf86bigfontproto
 PKG_RELEASE:=3
-PKG_VERSION:=1.1.2
-PKG_SOURCE_URL:=http://xorg.freedesktop.org/releases/X11R7.4/src/proto/
+PKG_VERSION:=1.2.0
+PKG_SOURCE_URL:=http://xorg.freedesktop.org/releases/individual/proto/
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
-PKG_BUILD_DIR=$(BUILD_DIR)/Xorg/$(_CATEGORY)/$(PKG_NAME)-$(PKG_VERSION)/
+PKG_BUILD_DIR:=$(BUILD_DIR)/Xorg/$(PKG_NAME)-$(PKG_VERSION)/
 
 include $(INCLUDE_DIR)/package.mk
 

diff --git a/Xorg/xorg/proto/xf86dgaproto/Makefile b/Xorg/xorg/proto/xf86dgaproto/Makefile
index f8c6688..8e2863f 100644 (file)
--- a/Xorg/xorg/proto/xf86dgaproto/Makefile
+++ b/Xorg/xorg/proto/xf86dgaproto/Makefile
@@ -1,5 +1,5 @@
-# 
-# Copyright (C) 2006-2008 OpenWrt.org
+#
+# Copyright (C) 2006-2009 OpenWrt.org
 #
 # This is free software, licensed under the GNU General Public License v2.
 # See /LICENSE for more information.
@@ -9,10 +9,10 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=xf86dgaproto
 PKG_RELEASE:=3
-PKG_VERSION:=2.0.3
-PKG_SOURCE_URL:=http://xorg.freedesktop.org/releases/X11R7.4/src/proto/
+PKG_VERSION:=2.1
+PKG_SOURCE_URL:=http://xorg.freedesktop.org/releases/individual/proto/
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
-PKG_BUILD_DIR=$(BUILD_DIR)/Xorg/$(_CATEGORY)/$(PKG_NAME)-$(PKG_VERSION)/
+PKG_BUILD_DIR:=$(BUILD_DIR)/Xorg/$(PKG_NAME)-$(PKG_VERSION)/
 
 include $(INCLUDE_DIR)/package.mk
 

diff --git a/Xorg/xorg/proto/xf86driproto/Makefile b/Xorg/xorg/proto/xf86driproto/Makefile
index 88bc7de..d4c71cc 100644 (file)
--- a/Xorg/xorg/proto/xf86driproto/Makefile
+++ b/Xorg/xorg/proto/xf86driproto/Makefile
@@ -1,5 +1,5 @@
-# 
-# Copyright (C) 2006-2008 OpenWrt.org
+#
+# Copyright (C) 2006-2009 OpenWrt.org
 #
 # This is free software, licensed under the GNU General Public License v2.
 # See /LICENSE for more information.
@@ -8,11 +8,11 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=xf86driproto
-PKG_RELEASE:=3
-PKG_VERSION:=2.0.4
-PKG_SOURCE_URL:=http://xorg.freedesktop.org/releases/X11R7.4/src/proto/
+PKG_RELEASE:=1
+PKG_VERSION:=2.1.0
+PKG_SOURCE_URL:=http://xorg.freedesktop.org/releases/individual/proto/
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
-PKG_BUILD_DIR=$(BUILD_DIR)/Xorg/$(_CATEGORY)/$(PKG_NAME)-$(PKG_VERSION)/
+PKG_BUILD_DIR:=$(BUILD_DIR)/Xorg/$(PKG_NAME)-$(PKG_VERSION)/
 
 include $(INCLUDE_DIR)/package.mk
 

diff --git a/Xorg/xorg/proto/xf86miscproto/Makefile b/Xorg/xorg/proto/xf86miscproto/Makefile
deleted file mode 100644 (file)
index 48c2de7..0000000
--- a/Xorg/xorg/proto/xf86miscproto/Makefile
+++ /dev/null
@@ -1,36 +0,0 @@
-# 
-# Copyright (C) 2006-2008 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:=xf86miscproto
-PKG_RELEASE:=3
-PKG_VERSION:=0.9.2
-PKG_SOURCE_URL:=http://xorg.freedesktop.org/releases/X11R7.4/src/proto/
-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/xf86miscproto
-  SECTION:=xorg-proto
-  CATEGORY:=Xorg
-  SUBMENU:=proto
-  DEPENDS:=
-  TITLE:=xf86miscproto
-  URL:=http://xorg.freedesktop.org/
-endef
-
-define Build/InstallDev
-       DESTDIR="$(1)" $(MAKE) -C $(PKG_BUILD_DIR)/ $(MAKE_FLAGS) install
-endef
-
-define Build/Compile
-       true
-endef
-
-$(eval $(call BuildPackage,xf86miscproto))

diff --git a/Xorg/xorg/proto/xf86rushproto/Makefile b/Xorg/xorg/proto/xf86rushproto/Makefile
deleted file mode 100644 (file)
index 129799b..0000000
--- a/Xorg/xorg/proto/xf86rushproto/Makefile
+++ /dev/null
@@ -1,36 +0,0 @@
-# 
-# Copyright (C) 2006-2008 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:=xf86rushproto
-PKG_RELEASE:=3
-PKG_VERSION:=1.1.2
-PKG_SOURCE_URL:=http://xorg.freedesktop.org/releases/X11R7.4/src/proto/
-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/xf86rushproto
-  SECTION:=xorg-proto
-  CATEGORY:=Xorg
-  SUBMENU:=proto
-  DEPENDS:=
-  TITLE:=xf86rushproto
-  URL:=http://xorg.freedesktop.org/
-endef
-
-define Build/InstallDev
-       DESTDIR="$(1)" $(MAKE) -C $(PKG_BUILD_DIR)/ $(MAKE_FLAGS) install
-endef
-
-define Build/Compile
-       true
-endef
-
-$(eval $(call BuildPackage,xf86rushproto))

diff --git a/Xorg/xorg/proto/xf86vidmodeproto/Makefile b/Xorg/xorg/proto/xf86vidmodeproto/Makefile
index 458a19c..55485f1 100644 (file)
--- a/Xorg/xorg/proto/xf86vidmodeproto/Makefile
+++ b/Xorg/xorg/proto/xf86vidmodeproto/Makefile
@@ -1,5 +1,5 @@
-# 
-# Copyright (C) 2006-2008 OpenWrt.org
+#
+# Copyright (C) 2006-2009 OpenWrt.org
 #
 # This is free software, licensed under the GNU General Public License v2.
 # See /LICENSE for more information.
@@ -8,11 +8,11 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=xf86vidmodeproto
-PKG_RELEASE:=3
-PKG_VERSION:=2.2.2
-PKG_SOURCE_URL:=http://xorg.freedesktop.org/releases/X11R7.4/src/proto/
+PKG_RELEASE:=1
+PKG_VERSION:=2.3
+PKG_SOURCE_URL:=http://xorg.freedesktop.org/releases/individual/proto/
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
-PKG_BUILD_DIR=$(BUILD_DIR)/Xorg/$(_CATEGORY)/$(PKG_NAME)-$(PKG_VERSION)/
+PKG_BUILD_DIR:=$(BUILD_DIR)/Xorg/$(PKG_NAME)-$(PKG_VERSION)/
 
 include $(INCLUDE_DIR)/package.mk
 

diff --git a/Xorg/xorg/proto/xineramaproto/Makefile b/Xorg/xorg/proto/xineramaproto/Makefile
index 849d88c..375f56d 100644 (file)
--- a/Xorg/xorg/proto/xineramaproto/Makefile
+++ b/Xorg/xorg/proto/xineramaproto/Makefile
@@ -1,5 +1,5 @@
-# 
-# Copyright (C) 2006-2008 OpenWrt.org
+#
+# Copyright (C) 2006-2009 OpenWrt.org
 #
 # This is free software, licensed under the GNU General Public License v2.
 # See /LICENSE for more information.
@@ -8,11 +8,11 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=xineramaproto
-PKG_RELEASE:=3
-PKG_VERSION:=1.1.2
-PKG_SOURCE_URL:=http://xorg.freedesktop.org/releases/X11R7.4/src/proto/
+PKG_RELEASE:=1
+PKG_VERSION:=1.2
+PKG_SOURCE_URL:=http://xorg.freedesktop.org/releases/individual/proto/
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
-PKG_BUILD_DIR=$(BUILD_DIR)/Xorg/$(_CATEGORY)/$(PKG_NAME)-$(PKG_VERSION)/
+PKG_BUILD_DIR:=$(BUILD_DIR)/Xorg/$(PKG_NAME)-$(PKG_VERSION)/
 
 include $(INCLUDE_DIR)/package.mk
 

diff --git a/Xorg/xorg/proto/xproto/Makefile b/Xorg/xorg/proto/xproto/Makefile
index 7962683..bb5ff8d 100644 (file)
--- a/Xorg/xorg/proto/xproto/Makefile
+++ b/Xorg/xorg/proto/xproto/Makefile
@@ -1,5 +1,5 @@
-# 
-# Copyright (C) 2006-2008 OpenWrt.org
+#
+# Copyright (C) 2006-2009 OpenWrt.org
 #
 # This is free software, licensed under the GNU General Public License v2.
 # See /LICENSE for more information.
@@ -8,11 +8,11 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=xproto
-PKG_RELEASE:=3
-PKG_VERSION:=7.0.13
-PKG_SOURCE_URL:=http://xorg.freedesktop.org/releases/X11R7.4/src/proto/
+PKG_RELEASE:=1
+PKG_VERSION:=7.0.16
+PKG_SOURCE_URL:=http://xorg.freedesktop.org/releases/individual/proto/
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
-PKG_BUILD_DIR=$(BUILD_DIR)/Xorg/$(_CATEGORY)/$(PKG_NAME)-$(PKG_VERSION)/
+PKG_BUILD_DIR:=$(BUILD_DIR)/Xorg/$(PKG_NAME)-$(PKG_VERSION)/
 
 include $(INCLUDE_DIR)/package.mk