[oe-commits] org.oe.dev merge of '7a3bad457105ec40106bf5bc6341dfc5906a0088'

coredump2 commit openembedded-commits at lists.openembedded.org
Sat Jan 5 17:05:04 UTC 2008 

merge of '7a3bad457105ec40106bf5bc6341dfc5906a0088'
     and 'a97c52f271b18a7c7146382c7acc35a108bda245'

Author: coredump2 at openembedded.org
Branch: org.openembedded.dev
Revision: a7496676105f22f543e3f1970b18350946f1838a
ViewMTN: http://monotone.openembedded.org/revision/info/a7496676105f22f543e3f1970b18350946f1838a
Files:
1
packages/speech-dispatcher/files/confSpeechd.conf_00.patch
packages/speech-dispatcher/files/configSpeechd.conf.in_00.patch
packages/speech-dispatcher/files/speech-dispatcher.init
packages/espeak/espeak_1.30.bb
packages/speech-dispatcher/speech-dispatcher_0.6.5.bb
packages/python/python-gsmd_svn.bb
conf/distro/include/moko-autorev.inc
packages/tasks/task-python-everything.bb
Diffs:

#
# mt diff -r7a3bad457105ec40106bf5bc6341dfc5906a0088 -ra7496676105f22f543e3f1970b18350946f1838a
#
# 
# 
# delete "packages/speech-dispatcher/files/confSpeechd.conf_00.patch"
# 
# add_file "packages/speech-dispatcher/files/configSpeechd.conf.in_00.patch"
#  content [001e9d4108977248cedd50752029192824293596]
# 
# add_file "packages/speech-dispatcher/files/speech-dispatcher.init"
#  content [c2d6965815b005c0d9ab696cbca0d2edb3c39bfd]
# 
# patch "packages/espeak/espeak_1.30.bb"
#  from [81d52cdf97440599166ddf3cf05b7e750c5bc59d]
#    to [0b187e4c430c8a401c4d5bd39c356847ef639578]
# 
# patch "packages/speech-dispatcher/speech-dispatcher_0.6.5.bb"
#  from [4c119ef83390203d6cbc5962db26ac4ec8ed6733]
#    to [c0404c61c7a8cf7050862abc2771e72e634cf323]
# 
============================================================
--- packages/speech-dispatcher/files/configSpeechd.conf.in_00.patch	001e9d4108977248cedd50752029192824293596
+++ packages/speech-dispatcher/files/configSpeechd.conf.in_00.patch	001e9d4108977248cedd50752029192824293596
@@ -0,0 +1,33 @@
+--- 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"       "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 "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"
+ 
============================================================
--- packages/speech-dispatcher/files/speech-dispatcher.init	c2d6965815b005c0d9ab696cbca0d2edb3c39bfd
+++ packages/speech-dispatcher/files/speech-dispatcher.init	c2d6965815b005c0d9ab696cbca0d2edb3c39bfd
@@ -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
============================================================
--- packages/espeak/espeak_1.30.bb	81d52cdf97440599166ddf3cf05b7e750c5bc59d
+++ packages/espeak/espeak_1.30.bb	0b187e4c430c8a401c4d5bd39c356847ef639578
@@ -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}
+}
============================================================
--- packages/speech-dispatcher/speech-dispatcher_0.6.5.bb	4c119ef83390203d6cbc5962db26ac4ec8ed6733
+++ packages/speech-dispatcher/speech-dispatcher_0.6.5.bb	c0404c61c7a8cf7050862abc2771e72e634cf323
@@ -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() {


#
# mt diff -ra97c52f271b18a7c7146382c7acc35a108bda245 -ra7496676105f22f543e3f1970b18350946f1838a
#
# 
# 
# add_file "packages/python/python-gsmd_svn.bb"
#  content [f544c0a64dbe8cc30141c6eca19d93a819db7b5c]
# 
# patch "conf/distro/include/moko-autorev.inc"
#  from [bfb54642af40a5440c951be6f7f4845770a7fb31]
#    to [2f7cb2290c8041be1845553e70a09af8c92e718d]
# 
# patch "packages/tasks/task-python-everything.bb"
#  from [3729081d243f947b170d93ab5c2e5503ee8fe392]
#    to [67974c31da8be9bcedbda9f7dfa5963f89e262a2]
# 
============================================================
--- packages/python/python-gsmd_svn.bb	f544c0a64dbe8cc30141c6eca19d93a819db7b5c
+++ packages/python/python-gsmd_svn.bb	f544c0a64dbe8cc30141c6eca19d93a819db7b5c
@@ -0,0 +1,15 @@
+DESCRIPTION = "Python bindings for the libgsmd"
+SRCNAME = "python-gsmd"
+AUTHOR = "Sudharshan S"
+SECTION = "devel/python"
+LICENSE = "LGPL"
+DEPENDS = "libgsmd"
+PV = "0.02+svnr${SRCREV}"
+PR = "r1"
+
+SRC_URI = "svn://svn.projects.openmoko.org/svnroot/python-openmoko;module=python-gsmd;proto=http"
+S = "${WORKDIR}/python-gsmd"
+
+SRCREV_pn-python-gsmd ?= "${AUTOREV}"
+
+inherit distutils
============================================================
--- conf/distro/include/moko-autorev.inc	bfb54642af40a5440c951be6f7f4845770a7fb31
+++ conf/distro/include/moko-autorev.inc	2f7cb2290c8041be1845553e70a09af8c92e718d
@@ -44,6 +44,8 @@ SRCREV_pn-openocd-native ?= "${AUTOREV}"
 SRCREV_pn-openocd ?= "${AUTOREV}"
 SRCREV_pn-openocd-native ?= "${AUTOREV}"
 
+SRCREV_pn-python-gsmd ?= "${AUTOREV}"
+
 SRCREV_pn-u-boot-openmoko ?= "${AUTOREV}"
 SRCREV_pn-dfu-util ?= "${AUTOREV}"
 SRCREV_pn-dfu-util-native ?= "${AUTOREV}"
============================================================
--- packages/tasks/task-python-everything.bb	3729081d243f947b170d93ab5c2e5503ee8fe392
+++ packages/tasks/task-python-everything.bb	67974c31da8be9bcedbda9f7dfa5963f89e262a2
@@ -1,7 +1,7 @@ LICENSE = "MIT"
 DESCRIPTION= "Everything Python"
 HOMEPAGE = "http://www.vanille.de/projects/python.spy"
 LICENSE = "MIT"
-PR = "ml22"
+PR = "ml23"
 
 RDEPENDS = "\
 		python-ao 		\
@@ -19,6 +19,7 @@ RDEPENDS = "\
 		python-fuse			\
 		python-gmpy		\
 		python-gnosis		\
+		python-gsmd			\
 		python-gst		\
 		python-hmm		\
 		python-imaging		\

More information about the Openembedded-commits mailing list