Merge branch 'org.openembedded.dev' of git@git.openembedded.net:openembedded into org.openembedded.dev

7 files changed, 41 insertions, 2 deletions

diff --git a/recipes/xorg-app/luit_1.0.5.bb b/recipes/xorg-app/luit_1.0.5.bb
new file mode 100644
index 0000000000..86d77d28c0
--- /dev/null
+++ b/recipes/xorg-app/luit_1.0.5.bb
@@ -0,0 +1,7 @@
+require xorg-app-common.inc
+DESCRIPTION = "a filter for locale and ISO 2022 support on Unicode terminals"
+DEPENDS += " zlib zlib virtual/libx11 libfontenc"
+PE = "1"
+
+SRC_URI[archive.md5sum] = "fd8579a993c4480978e3504a4c53c189"
+SRC_URI[archive.sha256sum] = "8eeb1cf7809acc17cf6cecfdc899613854560052229b21e6115b03a088cd059b"
diff --git a/recipes/xorg-app/xdm_1.1.9.bb b/recipes/xorg-app/xdm_1.1.9.bb
index eb153b1da9..b9bd743fe8 100644
--- a/recipes/xorg-app/xdm_1.1.9.bb
+++ b/recipes/xorg-app/xdm_1.1.9.bb
@@ -1,10 +1,14 @@
 require xorg-app-common.inc
 PE = "1"
+PR = "r1"
 
 DESCRIPTION = "X display manager"
 
 DEPENDS += " libxmu libxinerama libxpm libxdmcp libxau virtual/libx11 libxext libxdmcp libxt libxaw"
 
-EXTRA_OECONF += " --with-random-device=/dev/urandom"
+EXTRA_OECONF += "\
+	--with-random-device=/dev/urandom --with-utmp-file=/var/run/utmp \
+	--with-wtmp-file=/var/log/wtmp \
+	"
 
 FILES_${PN}-dbg += "${libdir}/X11/xdm/.debug/*"
diff --git a/recipes/xorg-app/xinit_1.2.0.bb b/recipes/xorg-app/xinit_1.2.0.bb
index ce82fb05d4..2bae60c8e5 100644
--- a/recipes/xorg-app/xinit_1.2.0.bb
+++ b/recipes/xorg-app/xinit_1.2.0.bb
@@ -2,5 +2,8 @@ require xorg-app-common.inc
 
 DESCRIPTION = "X Window System initializer"
 PE = "1"
+PR = "r1"
+
+DEPENDS += "util-linux-ng"
 
 FILES_${PN} += "${libdir}X11/xinit"
diff --git a/recipes/xorg-app/xinit_1.2.1.bb b/recipes/xorg-app/xinit_1.2.1.bb
new file mode 100644
index 0000000000..9fe144ffeb
--- /dev/null
+++ b/recipes/xorg-app/xinit_1.2.1.bb
@@ -0,0 +1,11 @@
+require xorg-app-common.inc
+
+DESCRIPTION = "X Window System initializer"
+PE = "1"
+PR = "r1"
+
+DEPENDS += "util-linux-ng"
+
+FILES_${PN} += "${libdir}X11/xinit"
+SRC_URI[archive.md5sum] = "56f2d202b3dc10fcd21931a67bb270f7"
+SRC_URI[archive.sha256sum] = "16bcc73ae81b6d80fd1a9419ea757f38870d1043d440b6d56fcaa79d4c6c9b07"
diff --git a/recipes/xorg-app/xinput_1.5.1.bb b/recipes/xorg-app/xinput_1.5.1.bb
new file mode 100644
index 0000000000..407301689a
--- /dev/null
+++ b/recipes/xorg-app/xinput_1.5.1.bb
@@ -0,0 +1,6 @@
+require xorg-app-common.inc
+
+DESCRIPTION = "a utility to configure and test XInput devices"
+DEPENDS += " libxi"
+SRC_URI[archive.md5sum] = "82400f0ba63217df9b00d825532cea7d"
+SRC_URI[archive.sha256sum] = "e33c8361c2b6cb13db9a7157753d417c168c8203c8b7027e9dda2fbeef00fd33"
diff --git a/recipes/xorg-app/xmessage_1.0.3.bb b/recipes/xorg-app/xmessage_1.0.3.bb
new file mode 100644
index 0000000000..2b8e70e418
--- /dev/null
+++ b/recipes/xorg-app/xmessage_1.0.3.bb
@@ -0,0 +1,8 @@
+require xorg-app-common.inc
+
+DESCRIPTION = "xmessage displays a message or query in a window."
+DEPENDS += " libxaw libxt"
+PE = "1"
+
+SRC_URI[archive.md5sum] = "76ac52710234ebb9d0e2762bb5d11ea1"
+SRC_URI[archive.sha256sum] = "cfa35d3ad4ad1306e49878163982e9d54872a20a497e77ab0a8d5de05c8b3d5b"
diff --git a/recipes/xorg-app/xorg-app-common.inc b/recipes/xorg-app/xorg-app-common.inc
index cd7f654be2..02db754f5a 100644
--- a/recipes/xorg-app/xorg-app-common.inc
+++ b/recipes/xorg-app/xorg-app-common.inc
@@ -6,7 +6,7 @@ DEPENDS = "util-macros-native virtual/libx11"
 
 XORG_PN = "${PN}"
 
-SRC_URI = "${XORG_MIRROR}/individual/app/${XORG_PN}-${PV}.tar.bz2"
+SRC_URI = "${XORG_MIRROR}/individual/app/${XORG_PN}-${PV}.tar.bz2;name=archive"
 
 S = "${WORKDIR}/${XORG_PN}-${PV}"