xorg-proto: Update for X11R7.0 and X11R7.1.

48 files changed, 289 insertions, 49 deletions

diff --git a/packages/xorg-proto/applewmproto_X11R7.0-1.0.3.bb b/packages/xorg-proto/applewmproto_X11R7.0-1.0.3.bb
index 66419fe87f..c03b079d65 100644
--- a/packages/xorg-proto/applewmproto_X11R7.0-1.0.3.bb
+++ b/packages/xorg-proto/applewmproto_X11R7.0-1.0.3.bb
@@ -1 +1,6 @@
-include proto-common.inc
+include xorg-proto-common.inc
+
+#DESCRIPTION = ""
+
+#DEPENDS += " "
+
diff --git a/packages/xorg-proto/bigreqsproto-native_X11R7.0-1.0.2.bb b/packages/xorg-proto/bigreqsproto-native_X11R7.0-1.0.2.bb
new file mode 100644
index 0000000000..9b9cc8e472
--- /dev/null
+++ b/packages/xorg-proto/bigreqsproto-native_X11R7.0-1.0.2.bb
@@ -0,0 +1,9 @@
+DESCRIPTION = "X protocol headers"
+SECTION = "x11/libs"
+LICENSE= "MIT-X"
+#MAINTAINER = ""
+
+SRC_URI = "${XORG_MIRROR}/X11R7.0/src/proto/bigreqsproto-${PV}.tar.bz2"
+S = "${WORKDIR}/bigreqsproto-${PV}"
+
+inherit native autotools pkgconfig
diff --git a/packages/xorg-proto/bigreqsproto_X11R7.0-1.0.2.bb b/packages/xorg-proto/bigreqsproto_X11R7.0-1.0.2.bb
index 66419fe87f..c03b079d65 100644
--- a/packages/xorg-proto/bigreqsproto_X11R7.0-1.0.2.bb
+++ b/packages/xorg-proto/bigreqsproto_X11R7.0-1.0.2.bb
@@ -1 +1,6 @@
-include proto-common.inc
+include xorg-proto-common.inc
+
+#DESCRIPTION = ""
+
+#DEPENDS += " "
+
diff --git a/packages/xorg-proto/compositeproto_X11R7.0-0.2.2.bb b/packages/xorg-proto/compositeproto_X11R7.0-0.2.2.bb
index 0989abb63c..9a566e7e7d 100644
--- a/packages/xorg-proto/compositeproto_X11R7.0-0.2.2.bb
+++ b/packages/xorg-proto/compositeproto_X11R7.0-0.2.2.bb
@@ -1,3 +1,7 @@
-include proto-common.inc
+include xorg-proto-common.inc
+
+#DESCRIPTION = ""
+
+#DEPENDS += " "
 
 CONFLICTS = "compositeext"
diff --git a/packages/xorg-proto/compositeproto_X11R7.1-0.3.1.bb b/packages/xorg-proto/compositeproto_X11R7.1-0.3.1.bb
index bb55a2022e..9a566e7e7d 100644
--- a/packages/xorg-proto/compositeproto_X11R7.1-0.3.1.bb
+++ b/packages/xorg-proto/compositeproto_X11R7.1-0.3.1.bb
@@ -1,3 +1,7 @@
-include proto-common.inc
-XORG_RELEASE = "X11R7.1"
+include xorg-proto-common.inc
+
+#DESCRIPTION = ""
+
+#DEPENDS += " "
+
 CONFLICTS = "compositeext"
diff --git a/packages/xorg-proto/damageproto_X11R7.0-1.0.3.bb b/packages/xorg-proto/damageproto_X11R7.0-1.0.3.bb
index cde80f0ffa..4104de91df 100644
--- a/packages/xorg-proto/damageproto_X11R7.0-1.0.3.bb
+++ b/packages/xorg-proto/damageproto_X11R7.0-1.0.3.bb
@@ -1,3 +1,7 @@
-include proto-common.inc
+include xorg-proto-common.inc
+
+#DESCRIPTION = ""
+
+#DEPENDS += " "
 
 CONFLICTS = "damageext"
diff --git a/packages/xorg-proto/dmxproto_X11R7.0-2.2.2.bb b/packages/xorg-proto/dmxproto_X11R7.0-2.2.2.bb
index 66419fe87f..f9017b560e 100644
--- a/packages/xorg-proto/dmxproto_X11R7.0-2.2.2.bb
+++ b/packages/xorg-proto/dmxproto_X11R7.0-2.2.2.bb
@@ -1 +1,5 @@
-include proto-common.inc
+include xorg-proto-common.inc
+
+#DESCRIPTION = ""
+
+#DEPENDS += " "
diff --git a/packages/xorg-proto/evieext_X11R7.0-1.0.2.bb b/packages/xorg-proto/evieext_X11R7.0-1.0.2.bb
index 66419fe87f..f9017b560e 100644
--- a/packages/xorg-proto/evieext_X11R7.0-1.0.2.bb
+++ b/packages/xorg-proto/evieext_X11R7.0-1.0.2.bb
@@ -1 +1,5 @@
-include proto-common.inc
+include xorg-proto-common.inc
+
+#DESCRIPTION = ""
+
+#DEPENDS += " "
diff --git a/packages/xorg-proto/fixesproto_X11R7.0-3.0.2.bb b/packages/xorg-proto/fixesproto_X11R7.0-3.0.2.bb
index 2be69994a8..63361612db 100644
--- a/packages/xorg-proto/fixesproto_X11R7.0-3.0.2.bb
+++ b/packages/xorg-proto/fixesproto_X11R7.0-3.0.2.bb
@@ -1,3 +1,7 @@
-include proto-common.inc
+include xorg-proto-common.inc
+
+#DESCRIPTION = ""
+
+#DEPENDS += " "
 
 CONFLICTS = "fixesext"
diff --git a/packages/xorg-proto/fixesproto_X11R7.1-4.0.bb b/packages/xorg-proto/fixesproto_X11R7.1-4.0.bb
index 8e552e6bc5..63361612db 100644
--- a/packages/xorg-proto/fixesproto_X11R7.1-4.0.bb
+++ b/packages/xorg-proto/fixesproto_X11R7.1-4.0.bb
@@ -1,3 +1,7 @@
-include proto-common.inc
-XORG_RELEASE = "X11R7.1"
+include xorg-proto-common.inc
+
+#DESCRIPTION = ""
+
+#DEPENDS += " "
+
 CONFLICTS = "fixesext"
diff --git a/packages/xorg-proto/fontcacheproto-native_X11R7.0-0.1.2.bb b/packages/xorg-proto/fontcacheproto-native_X11R7.0-0.1.2.bb
new file mode 100644
index 0000000000..062c6ccbb9
--- /dev/null
+++ b/packages/xorg-proto/fontcacheproto-native_X11R7.0-0.1.2.bb
@@ -0,0 +1,9 @@
+DESCRIPTION = "X protocol headers"
+SECTION = "x11/libs"
+LICENSE= "MIT-X"
+#MAINTAINER = ""
+
+SRC_URI = "${XORG_MIRROR}/X11R7.0/src/proto/fontcacheproto-${PV}.tar.bz2"
+S = "${WORKDIR}/fontcacheproto-${PV}"
+
+inherit native autotools pkgconfig
diff --git a/packages/xorg-proto/fontcacheproto_X11R7.0-0.1.2.bb b/packages/xorg-proto/fontcacheproto_X11R7.0-0.1.2.bb
index 66419fe87f..f9017b560e 100644
--- a/packages/xorg-proto/fontcacheproto_X11R7.0-0.1.2.bb
+++ b/packages/xorg-proto/fontcacheproto_X11R7.0-0.1.2.bb
@@ -1 +1,5 @@
-include proto-common.inc
+include xorg-proto-common.inc
+
+#DESCRIPTION = ""
+
+#DEPENDS += " "
diff --git a/packages/xorg-proto/fontsproto-native_X11R7.0-2.0.2.bb b/packages/xorg-proto/fontsproto-native_X11R7.0-2.0.2.bb
new file mode 100644
index 0000000000..3c5356f0df
--- /dev/null
+++ b/packages/xorg-proto/fontsproto-native_X11R7.0-2.0.2.bb
@@ -0,0 +1,9 @@
+DESCRIPTION = "X protocol headers"
+SECTION = "x11/libs"
+LICENSE= "MIT-X"
+#MAINTAINER = ""
+
+SRC_URI = "${XORG_MIRROR}/X11R7.0/src/proto/fontsproto-${PV}.tar.bz2"
+S = "${WORKDIR}/fontsproto-${PV}"
+
+inherit native autotools pkgconfig
diff --git a/packages/xorg-proto/fontsproto_X11R7.0-2.0.2.bb b/packages/xorg-proto/fontsproto_X11R7.0-2.0.2.bb
index 66419fe87f..f9017b560e 100644
--- a/packages/xorg-proto/fontsproto_X11R7.0-2.0.2.bb
+++ b/packages/xorg-proto/fontsproto_X11R7.0-2.0.2.bb
@@ -1 +1,5 @@
-include proto-common.inc
+include xorg-proto-common.inc
+
+#DESCRIPTION = ""
+
+#DEPENDS += " "
diff --git a/packages/xorg-proto/glproto_X11R7.0-1.4.3.bb b/packages/xorg-proto/glproto_X11R7.0-1.4.3.bb
index 66419fe87f..f9017b560e 100644
--- a/packages/xorg-proto/glproto_X11R7.0-1.4.3.bb
+++ b/packages/xorg-proto/glproto_X11R7.0-1.4.3.bb
@@ -1 +1,5 @@
-include proto-common.inc
+include xorg-proto-common.inc
+
+#DESCRIPTION = ""
+
+#DEPENDS += " "
diff --git a/packages/xorg-proto/glproto_X11R7.1-1.4.7.bb b/packages/xorg-proto/glproto_X11R7.1-1.4.7.bb
index 67c086e764..f9017b560e 100644
--- a/packages/xorg-proto/glproto_X11R7.1-1.4.7.bb
+++ b/packages/xorg-proto/glproto_X11R7.1-1.4.7.bb
@@ -1,2 +1,5 @@
-include proto-common.inc
-XORG_RELEASE = "X11R7.1"
+include xorg-proto-common.inc
+
+#DESCRIPTION = ""
+
+#DEPENDS += " "
diff --git a/packages/xorg-proto/inputproto-native_X11R7.0-1.3.2.bb b/packages/xorg-proto/inputproto-native_X11R7.0-1.3.2.bb
new file mode 100644
index 0000000000..c89ec23505
--- /dev/null
+++ b/packages/xorg-proto/inputproto-native_X11R7.0-1.3.2.bb
@@ -0,0 +1,9 @@
+DESCRIPTION = "X protocol headers"
+SECTION = "x11/libs"
+LICENSE= "MIT-X"
+#MAINTAINER = ""
+
+SRC_URI = "${XORG_MIRROR}/X11R7.0/src/proto/inputproto-${PV}.tar.bz2"
+S = "${WORKDIR}/inputproto-${PV}"
+
+inherit native autotools pkgconfig
diff --git a/packages/xorg-proto/inputproto_X11R7.0-1.3.2.bb b/packages/xorg-proto/inputproto_X11R7.0-1.3.2.bb
index 66419fe87f..f9017b560e 100644
--- a/packages/xorg-proto/inputproto_X11R7.0-1.3.2.bb
+++ b/packages/xorg-proto/inputproto_X11R7.0-1.3.2.bb
@@ -1 +1,5 @@
-include proto-common.inc
+include xorg-proto-common.inc
+
+#DESCRIPTION = ""
+
+#DEPENDS += " "
diff --git a/packages/xorg-proto/kbproto-native_X11R7.0-1.0.2.bb b/packages/xorg-proto/kbproto-native_X11R7.0-1.0.2.bb
new file mode 100644
index 0000000000..983730ecc0
--- /dev/null
+++ b/packages/xorg-proto/kbproto-native_X11R7.0-1.0.2.bb
@@ -0,0 +1,9 @@
+DESCRIPTION = "X protocol headers"
+SECTION = "x11/libs"
+LICENSE= "MIT-X"
+#MAINTAINER = ""
+
+SRC_URI = "${XORG_MIRROR}/X11R7.0/src/proto/kbproto-${PV}.tar.bz2"
+S = "${WORKDIR}/kbproto-${PV}"
+
+inherit native autotools pkgconfig
diff --git a/packages/xorg-proto/kbproto_X11R7.0-1.0.2.bb b/packages/xorg-proto/kbproto_X11R7.0-1.0.2.bb
index 66419fe87f..f9017b560e 100644
--- a/packages/xorg-proto/kbproto_X11R7.0-1.0.2.bb
+++ b/packages/xorg-proto/kbproto_X11R7.0-1.0.2.bb
@@ -1 +1,5 @@
-include proto-common.inc
+include xorg-proto-common.inc
+
+#DESCRIPTION = ""
+
+#DEPENDS += " "
diff --git a/packages/xorg-proto/printproto_X11R7.0-1.0.3.bb b/packages/xorg-proto/printproto_X11R7.0-1.0.3.bb
index 66419fe87f..f9017b560e 100644
--- a/packages/xorg-proto/printproto_X11R7.0-1.0.3.bb
+++ b/packages/xorg-proto/printproto_X11R7.0-1.0.3.bb
@@ -1 +1,5 @@
-include proto-common.inc
+include xorg-proto-common.inc
+
+#DESCRIPTION = ""
+
+#DEPENDS += " "
diff --git a/packages/xorg-proto/randrproto_X11R7.0-1.1.2.bb b/packages/xorg-proto/randrproto_X11R7.0-1.1.2.bb
index fafe3d3bef..19287d7a75 100644
--- a/packages/xorg-proto/randrproto_X11R7.0-1.1.2.bb
+++ b/packages/xorg-proto/randrproto_X11R7.0-1.1.2.bb
@@ -1,3 +1,7 @@
-include proto-common.inc
+include xorg-proto-common.inc
+
+#DESCRIPTION = ""
+
+#DEPENDS += " "
 
 CONFLICTS = "randrext"
diff --git a/packages/xorg-proto/recordproto_X11R7.0-1.13.2.bb b/packages/xorg-proto/recordproto_X11R7.0-1.13.2.bb
index 9e2cafceb8..262ea04c9b 100644
--- a/packages/xorg-proto/recordproto_X11R7.0-1.13.2.bb
+++ b/packages/xorg-proto/recordproto_X11R7.0-1.13.2.bb
@@ -1,3 +1,7 @@
-include proto-common.inc
+include xorg-proto-common.inc
+
+#DESCRIPTION = ""
+
+#DEPENDS += " "
 
 CONFLICTS = "recordext"
diff --git a/packages/xorg-proto/renderproto_X11R7.0-0.9.2.bb b/packages/xorg-proto/renderproto_X11R7.0-0.9.2.bb
index 7f9febd8fa..8dec781fda 100644
--- a/packages/xorg-proto/renderproto_X11R7.0-0.9.2.bb
+++ b/packages/xorg-proto/renderproto_X11R7.0-0.9.2.bb
@@ -1,3 +1,7 @@
-include proto-common.inc
+include xorg-proto-common.inc
+
+#DESCRIPTION = ""
+
+#DEPENDS += " "
 
 CONFLICTS = "renderext"
diff --git a/packages/xorg-proto/resourceproto_X11R7.0-1.0.2.bb b/packages/xorg-proto/resourceproto_X11R7.0-1.0.2.bb
index e210b894ee..414c7e2a2a 100644
--- a/packages/xorg-proto/resourceproto_X11R7.0-1.0.2.bb
+++ b/packages/xorg-proto/resourceproto_X11R7.0-1.0.2.bb
@@ -1,3 +1,7 @@
-include proto-common.inc
+include xorg-proto-common.inc
+
+#DESCRIPTION = ""
+
+#DEPENDS += " "
 
 CONFLICTS = "resourceext"
diff --git a/packages/xorg-proto/scrnsaverproto_X11R7.0-1.0.2.bb b/packages/xorg-proto/scrnsaverproto_X11R7.0-1.0.2.bb
index 66419fe87f..f9017b560e 100644
--- a/packages/xorg-proto/scrnsaverproto_X11R7.0-1.0.2.bb
+++ b/packages/xorg-proto/scrnsaverproto_X11R7.0-1.0.2.bb
@@ -1 +1,5 @@
-include proto-common.inc
+include xorg-proto-common.inc
+
+#DESCRIPTION = ""
+
+#DEPENDS += " "
diff --git a/packages/xorg-proto/scrnsaverproto_X11R7.1-1.1.0.bb b/packages/xorg-proto/scrnsaverproto_X11R7.1-1.1.0.bb
index 67c086e764..f9017b560e 100644
--- a/packages/xorg-proto/scrnsaverproto_X11R7.1-1.1.0.bb
+++ b/packages/xorg-proto/scrnsaverproto_X11R7.1-1.1.0.bb
@@ -1,2 +1,5 @@
-include proto-common.inc
-XORG_RELEASE = "X11R7.1"
+include xorg-proto-common.inc
+
+#DESCRIPTION = ""
+
+#DEPENDS += " "
diff --git a/packages/xorg-proto/trapproto_X11R7.0-3.4.3.bb b/packages/xorg-proto/trapproto_X11R7.0-3.4.3.bb
index 66419fe87f..f9017b560e 100644
--- a/packages/xorg-proto/trapproto_X11R7.0-3.4.3.bb
+++ b/packages/xorg-proto/trapproto_X11R7.0-3.4.3.bb
@@ -1 +1,5 @@
-include proto-common.inc
+include xorg-proto-common.inc
+
+#DESCRIPTION = ""
+
+#DEPENDS += " "
diff --git a/packages/xorg-proto/videoproto_X11R7.0-2.2.2.bb b/packages/xorg-proto/videoproto_X11R7.0-2.2.2.bb
index 66419fe87f..f9017b560e 100644
--- a/packages/xorg-proto/videoproto_X11R7.0-2.2.2.bb
+++ b/packages/xorg-proto/videoproto_X11R7.0-2.2.2.bb
@@ -1 +1,5 @@
-include proto-common.inc
+include xorg-proto-common.inc
+
+#DESCRIPTION = ""
+
+#DEPENDS += " "
diff --git a/packages/xorg-proto/windowswmproto_X11R7.0-1.0.3.bb b/packages/xorg-proto/windowswmproto_X11R7.0-1.0.3.bb
index 66419fe87f..f9017b560e 100644
--- a/packages/xorg-proto/windowswmproto_X11R7.0-1.0.3.bb
+++ b/packages/xorg-proto/windowswmproto_X11R7.0-1.0.3.bb
@@ -1 +1,5 @@
-include proto-common.inc
+include xorg-proto-common.inc
+
+#DESCRIPTION = ""
+
+#DEPENDS += " "
diff --git a/packages/xorg-proto/xcmiscproto-native_X11R7.0-1.1.2.bb b/packages/xorg-proto/xcmiscproto-native_X11R7.0-1.1.2.bb
new file mode 100644
index 0000000000..af35684479
--- /dev/null
+++ b/packages/xorg-proto/xcmiscproto-native_X11R7.0-1.1.2.bb
@@ -0,0 +1,9 @@
+DESCRIPTION = "X protocol headers"
+SECTION = "x11/libs"
+LICENSE= "MIT-X"
+#MAINTAINER = ""
+
+SRC_URI = "${XORG_MIRROR}/X11R7.0/src/proto/xcmiscproto-${PV}.tar.bz2"
+S = "${WORKDIR}/xcmiscproto-${PV}"
+
+inherit native autotools pkgconfig
diff --git a/packages/xorg-proto/xcmiscproto_X11R7.0-1.1.2.bb b/packages/xorg-proto/xcmiscproto_X11R7.0-1.1.2.bb
index 66419fe87f..f9017b560e 100644
--- a/packages/xorg-proto/xcmiscproto_X11R7.0-1.1.2.bb
+++ b/packages/xorg-proto/xcmiscproto_X11R7.0-1.1.2.bb
@@ -1 +1,5 @@
-include proto-common.inc
+include xorg-proto-common.inc
+
+#DESCRIPTION = ""
+
+#DEPENDS += " "
diff --git a/packages/xorg-proto/xextproto-native_X11R7.0-7.0.2.bb b/packages/xorg-proto/xextproto-native_X11R7.0-7.0.2.bb
new file mode 100644
index 0000000000..0c1fda0e16
--- /dev/null
+++ b/packages/xorg-proto/xextproto-native_X11R7.0-7.0.2.bb
@@ -0,0 +1,11 @@
+DESCRIPTION = "X protocol headers"
+SECTION = "x11/libs"
+LICENSE= "MIT-X"
+#MAINTAINER = ""
+
+SRC_URI = "${XORG_MIRROR}/X11R7.0/src/protto/xextproto-${PV}.tar.bz2"
+S = "${WORKDIR}/xextproto-${PV}"
+
+inherit native autotools pkgconfig
+
+PROVIDES = "xextensions-native"
diff --git a/packages/xorg-proto/xextproto_X11R7.0-7.0.2.bb b/packages/xorg-proto/xextproto_X11R7.0-7.0.2.bb
index 1ae2522d5f..4b73dc7da2 100644
--- a/packages/xorg-proto/xextproto_X11R7.0-7.0.2.bb
+++ b/packages/xorg-proto/xextproto_X11R7.0-7.0.2.bb
@@ -1,3 +1,7 @@
-include proto-common.inc
+include xorg-proto-common.inc
 
 PROVIDES = "xextensions"
+
+#DESCRIPTION = ""
+
+#DEPENDS += " "
diff --git a/packages/xorg-proto/xf86bigfontproto-native_X11R7.0-1.1.2.bb b/packages/xorg-proto/xf86bigfontproto-native_X11R7.0-1.1.2.bb
new file mode 100644
index 0000000000..3fa9c9522c
--- /dev/null
+++ b/packages/xorg-proto/xf86bigfontproto-native_X11R7.0-1.1.2.bb
@@ -0,0 +1,9 @@
+DESCRIPTION = "X protocol headers"
+SECTION = "x11/libs"
+LICENSE= "MIT-X"
+#MAINTAINER = ""
+
+SRC_URI = "${XORG_MIRROR}/X11R7.0/src/proto/xf86bigfontproto-${PV}.tar.bz2"
+S = "${WORKDIR}/xf86bigfontproto-${PV}"
+
+inherit native autotools pkgconfig
diff --git a/packages/xorg-proto/xf86bigfontproto_X11R7.0-1.1.2.bb b/packages/xorg-proto/xf86bigfontproto_X11R7.0-1.1.2.bb
index 66419fe87f..f9017b560e 100644
--- a/packages/xorg-proto/xf86bigfontproto_X11R7.0-1.1.2.bb
+++ b/packages/xorg-proto/xf86bigfontproto_X11R7.0-1.1.2.bb
@@ -1 +1,5 @@
-include proto-common.inc
+include xorg-proto-common.inc
+
+#DESCRIPTION = ""
+
+#DEPENDS += " "
diff --git a/packages/xorg-proto/xf86dgaproto_X11R7.0-2.0.2.bb b/packages/xorg-proto/xf86dgaproto_X11R7.0-2.0.2.bb
index 3d7166c741..08a45da203 100644
--- a/packages/xorg-proto/xf86dgaproto_X11R7.0-2.0.2.bb
+++ b/packages/xorg-proto/xf86dgaproto_X11R7.0-2.0.2.bb
@@ -1,3 +1,7 @@
-include proto-common.inc
+include xorg-proto-common.inc
+
+#DESCRIPTION = ""
+
+#DEPENDS += " "
 
 CONFLICTS = "xxf86dgaext"
diff --git a/packages/xorg-proto/xf86driproto_X11R7.0-2.0.3.bb b/packages/xorg-proto/xf86driproto_X11R7.0-2.0.3.bb
index 66419fe87f..f9017b560e 100644
--- a/packages/xorg-proto/xf86driproto_X11R7.0-2.0.3.bb
+++ b/packages/xorg-proto/xf86driproto_X11R7.0-2.0.3.bb
@@ -1 +1,5 @@
-include proto-common.inc
+include xorg-proto-common.inc
+
+#DESCRIPTION = ""
+
+#DEPENDS += " "
diff --git a/packages/xorg-proto/xf86miscproto_X11R7.0-0.9.2.bb b/packages/xorg-proto/xf86miscproto_X11R7.0-0.9.2.bb
index 66419fe87f..f9017b560e 100644
--- a/packages/xorg-proto/xf86miscproto_X11R7.0-0.9.2.bb
+++ b/packages/xorg-proto/xf86miscproto_X11R7.0-0.9.2.bb
@@ -1 +1,5 @@
-include proto-common.inc
+include xorg-proto-common.inc
+
+#DESCRIPTION = ""
+
+#DEPENDS += " "
diff --git a/packages/xorg-proto/xf86rushproto_X11R7.0-1.1.2.bb b/packages/xorg-proto/xf86rushproto_X11R7.0-1.1.2.bb
index 66419fe87f..f9017b560e 100644
--- a/packages/xorg-proto/xf86rushproto_X11R7.0-1.1.2.bb
+++ b/packages/xorg-proto/xf86rushproto_X11R7.0-1.1.2.bb
@@ -1 +1,5 @@
-include proto-common.inc
+include xorg-proto-common.inc
+
+#DESCRIPTION = ""
+
+#DEPENDS += " "
diff --git a/packages/xorg-proto/xf86vidmodeproto_X11R7.0-2.2.2.bb b/packages/xorg-proto/xf86vidmodeproto_X11R7.0-2.2.2.bb
index 9ce9a207b8..cfe5bf18a1 100644
--- a/packages/xorg-proto/xf86vidmodeproto_X11R7.0-2.2.2.bb
+++ b/packages/xorg-proto/xf86vidmodeproto_X11R7.0-2.2.2.bb
@@ -1,3 +1,7 @@
-include proto-common.inc
+include xorg-proto-common.inc
+
+#DESCRIPTION = ""
+
+#DEPENDS += " "
 
 CONFLICTS = "xxf86vmext"
diff --git a/packages/xorg-proto/xineramaproto_X11R7.0-1.1.2.bb b/packages/xorg-proto/xineramaproto_X11R7.0-1.1.2.bb
index 66419fe87f..f9017b560e 100644
--- a/packages/xorg-proto/xineramaproto_X11R7.0-1.1.2.bb
+++ b/packages/xorg-proto/xineramaproto_X11R7.0-1.1.2.bb
@@ -1 +1,5 @@
-include proto-common.inc
+include xorg-proto-common.inc
+
+#DESCRIPTION = ""
+
+#DEPENDS += " "
diff --git a/packages/xorg-proto/xorg-proto-common.inc b/packages/xorg-proto/xorg-proto-common.inc
index 65dfd4207a..74e7312a50 100644
--- a/packages/xorg-proto/xorg-proto-common.inc
+++ b/packages/xorg-proto/xorg-proto-common.inc
@@ -1,16 +1,16 @@
 DESCRIPTION = "X protocol headers"
+HOMEPAGE = "http://www.x.org"
 SECTION = "x11/libs"
-LICENSE= "MIT-X"
 #MAINTAINER = ""
+LICENSE = "MIT-X"
 
-SRC_URI = "${XORG_MIRROR}/${XORG_RELEASE}/src/proto/${PN}-${XORG_RELEASE}-${PV}.tar.bz2"
-
-S = "${WORKDIR}/${PN}-${XORG_RELEASE}-${PV}"
-
-XORG_RELEASE ?= "X11R7.0"
+#DEPENDS = ""
+XORG_PN = "${PN}"
+SRC_URI = "${XORG_MIRROR}/${@bb.data.getVar('PV', d, 1)[0:7]}/src/proto/${XORG_PN}-${PV}.tar.gz"
+S = "${WORKDIR}/${XORG_PN}-${PV}"
 
 inherit autotools pkgconfig
 
-do_stage () {
+do_stage() {
 	autotools_stage_all
 }
diff --git a/packages/xorg-proto/xproto-native_X11R7.0-7.0.4.bb b/packages/xorg-proto/xproto-native_X11R7.0-7.0.4.bb
new file mode 100644
index 0000000000..c197c87298
--- /dev/null
+++ b/packages/xorg-proto/xproto-native_X11R7.0-7.0.4.bb
@@ -0,0 +1,9 @@
+DESCRIPTION = "X protocol headers"
+SECTION = "x11/libs"
+LICENSE= "MIT-X"
+#MAINTAINER = ""
+
+SRC_URI = "${XORG_MIRROR}/X11R7.0/src/proto/xproto-${PV}.tar.bz2"
+S = "${WORKDIR}/xproto-${PV}"
+
+inherit native autotools pkgconfig
diff --git a/packages/xorg-proto/xproto-native_X11R7.1-7.0.5.bb b/packages/xorg-proto/xproto-native_X11R7.1-7.0.5.bb
new file mode 100644
index 0000000000..8cec6426fd
--- /dev/null
+++ b/packages/xorg-proto/xproto-native_X11R7.1-7.0.5.bb
@@ -0,0 +1,9 @@
+DESCRIPTION = "X protocol headers"
+SECTION = "x11/libs"
+LICENSE= "MIT-X"
+#MAINTAINER = ""
+
+SRC_URI = "${XORG_MIRROR}/X11R7.1/src/proto/xproto-${PV}.tar.bz2"
+S = "${WORKDIR}/xproto-${PV}"
+
+inherit native autotools pkgconfig
diff --git a/packages/xorg-proto/xproto_X11R7.0-7.0.4.bb b/packages/xorg-proto/xproto_X11R7.0-7.0.4.bb
index 66419fe87f..f9017b560e 100644
--- a/packages/xorg-proto/xproto_X11R7.0-7.0.4.bb
+++ b/packages/xorg-proto/xproto_X11R7.0-7.0.4.bb
@@ -1 +1,5 @@
-include proto-common.inc
+include xorg-proto-common.inc
+
+#DESCRIPTION = ""
+
+#DEPENDS += " "
diff --git a/packages/xorg-proto/xproto_X11R7.1-7.0.5.bb b/packages/xorg-proto/xproto_X11R7.1-7.0.5.bb
index 67c086e764..f9017b560e 100644
--- a/packages/xorg-proto/xproto_X11R7.1-7.0.5.bb
+++ b/packages/xorg-proto/xproto_X11R7.1-7.0.5.bb
@@ -1,2 +1,5 @@
-include proto-common.inc
-XORG_RELEASE = "X11R7.1"
+include xorg-proto-common.inc
+
+#DESCRIPTION = ""
+
+#DEPENDS += " "
diff --git a/packages/xorg-proto/xproxymanagementprotocol_X11R7.0-1.0.2.bb b/packages/xorg-proto/xproxymanagementprotocol_X11R7.0-1.0.2.bb
index 66419fe87f..836af65108 100644
--- a/packages/xorg-proto/xproxymanagementprotocol_X11R7.0-1.0.2.bb
+++ b/packages/xorg-proto/xproxymanagementprotocol_X11R7.0-1.0.2.bb
@@ -1 +1,6 @@
-include proto-common.inc
+include xorg-proto-common.inc
+
+PROVIDES="xproxymngproto"
+#DESCRIPTION = ""
+
+#DEPENDS += " "