From 64c7fa473413d998c2a99c79ef0de34ecc133aef Mon Sep 17 00:00:00 2001 From: Richard Purdie Date: Sat, 3 Jan 2009 17:10:57 +0000 Subject: xorg: Remove unneeded XORG_PN settings and replace some native/sdk recipes with BBCLASSEXTEND --- meta/packages/xorg-app/xkbcomp-native_1.0.5.bb | 11 ----------- meta/packages/xorg-app/xkbcomp_1.0.5.bb | 4 +++- meta/packages/xorg-app/xorg-app-common.inc | 2 +- meta/packages/xorg-lib/libx11-native_1.1.5.bb | 2 +- meta/packages/xorg-lib/xtrans_1.2.2.bb | 2 -- meta/packages/xorg-proto/bigreqsproto_1.0.2.bb | 2 -- meta/packages/xorg-proto/compositeproto_0.4.bb | 2 -- meta/packages/xorg-proto/damageproto_1.1.0.bb | 2 -- meta/packages/xorg-proto/fixesproto_4.0.bb | 2 -- meta/packages/xorg-proto/inputproto_1.9.99.5git.bb | 2 -- meta/packages/xorg-proto/kbproto_1.0.3.bb | 2 -- meta/packages/xorg-proto/randrproto-sdk_1.2.2.bb | 3 --- meta/packages/xorg-proto/randrproto_1.2.2.bb | 2 +- meta/packages/xorg-proto/renderproto-sdk_0.9.3.bb | 3 --- meta/packages/xorg-proto/renderproto_0.9.3.bb | 2 +- meta/packages/xorg-proto/xcmiscproto_1.1.2.bb | 2 -- meta/packages/xorg-proto/xextproto_7.0.4.bb | 2 -- meta/packages/xorg-proto/xf86bigfontproto_1.1.2.bb | 2 -- meta/packages/xorg-proto/xproto_7.0.14.bb | 3 --- meta/packages/xorg-util/util-macros_1.2.1.bb | 2 -- 20 files changed, 7 insertions(+), 47 deletions(-) delete mode 100644 meta/packages/xorg-app/xkbcomp-native_1.0.5.bb delete mode 100644 meta/packages/xorg-proto/randrproto-sdk_1.2.2.bb delete mode 100644 meta/packages/xorg-proto/renderproto-sdk_0.9.3.bb 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 ee7c25c407..0000000000 --- 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 ca6cdb8898..e436a71ed4 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 2dc659a0fa..32a2f061c9 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 dda63965eb..30f0ff826e 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 270abf074e..d3703229b1 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 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" - 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 8f33775a29..79288cd374 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})" -- cgit v1.2.3-54-g00ecf