From 2eb32292666a556a1a0b5dd4c346c0b97e91a1a8 Mon Sep 17 00:00:00 2001 From: Matthias Hentges Date: Sat, 5 Jan 2008 14:23:51 +0000 Subject: espeak: Add staging --- packages/espeak/espeak_1.30.bb | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) 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} +} -- cgit v1.2.3 From 102a2ccf962e5d85f50a7eb82821879948eaa8db Mon Sep 17 00:00:00 2001 From: Matthias Hentges Date: Sat, 5 Jan 2008 16:25:30 +0000 Subject: 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 --- .../files/confSpeechd.conf_00.patch | 26 -------------- .../files/configSpeechd.conf.in_00.patch | 31 ++++++++++++++++ .../speech-dispatcher/files/speech-dispatcher.init | 42 ++++++++++++++++++++++ .../speech-dispatcher/speech-dispatcher_0.6.5.bb | 17 ++++++--- 4 files changed, 85 insertions(+), 31 deletions(-) delete mode 100644 packages/speech-dispatcher/files/confSpeechd.conf_00.patch create mode 100644 packages/speech-dispatcher/files/configSpeechd.conf.in_00.patch create mode 100644 packages/speech-dispatcher/files/speech-dispatcher.init diff --git a/packages/speech-dispatcher/files/confSpeechd.conf_00.patch b/packages/speech-dispatcher/files/confSpeechd.conf_00.patch deleted file mode 100644 index de1a776e3b..0000000000 --- a/packages/speech-dispatcher/files/confSpeechd.conf_00.patch +++ /dev/null @@ -1,26 +0,0 @@ ---- 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, - # 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 "festival" "sd_festival" "festival.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" - #AddModule "ibmtts" "sd_ibmtts" "ibmtts.conf" -@@ -172,6 +172,6 @@ - - # There are some sample client settings - --Include "clients/emacs.conf" --Include "clients/gnome-speech.conf" -+#Include "clients/emacs.conf" -+#Include "clients/gnome-speech.conf" - diff --git a/packages/speech-dispatcher/files/configSpeechd.conf.in_00.patch b/packages/speech-dispatcher/files/configSpeechd.conf.in_00.patch new file mode 100644 index 0000000000..f8f135db7b --- /dev/null +++ b/packages/speech-dispatcher/files/configSpeechd.conf.in_00.patch @@ -0,0 +1,31 @@ +--- 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 "festival" "sd_festival" "festival.conf" +-AddModule "flite" "sd_flite" "flite.conf" ++#AddModule "festival" "sd_festival" "festival.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 + +-Include "clients/emacs.conf" +-Include "clients/gnome-speech.conf" ++#Include "clients/emacs.conf" ++#Include "clients/gnome-speech.conf" + 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() { -- cgit v1.2.3 From 1281530838d3bfd8ba09e3d4ad5ecf69a7ba8239 Mon Sep 17 00:00:00 2001 From: Matthias Hentges Date: Sat, 5 Jan 2008 16:44:14 +0000 Subject: speech-dispatcher: Fix packaging of configfiles --- .../speech-dispatcher/files/configSpeechd.conf.in_00.patch | 10 ++++++---- packages/speech-dispatcher/speech-dispatcher_0.6.5.bb | 11 ++++++----- 2 files changed, 12 insertions(+), 9 deletions(-) diff --git a/packages/speech-dispatcher/files/configSpeechd.conf.in_00.patch b/packages/speech-dispatcher/files/configSpeechd.conf.in_00.patch index f8f135db7b..c4a7f91ea0 100644 --- a/packages/speech-dispatcher/files/configSpeechd.conf.in_00.patch +++ b/packages/speech-dispatcher/files/configSpeechd.conf.in_00.patch @@ -1,5 +1,5 @@ ---- 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 +--- 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. @@ -9,12 +9,14 @@ #LogDir "/var/log/speech-dispatcher/" #LogDir "stdout" -@@ -130,8 +130,8 @@ +@@ -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 "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 "espeak-generic" "sd_generic" "espeak-generic.conf" diff --git a/packages/speech-dispatcher/speech-dispatcher_0.6.5.bb b/packages/speech-dispatcher/speech-dispatcher_0.6.5.bb index 4b49870665..d8e2b8ed3a 100644 --- a/packages/speech-dispatcher/speech-dispatcher_0.6.5.bb +++ b/packages/speech-dispatcher/speech-dispatcher_0.6.5.bb @@ -5,7 +5,7 @@ LICENSE = "GPLv2" DEPENDS = "flite libdotconf glib-2.0" RPROVIDES_${PN} += "speechd" -PR = "r4" +PR = "r5" inherit autotools update-rc.d @@ -24,9 +24,10 @@ 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} @@ -37,8 +38,8 @@ 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 } -- cgit v1.2.3