diff options
| author |   Michael 'Mickey' Lauer <mickey@vanille-media.de> | 2009-06-09 15:46:04 +0000 |
|---|---|---|
| committer | Michael 'Mickey' Lauer <mickey@vanille-media.de> | 2009-06-09 15:46:04 +0000 |
| commit | 84c0d7d3066c70eeca877de7897ce386d3fedc03 (patch) | |
| tree | 72677cc3a612fae00f56e6d3c453a70d98064169 | |
| parent | e29535b17e1fa8907fa6b406a0f9a34066c615d8 (diff) | |
| parent | b915b3bcf1c826bd68cbfcfc1b8ed9c8e0200c5a (diff) | |
| download | openembedded-84c0d7d3066c70eeca877de7897ce386d3fedc03.tar.gz | |
Merge commit 'origin/fso/milestone5.5' into ms5.5
| -rw-r--r-- | conf/distro/include/sane-srcrevs.inc | 2 | ||||
| -rw-r--r-- | recipes/speech-dispatcher/speech-dispatcher_0.6.6.bb | 5 |
2 files changed, 5 insertions, 2 deletions
diff --git a/conf/distro/include/sane-srcrevs.inc b/conf/distro/include/sane-srcrevs.inc index 46bce0d1e0..37ae9a7a3f 100644 --- a/conf/distro/include/sane-srcrevs.inc +++ b/conf/distro/include/sane-srcrevs.inc @@ -110,7 +110,7 @@ SRCREV_pn-mpd-alsa ?= "6952" SRCREV_pn-mplayer ?= "28342" SRCREV_pn-mplayer-maemo ?= "342" SRCREV_pn-multitap-pad ?= "373" -SRCREV_pn-navit ?= "1096" +SRCREV_pn-navit ?= "2310" SRCREV_pn-neod ?= "4617" SRCREV_pn-netsurf ?= "3859" SRCREV_pn-networkmanager ?= "3202" diff --git a/recipes/speech-dispatcher/speech-dispatcher_0.6.6.bb b/recipes/speech-dispatcher/speech-dispatcher_0.6.6.bb index 145f07531a..3c09c64ab3 100644 --- a/recipes/speech-dispatcher/speech-dispatcher_0.6.6.bb +++ b/recipes/speech-dispatcher/speech-dispatcher_0.6.6.bb @@ -3,9 +3,11 @@ for speech synthesis through a simple, stable and well documented interface." HOMEPAGE = "http://www.freebsoft.org/speechd/" LICENSE = "GPLv2" DEPENDS = "espeak flite pulseaudio libdotconf glib-2.0" +DEPENDS_shr = "espeak flite libdotconf glib-2.0" + RPROVIDES_${PN} += "speechd" -PR = "r1" +PR = "r2" inherit autotools update-rc.d @@ -17,6 +19,7 @@ SRC_URI = "http://www.freebsoft.org/pub/projects/speechd/${PN}-${PV}.tar.gz \ LEAD_SONAME = "libspeechd.so" EXTRA_OECONF = " --with-espeak --with-flite --without-ibmtts --without-nas --with-alsa " +EXTRA_OECONF_shr = " --with-espeak --with-flite --without-ibmtts --without-nas --with-alsa --without-pulse " INITSCRIPT_NAME = "speech-dispatcher" INITSCRIPT_PARAMS = "defaults 45" |