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

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

26 files changed, 45 insertions, 30 deletions

diff --git a/meta/packages/xorg-proto/bigreqsproto-native_1.0.2.bb b/meta/packages/xorg-proto/bigreqsproto-native_1.0.2.bb
index e86417195d..ce281c2979 100644
--- a/meta/packages/xorg-proto/bigreqsproto-native_1.0.2.bb
+++ b/meta/packages/xorg-proto/bigreqsproto-native_1.0.2.bb
@@ -1,7 +1,3 @@
 require bigreqsproto_${PV}.bb
 
-PR = "r1"
-
-XORG_PN = "bigreqsproto"
-
 inherit native
diff --git a/meta/packages/xorg-proto/bigreqsproto-sdk_1.0.2.bb b/meta/packages/xorg-proto/bigreqsproto-sdk_1.0.2.bb
new file mode 100644
index 0000000000..057013f92f
--- /dev/null
+++ b/meta/packages/xorg-proto/bigreqsproto-sdk_1.0.2.bb
@@ -0,0 +1,3 @@
+require bigreqsproto_${PV}.bb
+
+inherit sdk
diff --git a/meta/packages/xorg-proto/bigreqsproto_1.0.2.bb b/meta/packages/xorg-proto/bigreqsproto_1.0.2.bb
index 9f09fff7b7..ffe3bce8d8 100644
--- a/meta/packages/xorg-proto/bigreqsproto_1.0.2.bb
+++ b/meta/packages/xorg-proto/bigreqsproto_1.0.2.bb
@@ -2,3 +2,5 @@ require xorg-proto-common.inc
 
 PR = "r1"
 PE = "1"
+
+XORG_PN = "bigreqsproto"
diff --git a/meta/packages/xorg-proto/fontcacheproto-native_0.1.2.bb b/meta/packages/xorg-proto/fontcacheproto-native_0.1.2.bb
index f6df67f59e..f4a42c5203 100644
--- a/meta/packages/xorg-proto/fontcacheproto-native_0.1.2.bb
+++ b/meta/packages/xorg-proto/fontcacheproto-native_0.1.2.bb
@@ -1,7 +1,5 @@
 require fontcacheproto_${PV}.bb
 
-PR = "r1"
-
 XORG_PN = "fontcacheproto"
 
 inherit native
diff --git a/meta/packages/xorg-proto/inputproto-native_1.4.2.bb b/meta/packages/xorg-proto/inputproto-native_1.4.2.bb
index 11e0dae601..b6ce61142f 100644
--- a/meta/packages/xorg-proto/inputproto-native_1.4.2.bb
+++ b/meta/packages/xorg-proto/inputproto-native_1.4.2.bb
@@ -1,7 +1,3 @@
 require inputproto_${PV}.bb
 
-PR = "r1"
-
-XORG_PN = "inputproto"
-
 inherit native
diff --git a/meta/packages/xorg-proto/inputproto-sdk_1.4.2.bb b/meta/packages/xorg-proto/inputproto-sdk_1.4.2.bb
new file mode 100644
index 0000000000..f0e1985bf9
--- /dev/null
+++ b/meta/packages/xorg-proto/inputproto-sdk_1.4.2.bb
@@ -0,0 +1,3 @@
+require inputproto_${PV}.bb
+
+inherit sdk
diff --git a/meta/packages/xorg-proto/inputproto_1.4.2.bb b/meta/packages/xorg-proto/inputproto_1.4.2.bb
index 9f09fff7b7..e3a8b09f2b 100644
--- a/meta/packages/xorg-proto/inputproto_1.4.2.bb
+++ b/meta/packages/xorg-proto/inputproto_1.4.2.bb
@@ -2,3 +2,5 @@ require xorg-proto-common.inc
 
 PR = "r1"
 PE = "1"
+
+XORG_PN = "inputproto"
diff --git a/meta/packages/xorg-proto/kbproto-native_1.0.3.bb b/meta/packages/xorg-proto/kbproto-native_1.0.3.bb
index 68c677c07b..fa872e561e 100644
--- a/meta/packages/xorg-proto/kbproto-native_1.0.3.bb
+++ b/meta/packages/xorg-proto/kbproto-native_1.0.3.bb
@@ -1,7 +1,3 @@
 require kbproto_${PV}.bb
 
-PR = "r1"
-
-XORG_PN = "kbproto"
-
 inherit native
diff --git a/meta/packages/xorg-proto/kbproto-sdk_1.0.3.bb b/meta/packages/xorg-proto/kbproto-sdk_1.0.3.bb
new file mode 100644
index 0000000000..fa872e561e
--- /dev/null
+++ b/meta/packages/xorg-proto/kbproto-sdk_1.0.3.bb
@@ -0,0 +1,3 @@
+require kbproto_${PV}.bb
+
+inherit native
diff --git a/meta/packages/xorg-proto/kbproto_1.0.3.bb b/meta/packages/xorg-proto/kbproto_1.0.3.bb
index 9f09fff7b7..b3e9ffc365 100644
--- a/meta/packages/xorg-proto/kbproto_1.0.3.bb
+++ b/meta/packages/xorg-proto/kbproto_1.0.3.bb
@@ -2,3 +2,5 @@ require xorg-proto-common.inc
 
 PR = "r1"
 PE = "1"
+
+XORG_PN = "kbproto"
diff --git a/meta/packages/xorg-proto/randrproto-sdk_1.2.1.bb b/meta/packages/xorg-proto/randrproto-sdk_1.2.1.bb
new file mode 100644
index 0000000000..869c710e61
--- /dev/null
+++ b/meta/packages/xorg-proto/randrproto-sdk_1.2.1.bb
@@ -0,0 +1,3 @@
+require randrproto_${PV}.bb
+
+inherit native
diff --git a/meta/packages/xorg-proto/randrproto_1.2.1.bb b/meta/packages/xorg-proto/randrproto_1.2.1.bb
index eb8c7e0147..85000cc900 100644
--- a/meta/packages/xorg-proto/randrproto_1.2.1.bb
+++ b/meta/packages/xorg-proto/randrproto_1.2.1.bb
@@ -3,3 +3,5 @@ require xorg-proto-common.inc
 CONFLICTS = "randrext"
 PR = "r1"
 PE = "1"
+
+XORG_PN = "randrproto"
diff --git a/meta/packages/xorg-proto/renderproto-sdk_0.9.2.bb b/meta/packages/xorg-proto/renderproto-sdk_0.9.2.bb
new file mode 100644
index 0000000000..73e596c6df
--- /dev/null
+++ b/meta/packages/xorg-proto/renderproto-sdk_0.9.2.bb
@@ -0,0 +1,3 @@
+require renderproto_${PV}.bb
+
+inherit native
diff --git a/meta/packages/xorg-proto/renderproto_0.9.2.bb b/meta/packages/xorg-proto/renderproto_0.9.2.bb
index 39f4b66be7..d4e0983a8b 100644
--- a/meta/packages/xorg-proto/renderproto_0.9.2.bb
+++ b/meta/packages/xorg-proto/renderproto_0.9.2.bb
@@ -3,3 +3,5 @@ require xorg-proto-common.inc
 CONFLICTS = "renderext"
 PR = "r1"
 PE = "1"
+
+XORG_PN = "renderproto"
diff --git a/meta/packages/xorg-proto/xcmiscproto-native_1.1.2.bb b/meta/packages/xorg-proto/xcmiscproto-native_1.1.2.bb
index 417a2aaf13..615e7d786c 100644
--- a/meta/packages/xorg-proto/xcmiscproto-native_1.1.2.bb
+++ b/meta/packages/xorg-proto/xcmiscproto-native_1.1.2.bb
@@ -1,7 +1,3 @@
 require xcmiscproto_${PV}.bb
 
-PR = "r1"
-
-XORG_PN = "xcmiscproto"
-
 inherit native
diff --git a/meta/packages/xorg-proto/xcmiscproto-sdk_1.1.2.bb b/meta/packages/xorg-proto/xcmiscproto-sdk_1.1.2.bb
new file mode 100644
index 0000000000..83c31204d2
--- /dev/null
+++ b/meta/packages/xorg-proto/xcmiscproto-sdk_1.1.2.bb
@@ -0,0 +1,3 @@
+require xcmiscproto_${PV}.bb
+
+inherit sdk
diff --git a/meta/packages/xorg-proto/xcmiscproto_1.1.2.bb b/meta/packages/xorg-proto/xcmiscproto_1.1.2.bb
index 9f09fff7b7..8f48ecd9cd 100644
--- a/meta/packages/xorg-proto/xcmiscproto_1.1.2.bb
+++ b/meta/packages/xorg-proto/xcmiscproto_1.1.2.bb
@@ -2,3 +2,5 @@ require xorg-proto-common.inc
 
 PR = "r1"
 PE = "1"
+
+XORG_PN = "xcmiscproto"
diff --git a/meta/packages/xorg-proto/xextproto-native_7.0.2.bb b/meta/packages/xorg-proto/xextproto-native_7.0.2.bb
index ff2bc4ffd3..2529e62ca2 100644
--- a/meta/packages/xorg-proto/xextproto-native_7.0.2.bb
+++ b/meta/packages/xorg-proto/xextproto-native_7.0.2.bb
@@ -1,7 +1,3 @@
 require xextproto_${PV}.bb
 
-PR = "r1"
-
-XORG_PN = "xextproto"
-
 inherit native
diff --git a/meta/packages/xorg-proto/xextproto-sdk_7.0.2.bb b/meta/packages/xorg-proto/xextproto-sdk_7.0.2.bb
new file mode 100644
index 0000000000..3b182a02ff
--- /dev/null
+++ b/meta/packages/xorg-proto/xextproto-sdk_7.0.2.bb
@@ -0,0 +1,3 @@
+require xextproto_${PV}.bb
+
+inherit sdk
diff --git a/meta/packages/xorg-proto/xextproto_7.0.2.bb b/meta/packages/xorg-proto/xextproto_7.0.2.bb
index 9f09fff7b7..829d3cbe1e 100644
--- a/meta/packages/xorg-proto/xextproto_7.0.2.bb
+++ b/meta/packages/xorg-proto/xextproto_7.0.2.bb
@@ -2,3 +2,5 @@ require xorg-proto-common.inc
 
 PR = "r1"
 PE = "1"
+
+XORG_PN = "xextproto"
diff --git a/meta/packages/xorg-proto/xf86bigfontproto-native_1.1.2.bb b/meta/packages/xorg-proto/xf86bigfontproto-native_1.1.2.bb
index b0ac594997..5e13538034 100644
--- a/meta/packages/xorg-proto/xf86bigfontproto-native_1.1.2.bb
+++ b/meta/packages/xorg-proto/xf86bigfontproto-native_1.1.2.bb
@@ -1,7 +1,3 @@
 require xf86bigfontproto_${PV}.bb
 
-PR = "r1"
-
-XORG_PN = "xf86bigfontproto"
-
 inherit native
diff --git a/meta/packages/xorg-proto/xf86bigfontproto-sdk_1.1.2.bb b/meta/packages/xorg-proto/xf86bigfontproto-sdk_1.1.2.bb
new file mode 100644
index 0000000000..32b6280c04
--- /dev/null
+++ b/meta/packages/xorg-proto/xf86bigfontproto-sdk_1.1.2.bb
@@ -0,0 +1,3 @@
+require xf86bigfontproto_${PV}.bb
+
+inherit sdk
diff --git a/meta/packages/xorg-proto/xf86bigfontproto_1.1.2.bb b/meta/packages/xorg-proto/xf86bigfontproto_1.1.2.bb
index 9f09fff7b7..f29fdb84a7 100644
--- a/meta/packages/xorg-proto/xf86bigfontproto_1.1.2.bb
+++ b/meta/packages/xorg-proto/xf86bigfontproto_1.1.2.bb
@@ -2,3 +2,5 @@ require xorg-proto-common.inc
 
 PR = "r1"
 PE = "1"
+
+XORG_PN = "xf86bigfontproto"
diff --git a/meta/packages/xorg-proto/xproto-native_7.0.10.bb b/meta/packages/xorg-proto/xproto-native_7.0.10.bb
index 88ed38e93c..5dde8a7d4a 100644
--- a/meta/packages/xorg-proto/xproto-native_7.0.10.bb
+++ b/meta/packages/xorg-proto/xproto-native_7.0.10.bb
@@ -1,7 +1,3 @@
 require xproto_${PV}.bb
 
-PR = "r1"
-
-XORG_PN = "xproto"
-
 inherit native
diff --git a/meta/packages/xorg-proto/xproto-sdk_7.0.10.bb b/meta/packages/xorg-proto/xproto-sdk_7.0.10.bb
new file mode 100644
index 0000000000..1c1a934bb0
--- /dev/null
+++ b/meta/packages/xorg-proto/xproto-sdk_7.0.10.bb
@@ -0,0 +1,3 @@
+require xproto_${PV}.bb
+
+inherit sdk
diff --git a/meta/packages/xorg-proto/xproto_7.0.10.bb b/meta/packages/xorg-proto/xproto_7.0.10.bb
index 9f09fff7b7..1adf55d97a 100644
--- a/meta/packages/xorg-proto/xproto_7.0.10.bb
+++ b/meta/packages/xorg-proto/xproto_7.0.10.bb
@@ -2,3 +2,5 @@ require xorg-proto-common.inc
 
 PR = "r1"
 PE = "1"
+
+XORG_PN = "xproto"