Merge remote branch 'origin/org.openembedded.dev' into martin_jansa/srcpv

35 files changed, 492 insertions, 51 deletions

diff --git a/conf/checksums.ini b/conf/checksums.ini
index ccb96e2900..fdeeb5bac8 100644
--- a/conf/checksums.ini
+++ b/conf/checksums.ini
@@ -5290,6 +5290,10 @@ sha256=eb20cb028176e52432a2b877b2e292100dc41b384e829bc9e6d4823075ed8188
 md5=dd627a121e43835bead3ffef5b1a72fd
 sha256=f435e14e1f54dc8792f4e655463d07f2bdbe6d8a8581bd62f5167334ab18bb87
 
+[http://www.gentoo.com/di/di-4.17.tar.gz]
+md5=be55b3a1693b318effa3db8d1c0243c1
+sha256=46e124670fb2b63cb7500a8b36b7856c15858cb35658263ddad4933935d5e210
+
 [ftp://ftp.gnome.org/pub/gnome/sources/dia/0.95/dia-0.95-pre3.tar.gz]
 md5=642f7e7d4c71dc144b60f51f9d65de62
 sha256=902da1b1e9d90dfda8aa1864846db8ad12386e7521fc9f8b18c8ba220dd0123a
@@ -22026,6 +22030,10 @@ sha256=1e8ad5b7c5cf3485bd0738c296274ff2c99d26d12a25a225dc250eddea25b9f1
 md5=02adc2b99252675f0271db3b9edd432e
 sha256=e47e27083deb79571fb2b9215874ddc26d77c3dec2a7dc8de5ecec9058e4b806
 
+[http://0pointer.de/lennart/projects/pulseaudio/pulseaudio-0.9.21.tar.gz]
+md5=76e623c4c72e2258bc8bdeb1599bad74
+sha256=94e22356ac70ee95388ae58da90d88c6b3186d1938618d21671627ff56cee254
+
 [http://0pointer.de/lennart/projects/pulseaudio/pulseaudio-0.9.5.tar.gz]
 md5=99b5d9efd4fce35cabb4ae5d0ebb230d
 sha256=cd82eabcf9fa310a64b58b621730cebe5d3edae7596a9c121155db455b1e58f6
@@ -23970,6 +23978,10 @@ sha256=5cd5d9c06281a4f81d85d9a9f9b0410045d4a764a855f06f574183b528c15d1a
 md5=30a82ad466bae223875e66ee14b94904
 sha256=5cd5d9c06281a4f81d85d9a9f9b0410045d4a764a855f06f574183b528c15d1a
 
+[http://downloads.sourceforge.net/scummvm/scummvm-1.0.0.tar.bz2]
+md5=11b911937e0fc73c94a7bdc374ab617c
+sha256=920932b9d0cfca019f35c2451d93d94ca3b9f981f0b82c418bfbc864fb8c00ec
+
 [ftp://ftp.debian.org/debian/pool/main/s/scw/scw_0.4.3.orig.tar.gz]
 md5=4c9fb66fa496cf32542e92f32f821818
 sha256=fca3763b05f064728c9ff248fa0766808d1ceae561b88ad202811924e4ccdb45
diff --git a/conf/distro/include/fso-autorev.inc b/conf/distro/include/fso-autorev.inc
index ba8cdac1f5..70f8f9019b 100644
--- a/conf/distro/include/fso-autorev.inc
+++ b/conf/distro/include/fso-autorev.inc
@@ -2,9 +2,11 @@
 SRCREV_pn-dbus-hlid = "${AUTOREV}"
 SRCREV_pn-frameworkd = "${AUTOREV}"
 SRCREV_pn-frameworkd-devel = "${AUTOREV}"
+SRCREV_pn-fsodatad = "${AUTOREV}"
 SRCREV_pn-fsodeviced = "${AUTOREV}"
 SRCREV_pn-fsogsmd = "${AUTOREV}"
-SRCREV_pn-fsogpsd = "${AUTOREV}"
+SRCREV_pn-fsolocationd = "${AUTOREV}"
+SRCREV_pn-fsomusicd = "${AUTOREV}"
 SRCREV_pn-fsonetworkd = "${AUTOREV}"
 SRCREV_pn-fsotimed = "${AUTOREV}"
 SRCREV_pn-fsousaged = "${AUTOREV}"
diff --git a/conf/distro/include/sane-srcrevs-fso.inc b/conf/distro/include/sane-srcrevs-fso.inc
index bc9dfc6a45..6eb1004cfd 100644
--- a/conf/distro/include/sane-srcrevs-fso.inc
+++ b/conf/distro/include/sane-srcrevs-fso.inc
@@ -3,9 +3,11 @@
 # FSO Projects -- Cornucopia
 FSO_CORNUCOPIA_SRCREV ?= "1dcf546fb0423930f938129a51f538874c172226"
 SRCREV_pn-fso-apm ?= "${FSO_CORNUCOPIA_SRCREV}"
-SRCREV_pn-fsodeviced ?= "690dc75efcc8e4dbcb53e361d48c54e104955921"
+SRCREV_pn-fsodatad ?= "1b329ccc044eb087a6f8a7c7c61022c162f51ab2"
+SRCREV_pn-fsodeviced ?= "1b329ccc044eb087a6f8a7c7c61022c162f51ab2"
 SRCREV_pn-fsogsmd ?= "${FSO_CORNUCOPIA_SRCREV}"
-SRCREV_pn-fsogpsd ?= "${FSO_CORNUCOPIA_SRCREV}"
+SRCREV_pn-fsolocationd ?= "${FSO_CORNUCOPIA_SRCREV}"
+SRCREV_pn-fsomusicd ?= "1b329ccc044eb087a6f8a7c7c61022c162f51ab2"
 SRCREV_pn-fsonetworkd ?= "${FSO_CORNUCOPIA_SRCREV}"
 SRCREV_pn-fsotimed ?= "${FSO_CORNUCOPIA_SRCREV}"
 SRCREV_pn-fsousaged ?= "fe2ec3260b73233c414de584aa1b4a5e49c24a0d"
diff --git a/conf/distro/include/sane-srcrevs.inc b/conf/distro/include/sane-srcrevs.inc
index 3dee57ca73..bdfb729b2d 100644
--- a/conf/distro/include/sane-srcrevs.inc
+++ b/conf/distro/include/sane-srcrevs.inc
@@ -162,7 +162,7 @@ SRCREV_pn-linux-eten ?= "ab2d414f4f13816af0ec0401b608133ca946624a"
 SRCREV_pn-linux-hackndev-2.6 ?= "1308"
 SRCREV_pn-linux-ixp4xx ?= "1089"
 SRCREV_pn-linux-openmoko-2.6.24 ?= "fb42ce6724576fc173faf8abfb04aa2c36d213b7"
-SRCREV_pn-linux-openmoko-2.6.28 ?= "8aa6cdde17381dd8865d10ba15ee62c092ec2ba5"
+SRCREV_pn-linux-openmoko-2.6.28 ?= "8c65792a5c83c76d662a617a7c4e1ae8104bb6a5"
 SRCREV_pn-linux-openmoko-2.6.31 ?= "4331f6c95fadc37ea89359d6afb915be838790f9"
 SRCREV_pn-linux-openmoko-devel ?= "b9aa5bf345a0b802af0d10b6cf1079738fe4fd12"
 SRCREV_pn-linux-openmoko-shr-devel ?= "b90406de472c1aa5371ab593a2bb79136d5de658"
@@ -198,8 +198,10 @@ SRCREV_pn-multitap-pad ?= "373"
 SRCREV_pn-mux ?= "72460e890dbb15edbf7dc193116be0dcf9794a8b"
 SRCREV_pn-navit ?= "1096"
 SRCREV_pn-neod ?= "4617"
+SRCREV_pn-neomis ?= "2"
 SRCREV_pn-net-snmp ?= "17367"
 SRCREV_pn-netsurf ?= "3859"
+SRCREV_pn-numberx ?= "3"
 SRCREV_pn-numptyphysics ?= "109"
 SRCREV_pn-oh-puzzles ?= "22"
 SRCREV_pn-ohm ?= "edfe25d49d67884bf004de7ae0724c162bb5e65e"
diff --git a/recipes/bootchart-lite/bootchart-lite_svn.bb b/recipes/bootchart-lite/bootchart-lite_svn.bb
index 2220560070..1368c92105 100644
--- a/recipes/bootchart-lite/bootchart-lite_svn.bb
+++ b/recipes/bootchart-lite/bootchart-lite_svn.bb
@@ -12,7 +12,7 @@ S = "${WORKDIR}/trunk"
 inherit autotools
 
 pkg_postinst_${PN} () {
-	install -d /etc/bootchart-lite
+	mkdir /etc/bootchart-lite
 }
 
 pkg_postrm_${PN} () {
diff --git a/recipes/chicken/chicken-4.2.0/translator-cross.patch b/recipes/chicken/chicken-4.2.0/translator-cross.patch
new file mode 100644
index 0000000000..ac0dde9aec
--- /dev/null
+++ b/recipes/chicken/chicken-4.2.0/translator-cross.patch
@@ -0,0 +1,11 @@
+--- a/csc.scm.orig	2009-11-26 17:16:57.000000000 -0200
++++ b/csc.scm	2009-11-26 17:17:09.000000000 -0200
+@@ -89,7 +89,7 @@
+   (quotewrap 
+    (prefix "chicken" "bin"
+ 	   (make-pathname
+-	    (if host-mode INSTALL_BIN_HOME TARGET_BIN_HOME)
++	    INSTALL_BIN_HOME
+ 	    CHICKEN_PROGRAM))))
+ 
+ (define compiler (quotewrap (if host-mode INSTALL_CC TARGET_CC)))
diff --git a/recipes/chicken/chicken-cross_4.2.0.bb b/recipes/chicken/chicken-cross_4.2.0.bb
index 14b929bac9..387247b58a 100644
--- a/recipes/chicken/chicken-cross_4.2.0.bb
+++ b/recipes/chicken/chicken-cross_4.2.0.bb
@@ -1,21 +1,19 @@
 require chicken.inc
 
-DEPENDS = "gcc-cross-sdk chicken"
-RDEPENDS = "gcc-cross-sdk chicken"
 PR = "${INC_PR}.1"
 
 inherit cross
 
 do_compile() {
-    make PLATFORM="linux" PREFIX="${prefix}" TARGET_PREFIX="${STAGING_DIR}/${TARGET_SYS}/usr" TARGET_RUN_PREFIX="${layout_prefix}" TARGETSYSTEM="${TARGET_SYS}" C_COMPILER=gcc LIBRARIAN=ar
+    make PLATFORM="linux" PREFIX="${prefix}" TARGET_PREFIX="${STAGING_DIR_TARGET}${layout_prefix}" TARGETSYSTEM="${TARGET_SYS}" LIBRARIAN=ar
 }
 
 do_install() {
-    make PLATFORM="linux" PREFIX="${prefix}" TARGET_PREFIX="${STAGING_DIR}/${TARGET_SYS}/usr" TARGET_RUN_PREFIX="${layout_prefix}" TARGETSYSTEM="${TARGET_SYS}" C_COMPILER=gcc LIBRARIAN=ar install
+    make PLATFORM="linux" PREFIX="${prefix}" TARGET_PREFIX="${STAGING_DIR_TARGET}${layout_prefix}" TARGETSYSTEM="${TARGET_SYS}" LIBRARIAN=ar install
 }
 
 do_stage() {
-    make PLATFORM="linux" PREFIX="${prefix}" TARGET_PREFIX="${STAGING_DIR}/${TARGET_SYS}/usr" TARGET_RUN_PREFIX="${layout_prefix}" TARGETSYSTEM="${TARGET_SYS}" C_COMPILER=gcc LIBRARIAN=ar install
+    make PLATFORM="linux" PREFIX="${prefix}" TARGET_PREFIX="${STAGING_DIR_TARGET}${layout_prefix}" TARGETSYSTEM="${TARGET_SYS}" LIBRARIAN=ar install
 }
 
 PACKAGES += "chicken-bin libchicken libuchicken"
diff --git a/recipes/chicken/chicken-cross_4.2.10.bb b/recipes/chicken/chicken-cross_4.2.10.bb
new file mode 100644
index 0000000000..f884b1096d
--- /dev/null
+++ b/recipes/chicken/chicken-cross_4.2.10.bb
@@ -0,0 +1,27 @@
+require chicken-snapshot.inc
+
+DEPENDS = "chicken"
+PR = "${INC_PR}.1"
+
+inherit cross
+
+do_compile() {
+    make PLATFORM="linux" PREFIX="${prefix}" TARGET_PREFIX="${STAGING_DIR_TARGET}${layout_prefix}" TARGETSYSTEM="${TARGET_SYS}" LIBRARIAN=ar
+}
+
+do_install() {
+    make PLATFORM="linux" PREFIX="${prefix}" TARGET_PREFIX="${STAGING_DIR_TARGET}${layout_prefix}" TARGETSYSTEM="${TARGET_SYS}" LIBRARIAN=ar install
+}
+
+do_stage() {
+    make PLATFORM="linux" PREFIX="${prefix}" TARGET_PREFIX="${STAGING_DIR_TARGET}${layout_prefix}" TARGETSYSTEM="${TARGET_SYS}" LIBRARIAN=ar install
+}
+
+PACKAGES += "chicken-bin libchicken libuchicken"
+
+FILES_${PN} = ""
+FILES_libchicken = "${libdir}/libchicken.so.*"
+FILES_libuchicken = "${libdir}/libuchicken.so.*"
+FILES_${PN}-bin = "${bindir}/* ${datadir}/chicken/*.* ${libdir}/chicken/*/*.so"
+FILES_${PN}-doc += "${datadir}/chicken/doc"
+FILES_${PN}-dbg += "${libdir}/chicken/*/.debug"
diff --git a/recipes/chicken/chicken-snapshot.inc b/recipes/chicken/chicken-snapshot.inc
new file mode 100644
index 0000000000..5fddee279a
--- /dev/null
+++ b/recipes/chicken/chicken-snapshot.inc
@@ -0,0 +1,13 @@
+ESCRIPTION = "A compiler that translates Scheme source files to C, and an interpreter"
+HOMEPAGE = "http://www.call-with-current-continuation.org/"
+SECTION = "interpreters"
+PRIORITY = "optional"
+LICENSE = "BSD"
+INC_PR = "r3"
+
+SRC_URI = "http://chicken.wiki.br/dev-snapshots/2009/11/24/chicken-${PV}.tar.gz"
+
+# Parallel building is not supported
+PARALLEL_MAKE = ""
+
+inherit chicken
diff --git a/recipes/chicken/chicken.inc b/recipes/chicken/chicken.inc
index 477a8a8c05..229de94cba 100644
--- a/recipes/chicken/chicken.inc
+++ b/recipes/chicken/chicken.inc
@@ -3,10 +3,11 @@ HOMEPAGE = "http://www.call-with-current-continuation.org/"
 SECTION = "interpreters"
 PRIORITY = "optional"
 LICENSE = "BSD"
-INC_PR = "r2"
+INC_PR = "r3"
 
 SRC_URI = "http://chicken.wiki.br/releases/${PV}/chicken-${PV}.tar.gz \
-           file://soname.patch;patch=1"
+           file://soname.patch;patch=1 \
+           file://translator-cross.patch;patch=1"
 
 # Parallel building is not supported
 PARALLEL_MAKE = ""
diff --git a/recipes/chicken/chicken_4.2.0.bb b/recipes/chicken/chicken_4.2.0.bb
index eda4d7a3f9..601462a3fc 100644
--- a/recipes/chicken/chicken_4.2.0.bb
+++ b/recipes/chicken/chicken_4.2.0.bb
@@ -5,7 +5,7 @@ RDEPENDS = "gcc-cross-sdk"
 PR = "${INC_PR}.1"
 
 do_compile() {
-    make PLATFORM="linux" PREFIX="${prefix}" HOSTSYSTEM="${TARGET_SYS}" ARCH=${CHICKEN_ARCH}
+    make PLATFORM="linux" DESTDIR="${D}" PREFIX="${prefix}" HOSTSYSTEM="${TARGET_SYS}" ARCH=${CHICKEN_ARCH}
 }
 
 do_install() {
@@ -13,7 +13,7 @@ do_install() {
 }
 
 do_stage() {
-    make PLATFORM="linux" PREFIX="${STAGING_DIR}/${TARGET_SYS}${layout_prefix}" HOSTSYSTEM="${TARGET_SYS}" ARCH=${CHICKEN_ARCH} install
+    make PLATFORM="linux" DESTDIR="${STAGING_DIR_TARGET}" PREFIX="${prefix}" HOSTSYSTEM="${TARGET_SYS}" ARCH=${CHICKEN_ARCH} install
 }
 
 PACKAGES += "chicken-bin libchicken libuchicken"
diff --git a/recipes/chicken/chicken_4.2.10.bb b/recipes/chicken/chicken_4.2.10.bb
new file mode 100644
index 0000000000..de002dd92a
--- /dev/null
+++ b/recipes/chicken/chicken_4.2.10.bb
@@ -0,0 +1,24 @@
+require chicken-snapshot.inc
+
+PR = "${INC_PR}.1"
+
+do_compile() {
+    make PLATFORM="linux" DESTDIR="${D}" PREFIX="${prefix}" HOSTSYSTEM="${TARGET_SYS}" ARCH=${CHICKEN_ARCH}
+}
+
+do_install() {
+    make PLATFORM="linux" DESTDIR="${D}" PREFIX="${prefix}" HOSTSYSTEM="${TARGET_SYS}" ARCH=${CHICKEN_ARCH} install
+}
+
+do_stage() {
+    make PLATFORM="linux" DESTDIR="${STAGING_DIR_TARGET}" PREFIX="${prefix}" HOSTSYSTEM="${TARGET_SYS}" ARCH=${CHICKEN_ARCH} install
+}
+
+PACKAGES += "chicken-bin libchicken libuchicken"
+
+FILES_${PN} = ""
+FILES_libchicken = "${libdir}/libchicken.so.*"
+FILES_libuchicken = "${libdir}/libuchicken.so.*"
+FILES_${PN}-bin = "${bindir}/* ${datadir}/chicken/*.* ${libdir}/chicken/*/*.so"
+FILES_${PN}-doc += "${datadir}/chicken/doc"
+FILES_${PN}-dbg += "${libdir}/chicken/*/.debug"
diff --git a/recipes/di/di_4.17.bb b/recipes/di/di_4.17.bb
new file mode 100644
index 0000000000..9b04df8c24
--- /dev/null
+++ b/recipes/di/di_4.17.bb
@@ -0,0 +1,17 @@
+DESCRIPTION = "di is a disk information utility, displaying everything (and more) that your df(1) command does. It features the ability to display your disk usage in whatever format you desire/prefer/are used to. It is designed to be portable across many platforms. "
+HOMEPAGE = "http://www.gentoo.com/di/"
+LICENSE = "MIT-style"
+SECTION = "base"
+DEPENDS = "perl-native"
+
+SRC_URI = "http://www.gentoo.com/di/di-${PV}.tar.gz"
+
+do_install() {
+	# install binary
+	install -d ${D}${bindir}
+	install -m 0755 ${S}/di ${D}${bindir}
+
+	# install manpage
+	install -d ${D}${mandir}/man1
+	install -m 0644 ${S}/di.1 ${D}${mandir}/man1
+}
diff --git a/recipes/freesmartphone/fsodatad_git.bb b/recipes/freesmartphone/fsodatad_git.bb
new file mode 100644
index 0000000000..de13bedc0a
--- /dev/null
+++ b/recipes/freesmartphone/fsodatad_git.bb
@@ -0,0 +1,6 @@
+require cornucopia.inc
+inherit fso-plugin
+PR = "${INC_PR}.0"
+PV = "0.0.0+gitr${SRCREV}"
+
+DEPENDS += "libxml2 mobile-broadband-provider-info"
diff --git a/recipes/freesmartphone/fsodeviced_git.bb b/recipes/freesmartphone/fsodeviced_git.bb
index 0e16888005..402bb4c356 100644
--- a/recipes/freesmartphone/fsodeviced_git.bb
+++ b/recipes/freesmartphone/fsodeviced_git.bb
@@ -6,7 +6,12 @@ RDEPENDS += "libcanberra-alsa"
 RRECOMMENDS += "fso-alsa-data"
 PV = "0.9.0+gitr${SRCPV}"
 PE = "1"
-PR = "${INC_PR}.4"
+PR = "${INC_PR}.5"
+
+EXTRA_OECONF = "\
+  --enable-kernel26-rfkill \
+  --enable-player-canberra \
+"
 
 inherit update-rc.d
 
diff --git a/recipes/freesmartphone/fsogpsd_git.bb b/recipes/freesmartphone/fsolocationd_git.bb
index 651a0266b7..2046be7a93 100644
--- a/recipes/freesmartphone/fsogpsd_git.bb
+++ b/recipes/freesmartphone/fsolocationd_git.bb
@@ -4,4 +4,4 @@ PR = "${INC_PR}.0"
 PV = "0.0.0+gitr${SRCPV}"
 PE = "1"
 
-DEPENDS += "libfsoresource"
+DEPENDS += "libfsotransport libfsoresource"
diff --git a/recipes/freesmartphone/fsomusicd_git.bb b/recipes/freesmartphone/fsomusicd_git.bb
new file mode 100644
index 0000000000..80c4b96323
--- /dev/null
+++ b/recipes/freesmartphone/fsomusicd_git.bb
@@ -0,0 +1,20 @@
+require cornucopia.inc
+DEPENDS += "gstreamer"
+PR = "${INC_PR}.0"
+PV = "0.0.1"
+
+RDEPENDS += "\
+  gst-plugin-volume \
+  gst-plugin-mad \
+  gst-plugin-oggdemux \
+  gst-plugin-ivorbisdec \
+  gst-plugin-audioconvert \
+  gst-plugin-flacdec \
+  gst-plugin-waveparse \
+  gst-plugin-siddec \
+  gst-plugin-modplug \
+  gst-plugin-filesrc \
+  gst-plugin-souphttpsrc \
+  gst-plugin-mmssrc \
+  gst-plugin-alsasink \
+"
diff --git a/recipes/openmoko-3rdparty/babiloo-efl_2.0.9-3.bb b/recipes/openmoko-3rdparty/babiloo-efl_2.0.9-3.bb
new file mode 100644
index 0000000000..4bff706b6d
--- /dev/null
+++ b/recipes/openmoko-3rdparty/babiloo-efl_2.0.9-3.bb
@@ -0,0 +1,40 @@
+DESCRIPTION = "EFL Dictionary Viewer. It supports dictionaries in SDictionary and StarDict format."
+SECTION = "devel/python"
+PRIORITY = "optional"
+LICENSE = "GPL"
+AUTHOR = "Luca Vaudano <vaudano@gmail.com>"
+HOMEPAGE = "http://babiloo-project.org"
+RDEPENDS = "python-elementary python-compression python-misc python-netclient"
+
+PACKAGE_ARCH = "all"
+
+PV = "2.0.9-3"
+PR = "r0"
+
+SRC_URI = "http://bazaar.launchpad.net/%7Evaudano/babiloo/efl/download/head%3A/babiloo_2.0.93.tar.g-20091127144609-qfgdm9zxdc47ap4y-1/babiloo_2.0.9-3.tar.gz;name=tarball"
+SRC_URI[tarball.md5sum] = "3f254dbbe7dd7a4c9527e1e17686101b"
+SRC_URI[tarball.sha256sum] = "4c4eacd8d8aec7ec7f325c18c8401d6d09986b77ddce317768360fccef78e3ef"
+
+S = "${WORKDIR}/babiloo"
+
+do_install() {
+	install -d "${D}${datadir}/babiloo"
+	install -d "${D}${datadir}/babiloo/dicts"
+
+	cp -a "${S}/core" "${D}${datadir}/babiloo/"
+	cp -a "${S}/efl" "${D}${datadir}/babiloo/"
+	cp -a "${S}/images" "${D}${datadir}/babiloo/"
+	install -m 0755 "${S}/run.py" "${D}${datadir}/babiloo/"
+	install -d "${D}${bindir}"
+	ln -s "${datadir}/babiloo/run.py" "${D}${bindir}/babiloo"
+	install -d "${D}${datadir}/pixmaps"
+	install -m 0644 "${S}/images/babiloo.png" "${D}${datadir}/pixmaps"
+	install -d "${D}${datadir}/applications"
+        install -m 0644 "${S}/babiloo.desktop" "${D}${datadir}/applications"
+
+	#cp -a "${S}/locale" "${D}${datadir}/"
+	#find ${D}${datadir}/locale -name *.po -exec rm {} \;
+	#rm -f ${D}${datadir}/locale/babiloo.pot
+}
+
+FILES_${PN} += "${datadir}/babiloo"
diff --git a/recipes/openmoko-3rdparty/babiloo-efl_bzr.bb b/recipes/openmoko-3rdparty/babiloo-efl_bzr.bb
index da792df354..614c095b8b 100644
--- a/recipes/openmoko-3rdparty/babiloo-efl_bzr.bb
+++ b/recipes/openmoko-3rdparty/babiloo-efl_bzr.bb
@@ -8,7 +8,8 @@ RDEPENDS = "python-elementary python-compression python-misc python-netclient"
 
 PACKAGE_ARCH = "all"
 
-PV = "2.0.9-bzrr${SRCREV}"
+DEFAULT_PREFERENCE = "-1"
+PV = "2.0.9-bzrr${SRCPV}"
 
 SRC_URI = "bzr://bazaar.launchpad.net/~vaudano/babiloo/efl"
 
diff --git a/recipes/openmoko-3rdparty/neomis_svn.bb b/recipes/openmoko-3rdparty/neomis_svn.bb
new file mode 100644
index 0000000000..2b6075b787
--- /dev/null
+++ b/recipes/openmoko-3rdparty/neomis_svn.bb
@@ -0,0 +1,21 @@
+DESCRIPTION = "A computer version of the well-known electronic game named Simon"
+HOMEPAGE = "http://code.google.com/p/neomis/"
+LICENSE = "GPLv3"
+AUTHOR = "Valéry Febvre <vfebvre@easter-eggs.com>"
+SECTION = "x11/applications"
+PRIORITY = "optional"
+DEPENDS = "python-native"
+
+PV = "1.1.0+svnr${SRCPV}"
+
+S = "${WORKDIR}/trunk"
+
+PACKAGE_ARCH = "all"
+
+SRC_URI = "svn://neomis.googlecode.com/svn;module=trunk;proto=http"
+
+inherit distutils
+
+FILES_${PN} += "${datadir}/neomis ${datadir}/applications/neomis.desktop ${datadir}/pixmaps"
+
+RDEPENDS += "python-audio python-pyalsaaudio python-elementary" 
diff --git a/recipes/openmoko-3rdparty/numberx_svn.bb b/recipes/openmoko-3rdparty/numberx_svn.bb
new file mode 100644
index 0000000000..446ed37b52
--- /dev/null
+++ b/recipes/openmoko-3rdparty/numberx_svn.bb
@@ -0,0 +1,21 @@
+DESCRIPTION = "NumberX is a mathematical puzzle game that will challenge your mental math abilities! "
+HOMEPAGE = "http://code.google.com/p/numberx/"
+LICENSE = "GPLv3"
+AUTHOR = "Valéry Febvre <vfebvre@easter-eggs.com>"
+SECTION = "x11/applications"
+PRIORITY = "optional"
+DEPENDS = "python-native"
+
+PV = "1.0.0+svnr${SRCPV}"
+
+S = "${WORKDIR}/trunk"
+
+PACKAGE_ARCH = "all"
+
+SRC_URI = "svn://numberx.googlecode.com/svn;module=trunk;proto=http"
+
+inherit distutils
+
+RDEPENDS += "python-math python-elementary" 
+
+FILES_${PN} += "${datadir}"
diff --git a/recipes/openttd/openttd_0.7.4-RC1.bb b/recipes/openttd/openttd_0.7.4-RC1.bb
index bbb570352b..1887e06cbe 100644
--- a/recipes/openttd/openttd_0.7.4-RC1.bb
+++ b/recipes/openttd/openttd_0.7.4-RC1.bb
@@ -42,8 +42,8 @@ do_install() {
 }
 
 do_install_append_shr() {
-	install -d ${D}${datadir}/games/openttd/
-	install -m 0644 ${WORKDIR}/openttd.cfg ${D}${datadir}/games/openttd/
+	install -d ${D}${datadir}/games/openttd/data/
+	install -m 0644 ${WORKDIR}/openttd.cfg ${D}${datadir}/games/openttd/data/
 }
 
 FILES_${PN} += "${datadir}"
diff --git a/recipes/pulseaudio/pulseaudio-0.9.21/autoconf_version.patch b/recipes/pulseaudio/pulseaudio-0.9.21/autoconf_version.patch
new file mode 100644
index 0000000000..7a0759da13
--- /dev/null
+++ b/recipes/pulseaudio/pulseaudio-0.9.21/autoconf_version.patch
@@ -0,0 +1,13 @@
+Index: pulseaudio-0.9.15/configure.ac
+===================================================================
+--- pulseaudio-0.9.15.orig/configure.ac	2009-04-14 00:09:53.000000000 +0100
++++ pulseaudio-0.9.15/configure.ac	2009-05-22 11:32:50.000000000 +0100
+@@ -20,7 +20,7 @@
+ # along with PulseAudio; if not, write to the Free Software Foundation,
+ # Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+ 
+-AC_PREREQ(2.63)
++AC_PREREQ(2.61)
+ 
+ m4_define(pa_major, [0])
+ m4_define(pa_minor, [9])
diff --git a/recipes/pulseaudio/pulseaudio-0.9.21/buildfix.patch b/recipes/pulseaudio/pulseaudio-0.9.21/buildfix.patch
new file mode 100644
index 0000000000..ca01e0d80f
--- /dev/null
+++ b/recipes/pulseaudio/pulseaudio-0.9.21/buildfix.patch
@@ -0,0 +1,13 @@
+Index: pulseaudio-0.9.11/src/pulsecore/atomic.h
+===================================================================
+--- pulseaudio-0.9.11.orig/src/pulsecore/atomic.h
++++ pulseaudio-0.9.11/src/pulsecore/atomic.h
+@@ -40,6 +40,8 @@
+ #error "Please include config.h before including this file!"
+ #endif
+ 
++#include "macro.h"
++
+ #ifdef HAVE_ATOMIC_BUILTINS
+ 
+ /* __sync based implementation */
diff --git a/recipes/pulseaudio/pulseaudio-0.9.21/configure_silent_rules.patch b/recipes/pulseaudio/pulseaudio-0.9.21/configure_silent_rules.patch
new file mode 100644
index 0000000000..aeabec2b09
--- /dev/null
+++ b/recipes/pulseaudio/pulseaudio-0.9.21/configure_silent_rules.patch
@@ -0,0 +1,29 @@
+Index: pulseaudio-0.9.19/configure.ac
+===================================================================
+--- pulseaudio-0.9.19.orig/configure.ac	2009-10-31 11:40:00.000000000 +0000
++++ pulseaudio-0.9.19/configure.ac	2009-10-31 11:50:35.000000000 +0000
+@@ -27,12 +27,13 @@
+ AC_CONFIG_SRCDIR([src/daemon/main.c])
+ AC_CONFIG_MACRO_DIR([m4])
+ AC_CONFIG_HEADERS([config.h])
+-AM_INIT_AUTOMAKE([foreign 1.11 -Wall -Wno-portability silent-rules tar-pax])
++AM_INIT_AUTOMAKE([foreign 1.10 -Wall -Wno-portability tar-pax])
+ 
+ m4_define(pa_major, `echo $VERSION | cut -d. -f1 | cut -d- -f1`)
+ m4_define(pa_minor, `echo $VERSION | cut -d. -f2 | cut -d- -f1`)
+ m4_define(pa_micro, `echo $VERSION | cut -d. -f3 | cut -d- -f1`)
+ 
++
+ AC_SUBST(PA_MAJOR, pa_major)
+ AC_SUBST(PA_MINOR, pa_minor)
+ AC_SUBST(PA_MICRO, pa_micro)
+@@ -80,7 +81,8 @@
+       ;;
+ esac
+ 
+-AM_SILENT_RULES([yes])
++# only use if available
++m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])])
+ 
+ #### Checks for programs. ####
+ 
diff --git a/recipes/pulseaudio/pulseaudio-0.9.21/gcc4-compile-fix.patch b/recipes/pulseaudio/pulseaudio-0.9.21/gcc4-compile-fix.patch
new file mode 100644
index 0000000000..34ad026e4d
--- /dev/null
+++ b/recipes/pulseaudio/pulseaudio-0.9.21/gcc4-compile-fix.patch
@@ -0,0 +1,18 @@
+| fix for more strict syntax compliance in gcc4.x
+| pulsecore/core-util.c: In function 'pa_raise_priority':
+| pulsecore/core-util.c:547: error: label at end of compound statement
+| Signed off: mickey@openmoko.org
+|
+Index: pulseaudio-0.9.6/src/pulsecore/core-util.c
+===================================================================
+--- pulseaudio-0.9.6.orig/src/pulsecore/core-util.c
++++ pulseaudio-0.9.6/src/pulsecore/core-util.c
+@@ -535,7 +535,7 @@ void pa_raise_priority(void) {
+         pa_log_info("Successfully gained high priority class.");
+ #endif
+ 
+-fail:
++fail:;
+ 
+ #if defined(HAVE_SYS_CAPABILITY_H)
+     if (caps) {
diff --git a/recipes/pulseaudio/pulseaudio-0.9.21/tls_m4.patch b/recipes/pulseaudio/pulseaudio-0.9.21/tls_m4.patch
new file mode 100644
index 0000000000..7b333e3df9
--- /dev/null
+++ b/recipes/pulseaudio/pulseaudio-0.9.21/tls_m4.patch
@@ -0,0 +1,30 @@
+Index: pulseaudio-0.9.15/m4/tls.m4
+===================================================================
+--- pulseaudio-0.9.15.orig/m4/tls.m4	2008-08-19 23:25:02.000000000 +0200
++++ pulseaudio-0.9.15/m4/tls.m4	2009-07-10 09:55:25.266365511 +0200
+@@ -1,12 +1,19 @@
+ AC_DEFUN([CC_CHECK_TLS], [
+   AC_CACHE_CHECK([whether $CC knows __thread for Thread-Local Storage],
+     cc_cv_tls___thread,
+-    [AC_COMPILE_IFELSE(
+-      AC_LANG_PROGRAM(
+-        [[static __thread int a = 6;]],
+-        [[a = 5;]]),
+-      [cc_cv_tls___thread=yes],
+-      [cc_cv_tls___thread=no])
++    [AC_LINK_IFELSE([__thread int a; int b; int main() { return a = b; }],
++	 [chktls_save_LDFLAGS="$LDFLAGS"
++	  LDFLAGS="-shared -Wl,--no-undefined $LDFLAGS"
++	  chktls_save_CFLAGS="$CFLAGS"
++	  CFLAGS="-fPIC $CFLAGS"
++	  dnl If -shared works, test if TLS works in a shared library.
++	  AC_LINK_IFELSE([int f() { return 0; }],
++	    AC_LINK_IFELSE([__thread int a; int b; int f() { return a = b; }],
++	      [cc_cv_tls___thread=yes],
++	      [cc_cv_tls___thread=no]),
++	    [cc_cv_tls___thread=yes])
++	  CFLAGS="$chktls_save_CFLAGS"
++	  LDFLAGS="$chktls_save_LDFLAGS"], [cc_cv_tls___thread=no])
+     ])
+   
+   AS_IF([test "x$cc_cv_tls___thread" = "xyes"],
diff --git a/recipes/pulseaudio/pulseaudio-0.9.21/volatiles.04_pulse b/recipes/pulseaudio/pulseaudio-0.9.21/volatiles.04_pulse
new file mode 100644
index 0000000000..5b1998032b
--- /dev/null
+++ b/recipes/pulseaudio/pulseaudio-0.9.21/volatiles.04_pulse
@@ -0,0 +1,2 @@
+# <type> <owner> <group> <mode> <path> <linksource>
+d pulse pulse 0755 /var/run/pulse none
diff --git a/recipes/pulseaudio/pulseaudio_0.9.21.bb b/recipes/pulseaudio/pulseaudio_0.9.21.bb
new file mode 100644
index 0000000000..cd9e46e4f2
--- /dev/null
+++ b/recipes/pulseaudio/pulseaudio_0.9.21.bb
@@ -0,0 +1,18 @@
+require pulseaudio.inc
+
+DEPENDS += "gdbm speex"
+
+inherit gettext
+
+SRC_URI += "\
+  file://buildfix.patch;patch=1 \
+  file://autoconf_version.patch;patch=1 \
+  file://tls_m4.patch;patch=1 \
+  file://configure_silent_rules.patch;patch=1 \
+"
+
+do_compile_prepend() {
+    cd ${S}
+    mkdir -p ${S}/libltdl
+    cp ${STAGING_LIBDIR}/libltdl* ${S}/libltdl
+}
diff --git a/recipes/scummvm/files/shr/openmoko-scummvm b/recipes/scummvm/files/shr/openmoko-scummvm
new file mode 100644
index 0000000000..58eb2bbded
--- /dev/null
+++ b/recipes/scummvm/files/shr/openmoko-scummvm
@@ -0,0 +1,19 @@
+#!/bin/sh
+
+# Save current AUX Key mapping
+SAVE_KEY="$(xmodmap -pke | grep 'keycode 177')"
+
+# Map AUX Key to F5
+xmodmap -e "keycode 177 = F5"
+
+# Turn LCD feft
+xrandr -o left
+
+# Start the scummvm in fullscreen mode
+scummvm --fullscreen --themepath=/usr/share/scummvm/
+
+# Turn LCD normal
+xrandr -o normal
+
+# Restore the AUX Key mapping
+xmodmap -e "$SAVE_KEY"
diff --git a/recipes/scummvm/files/shr/scummvm.desktop b/recipes/scummvm/files/shr/scummvm.desktop
new file mode 100644
index 0000000000..96c025050e
--- /dev/null
+++ b/recipes/scummvm/files/shr/scummvm.desktop
@@ -0,0 +1,12 @@
+[Desktop Entry]
+Encoding=UTF-8
+Name=ScummVM
+Name[pl]=ScummVM
+Comment=Interpreter for several adventure games
+Comment[pl]=Interpreter graficznych gier przygodowych
+Exec=openmoko-scummvm
+Icon=scummvm.xpm
+Terminal=false
+Type=Application
+Categories=Application;Game;AdventureGame;
+StartupNotify=false
diff --git a/recipes/scummvm/scummvm-1.0.0/no-strip.patch b/recipes/scummvm/scummvm-1.0.0/no-strip.patch
new file mode 100644
index 0000000000..c69402e469
--- /dev/null
+++ b/recipes/scummvm/scummvm-1.0.0/no-strip.patch
@@ -0,0 +1,20 @@
+--- scummvm-1.0.0/ports.mk~	2009-11-27 12:51:50.000000000 +0100
++++ scummvm-1.0.0/ports.mk	2009-11-27 12:51:50.000000000 +0100
+@@ -10,7 +10,7 @@
+ #
+ install: all
+ 	$(INSTALL) -d "$(DESTDIR)$(BINDIR)"
+-	$(INSTALL) -c -s -m 755 "./$(EXECUTABLE)" "$(DESTDIR)$(BINDIR)/$(EXECUTABLE)"
++	$(INSTALL) -c -m 755 "./$(EXECUTABLE)" "$(DESTDIR)$(BINDIR)/$(EXECUTABLE)"
+ 	$(INSTALL) -d "$(DESTDIR)$(MANDIR)/man6/"
+ 	$(INSTALL) -c -m 644 "$(srcdir)/dists/scummvm.6" "$(DESTDIR)$(MANDIR)/man6/scummvm.6"
+ 	$(INSTALL) -d "$(DESTDIR)$(PREFIX)/share/pixmaps/"
+@@ -21,7 +21,7 @@
+ 	$(INSTALL) -c -m 644 $(DIST_FILES_THEMES) $(DIST_FILES_ENGINEDATA) "$(DESTDIR)$(DATADIR)/scummvm/"
+ ifdef DYNAMIC_MODULES
+ 	$(INSTALL) -d "$(DESTDIR)$(LIBDIR)/scummvm/"
+-	$(INSTALL) -c -s -m 644 $(DIST_FILES_PLUGINS) "$(DESTDIR)$(LIBDIR)/scummvm/"
++	$(INSTALL) -c -m 644 $(DIST_FILES_PLUGINS) "$(DESTDIR)$(LIBDIR)/scummvm/"
+ endif
+ 
+ uninstall:
diff --git a/recipes/scummvm/scummvm_0.12.0.bb b/recipes/scummvm/scummvm_0.12.0.bb
index 630db67f21..9d76426ab1 100644
--- a/recipes/scummvm/scummvm_0.12.0.bb
+++ b/recipes/scummvm/scummvm_0.12.0.bb
@@ -9,6 +9,7 @@ SRC_URI += " file://scummvm.desktop \
 	file://no-strip.patch;patch=1"
 
 SRC_URI_append_openmoko = " file://openmoko-scummvm "
+SRC_URI_append_shr = " file://openmoko-scummvm "
 
 
 SRC_URI_OVERRIDES_PACKAGE_ARCH = "1"
diff --git a/recipes/scummvm/scummvm_1.0.0.bb b/recipes/scummvm/scummvm_1.0.0.bb
new file mode 100644
index 0000000000..28465f409e
--- /dev/null
+++ b/recipes/scummvm/scummvm_1.0.0.bb
@@ -0,0 +1,39 @@
+require scummvm.inc
+
+CCACHE = ""
+
+DEPENDS = "virtual/libsdl libvorbis libogg zlib \
+           ${@base_conditional('ENTERPRISE_DISTRO', '1', '', 'libmad mpeg2dec', d)}"
+
+SRC_URI += " file://scummvm.desktop \
+             file://no-strip.patch;patch=1 \
+           "
+
+SRC_URI_append_openmoko = " file://openmoko-scummvm "
+SRC_URI_append_shr = " file://openmoko-scummvm "
+
+SRC_URI_OVERRIDES_PACKAGE_ARCH = "1"
+
+EXTRA_OECONF += " \
+		--disable-scumm-7-8 \ 
+		--disable-he \
+		"
+
+# Workaround, because some env variables aren't recognised correctly
+do_configure_append() {
+	sed -i "s/AS := as/AS := ${AS}/" ${S}/config.mk
+	sed -i "s/AR := ar cru/AR := ${AR} cru/" ${S}/config.mk
+	sed -i "s/STRIP := strip/STRIP := ${STRIP}/" ${S}/config.mk
+	sed -i "s/RANLIB := ranlib/RANLIB := ${RANLIB}/" ${S}/config.mk
+}
+
+do_install_append() {
+	if [ -f ${WORKDIR}/openmoko-scummvm ]; then
+		install -d ${D}${bindir}
+		install -m 0755 ${WORKDIR}/openmoko-scummvm ${D}${bindir}/openmoko-scummvm
+	fi
+	if  [ -f ${WORKDIR}/scummvm.desktop ]; then
+		install -d ${D}${datadir}/applications
+		install -m 0644 ${WORKDIR}/scummvm.desktop ${D}${datadir}/applications
+	fi
+}
diff --git a/recipes/tasks/task-shr-feed.bb b/recipes/tasks/task-shr-feed.bb
index aab0c5b680..2ed5ac898e 100644
--- a/recipes/tasks/task-shr-feed.bb
+++ b/recipes/tasks/task-shr-feed.bb
@@ -6,24 +6,49 @@ LICENSE = "GPL"
 inherit task
 
 RDEPENDS_${PN} += "\
-		python-elementary \
-		openmoko-agpsui \
+		babiloo-efl \
+		di \
+		dictator \
+		dosbox \
+		enotes \
+		epdfview \
+		fbreader \
+		ffalarms \
+		gpe-calendar \
+		gpe-todo \
+		gpe-scap \
+		gpe-sketchbook \
+		gpe-filemanager \
+		gpe-gallery \
+		gpe-timesheet \
+		gpe-contacts \
+		gtkmm \
 		mc \
 		mplayer \
-		x11vnc \
-		omview \
-		openvpn \
 		navit \
+		omview \
+		python-elementary \
 		pythm \
-		fbreader \
+		openmoko-agpsui \
+		openvpn \
+#		shr-config \
+		shr-today \
+                shr-theme-neo \
+		shr-theme-niebiee \
+		shr-theme-sixteen \
+# gry should be in image already
+#		shr-theme-gry \
+		shr-splash \
+		shr-splash-theme-simple \
+		shr-splash-theme-dontpanic \
+		shr-splash-theme-handy \
+		vagalume \
+		x11vnc \
+
 		omoney \
-		enotes \
-		epdfview \
 		pyphonelog \
 		pingus \
 		openmoocow \
-		dosbox \
-		vagalume \
 		python-pygame \
 		mokoko \
 		exhibit \
@@ -36,30 +61,10 @@ RDEPENDS_${PN} += "\
 		ipkg-link \
 		ipkg-utils \
 		mysql \
-		gpe-calendar \
-		gpe-todo \
-		gpe-scap \
-		gpe-sketchbook \
-		gpe-filemanager \
-		gpe-gallery \
-		gpe-timesheet \
-		gpe-contacts \
 		fltk-chess \
 		remoko \
-#		shr-config \
-		shr-today \
-                shr-theme-neo \
-		shr-theme-niebiee \
-		shr-theme-sixteen \
-# gry should be in image already
-#		shr-theme-gry \
-		shr-splash \
-		shr-splash-theme-simple \
-		shr-splash-theme-dontpanic \
-		shr-splash-theme-handy \
 		openbmap-logger \
 		pisi \
-		ffalarms \
 		libnotify \
 		accelges \
 		ebrainy \
@@ -84,7 +89,6 @@ RDEPENDS_${PN} += "\
 		links-x11 \
 		e-wm-illume-dict-pl \
 		callrec \
-		dictator \
 		midori \
 		numptyphysics \
 		pidgin \
@@ -192,7 +196,6 @@ RDEPENDS_${PN} += "\
 		font-winitzki-cyrillic \
 #		font-xfree86-type1 \
 #		msn-pecan \
-		erminig \
 		qwo \
 		fso-apm \
 		fso-abyss \
@@ -250,4 +253,5 @@ RDEPENDS_${PN} += "\
 		xf86-input-tslib \
 		fltkcocktailbar \
 		babiloo-efl \
+		make \
 "