xorg mega commit: merge in change from poky

45 files changed, 257 insertions, 34 deletions

diff --git a/packages/xorg-proto/applewmproto_1.0.3.bb b/packages/xorg-proto/applewmproto_1.0.3.bb
new file mode 100644
index 0000000000..9f09fff7b7
--- /dev/null
+++ b/packages/xorg-proto/applewmproto_1.0.3.bb
@@ -0,0 +1,4 @@
+require xorg-proto-common.inc
+
+PR = "r1"
+PE = "1"
diff --git a/packages/xorg-proto/bigreqsproto-native_1.0.2.bb b/packages/xorg-proto/bigreqsproto-native_1.0.2.bb
new file mode 100644
index 0000000000..e86417195d
--- /dev/null
+++ b/packages/xorg-proto/bigreqsproto-native_1.0.2.bb
@@ -0,0 +1,7 @@
+require bigreqsproto_${PV}.bb
+
+PR = "r1"
+
+XORG_PN = "bigreqsproto"
+
+inherit native
diff --git a/packages/xorg-proto/bigreqsproto_1.0.2.bb b/packages/xorg-proto/bigreqsproto_1.0.2.bb
new file mode 100644
index 0000000000..9f09fff7b7
--- /dev/null
+++ b/packages/xorg-proto/bigreqsproto_1.0.2.bb
@@ -0,0 +1,4 @@
+require xorg-proto-common.inc
+
+PR = "r1"
+PE = "1"
diff --git a/packages/xorg-proto/calibrateproto/.mtn2git_empty b/packages/xorg-proto/calibrateproto/.mtn2git_empty
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/xorg-proto/calibrateproto/.mtn2git_empty
diff --git a/packages/xorg-proto/calibrateproto/coords.patch b/packages/xorg-proto/calibrateproto/coords.patch
new file mode 100644
index 0000000000..8f44b029c5
--- /dev/null
+++ b/packages/xorg-proto/calibrateproto/coords.patch
@@ -0,0 +1,56 @@
+---
+ xcalibrateproto.h |   25 +++++++++++++++++++++++++
+ xcalibratewire.h  |    3 ++-
+ 2 files changed, 27 insertions(+), 1 deletion(-)
+
+Index: XCalibrateExt/xcalibrateproto.h
+===================================================================
+--- XCalibrateExt.orig/xcalibrateproto.h	2004-06-02 20:18:47.000000000 +0100
++++ XCalibrateExt/xcalibrateproto.h	2007-06-30 14:17:29.000000000 +0100
+@@ -78,6 +78,31 @@ typedef struct {
+ 
+ #define sz_xXCalibrateRawModeReply	32
+ 
++typedef struct {
++    CARD8   reqType;
++    CARD8   xCalibrateReqType;
++    CARD16  length B16;
++    CARD32  x B32;
++    CARD32  y B32;
++} xXCalibrateScreenToCoordReq;
++
++#define sz_xXCalibrateScreenToCoordReq	12
++
++typedef struct {
++    BYTE    type;   /* X_Reply */
++    BYTE    pad1;
++    CARD16  sequenceNumber B16;
++    CARD32  x;
++    CARD32  y;
++    CARD32  pad2 B32;
++    CARD32  pad3 B32;
++    CARD32  pad4 B32;
++    CARD32  pad5 B32;
++    CARD32  pad6 B32;
++} xXCalibrateScreenToCoordReply;
++
++#define sz_xXCalibrateScreenToCoordReply	32
++
+ /* Events */
+ 
+ typedef struct {
+Index: XCalibrateExt/xcalibratewire.h
+===================================================================
+--- XCalibrateExt.orig/xcalibratewire.h	2004-06-02 20:18:47.000000000 +0100
++++ XCalibrateExt/xcalibratewire.h	2007-06-30 14:17:29.000000000 +0100
+@@ -31,8 +31,9 @@
+ 
+ #define X_XCalibrateQueryVersion		0
+ #define X_XCalibrateRawMode			1
++#define X_XCalibrateScreenToCoord		2
+ 
+-#define XCalibrateNumberRequests		(X_XCalibrateSetRawMode + 1)
++#define XCalibrateNumberRequests		(X_XCalibrateScreenToCoord + 1)
+ 
+ #define X_XCalibrateRawTouchscreen		0
+ 
diff --git a/packages/xorg-proto/calibrateproto_git.bb b/packages/xorg-proto/calibrateproto_git.bb
index bc407badb4..60308601b9 100644
--- a/packages/xorg-proto/calibrateproto_git.bb
+++ b/packages/xorg-proto/calibrateproto_git.bb
@@ -1,9 +1,11 @@
 require xorg-proto-common.inc
 
-DESCRIPTION = "	Touchscreen calibration protocol"
+DESCRIPTION = "Touchscreen calibration protocol"
 
-PV = "0.0+gita1d5ef0c73fbef3e758c51b57ac69ba9567bae04"
+PV = "0.0+git${SRCDATE}"
+PR = "r1"
 
-SRC_URI = "git://anongit.freedesktop.org/git/xorg/proto/calibrateproto;protocol=git;tag=a1d5ef0c73fbef3e758c51b57ac69ba9567bae04"
-S = "${WORKDIR}/git"
+SRC_URI = "git://anongit.freedesktop.org/git/xorg/proto/calibrateproto;protocol=git;tag=a1d5ef0c73fbef3e758c51b57ac69ba9567bae04 \
+           file://coords.patch;patch=1"
 
+S = "${WORKDIR}/git"
diff --git a/packages/xorg-proto/compositeproto_0.4.bb b/packages/xorg-proto/compositeproto_0.4.bb
new file mode 100644
index 0000000000..f74413c551
--- /dev/null
+++ b/packages/xorg-proto/compositeproto_0.4.bb
@@ -0,0 +1,4 @@
+require xorg-proto-common.inc
+
+CONFLICTS = "compositeext"
+PE = "1"
diff --git a/packages/xorg-proto/damageproto_1.1.0.bb b/packages/xorg-proto/damageproto_1.1.0.bb
index ae54c06a64..202ec2874f 100644
--- a/packages/xorg-proto/damageproto_1.1.0.bb
+++ b/packages/xorg-proto/damageproto_1.1.0.bb
@@ -1,8 +1,5 @@
 require xorg-proto-common.inc
-PE = "1"
-
-#DESCRIPTION = ""
-
-#DEPENDS += " "
 
 CONFLICTS = "damageext"
+PR = "r1"
+PE = "1"
diff --git a/packages/xorg-proto/dmxproto_2.2.2.bb b/packages/xorg-proto/dmxproto_2.2.2.bb
new file mode 100644
index 0000000000..9f09fff7b7
--- /dev/null
+++ b/packages/xorg-proto/dmxproto_2.2.2.bb
@@ -0,0 +1,4 @@
+require xorg-proto-common.inc
+
+PR = "r1"
+PE = "1"
diff --git a/packages/xorg-proto/evieext_1.0.2.bb b/packages/xorg-proto/evieext_1.0.2.bb
new file mode 100644
index 0000000000..9f09fff7b7
--- /dev/null
+++ b/packages/xorg-proto/evieext_1.0.2.bb
@@ -0,0 +1,4 @@
+require xorg-proto-common.inc
+
+PR = "r1"
+PE = "1"
diff --git a/packages/xorg-proto/fixesproto_4.0.bb b/packages/xorg-proto/fixesproto_4.0.bb
new file mode 100644
index 0000000000..1bc36e00da
--- /dev/null
+++ b/packages/xorg-proto/fixesproto_4.0.bb
@@ -0,0 +1,5 @@
+require xorg-proto-common.inc
+
+CONFLICTS = "fixesext"
+PR = "r1"
+PE = "1"
diff --git a/packages/xorg-proto/fontcacheproto-native_0.1.2.bb b/packages/xorg-proto/fontcacheproto-native_0.1.2.bb
new file mode 100644
index 0000000000..f6df67f59e
--- /dev/null
+++ b/packages/xorg-proto/fontcacheproto-native_0.1.2.bb
@@ -0,0 +1,7 @@
+require fontcacheproto_${PV}.bb
+
+PR = "r1"
+
+XORG_PN = "fontcacheproto"
+
+inherit native
diff --git a/packages/xorg-proto/fontcacheproto_0.1.2.bb b/packages/xorg-proto/fontcacheproto_0.1.2.bb
new file mode 100644
index 0000000000..9f09fff7b7
--- /dev/null
+++ b/packages/xorg-proto/fontcacheproto_0.1.2.bb
@@ -0,0 +1,4 @@
+require xorg-proto-common.inc
+
+PR = "r1"
+PE = "1"
diff --git a/packages/xorg-proto/fontsproto-native_2.0.2.bb b/packages/xorg-proto/fontsproto-native_2.0.2.bb
new file mode 100644
index 0000000000..4371a07836
--- /dev/null
+++ b/packages/xorg-proto/fontsproto-native_2.0.2.bb
@@ -0,0 +1,9 @@
+require fontsproto_${PV}.bb
+
+PR = "r1"
+
+XORG_PN = "fontsproto"
+
+S = "${WORKDIR}/fontsproto-${PV}"
+
+inherit native
diff --git a/packages/xorg-proto/fontsproto_2.0.2.bb b/packages/xorg-proto/fontsproto_2.0.2.bb
new file mode 100644
index 0000000000..9f09fff7b7
--- /dev/null
+++ b/packages/xorg-proto/fontsproto_2.0.2.bb
@@ -0,0 +1,4 @@
+require xorg-proto-common.inc
+
+PR = "r1"
+PE = "1"
diff --git a/packages/xorg-proto/glproto_1.4.8.bb b/packages/xorg-proto/glproto_1.4.8.bb
index 7a4888d489..9f09fff7b7 100644
--- a/packages/xorg-proto/glproto_1.4.8.bb
+++ b/packages/xorg-proto/glproto_1.4.8.bb
@@ -1,6 +1,4 @@
 require xorg-proto-common.inc
-PE="1"
 
-#DESCRIPTION = ""
-
-#DEPENDS += " "
+PR = "r1"
+PE = "1"
diff --git a/packages/xorg-proto/inputproto-native_1.4.2.bb b/packages/xorg-proto/inputproto-native_1.4.2.bb
new file mode 100644
index 0000000000..11e0dae601
--- /dev/null
+++ b/packages/xorg-proto/inputproto-native_1.4.2.bb
@@ -0,0 +1,7 @@
+require inputproto_${PV}.bb
+
+PR = "r1"
+
+XORG_PN = "inputproto"
+
+inherit native
diff --git a/packages/xorg-proto/inputproto_1.4.2.bb b/packages/xorg-proto/inputproto_1.4.2.bb
new file mode 100644
index 0000000000..9f09fff7b7
--- /dev/null
+++ b/packages/xorg-proto/inputproto_1.4.2.bb
@@ -0,0 +1,4 @@
+require xorg-proto-common.inc
+
+PR = "r1"
+PE = "1"
diff --git a/packages/xorg-proto/kbproto-native_1.0.3.bb b/packages/xorg-proto/kbproto-native_1.0.3.bb
new file mode 100644
index 0000000000..68c677c07b
--- /dev/null
+++ b/packages/xorg-proto/kbproto-native_1.0.3.bb
@@ -0,0 +1,7 @@
+require kbproto_${PV}.bb
+
+PR = "r1"
+
+XORG_PN = "kbproto"
+
+inherit native
diff --git a/packages/xorg-proto/kbproto_1.0.3.bb b/packages/xorg-proto/kbproto_1.0.3.bb
new file mode 100644
index 0000000000..9f09fff7b7
--- /dev/null
+++ b/packages/xorg-proto/kbproto_1.0.3.bb
@@ -0,0 +1,4 @@
+require xorg-proto-common.inc
+
+PR = "r1"
+PE = "1"
diff --git a/packages/xorg-proto/printproto_1.0.3.bb b/packages/xorg-proto/printproto_1.0.3.bb
new file mode 100644
index 0000000000..9f09fff7b7
--- /dev/null
+++ b/packages/xorg-proto/printproto_1.0.3.bb
@@ -0,0 +1,4 @@
+require xorg-proto-common.inc
+
+PR = "r1"
+PE = "1"
diff --git a/packages/xorg-proto/randrproto_1.2.1.bb b/packages/xorg-proto/randrproto_1.2.1.bb
index 1116da8f93..eb8c7e0147 100644
--- a/packages/xorg-proto/randrproto_1.2.1.bb
+++ b/packages/xorg-proto/randrproto_1.2.1.bb
@@ -1,8 +1,5 @@
 require xorg-proto-common.inc
-PE = "1"
-
-#DESCRIPTION = ""
-
-#DEPENDS += " "
 
 CONFLICTS = "randrext"
+PR = "r1"
+PE = "1"
diff --git a/packages/xorg-proto/recordproto_1.13.2.bb b/packages/xorg-proto/recordproto_1.13.2.bb
new file mode 100644
index 0000000000..af63403600
--- /dev/null
+++ b/packages/xorg-proto/recordproto_1.13.2.bb
@@ -0,0 +1,5 @@
+require xorg-proto-common.inc
+
+CONFLICTS = "recordext"
+PR = "r1"
+PE = "1"
diff --git a/packages/xorg-proto/renderproto_0.9.2.bb b/packages/xorg-proto/renderproto_0.9.2.bb
new file mode 100644
index 0000000000..39f4b66be7
--- /dev/null
+++ b/packages/xorg-proto/renderproto_0.9.2.bb
@@ -0,0 +1,5 @@
+require xorg-proto-common.inc
+
+CONFLICTS = "renderext"
+PR = "r1"
+PE = "1"
diff --git a/packages/xorg-proto/resourceproto_1.0.2.bb b/packages/xorg-proto/resourceproto_1.0.2.bb
new file mode 100644
index 0000000000..1fb8aa7f12
--- /dev/null
+++ b/packages/xorg-proto/resourceproto_1.0.2.bb
@@ -0,0 +1,5 @@
+require xorg-proto-common.inc
+
+CONFLICTS = "resourceext"
+PR = "r1"
+PE = "1"
diff --git a/packages/xorg-proto/scrnsaverproto_1.1.0.bb b/packages/xorg-proto/scrnsaverproto_1.1.0.bb
new file mode 100644
index 0000000000..9f09fff7b7
--- /dev/null
+++ b/packages/xorg-proto/scrnsaverproto_1.1.0.bb
@@ -0,0 +1,4 @@
+require xorg-proto-common.inc
+
+PR = "r1"
+PE = "1"
diff --git a/packages/xorg-proto/trapproto_3.4.3.bb b/packages/xorg-proto/trapproto_3.4.3.bb
new file mode 100644
index 0000000000..9f09fff7b7
--- /dev/null
+++ b/packages/xorg-proto/trapproto_3.4.3.bb
@@ -0,0 +1,4 @@
+require xorg-proto-common.inc
+
+PR = "r1"
+PE = "1"
diff --git a/packages/xorg-proto/videoproto_2.2.2.bb b/packages/xorg-proto/videoproto_2.2.2.bb
new file mode 100644
index 0000000000..9f09fff7b7
--- /dev/null
+++ b/packages/xorg-proto/videoproto_2.2.2.bb
@@ -0,0 +1,4 @@
+require xorg-proto-common.inc
+
+PR = "r1"
+PE = "1"
diff --git a/packages/xorg-proto/windowswmproto_1.0.3.bb b/packages/xorg-proto/windowswmproto_1.0.3.bb
new file mode 100644
index 0000000000..9f09fff7b7
--- /dev/null
+++ b/packages/xorg-proto/windowswmproto_1.0.3.bb
@@ -0,0 +1,4 @@
+require xorg-proto-common.inc
+
+PR = "r1"
+PE = "1"
diff --git a/packages/xorg-proto/xcmiscproto-native_1.1.2.bb b/packages/xorg-proto/xcmiscproto-native_1.1.2.bb
new file mode 100644
index 0000000000..417a2aaf13
--- /dev/null
+++ b/packages/xorg-proto/xcmiscproto-native_1.1.2.bb
@@ -0,0 +1,7 @@
+require xcmiscproto_${PV}.bb
+
+PR = "r1"
+
+XORG_PN = "xcmiscproto"
+
+inherit native
diff --git a/packages/xorg-proto/xcmiscproto_1.1.2.bb b/packages/xorg-proto/xcmiscproto_1.1.2.bb
new file mode 100644
index 0000000000..9f09fff7b7
--- /dev/null
+++ b/packages/xorg-proto/xcmiscproto_1.1.2.bb
@@ -0,0 +1,4 @@
+require xorg-proto-common.inc
+
+PR = "r1"
+PE = "1"
diff --git a/packages/xorg-proto/xextproto-native_7.0.2.bb b/packages/xorg-proto/xextproto-native_7.0.2.bb
new file mode 100644
index 0000000000..ff2bc4ffd3
--- /dev/null
+++ b/packages/xorg-proto/xextproto-native_7.0.2.bb
@@ -0,0 +1,7 @@
+require xextproto_${PV}.bb
+
+PR = "r1"
+
+XORG_PN = "xextproto"
+
+inherit native
diff --git a/packages/xorg-proto/xextproto_7.0.2.bb b/packages/xorg-proto/xextproto_7.0.2.bb
new file mode 100644
index 0000000000..9f09fff7b7
--- /dev/null
+++ b/packages/xorg-proto/xextproto_7.0.2.bb
@@ -0,0 +1,4 @@
+require xorg-proto-common.inc
+
+PR = "r1"
+PE = "1"
diff --git a/packages/xorg-proto/xf86bigfontproto-native_1.1.2.bb b/packages/xorg-proto/xf86bigfontproto-native_1.1.2.bb
new file mode 100644
index 0000000000..b0ac594997
--- /dev/null
+++ b/packages/xorg-proto/xf86bigfontproto-native_1.1.2.bb
@@ -0,0 +1,7 @@
+require xf86bigfontproto_${PV}.bb
+
+PR = "r1"
+
+XORG_PN = "xf86bigfontproto"
+
+inherit native
diff --git a/packages/xorg-proto/xf86bigfontproto_1.1.2.bb b/packages/xorg-proto/xf86bigfontproto_1.1.2.bb
new file mode 100644
index 0000000000..9f09fff7b7
--- /dev/null
+++ b/packages/xorg-proto/xf86bigfontproto_1.1.2.bb
@@ -0,0 +1,4 @@
+require xorg-proto-common.inc
+
+PR = "r1"
+PE = "1"
diff --git a/packages/xorg-proto/xf86dgaproto_2.0.2.bb b/packages/xorg-proto/xf86dgaproto_2.0.2.bb
new file mode 100644
index 0000000000..2e0e734858
--- /dev/null
+++ b/packages/xorg-proto/xf86dgaproto_2.0.2.bb
@@ -0,0 +1,5 @@
+require xorg-proto-common.inc
+
+CONFLICTS = "xxf86dgaext"
+PR = "r1"
+PE = "1"
diff --git a/packages/xorg-proto/xf86driproto_2.0.3.bb b/packages/xorg-proto/xf86driproto_2.0.3.bb
new file mode 100644
index 0000000000..9f09fff7b7
--- /dev/null
+++ b/packages/xorg-proto/xf86driproto_2.0.3.bb
@@ -0,0 +1,4 @@
+require xorg-proto-common.inc
+
+PR = "r1"
+PE = "1"
diff --git a/packages/xorg-proto/xf86miscproto_0.9.2.bb b/packages/xorg-proto/xf86miscproto_0.9.2.bb
new file mode 100644
index 0000000000..9f09fff7b7
--- /dev/null
+++ b/packages/xorg-proto/xf86miscproto_0.9.2.bb
@@ -0,0 +1,4 @@
+require xorg-proto-common.inc
+
+PR = "r1"
+PE = "1"
diff --git a/packages/xorg-proto/xf86rushproto_1.1.2.bb b/packages/xorg-proto/xf86rushproto_1.1.2.bb
new file mode 100644
index 0000000000..9f09fff7b7
--- /dev/null
+++ b/packages/xorg-proto/xf86rushproto_1.1.2.bb
@@ -0,0 +1,4 @@
+require xorg-proto-common.inc
+
+PR = "r1"
+PE = "1"
diff --git a/packages/xorg-proto/xf86vidmodeproto_2.2.2.bb b/packages/xorg-proto/xf86vidmodeproto_2.2.2.bb
new file mode 100644
index 0000000000..946be11407
--- /dev/null
+++ b/packages/xorg-proto/xf86vidmodeproto_2.2.2.bb
@@ -0,0 +1,5 @@
+require xorg-proto-common.inc
+
+CONFLICTS = "xxf86vmext"
+PR = "r1"
+PE = "1"
diff --git a/packages/xorg-proto/xineramaproto_1.1.2.bb b/packages/xorg-proto/xineramaproto_1.1.2.bb
new file mode 100644
index 0000000000..9f09fff7b7
--- /dev/null
+++ b/packages/xorg-proto/xineramaproto_1.1.2.bb
@@ -0,0 +1,4 @@
+require xorg-proto-common.inc
+
+PR = "r1"
+PE = "1"
diff --git a/packages/xorg-proto/xorg-proto-common.inc b/packages/xorg-proto/xorg-proto-common.inc
index 1dc4f12fc7..248bbc7e11 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"
+DESCRIPTION = "X protocol headers: ${XORG_PN}"
 HOMEPAGE = "http://www.x.org"
 SECTION = "x11/libs"
 LICENSE = "MIT-X"
 
-#DEPENDS = ""
 XORG_PN = "${PN}"
-XORG_RELEASE = "${@["individual",bb.data.getVar('PV', d, 1)[0:7]+"/src"][bb.data.getVar('PV', d, 1)[0:4] == "X11R"]}"
-SRC_URI = "${XORG_MIRROR}/${XORG_RELEASE}/proto/${XORG_PN}-${PV}.tar.bz2"
+
+SRC_URI = "${XORG_MIRROR}/individual/proto/${XORG_PN}-${PV}.tar.bz2"
+
 S = "${WORKDIR}/${XORG_PN}-${PV}"
 
 inherit autotools pkgconfig
 
 do_stage() {
-	autotools_stage_all
+        autotools_stage_all
 }
diff --git a/packages/xorg-proto/xproto-native_7.0.10.bb b/packages/xorg-proto/xproto-native_7.0.10.bb
index 12a58b5a0a..88ed38e93c 100644
--- a/packages/xorg-proto/xproto-native_7.0.10.bb
+++ b/packages/xorg-proto/xproto-native_7.0.10.bb
@@ -1,9 +1,7 @@
-DESCRIPTION = "X protocol headers"
-SECTION = "x11/libs"
-LICENSE= "MIT-X"
-PE = "1"
+require xproto_${PV}.bb
 
-SRC_URI = "${XORG_MIRROR}/individual/proto/xproto-${PV}.tar.bz2"
-S = "${WORKDIR}/xproto-${PV}"
+PR = "r1"
 
-inherit native autotools pkgconfig
+XORG_PN = "xproto"
+
+inherit native
diff --git a/packages/xorg-proto/xproto_7.0.10.bb b/packages/xorg-proto/xproto_7.0.10.bb
index 3f598df1bb..9f09fff7b7 100644
--- a/packages/xorg-proto/xproto_7.0.10.bb
+++ b/packages/xorg-proto/xproto_7.0.10.bb
@@ -1,6 +1,4 @@
 require xorg-proto-common.inc
-PE = "1"
-
-#DESCRIPTION = ""
 
-#DEPENDS += " "
+PR = "r1"
+PE = "1"
diff --git a/packages/xorg-proto/xproxymanagementprotocol_1.0.2.bb b/packages/xorg-proto/xproxymanagementprotocol_1.0.2.bb
new file mode 100644
index 0000000000..9c3d9efa71
--- /dev/null
+++ b/packages/xorg-proto/xproxymanagementprotocol_1.0.2.bb
@@ -0,0 +1,5 @@
+require xorg-proto-common.inc
+
+PROVIDES="xproxymngproto"
+PR = "r1"
+PE = "1"