xorg-lib: Clean up various files and add sdk varients where needed

git-svn-id: https://svn.o-hand.com/repos/poky/trunk@3503 311d38ba-8fff-0310-9ca6-ca027cbcb966

11 files changed, 44 insertions, 10 deletions

diff --git a/meta/packages/xorg-lib/libx11-sdk_1.1.2.bb b/meta/packages/xorg-lib/libx11-sdk_1.1.2.bb
new file mode 100644
index 000000000..068e616cc
--- /dev/null
+++ b/meta/packages/xorg-lib/libx11-sdk_1.1.2.bb
@@ -0,0 +1,7 @@
+require libx11_${PV}.bb
+
+FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/libx11"
+
+DEPENDS = "xproto-sdk xextproto-sdk libxau-sdk xtrans-sdk libxdmcp-sdk xcmiscproto-sdk xf86bigfontproto-sdk kbproto-sdk inputproto-sdk bigreqsproto-sdk util-macros-sdk"
+
+inherit sdk
diff --git a/meta/packages/xorg-lib/libxau-native_1.0.3.bb b/meta/packages/xorg-lib/libxau-native_1.0.3.bb
index 953a93adf..9f01e139b 100644
--- a/meta/packages/xorg-lib/libxau-native_1.0.3.bb
+++ b/meta/packages/xorg-lib/libxau-native_1.0.3.bb
@@ -1,8 +1,6 @@
 require libxau_${PV}.bb
 
 DEPENDS = "xproto-native util-macros-native"
-PR = "r1"
-
-XORG_PN = "libXau"
+PROVIDES = ""
 
 inherit native
diff --git a/meta/packages/xorg-lib/libxau-sdk_1.0.3.bb b/meta/packages/xorg-lib/libxau-sdk_1.0.3.bb
new file mode 100644
index 000000000..64373f45a
--- /dev/null
+++ b/meta/packages/xorg-lib/libxau-sdk_1.0.3.bb
@@ -0,0 +1,6 @@
+require libxau_${PV}.bb
+
+DEPENDS = "xproto-sdk util-macros-sdk"
+PROVIDES = ""
+
+inherit sdk
diff --git a/meta/packages/xorg-lib/libxdmcp-native_1.0.2.bb b/meta/packages/xorg-lib/libxdmcp-native_1.0.2.bb
index d57f8ac48..0a37c66eb 100644
--- a/meta/packages/xorg-lib/libxdmcp-native_1.0.2.bb
+++ b/meta/packages/xorg-lib/libxdmcp-native_1.0.2.bb
@@ -1,9 +1,5 @@
 require libxdmcp_${PV}.bb
 
 DEPENDS = "xproto-native util-macros-native"
-PR = "r1"
-PE = "1"
-
-XORG_PN = "libXdmcp"
 
 inherit native
diff --git a/meta/packages/xorg-lib/libxdmcp-sdk_1.0.2.bb b/meta/packages/xorg-lib/libxdmcp-sdk_1.0.2.bb
new file mode 100644
index 000000000..898980f42
--- /dev/null
+++ b/meta/packages/xorg-lib/libxdmcp-sdk_1.0.2.bb
@@ -0,0 +1,5 @@
+require libxdmcp_${PV}.bb
+
+DEPENDS = "xproto-sdk util-macros-sdk"
+
+inherit sdk
diff --git a/meta/packages/xorg-lib/libxext-sdk_1.0.3.bb b/meta/packages/xorg-lib/libxext-sdk_1.0.3.bb
new file mode 100644
index 000000000..267faa584
--- /dev/null
+++ b/meta/packages/xorg-lib/libxext-sdk_1.0.3.bb
@@ -0,0 +1,6 @@
+require libxext_${PV}.bb
+
+DEPENDS = "xproto-sdk util-macros-sdk libx11-sdk libxau-sdk xextproto-sdk"
+PROVIDES = ""
+
+inherit sdk
diff --git a/meta/packages/xorg-lib/libxrandr-sdk_1.2.1.bb b/meta/packages/xorg-lib/libxrandr-sdk_1.2.1.bb
new file mode 100644
index 000000000..1f7d30dd0
--- /dev/null
+++ b/meta/packages/xorg-lib/libxrandr-sdk_1.2.1.bb
@@ -0,0 +1,5 @@
+require libxrandr_${PV}.bb
+
+DEPENDS = "randrproto-sdk util-macros-sdk libxext-sdk libxrender-sdk"
+
+inherit sdk
diff --git a/meta/packages/xorg-lib/libxrender-sdk_0.9.2.bb b/meta/packages/xorg-lib/libxrender-sdk_0.9.2.bb
new file mode 100644
index 000000000..3765c8a27
--- /dev/null
+++ b/meta/packages/xorg-lib/libxrender-sdk_0.9.2.bb
@@ -0,0 +1,5 @@
+require libxrender_${PV}.bb
+
+DEPENDS = "xproto-sdk renderproto-sdk util-macros-sdk libx11-sdk"
+
+inherit sdk
diff --git a/meta/packages/xorg-lib/xtrans-native_1.0.3.bb b/meta/packages/xorg-lib/xtrans-native_1.0.3.bb
index 722d7e15e..793f1e495 100644
--- a/meta/packages/xorg-lib/xtrans-native_1.0.3.bb
+++ b/meta/packages/xorg-lib/xtrans-native_1.0.3.bb
@@ -1,9 +1,6 @@
 require xtrans_${PV}.bb
 
 DEPENDS = "util-macros-native"
-PE = "1"
-
-XORG_PN = "xtrans"
 
 SRC_URI = "${XORG_MIRROR}/individual/lib/${XORG_PN}-${PV}.tar.bz2"
 
diff --git a/meta/packages/xorg-lib/xtrans-sdk_1.0.3.bb b/meta/packages/xorg-lib/xtrans-sdk_1.0.3.bb
new file mode 100644
index 000000000..e018a6422
--- /dev/null
+++ b/meta/packages/xorg-lib/xtrans-sdk_1.0.3.bb
@@ -0,0 +1,7 @@
+require xtrans_${PV}.bb
+
+DEPENDS = "util-macros-sdk"
+
+SRC_URI = "${XORG_MIRROR}/individual/lib/${XORG_PN}-${PV}.tar.bz2"
+
+inherit sdk
diff --git a/meta/packages/xorg-lib/xtrans_1.0.3.bb b/meta/packages/xorg-lib/xtrans_1.0.3.bb
index 4719d7588..2400d3bec 100644
--- a/meta/packages/xorg-lib/xtrans_1.0.3.bb
+++ b/meta/packages/xorg-lib/xtrans_1.0.3.bb
@@ -8,3 +8,5 @@ PR = "r2"
 SRC_URI += "file://fix-missing-includepath.patch;patch=1"
 
 RDEPENDS_${PN}-dev = ""
+
+XORG_PN = "xtrans"