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

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 (file)
index ee7c25c..0000000
--- 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 ca6cdb8898abdeee34bf6f348654140b3523033e..e436a71ed43cbff5ed481f5ad3f3319bd9ff6b06 100644 (file)
--- 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 2dc659a0faeeafa3c7f0f2e5029955bd8eaed4c1..32a2f061c95f93489e58bb883c41f2ccf0e86717 100644 (file)
--- 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 dda63965ebda313a483a3c883af6899b86d2ae65..30f0ff826efa3b943212704fdfe3dd5721ac8430 100644 (file)
--- 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 270abf074e4c9c4cbed6e54fdad30a38f666107b..d3703229b128bc1b346ef99e93693dae243363a8 100644 (file)
--- 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 5d0bd80753c9ce0499570f98cc8fef247fc80bc6..e799a991e78c7f438d59d6048d13ad181117f4cb 100644 (file)
--- 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 b7bb50e5799e38f62dde6bd75510cfaa9c888d44..f74413c551d3e2315ac758998f8597b6716763f1 100644 (file)
--- 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 e7abb316ed39d9f51ad4164cc0c3b9e0bf6dc3f1..202ec2874fc803f07875d0c854fd484ad28ff57a 100644 (file)
--- 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 f9bc9d9e3c578ec7256e71311d9e853f95e5b8a2..1bc36e00dab9c538d0da76fe2a4690c73589bfe6 100644 (file)
--- 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 e669a27924ef63a4f6f37d4c862546dc597acae9..1276fab7f38c21b090330b1353daaf866da1dd28 100644 (file)
--- 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 220da1d438c0338644b855fed763ec797713cb9a..e799a991e78c7f438d59d6048d13ad181117f4cb 100644 (file)
--- 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 (file)
index 2759cb0..0000000
--- 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 85000cc9007929597c84940b0a66fcd562795ce8..74a0e2d5f6c9d16578c801936115ef6a922508dd 100644 (file)
--- 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 (file)
index 25ab908..0000000
--- 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 d4e0983a8b48c8b37d1449462c143ef7db0c22aa..77d620a587870b36e6558e29a9b692f6c6a703aa 100644 (file)
--- 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 2a501fed9edc4808cbd82aeacddd65d9d0dd4e3b..e799a991e78c7f438d59d6048d13ad181117f4cb 100644 (file)
--- 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 ff065edc331fb6abcb9c0ce7c2bf1a52aaa8e5f3..dcec209badd3b7beef6c055f820b9ba78183bf80 100644 (file)
--- 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 445bdf619d56c8843eef9735d4958ff75e9f6070..e799a991e78c7f438d59d6048d13ad181117f4cb 100644 (file)
--- 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 ebe6fe40962a8b7c3b6f2aa2d5e4c6a524874c12..e799a991e78c7f438d59d6048d13ad181117f4cb 100644 (file)
--- 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 8f33775a295097bdbffdcc78fade6bafd79f21b3..79288cd374eebad595cd2cef8eec7fb31d10aba3 100644 (file)
--- 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})"