Update xorg proto packages to Xorg 7.5

SVN-Revision: 18233

diff --git a/Xorg/xorg/proto/applewmproto/Makefile b/Xorg/xorg/proto/applewmproto/Makefile
index a0b2de6dc23211ebcd4874b44bbaeadd2184f4c3..b04675ae632cbe291f52e63bfbb0ebf931b9902a 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 8d510c4254cd451b712bbf3fb8c88222344855d0..3d5b699719e3629976ffcc0196b1e94ae332b412 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 9a7fa666757d73dbf45632cfe7d7444663e0a413..40d812ea29c2f93bb5b4a0960694ad552c7a543d 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 c624a1dc5bedacecec45ea984f121f364b6633e7..b52e466c40f1ac5f7d4b5632f9d4bb5dcc355be7 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 e078cfee7295e8337c2102bc71d03ee9e4cfaef7..54320dae43ac66629e58af89f62f5b0d9a17ceec 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 857ad32481984dea0e53db4dd4aba6309331bded..a3d6a3885105e9e526dff64f724acba947b5ed45 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 0e2851d403b542d7d5ba7f0ac075c4adf00a2636..f53e7031b093707dd84205bc0915e16d9983c728 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 08cfc7010706bc4673aac1e0545dcd5a94f30e82..2bfb772137adbe5b66d5e49a8a0f6aca8d10ad27 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 b79c4b01290d27615c05b23e0d5d30f6b36821f6..6592eec73f1ad239ddb2c8543c8a8382adcbc519 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 b1b066a2719a2d4fb127ff32e555163d17339fed..138a1093fa1c2a92d56101980080be25bc79a0fc 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 ed5611c226542666692a0edbd614520a83dfabf5..0e3e78ac44ec79f1db6f88ee23a7d48bd4330f0b 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 ba560e469513d9feaae469e0f224edd2299b9452..91065c25c9c049baa875ded01a21990ab03721e8 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 114de7bb067bdabe54f74d94f104115b38007b29..8596e78fe5ff92f29939b915588757e24ee27ea4 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 186d907f1eb01239721d96ee48db58eb42358f3f..90b93c49700a4589b039717b8faf570e83299d76 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 f7a32cee3901a611cdcea597d8860046d5dc0b77..b354079f2940fa50efc2fbfda29fe4d6c9b3f084 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 9d720e0c6d0ecc659b5af9dfee5efcfbaaac727e..749193a70a2334ae48272dcf03db32b148a3ea87 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 9bba047ab7e54f6697f9b31ddc7d24d73a1018fb..ec35485bf3491c95cd53b88e9474256c46ff16e3 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 7194c3618efe058d4c37adb0cac92a18f854ef3e..a117735d4cbba622d5dd0cefe65e04f8ca2371db 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 5b78a102ecbbd30c778d45e1794276b4f6a1dead..f0311867fef0b54e16d78f9eb3022ec23931861d 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 a1b808fe5695634b165816fd0bc47fa776309545..21b05d55aa39076e44d7685f1f44ed782dd2b60c 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 6f06a04caf2fbf4fffcf8ca0345eb630945b3491..d344f7a2d89f7dcb4c4a0060e921a16ac5b8401c 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 0cea026b13a68f9cbf051430d92d8c2062db2d15..aafa1123577027bce6e700205888a888fea43e01 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 569bf6939eaefa9db973b2e0c55723fd29ca278c..f2dc4addcbe44477dd5dd1a203468ffa2d210c60 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 f8c6688a22c2a9b6e5f25c0c353c670e148bc799..8e2863f238d894726f4ef4bd38e409daeb32e83c 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 88bc7de48d65a58fa4187536d22e4a1dda5acd57..d4c71ccbcb20cce3c159bcd3afd27608c256045b 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 458a19cd6d3df0a4b3b2473d77db062f42cdf25e..55485f129d2cdb711efee08e620a09cc70d4dc98 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 849d88cb1dc8c2f45df280ef4214d874fc632c6f..375f56d14c3bc905cd523b1b3e6872883e33688f 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 7962683b47e52f0d209651eb3f5bc02a2bc28383..bb5ff8d35c75d09e05069842def8e21e5ab87a6d 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