speech-dispatcher:

- Fix RPROVIDES so it doesn't pull in a ton of -dev packages
- Update EXTRA_OECONF to exclude modules we do not need and enable espeak
- Update configs to set espeak module as default and fix logfile destination
- Install initscript (this could use some work...)
- Tested to work on fic-gta01

3 files changed, 68 insertions, 14 deletions

diff --git a/packages/speech-dispatcher/files/confSpeechd.conf_00.patch b/packages/speech-dispatcher/files/configSpeechd.conf.in_00.patch
index de1a776e3b..f8f135db7b 100644
--- a/packages/speech-dispatcher/files/confSpeechd.conf_00.patch
+++ b/packages/speech-dispatcher/files/configSpeechd.conf.in_00.patch
@@ -1,20 +1,25 @@
---- 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 @@
- #  - configuration is the path to the config file of this module,
+--- speech-dispatcher-0.6.5/config/speechd.conf.in.orig	2008-01-05 15:07:08.000000000 +0000
++++ speech-dispatcher-0.6.5/config/speechd.conf.in	2008-01-05 15:08:00.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"
+ 
+@@ -130,8 +130,8 @@
  #    either relative (to etc/speechd/modules/) or absolute
  
--AddModule "espeak"       "sd_espeak"   "espeak.conf"
+ 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 "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..4b49870665 100644
--- a/packages/speech-dispatcher/speech-dispatcher_0.6.5.bb
+++ b/packages/speech-dispatcher/speech-dispatcher_0.6.5.bb
@@ -1,19 +1,24 @@
-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 = "r4"
 
-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}
@@ -21,6 +26,7 @@ do_install() {
         install -d ${D}${libdir}/${PN}-modules
 	install -d ${D}${sysconfdir}
 	install -d ${D}${sysconfdir}/modules
+	install -d ${D}${sysconfdir}/init.d
 
         oe_libinstall -so -C src/audio libsdaudio ${D}${libdir}
         oe_libinstall -so -C src/c/api libspeechd ${D}${libdir}
@@ -33,6 +39,7 @@ do_install() {
 	
 	install -m 0644 ${S}/config/speechd.conf ${D}${sysconfdir}
 	install -m 0644 ${S}/config/modules/*.conf ${D}${sysconfdir}/modules
+	install -m 0755 ${WORKDIR}/speech-dispatcher.init ${D}${sysconfdir}/init.d/speech-dispatcher
 }
 
 do_stage() {