xorg mega commit: merge in change from poky

9 files changed, 60 insertions, 3 deletions

diff --git a/packages/xorg-util/gccmakedep_1.0.2.bb b/packages/xorg-util/gccmakedep_1.0.2.bb
new file mode 100644
index 0000000000..3abfa037a2
--- /dev/null
+++ b/packages/xorg-util/gccmakedep_1.0.2.bb
@@ -0,0 +1,7 @@
+require xorg-util-common.inc
+
+DESCRIPTION = "create dependencies in makefiles using 'gcc -M'"
+RDEPENDS = "gcc"
+
+PR = "r2"
+PE = "1"
diff --git a/packages/xorg-util/imake_1.0.2.bb b/packages/xorg-util/imake_1.0.2.bb
new file mode 100644
index 0000000000..deeb4477a1
--- /dev/null
+++ b/packages/xorg-util/imake_1.0.2.bb
@@ -0,0 +1,7 @@
+require xorg-util-common.inc
+
+DESCRIPTION = "C preprocessor interface to the make utility"
+RDEPENDS = "perl xproto"
+
+PR = "r1"
+PE = "1"
diff --git a/packages/xorg-util/lndir_1.0.1.bb b/packages/xorg-util/lndir_1.0.1.bb
new file mode 100644
index 0000000000..34309a6487
--- /dev/null
+++ b/packages/xorg-util/lndir_1.0.1.bb
@@ -0,0 +1,5 @@
+require xorg-util-common.inc
+
+DESCRIPTION = "create a shadow directory of symbolic links to another directory tree"
+PR = "r1"
+PE = "1"
diff --git a/packages/xorg-util/makedepend-native_1.0.1.bb b/packages/xorg-util/makedepend-native_1.0.1.bb
new file mode 100644
index 0000000000..554270e6e4
--- /dev/null
+++ b/packages/xorg-util/makedepend-native_1.0.1.bb
@@ -0,0 +1,8 @@
+require xorg-util-common.inc
+inherit native
+
+DESCRIPTION = "create dependencies in makefiles"
+PR = "r1"
+PE = "1"
+
+XORG_PN = "makedepend"
diff --git a/packages/xorg-util/makedepend_1.0.1.bb b/packages/xorg-util/makedepend_1.0.1.bb
new file mode 100644
index 0000000000..3605b51d49
--- /dev/null
+++ b/packages/xorg-util/makedepend_1.0.1.bb
@@ -0,0 +1,5 @@
+require xorg-util-common.inc
+
+DESCRIPTION = "create dependencies in makefiles"
+PR = "r1"
+PE = "1"
diff --git a/packages/xorg-util/util-macros-native_1.1.5.bb b/packages/xorg-util/util-macros-native_1.1.5.bb
new file mode 100644
index 0000000000..c327f3f54e
--- /dev/null
+++ b/packages/xorg-util/util-macros-native_1.1.5.bb
@@ -0,0 +1,9 @@
+require util-macros_${PV}.bb
+
+inherit native
+
+PR = "r1"
+
+XORG_PN = "util-macros"
+
+S = "${WORKDIR}/util-macros-1.1.5"
diff --git a/packages/xorg-util/util-macros_1.1.5.bb b/packages/xorg-util/util-macros_1.1.5.bb
new file mode 100644
index 0000000000..22634bffd2
--- /dev/null
+++ b/packages/xorg-util/util-macros_1.1.5.bb
@@ -0,0 +1,7 @@
+require xorg-util-common.inc
+
+DESCRIPTION = "X autotools macros"
+PR = "r1"
+PE = "1"
+
+SRC_URI += "file://unbreak_cross_compile.patch;patch=1"
diff --git a/packages/xorg-util/xorg-cf-files_1.0.2.bb b/packages/xorg-util/xorg-cf-files_1.0.2.bb
new file mode 100644
index 0000000000..7c3fb8d7e9
--- /dev/null
+++ b/packages/xorg-util/xorg-cf-files_1.0.2.bb
@@ -0,0 +1,8 @@
+require xorg-util-common.inc
+
+DESCRIPTION = "X Window System CF files"
+
+PR = "r1"
+PE = "1"
+
+FILES_${PN} += " /usr/lib/X11/config"
diff --git a/packages/xorg-util/xorg-util-common.inc b/packages/xorg-util/xorg-util-common.inc
index f6e9c65b78..56aae30725 100644
--- a/packages/xorg-util/xorg-util-common.inc
+++ b/packages/xorg-util/xorg-util-common.inc
@@ -2,13 +2,14 @@ HOMEPAGE = "http://www.x.org"
 SECTION = "x11/utils"
 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.bz2"
+
+SRC_URI = "${XORG_MIRROR}/individual/util/${XORG_PN}-${PV}.tar.gz"
+
 S = "${WORKDIR}/${XORG_PN}-${PV}"
 
 inherit autotools pkgconfig
 
 do_stage() {
-	autotools_stage_all
+        autotools_stage_all
 }