From 1811e7955c524ce4909575905c10320be3160a7a Mon Sep 17 00:00:00 2001 From: Marcin Juszkiewicz Date: Tue, 3 Jul 2007 10:59:12 +0000 Subject: xorg-util: X11 cleanup git-svn-id: https://svn.o-hand.com/repos/poky/trunk@2081 311d38ba-8fff-0310-9ca6-ca027cbcb966 --- meta/packages/xorg-util/gccmakedep_1.0.2.bb | 7 +++++++ meta/packages/xorg-util/gccmakedep_X11R7.1-1.0.2.bb | 6 ------ meta/packages/xorg-util/imake_1.0.2.bb | 7 +++++++ meta/packages/xorg-util/imake_X11R7.1-1.0.2.bb | 6 ------ meta/packages/xorg-util/lndir_1.0.1.bb | 7 +++++++ meta/packages/xorg-util/lndir_X11R7.0-1.0.1.bb | 6 ------ meta/packages/xorg-util/makedepend-native_1.0.0.bb | 11 +++++++++++ meta/packages/xorg-util/makedepend-native_X11R7.0-1.0.0.bb | 10 ---------- meta/packages/xorg-util/makedepend_1.0.0.bb | 7 +++++++ meta/packages/xorg-util/makedepend_X11R7.0-1.0.0.bb | 6 ------ meta/packages/xorg-util/util-macros-native_1.1.5.bb | 12 ++++++++++++ meta/packages/xorg-util/util-macros-native_X11R7.1-1.0.2.bb | 9 --------- meta/packages/xorg-util/util-macros-native_X11R7.1-1.1.5.bb | 11 ----------- meta/packages/xorg-util/util-macros_1.1.5.bb | 10 ++++++++++ meta/packages/xorg-util/util-macros_X11R7.1-1.1.5.bb | 10 ---------- meta/packages/xorg-util/xorg-cf-files_1.0.2.bb | 8 ++++++++ meta/packages/xorg-util/xorg-cf-files_X11R7.1-1.0.2.bb | 7 ------- meta/packages/xorg-util/xorg-util-common.inc | 3 ++- 18 files changed, 71 insertions(+), 72 deletions(-) create mode 100644 meta/packages/xorg-util/gccmakedep_1.0.2.bb delete mode 100644 meta/packages/xorg-util/gccmakedep_X11R7.1-1.0.2.bb create mode 100644 meta/packages/xorg-util/imake_1.0.2.bb delete mode 100644 meta/packages/xorg-util/imake_X11R7.1-1.0.2.bb create mode 100644 meta/packages/xorg-util/lndir_1.0.1.bb delete mode 100644 meta/packages/xorg-util/lndir_X11R7.0-1.0.1.bb create mode 100644 meta/packages/xorg-util/makedepend-native_1.0.0.bb delete mode 100644 meta/packages/xorg-util/makedepend-native_X11R7.0-1.0.0.bb create mode 100644 meta/packages/xorg-util/makedepend_1.0.0.bb delete mode 100644 meta/packages/xorg-util/makedepend_X11R7.0-1.0.0.bb create mode 100644 meta/packages/xorg-util/util-macros-native_1.1.5.bb delete mode 100644 meta/packages/xorg-util/util-macros-native_X11R7.1-1.0.2.bb delete mode 100644 meta/packages/xorg-util/util-macros-native_X11R7.1-1.1.5.bb create mode 100644 meta/packages/xorg-util/util-macros_1.1.5.bb delete mode 100644 meta/packages/xorg-util/util-macros_X11R7.1-1.1.5.bb create mode 100644 meta/packages/xorg-util/xorg-cf-files_1.0.2.bb delete mode 100644 meta/packages/xorg-util/xorg-cf-files_X11R7.1-1.0.2.bb (limited to 'meta') diff --git a/meta/packages/xorg-util/gccmakedep_1.0.2.bb b/meta/packages/xorg-util/gccmakedep_1.0.2.bb new file mode 100644 index 0000000000..e943b70aa5 --- /dev/null +++ b/meta/packages/xorg-util/gccmakedep_1.0.2.bb @@ -0,0 +1,7 @@ +require xorg-util-common.inc + +#DESCRIPTION = "" + +#DEPENDS += " " + +PE = "1" diff --git a/meta/packages/xorg-util/gccmakedep_X11R7.1-1.0.2.bb b/meta/packages/xorg-util/gccmakedep_X11R7.1-1.0.2.bb deleted file mode 100644 index f9dc1f3d3e..0000000000 --- a/meta/packages/xorg-util/gccmakedep_X11R7.1-1.0.2.bb +++ /dev/null @@ -1,6 +0,0 @@ -require xorg-util-common.inc - -#DESCRIPTION = "" - -#DEPENDS += " " - diff --git a/meta/packages/xorg-util/imake_1.0.2.bb b/meta/packages/xorg-util/imake_1.0.2.bb new file mode 100644 index 0000000000..62611cc899 --- /dev/null +++ b/meta/packages/xorg-util/imake_1.0.2.bb @@ -0,0 +1,7 @@ +require xorg-util-common.inc + +DESCRIPTION = "imake utility" + +DEPENDS += " perl xproto" + +PE = "1" diff --git a/meta/packages/xorg-util/imake_X11R7.1-1.0.2.bb b/meta/packages/xorg-util/imake_X11R7.1-1.0.2.bb deleted file mode 100644 index b2b11cf038..0000000000 --- a/meta/packages/xorg-util/imake_X11R7.1-1.0.2.bb +++ /dev/null @@ -1,6 +0,0 @@ -require xorg-util-common.inc - -DESCRIPTION = "imake utility" - -DEPENDS += " perl xproto" - diff --git a/meta/packages/xorg-util/lndir_1.0.1.bb b/meta/packages/xorg-util/lndir_1.0.1.bb new file mode 100644 index 0000000000..a071d28660 --- /dev/null +++ b/meta/packages/xorg-util/lndir_1.0.1.bb @@ -0,0 +1,7 @@ +require xorg-util-common.inc + +#DESCRIPTION = "" + +DEPENDS += " xproto" + +PE = "1" diff --git a/meta/packages/xorg-util/lndir_X11R7.0-1.0.1.bb b/meta/packages/xorg-util/lndir_X11R7.0-1.0.1.bb deleted file mode 100644 index 09a7787ee3..0000000000 --- a/meta/packages/xorg-util/lndir_X11R7.0-1.0.1.bb +++ /dev/null @@ -1,6 +0,0 @@ -require xorg-util-common.inc - -#DESCRIPTION = "" - -DEPENDS += " xproto" - diff --git a/meta/packages/xorg-util/makedepend-native_1.0.0.bb b/meta/packages/xorg-util/makedepend-native_1.0.0.bb new file mode 100644 index 0000000000..833d2daa92 --- /dev/null +++ b/meta/packages/xorg-util/makedepend-native_1.0.0.bb @@ -0,0 +1,11 @@ +require xorg-util-common.inc +inherit native + +#DESCRIPTION = "" + +XORG_PN = "makedepend" +S = "${WORKDIR}/makedepend-${PV}" + +DEPENDS += " util-macros-native xproto-native" + +PE = "1" diff --git a/meta/packages/xorg-util/makedepend-native_X11R7.0-1.0.0.bb b/meta/packages/xorg-util/makedepend-native_X11R7.0-1.0.0.bb deleted file mode 100644 index 1b8476be47..0000000000 --- a/meta/packages/xorg-util/makedepend-native_X11R7.0-1.0.0.bb +++ /dev/null @@ -1,10 +0,0 @@ -require xorg-util-common.inc -inherit native - -#DESCRIPTION = "" - -SRC_URI = "${XORG_MIRROR}/X11R7.0/src/util/makedepend-${PV}.tar.bz2" -S="${WORKDIR}/makedepend-${PV}" - -DEPENDS += " util-macros-native xproto-native" - diff --git a/meta/packages/xorg-util/makedepend_1.0.0.bb b/meta/packages/xorg-util/makedepend_1.0.0.bb new file mode 100644 index 0000000000..a071d28660 --- /dev/null +++ b/meta/packages/xorg-util/makedepend_1.0.0.bb @@ -0,0 +1,7 @@ +require xorg-util-common.inc + +#DESCRIPTION = "" + +DEPENDS += " xproto" + +PE = "1" diff --git a/meta/packages/xorg-util/makedepend_X11R7.0-1.0.0.bb b/meta/packages/xorg-util/makedepend_X11R7.0-1.0.0.bb deleted file mode 100644 index 09a7787ee3..0000000000 --- a/meta/packages/xorg-util/makedepend_X11R7.0-1.0.0.bb +++ /dev/null @@ -1,6 +0,0 @@ -require xorg-util-common.inc - -#DESCRIPTION = "" - -DEPENDS += " xproto" - diff --git a/meta/packages/xorg-util/util-macros-native_1.1.5.bb b/meta/packages/xorg-util/util-macros-native_1.1.5.bb new file mode 100644 index 0000000000..2728e83e18 --- /dev/null +++ b/meta/packages/xorg-util/util-macros-native_1.1.5.bb @@ -0,0 +1,12 @@ +DESCRIPTION = "X autotools macros" +SECTION = "x11/libs" +LICENSE= "Xorg" +PE = "1" + +SRC_URI = "${XORG_MIRROR}/individual/util/util-macros-1.1.5.tar.bz2 \ + file://unbreak_cross_compile.patch;patch=1 " + +S = "${WORKDIR}/util-macros-1.1.5" + +inherit native autotools pkgconfig + diff --git a/meta/packages/xorg-util/util-macros-native_X11R7.1-1.0.2.bb b/meta/packages/xorg-util/util-macros-native_X11R7.1-1.0.2.bb deleted file mode 100644 index 239750bb80..0000000000 --- a/meta/packages/xorg-util/util-macros-native_X11R7.1-1.0.2.bb +++ /dev/null @@ -1,9 +0,0 @@ -DESCRIPTION = "X autotools macros" -SECTION = "x11/libs" -LICENSE= "Xorg" - -SRC_URI = "${XORG_MIRROR}/X11R7.1/src/util/util-macros-${PV}.tar.bz2" -S = "${WORKDIR}/util-macros-${PV}" - -inherit native autotools pkgconfig - diff --git a/meta/packages/xorg-util/util-macros-native_X11R7.1-1.1.5.bb b/meta/packages/xorg-util/util-macros-native_X11R7.1-1.1.5.bb deleted file mode 100644 index 64e0550571..0000000000 --- a/meta/packages/xorg-util/util-macros-native_X11R7.1-1.1.5.bb +++ /dev/null @@ -1,11 +0,0 @@ -DESCRIPTION = "X autotools macros" -SECTION = "x11/libs" -LICENSE= "Xorg" - -SRC_URI = "${XORG_MIRROR}/individual/util/util-macros-1.1.5.tar.bz2 \ - file://unbreak_cross_compile.patch;patch=1 " - -S = "${WORKDIR}/util-macros-1.1.5" - -inherit native autotools pkgconfig - diff --git a/meta/packages/xorg-util/util-macros_1.1.5.bb b/meta/packages/xorg-util/util-macros_1.1.5.bb new file mode 100644 index 0000000000..7fa9a07c05 --- /dev/null +++ b/meta/packages/xorg-util/util-macros_1.1.5.bb @@ -0,0 +1,10 @@ +require xorg-util-common.inc + +DESCRIPTION = "X autotools macros" + +PE = "1" + +SRC_URI = "${XORG_MIRROR}/individual/util/${XORG_PN}-1.1.5.tar.gz \ + file://unbreak_cross_compile.patch;patch=1 " +S = "${WORKDIR}/${XORG_PN}-1.1.5" + diff --git a/meta/packages/xorg-util/util-macros_X11R7.1-1.1.5.bb b/meta/packages/xorg-util/util-macros_X11R7.1-1.1.5.bb deleted file mode 100644 index 06dd0a5d73..0000000000 --- a/meta/packages/xorg-util/util-macros_X11R7.1-1.1.5.bb +++ /dev/null @@ -1,10 +0,0 @@ -require xorg-util-common.inc - -DESCRIPTION = "X autotools macros" - -PR = "r1" - -SRC_URI = "${XORG_MIRROR}/individual/util/${XORG_PN}-1.1.5.tar.gz \ - file://unbreak_cross_compile.patch;patch=1 " -S = "${WORKDIR}/${XORG_PN}-1.1.5" - diff --git a/meta/packages/xorg-util/xorg-cf-files_1.0.2.bb b/meta/packages/xorg-util/xorg-cf-files_1.0.2.bb new file mode 100644 index 0000000000..c0a3974d26 --- /dev/null +++ b/meta/packages/xorg-util/xorg-cf-files_1.0.2.bb @@ -0,0 +1,8 @@ +require xorg-util-common.inc + +#DESCRIPTION = "" + +#DEPENDS += " " +PE = "1" + +FILES_${PN} += " /usr/lib/X11/config" diff --git a/meta/packages/xorg-util/xorg-cf-files_X11R7.1-1.0.2.bb b/meta/packages/xorg-util/xorg-cf-files_X11R7.1-1.0.2.bb deleted file mode 100644 index f1b6b0d4f7..0000000000 --- a/meta/packages/xorg-util/xorg-cf-files_X11R7.1-1.0.2.bb +++ /dev/null @@ -1,7 +0,0 @@ -require xorg-util-common.inc - -#DESCRIPTION = "" - -#DEPENDS += " " - -FILES_${PN} += " /usr/lib/X11/config" diff --git a/meta/packages/xorg-util/xorg-util-common.inc b/meta/packages/xorg-util/xorg-util-common.inc index 3cbc346bf0..4dc547f105 100644 --- a/meta/packages/xorg-util/xorg-util-common.inc +++ b/meta/packages/xorg-util/xorg-util-common.inc @@ -4,7 +4,8 @@ LICENSE = "MIT-X" #DEPENDS = "" XORG_PN = "${PN}" -SRC_URI = "${XORG_MIRROR}/${@bb.data.getVar('PV', d, 1)[0:7]}/src/util/${XORG_PN}-${PV}.tar.gz" +XORG_RELEASE = "${@["individual",bb.data.getVar('PV', d, 1)[0:7]+"/src"][bb.data.getVar('PV', d, 1)[0:4] == "X11R"]}" +SRC_URI = "${XORG_MIRROR}/${XORG_RELEASE}/util/${XORG_PN}-${PV}.tar.gz" S = "${WORKDIR}/${XORG_PN}-${PV}" inherit autotools pkgconfig -- cgit v1.2.3-54-g00ecf