merge of '5e5ed72728986531bc9fcd00f87f56051f1fbff5'

     and '897413a90458757cb227c0afbc74963d175a60a7'

8 files changed, 126 insertions, 24 deletions

diff --git a/packages/espeak/espeak_1.30.bb b/packages/espeak/espeak_1.30.bb
index 03290d0aa2..a460b5b4ba 100644
--- a/packages/espeak/espeak_1.30.bb
+++ b/packages/espeak/espeak_1.30.bb
@@ -15,7 +15,7 @@ DEPENDS = "portaudio-v19"
 
 ######################################################################################
 
-PR = "r0"
+PR = "r1"
 
 SRC_URI = "http://kent.dl.sourceforge.net/sourceforge/espeak/espeak-${PV}-source.zip"
 
@@ -44,3 +44,9 @@ do_install() {
 	
 	cp -prf ${S}/espeak-data/* ${D}/usr/share/espeak-data
 }
+
+do_stage() {
+	install -d ${STAGING_INCDIR}/espeak
+	install -m 0644 ${S}/src/speak_lib.h ${STAGING_INCDIR}/espeak/
+        oe_libinstall -so -C src libespeak ${STAGING_LIBDIR}
+}
diff --git a/packages/navit/files/navit.launcher b/packages/navit/files/navit.launcher
new file mode 100644
index 0000000000..b95aadb878
--- /dev/null
+++ b/packages/navit/files/navit.launcher
@@ -0,0 +1,30 @@
+#! /bin/sh
+#
+# Copyright Matthias Hentges <devel@hentges.net> (c) 2008
+# License: GPL (see http://www.gnu.org/licenses/gpl.txt for a copy of the license)
+#
+# Filename: navit.launcher
+# Date: 20080105 (YMD)
+#
+#################################################################################
+#
+# 20080105 - v0.0.1	- Initial release
+
+# On devices with low memory (< 512Mb?) Navit will segfault on start.
+# This can be worked around by doing
+# "echo 1 > /proc/sys/vm/overcommit_memory"
+
+if test "`cat /proc/meminfo | grep ^MemTotal | awk '{print $2}'`" -lt "500000"
+then
+	if test "$USER" = "root"
+	then
+		echo "Enabling low-mem workaround..."
+		echo 1 > /proc/sys/vm/overcommit_memory
+	else
+		echo "I need root-privs to enable the low-mem workaround!"
+	fi
+fi
+
+navit.real $*
+	
+
diff --git a/packages/navit/navit.inc b/packages/navit/navit.inc
index 3754e1580a..1d68027e17 100644
--- a/packages/navit/navit.inc
+++ b/packages/navit/navit.inc
@@ -9,3 +9,17 @@ PACKAGES = "${PN}-dbg ${PN}-dev ${PN} ${PN}-doc ${PN}-locale"
 
 FILES_${PN}-dbg += "${libdir}/${PN}/*/.debug"
 FILES_${PN}-dev += "${libdir}/${PN}/*/*.so"
+
+SRC_URI_append = " \
+	    	  file://navit.launcher \
+	  	 "
+
+do_install_append() {
+	install -d ${D}/usr/share/applications/
+	
+	install -m 0644 ${WORKDIR}/navit.desktop ${D}/usr/share/applications/
+	
+	mv ${D}/usr/bin/navit ${D}/usr/bin/navit.real
+	
+	install -m 0755 ${WORKDIR}/navit.launcher ${D}/usr/bin/navit
+}
diff --git a/packages/navit/navit_0.0.3.bb b/packages/navit/navit_0.0.3.bb
index efb78e9967..7fdb491882 100644
--- a/packages/navit/navit_0.0.3.bb
+++ b/packages/navit/navit_0.0.3.bb
@@ -1,6 +1,6 @@
 require navit.inc
 
-PR = "r2"
+PR = "r3"
 
 SRC_URI = "${SOURCEFORGE_MIRROR}/navit/navit-${PV}.tar.gz \
 	   file://navit.xml-so.patch;patch=1 \
diff --git a/packages/navit/navit_cvs.bb b/packages/navit/navit_cvs.bb
index 30bc778e3b..0f9583324c 100644
--- a/packages/navit/navit_cvs.bb
+++ b/packages/navit/navit_cvs.bb
@@ -1,7 +1,7 @@
 require navit.inc
 
 PV = "0.0.3+cvs${SRCDATE}"
-PR = "r2"
+PR = "r3"
 
 S = "${WORKDIR}/navit"
 
@@ -13,8 +13,3 @@ EXTRA_OECONF = "--disable-binding-python --disable-gui-sdl --disable-samplemap -
 
 EXTRA_AUTORECONF = " -I m4"
 
-do_install_append() {
-	install -d ${D}/usr/share/applications/
-	
-	install -m 0644 ${WORKDIR}/navit.desktop ${D}/usr/share/applications/
-}
diff --git a/packages/speech-dispatcher/files/confSpeechd.conf_00.patch b/packages/speech-dispatcher/files/configSpeechd.conf.in_00.patch
index de1a776e3b..c4a7f91ea0 100644
--- a/packages/speech-dispatcher/files/confSpeechd.conf_00.patch
+++ b/packages/speech-dispatcher/files/configSpeechd.conf.in_00.patch
@@ -1,20 +1,27 @@
---- speech-dispatcher-0.6.5/config/speechd.conf.in.orig	2008-01-04 13:45:43.000000000 +0000
-+++ speech-dispatcher-0.6.5/config/speechd.conf.in	2008-01-04 13:47:31.000000000 +0000
-@@ -129,10 +129,10 @@
+--- speech-dispatcher-0.6.5/config/speechd.conf.in.orig	2008-01-05 16:38:53.000000000 +0000
++++ speech-dispatcher-0.6.5/config/speechd.conf.in	2008-01-05 16:40:45.000000000 +0000
+@@ -36,7 +36,7 @@
+ # DO NOT COMMENT OUT THIS OPTION, SET IT TO "default" if you do not
+ # want to influence it.
+ 
+-LogDir  "default"
++LogDir  "/var/log/"
+ #LogDir  "/var/log/speech-dispatcher/"
+ #LogDir  "stdout"
+ 
+@@ -129,9 +129,9 @@
  #  - configuration is the path to the config file of this module,
  #    either relative (to etc/speechd/modules/) or absolute
  
 -AddModule "espeak"       "sd_espeak"   "espeak.conf"
 -AddModule "festival"     "sd_festival"  "festival.conf"
 -AddModule "flite"        "sd_flite"     "flite.conf"
--#AddModule "espeak-generic" "sd_generic" "espeak-generic.conf"
-+#AddModule "espeak"       "sd_espeak"   "espeak.conf"
++AddModule "espeak"       "sd_espeak"   "/etc/speech-dispatcher/modules/espeak.conf"
 +#AddModule "festival"     "sd_festival"  "festival.conf"
 +#AddModule "flite"        "sd_flite"     "flite.conf"
-+AddModule "espeak-generic" "sd_generic" "espeak-generic.conf"
+ #AddModule "espeak-generic" "sd_generic" "espeak-generic.conf"
  #AddModule "epos-generic" "sd_generic"   "epos-generic.conf"
  #AddModule "dtk-generic"  "sd_generic"   "dtk-generic.conf"
- #AddModule "ibmtts"       "sd_ibmtts"    "ibmtts.conf"
 @@ -172,6 +172,6 @@
  
  # There are some sample client settings
diff --git a/packages/speech-dispatcher/files/speech-dispatcher.init b/packages/speech-dispatcher/files/speech-dispatcher.init
new file mode 100644
index 0000000000..c3be5d8385
--- /dev/null
+++ b/packages/speech-dispatcher/files/speech-dispatcher.init
@@ -0,0 +1,42 @@
+#! /bin/sh
+
+
+PATH=/sbin:/bin:/usr/sbin:/usr/bin
+DAEMON=/usr/bin/speech-dispatcher
+PIDFILE=/var/run/speech-dispatcher.pid
+NAME=speech-dispatcher
+DESC='Speech Dispatcher'
+USER=speech-dispatcher
+
+test -f $DAEMON || exit 0
+
+set -e
+
+case "$1" in
+  start)
+	echo "Starting $NAME"
+	start-stop-daemon --start --quiet --pidfile $PIDFILE \
+          --exec $DAEMON
+
+	;;
+  stop)
+  	echo "Stopping $NAME"
+	start-stop-daemon --oknodo --stop --quiet \
+          --pidfile $PIDFILE --exec $DAEMON
+	;;
+  restart)
+	echo "Restarting $NAME"
+	start-stop-daemon --oknodo --stop --quiet \
+          --pidfile $PIDFILE --exec $DAEMON
+	sleep 3
+	start-stop-daemon --start --quiet --pidfile $PIDFILE \
+          --exec $DAEMON
+	;;
+  *)
+	N=/etc/init.d/$NAME
+	echo "Usage: $N {start|stop|restart|reload|force-reload}" >&2
+	exit 1
+	;;
+esac
+
+exit 0
diff --git a/packages/speech-dispatcher/speech-dispatcher_0.6.5.bb b/packages/speech-dispatcher/speech-dispatcher_0.6.5.bb
index 68bfd8a347..d8e2b8ed3a 100644
--- a/packages/speech-dispatcher/speech-dispatcher_0.6.5.bb
+++ b/packages/speech-dispatcher/speech-dispatcher_0.6.5.bb
@@ -1,26 +1,33 @@
-DESCRIPTION = " Speech Dispatcher is a high-level device independent layer \
+DESCRIPTION = "Speech Dispatcher is a high-level device independent layer \
 for speech synthesis through a simple, stable and well documented interface."
 HOMEPAGE = "http://www.freebsoft.org/speechd/"
 LICENSE = "GPLv2"
 DEPENDS = "flite libdotconf glib-2.0"
-RPROVIDES += "speechd"
+RPROVIDES_${PN} += "speechd"
 
-PR = "r1"
+PR = "r5"
 
-inherit autotools
+inherit autotools update-rc.d
 
 SRC_URI = "http://www.freebsoft.org/pub/projects/speechd/${PN}-${PV}.tar.gz \
+	   file://speech-dispatcher.init \
            file://srcMakefile.am.patch;patch=1 \
-	   file://confSpeechd.conf_00.patch;patch=1"
+	   file://configSpeechd.conf.in_00.patch;patch=1"
 
 LEAD_SONAME = "libspeechd.so"
+EXTRA_OECONF = " --with-espeak=yes --with-flite=no --with-ibmtts=no --with-nas=no --with-alsa=yes --with-pulse=yes "
+
+INITSCRIPT_NAME = "speech-dispatcher"
+INITSCRIPT_PARAMS = "defaults 45"
 
 do_install() {
         install -d ${D}${bindir}
         install -d ${D}${includedir}
         install -d ${D}${libdir}/${PN}-modules
-	install -d ${D}${sysconfdir}
-	install -d ${D}${sysconfdir}/modules
+	install -d ${D}${sysconfdir}	
+	install -d ${D}${sysconfdir}/init.d
+	install -d ${D}${sysconfdir}/speech-dispatcher
+	install -d ${D}${sysconfdir}/speech-dispatcher/modules
 
         oe_libinstall -so -C src/audio libsdaudio ${D}${libdir}
         oe_libinstall -so -C src/c/api libspeechd ${D}${libdir}
@@ -31,8 +38,9 @@ do_install() {
         install -m 0755 ${S}/src/server/.libs/speech-dispatcher  ${D}${bindir}
         install -m 0755 ${S}/src/modules/.libs/sd_*   ${D}${libdir}/${PN}-modules/
 	
-	install -m 0644 ${S}/config/speechd.conf ${D}${sysconfdir}
-	install -m 0644 ${S}/config/modules/*.conf ${D}${sysconfdir}/modules
+	install -m 0644 ${S}/config/speechd.conf ${D}${sysconfdir}/speech-dispatcher
+	install -m 0644 ${S}/config/modules/*.conf ${D}${sysconfdir}/speech-dispatcher/modules
+	install -m 0755 ${WORKDIR}/speech-dispatcher.init ${D}${sysconfdir}/init.d/speech-dispatcher
 }
 
 do_stage() {