xorg: Remove unneeded XORG_PN settings and replace some native/sdk recipes with BBCLASSEXTEND

14 files changed, 2 insertions, 29 deletions

diff --git a/meta/packages/xorg-proto/bigreqsproto_1.0.2.bb b/meta/packages/xorg-proto/bigreqsproto_1.0.2.bb
index 5d0bd80753..e799a991e7 100644
--- a/meta/packages/xorg-proto/bigreqsproto_1.0.2.bb
+++ b/meta/packages/xorg-proto/bigreqsproto_1.0.2.bb
@@ -3,6 +3,4 @@ require xorg-proto-common.inc
 PR = "r1"
 PE = "1"
 
-XORG_PN = "bigreqsproto"
-
 BBCLASSEXTEND = "native sdk"
diff --git a/meta/packages/xorg-proto/compositeproto_0.4.bb b/meta/packages/xorg-proto/compositeproto_0.4.bb
index b7bb50e579..f74413c551 100644
--- a/meta/packages/xorg-proto/compositeproto_0.4.bb
+++ b/meta/packages/xorg-proto/compositeproto_0.4.bb
@@ -2,5 +2,3 @@ require xorg-proto-common.inc
 
 CONFLICTS = "compositeext"
 PE = "1"
-
-XORG_PN = "compositeproto"
diff --git a/meta/packages/xorg-proto/damageproto_1.1.0.bb b/meta/packages/xorg-proto/damageproto_1.1.0.bb
index e7abb316ed..202ec2874f 100644
--- a/meta/packages/xorg-proto/damageproto_1.1.0.bb
+++ b/meta/packages/xorg-proto/damageproto_1.1.0.bb
@@ -3,5 +3,3 @@ require xorg-proto-common.inc
 CONFLICTS = "damageext"
 PR = "r1"
 PE = "1"
-
-XORG_PN = "damageproto"
diff --git a/meta/packages/xorg-proto/fixesproto_4.0.bb b/meta/packages/xorg-proto/fixesproto_4.0.bb
index f9bc9d9e3c..1bc36e00da 100644
--- a/meta/packages/xorg-proto/fixesproto_4.0.bb
+++ b/meta/packages/xorg-proto/fixesproto_4.0.bb
@@ -3,5 +3,3 @@ require xorg-proto-common.inc
 CONFLICTS = "fixesext"
 PR = "r1"
 PE = "1"
-
-XORG_PN = "fixesproto"
diff --git a/meta/packages/xorg-proto/inputproto_1.9.99.5git.bb b/meta/packages/xorg-proto/inputproto_1.9.99.5git.bb
index e669a27924..1276fab7f3 100644
--- a/meta/packages/xorg-proto/inputproto_1.9.99.5git.bb
+++ b/meta/packages/xorg-proto/inputproto_1.9.99.5git.bb
@@ -7,6 +7,4 @@ PV = "1.9.99.5+git${SRCREV}"
 SRC_URI = "git://anongit.freedesktop.org/git/xorg/proto/inputproto;protocol=git"
 S = "${WORKDIR}/git"
 
-XORG_PN = "inputproto"
-
 BBCLASSEXTEND = "native sdk"
diff --git a/meta/packages/xorg-proto/kbproto_1.0.3.bb b/meta/packages/xorg-proto/kbproto_1.0.3.bb
index 220da1d438..e799a991e7 100644
--- a/meta/packages/xorg-proto/kbproto_1.0.3.bb
+++ b/meta/packages/xorg-proto/kbproto_1.0.3.bb
@@ -3,6 +3,4 @@ require xorg-proto-common.inc
 PR = "r1"
 PE = "1"
 
-XORG_PN = "kbproto"
-
 BBCLASSEXTEND = "native sdk"
diff --git a/meta/packages/xorg-proto/randrproto-sdk_1.2.2.bb b/meta/packages/xorg-proto/randrproto-sdk_1.2.2.bb
deleted file mode 100644
index 2759cb00cc..0000000000
--- a/meta/packages/xorg-proto/randrproto-sdk_1.2.2.bb
+++ /dev/null
@@ -1,3 +0,0 @@
-require randrproto_${PV}.bb
-
-inherit sdk
diff --git a/meta/packages/xorg-proto/randrproto_1.2.2.bb b/meta/packages/xorg-proto/randrproto_1.2.2.bb
index 85000cc900..74a0e2d5f6 100644
--- a/meta/packages/xorg-proto/randrproto_1.2.2.bb
+++ b/meta/packages/xorg-proto/randrproto_1.2.2.bb
@@ -4,4 +4,4 @@ CONFLICTS = "randrext"
 PR = "r1"
 PE = "1"
 
-XORG_PN = "randrproto"
+BBCLASSEXTEND = "sdk"
diff --git a/meta/packages/xorg-proto/renderproto-sdk_0.9.3.bb b/meta/packages/xorg-proto/renderproto-sdk_0.9.3.bb
deleted file mode 100644
index 25ab90827f..0000000000
--- a/meta/packages/xorg-proto/renderproto-sdk_0.9.3.bb
+++ /dev/null
@@ -1,3 +0,0 @@
-require renderproto_${PV}.bb
-
-inherit sdk
diff --git a/meta/packages/xorg-proto/renderproto_0.9.3.bb b/meta/packages/xorg-proto/renderproto_0.9.3.bb
index d4e0983a8b..77d620a587 100644
--- a/meta/packages/xorg-proto/renderproto_0.9.3.bb
+++ b/meta/packages/xorg-proto/renderproto_0.9.3.bb
@@ -4,4 +4,4 @@ CONFLICTS = "renderext"
 PR = "r1"
 PE = "1"
 
-XORG_PN = "renderproto"
+BBCLASSEXTEND = "sdk"
diff --git a/meta/packages/xorg-proto/xcmiscproto_1.1.2.bb b/meta/packages/xorg-proto/xcmiscproto_1.1.2.bb
index 2a501fed9e..e799a991e7 100644
--- a/meta/packages/xorg-proto/xcmiscproto_1.1.2.bb
+++ b/meta/packages/xorg-proto/xcmiscproto_1.1.2.bb
@@ -3,6 +3,4 @@ require xorg-proto-common.inc
 PR = "r1"
 PE = "1"
 
-XORG_PN = "xcmiscproto"
-
 BBCLASSEXTEND = "native sdk"
diff --git a/meta/packages/xorg-proto/xextproto_7.0.4.bb b/meta/packages/xorg-proto/xextproto_7.0.4.bb
index ff065edc33..dcec209bad 100644
--- a/meta/packages/xorg-proto/xextproto_7.0.4.bb
+++ b/meta/packages/xorg-proto/xextproto_7.0.4.bb
@@ -3,6 +3,4 @@ require xorg-proto-common.inc
 PR = "r2"
 PE = "1"
 
-XORG_PN = "xextproto"
-
 BBCLASSEXTEND = "native sdk"
diff --git a/meta/packages/xorg-proto/xf86bigfontproto_1.1.2.bb b/meta/packages/xorg-proto/xf86bigfontproto_1.1.2.bb
index 445bdf619d..e799a991e7 100644
--- a/meta/packages/xorg-proto/xf86bigfontproto_1.1.2.bb
+++ b/meta/packages/xorg-proto/xf86bigfontproto_1.1.2.bb
@@ -3,6 +3,4 @@ require xorg-proto-common.inc
 PR = "r1"
 PE = "1"
 
-XORG_PN = "xf86bigfontproto"
-
 BBCLASSEXTEND = "native sdk"
diff --git a/meta/packages/xorg-proto/xproto_7.0.14.bb b/meta/packages/xorg-proto/xproto_7.0.14.bb
index ebe6fe4096..e799a991e7 100644
--- a/meta/packages/xorg-proto/xproto_7.0.14.bb
+++ b/meta/packages/xorg-proto/xproto_7.0.14.bb
@@ -3,7 +3,4 @@ require xorg-proto-common.inc
 PR = "r1"
 PE = "1"
 
-XORG_PN = "xproto"
-
 BBCLASSEXTEND = "native sdk"
-