diff options
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 ee7c25c407..0000000000 --- a/meta/packages/xorg-app/xkbcomp-native_1.0.5.bb +++ /dev/null | |||
@@ -1,11 +0,0 @@ | |||
1 | DESCRIPTION = "The X Keyboard Extension essentially replaces the core protocol definition of keyboard." | ||
2 | |||
3 | SECTION = "x11/applications" | ||
4 | LICENSE = "MIT-X" | ||
5 | S="${WORKDIR}/xkbcomp-${PV}" | ||
6 | |||
7 | DEPENDS = "libx11-native libxkbfile-native" | ||
8 | |||
9 | SRC_URI = "${XORG_MIRROR}/individual/app/xkbcomp-${PV}.tar.bz2" | ||
10 | |||
11 | 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 | |||
2 | 2 | ||
3 | DESCRIPTION = "The X Keyboard Extension essentially replaces the core protocol definition of keyboard." | 3 | DESCRIPTION = "The X Keyboard Extension essentially replaces the core protocol definition of keyboard." |
4 | 4 | ||
5 | DEPENDS += " virtual/libx11 libxkbfile" | 5 | DEPENDS += "libxkbfile" |
6 | |||
7 | 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" | |||
4 | LICENSE = "MIT-X" | 4 | LICENSE = "MIT-X" |
5 | DEPENDS = "util-macros-native virtual/libx11" | 5 | DEPENDS = "util-macros-native virtual/libx11" |
6 | 6 | ||
7 | XORG_PN = "${PN}" | 7 | XORG_PN = "${BPN}" |
8 | 8 | ||
9 | SRC_URI = "${XORG_MIRROR}/individual/app/${XORG_PN}-${PV}.tar.bz2" | 9 | SRC_URI = "${XORG_MIRROR}/individual/app/${XORG_PN}-${PV}.tar.bz2" |
10 | 10 | ||
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 @@ | |||
1 | require libx11_${PV}.bb | 1 | require libx11_${PV}.bb |
2 | 2 | ||
3 | DEPENDS = "xproto-native xextproto-native libxau-native xtrans-native libxdmcp-native xcmiscproto-native xf86bigfontproto-native kbproto-native inputproto-native bigreqsproto-native util-macros-native" | 3 | DEPENDS = "xproto-native xextproto-native libxau-native xtrans-native libxdmcp-native xcmiscproto-native xf86bigfontproto-native kbproto-native inputproto-native bigreqsproto-native util-macros-native" |
4 | PROVIDES = "" | 4 | PROVIDES = "virtual/libx11-native" |
5 | 5 | ||
6 | inherit native | 6 | 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" | |||
7 | 7 | ||
8 | RDEPENDS_${PN}-dev = "" | 8 | RDEPENDS_${PN}-dev = "" |
9 | 9 | ||
10 | XORG_PN = "xtrans" | ||
11 | |||
12 | BBCLASSEXTEND = "native sdk" | 10 | 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 | |||
3 | PR = "r1" | 3 | PR = "r1" |
4 | PE = "1" | 4 | PE = "1" |
5 | 5 | ||
6 | XORG_PN = "bigreqsproto" | ||
7 | |||
8 | BBCLASSEXTEND = "native sdk" | 6 | 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 | |||
2 | 2 | ||
3 | CONFLICTS = "compositeext" | 3 | CONFLICTS = "compositeext" |
4 | PE = "1" | 4 | PE = "1" |
5 | |||
6 | 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 | |||
3 | CONFLICTS = "damageext" | 3 | CONFLICTS = "damageext" |
4 | PR = "r1" | 4 | PR = "r1" |
5 | PE = "1" | 5 | PE = "1" |
6 | |||
7 | 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 | |||
3 | CONFLICTS = "fixesext" | 3 | CONFLICTS = "fixesext" |
4 | PR = "r1" | 4 | PR = "r1" |
5 | PE = "1" | 5 | PE = "1" |
6 | |||
7 | 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}" | |||
7 | SRC_URI = "git://anongit.freedesktop.org/git/xorg/proto/inputproto;protocol=git" | 7 | SRC_URI = "git://anongit.freedesktop.org/git/xorg/proto/inputproto;protocol=git" |
8 | S = "${WORKDIR}/git" | 8 | S = "${WORKDIR}/git" |
9 | 9 | ||
10 | XORG_PN = "inputproto" | ||
11 | |||
12 | BBCLASSEXTEND = "native sdk" | 10 | 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 | |||
3 | PR = "r1" | 3 | PR = "r1" |
4 | PE = "1" | 4 | PE = "1" |
5 | 5 | ||
6 | XORG_PN = "kbproto" | ||
7 | |||
8 | BBCLASSEXTEND = "native sdk" | 6 | 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 @@ | |||
1 | require randrproto_${PV}.bb | ||
2 | |||
3 | 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" | |||
4 | PR = "r1" | 4 | PR = "r1" |
5 | PE = "1" | 5 | PE = "1" |
6 | 6 | ||
7 | XORG_PN = "randrproto" | 7 | 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 @@ | |||
1 | require renderproto_${PV}.bb | ||
2 | |||
3 | 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" | |||
4 | PR = "r1" | 4 | PR = "r1" |
5 | PE = "1" | 5 | PE = "1" |
6 | 6 | ||
7 | XORG_PN = "renderproto" | 7 | 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 | |||
3 | PR = "r1" | 3 | PR = "r1" |
4 | PE = "1" | 4 | PE = "1" |
5 | 5 | ||
6 | XORG_PN = "xcmiscproto" | ||
7 | |||
8 | BBCLASSEXTEND = "native sdk" | 6 | 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 | |||
3 | PR = "r2" | 3 | PR = "r2" |
4 | PE = "1" | 4 | PE = "1" |
5 | 5 | ||
6 | XORG_PN = "xextproto" | ||
7 | |||
8 | BBCLASSEXTEND = "native sdk" | 6 | 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 | |||
3 | PR = "r1" | 3 | PR = "r1" |
4 | PE = "1" | 4 | PE = "1" |
5 | 5 | ||
6 | XORG_PN = "xf86bigfontproto" | ||
7 | |||
8 | BBCLASSEXTEND = "native sdk" | 6 | 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 | |||
3 | PR = "r1" | 3 | PR = "r1" |
4 | PE = "1" | 4 | PE = "1" |
5 | 5 | ||
6 | XORG_PN = "xproto" | ||
7 | |||
8 | BBCLASSEXTEND = "native sdk" | 6 | BBCLASSEXTEND = "native sdk" |
9 | |||
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" | |||
6 | 6 | ||
7 | SRC_URI += "file://unbreak_cross_compile.patch;patch=1" | 7 | SRC_URI += "file://unbreak_cross_compile.patch;patch=1" |
8 | 8 | ||
9 | XORG_PN = "util-macros" | ||
10 | |||
11 | # ${PN} is empty so we need to tweak -dev and -dbg package dependencies | 9 | # ${PN} is empty so we need to tweak -dev and -dbg package dependencies |
12 | RDEPENDS_${PN}-dev = "" | 10 | RDEPENDS_${PN}-dev = "" |
13 | RRECOMMENDS_${PN}-dbg = "${PN}-dev (= ${EXTENDPV})" | 11 | RRECOMMENDS_${PN}-dbg = "${PN}-dev (= ${EXTENDPV})" |