speech-dispatcher: enable flite, fix DEPENDS, remove spdsend

diff --git a/packages/speech-dispatcher/files/configSpeechd.conf.in_00.patch b/packages/speech-dispatcher/files/configSpeechd.conf.in_00.patch
index c4a7f91..72b5e31 100644 (file)
--- a/packages/speech-dispatcher/files/configSpeechd.conf.in_00.patch
+++ b/packages/speech-dispatcher/files/configSpeechd.conf.in_00.patch
@@ -9,19 +9,17 @@
  #LogDir  "/var/log/speech-dispatcher/"
  #LogDir  "stdout"
  
-@@ -129,9 +129,9 @@
+@@ -129,8 +129,8 @@
  #  - 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"       "sd_espeak"   "/etc/speech-dispatcher/modules/espeak.conf"
 +#AddModule "festival"     "sd_festival"  "festival.conf"
-+#AddModule "flite"        "sd_flite"     "flite.conf"
+ AddModule "flite"        "sd_flite"     "flite.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"
 @@ -172,6 +172,6 @@
  
  # There are some sample client settings

diff --git a/packages/speech-dispatcher/speech-dispatcher_0.6.5.bb b/packages/speech-dispatcher/speech-dispatcher_0.6.5.bb
index d8e2b8e..f132109 100644 (file)
--- a/packages/speech-dispatcher/speech-dispatcher_0.6.5.bb
+++ b/packages/speech-dispatcher/speech-dispatcher_0.6.5.bb
@@ -2,10 +2,10 @@ 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"
+DEPENDS = "espeak flite pulseaudio libdotconf glib-2.0"
 RPROVIDES_${PN} += "speechd"
 
-PR = "r5"
+PR = "r6"
 
 inherit autotools update-rc.d
 
@@ -15,7 +15,7 @@ SRC_URI = "http://www.freebsoft.org/pub/projects/speechd/${PN}-${PV}.tar.gz \
           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 "
+EXTRA_OECONF = " --with-espeak=yes --with-flite=yes --with-ibmtts=no --with-nas=no --with-alsa=yes --with-pulse=yes "
 
 INITSCRIPT_NAME = "speech-dispatcher"
 INITSCRIPT_PARAMS = "defaults 45"
@@ -34,7 +34,6 @@ do_install() {
         
         install -m 0644 ${S}/src/c/api/libspeechd.h    ${D}${includedir}
         install -m 0755 ${S}/src/c/clients/say/.libs/spd-say ${D}${bindir}
-        install -m 0755 ${S}/src/c/clients/spdsend/spdsend ${D}${bindir}
         install -m 0755 ${S}/src/server/.libs/speech-dispatcher  ${D}${bindir}
         install -m 0755 ${S}/src/modules/.libs/sd_*   ${D}${libdir}/${PN}-modules/