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

20 files changed, 7 insertions, 47 deletions

diff --git a/meta/packages/xorg-app/xkbcomp-native_1.0.5.bb b/meta/packages/xorg-app/xkbcomp-native_1.0.5.bb
deleted file mode 100644
index ee7c25c40..000000000
--- a/meta/packages/xorg-app/xkbcomp-native_1.0.5.bb
+++ /dev/null
@@ -1,11 +0,0 @@
-DESCRIPTION = "The X Keyboard Extension essentially replaces the core protocol definition of keyboard."
-
-SECTION = "x11/applications"
-LICENSE = "MIT-X"
-S="${WORKDIR}/xkbcomp-${PV}"
-
-DEPENDS = "libx11-native libxkbfile-native"
-
-SRC_URI = "${XORG_MIRROR}/individual/app/xkbcomp-${PV}.tar.bz2"
-
-inherit native autotools pkgconfig
diff --git a/meta/packages/xorg-app/xkbcomp_1.0.5.bb b/meta/packages/xorg-app/xkbcomp_1.0.5.bb
index ca6cdb889..e436a71ed 100644
--- a/meta/packages/xorg-app/xkbcomp_1.0.5.bb
+++ b/meta/packages/xorg-app/xkbcomp_1.0.5.bb
@@ -2,4 +2,6 @@ require xorg-app-common.inc
 
 DESCRIPTION = "The X Keyboard Extension essentially replaces the core protocol definition of keyboard."
 
-DEPENDS += " virtual/libx11 libxkbfile"
+DEPENDS += "libxkbfile"
+
+BBCLASSEXTEND = "native"
diff --git a/meta/packages/xorg-app/xorg-app-common.inc b/meta/packages/xorg-app/xorg-app-common.inc
index 2dc659a0f..32a2f061c 100644
--- a/meta/packages/xorg-app/xorg-app-common.inc
+++ b/meta/packages/xorg-app/xorg-app-common.inc
@@ -4,7 +4,7 @@ SECTION = "x11/apps"
 LICENSE = "MIT-X"
 DEPENDS = "util-macros-native virtual/libx11"
 
-XORG_PN = "${PN}"
+XORG_PN = "${BPN}"
 
 SRC_URI = "${XORG_MIRROR}/individual/app/${XORG_PN}-${PV}.tar.bz2"
 
diff --git a/meta/packages/xorg-lib/libx11-native_1.1.5.bb b/meta/packages/xorg-lib/libx11-native_1.1.5.bb
index dda63965e..30f0ff826 100644
--- a/meta/packages/xorg-lib/libx11-native_1.1.5.bb
+++ b/meta/packages/xorg-lib/libx11-native_1.1.5.bb
@@ -1,6 +1,6 @@
 require libx11_${PV}.bb
 
 DEPENDS = "xproto-native xextproto-native libxau-native xtrans-native libxdmcp-native xcmiscproto-native xf86bigfontproto-native kbproto-native inputproto-native bigreqsproto-native util-macros-native"
-PROVIDES = ""
+PROVIDES = "virtual/libx11-native"
 
 inherit native
diff --git a/meta/packages/xorg-lib/xtrans_1.2.2.bb b/meta/packages/xorg-lib/xtrans_1.2.2.bb
index 270abf074..d3703229b 100644
--- a/meta/packages/xorg-lib/xtrans_1.2.2.bb
+++ b/meta/packages/xorg-lib/xtrans_1.2.2.bb
@@ -7,6 +7,4 @@ PR = "r0"
 
 RDEPENDS_${PN}-dev = ""
 
-XORG_PN = "xtrans"
-
 BBCLASSEXTEND = "native sdk"
diff --git a/meta/packages/xorg-proto/bigreqsproto_1.0.2.bb b/meta/packages/xorg-proto/bigreqsproto_1.0.2.bb
index 5d0bd8075..e799a991e 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 b7bb50e57..f74413c55 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 e7abb316e..202ec2874 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 f9bc9d9e3..1bc36e00d 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 e669a2792..1276fab7f 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 220da1d43..e799a991e 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 2759cb00c..000000000
--- 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 85000cc90..74a0e2d5f 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 25ab90827..000000000
--- 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 d4e0983a8..77d620a58 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 2a501fed9..e799a991e 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 ff065edc3..dcec209ba 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 445bdf619..e799a991e 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 ebe6fe409..e799a991e 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"
-
diff --git a/meta/packages/xorg-util/util-macros_1.2.1.bb b/meta/packages/xorg-util/util-macros_1.2.1.bb
index 8f33775a2..79288cd37 100644
--- a/meta/packages/xorg-util/util-macros_1.2.1.bb
+++ b/meta/packages/xorg-util/util-macros_1.2.1.bb
@@ -6,8 +6,6 @@ PE = "1"
 
 SRC_URI += "file://unbreak_cross_compile.patch;patch=1"
 
-XORG_PN = "util-macros"
-
 # ${PN} is empty so we need to tweak -dev and -dbg package dependencies
 RDEPENDS_${PN}-dev = ""
 RRECOMMENDS_${PN}-dbg = "${PN}-dev (= ${EXTENDPV})"