[oe-commits] org.oe.dev merge of '0bce6a5194a4bb1f18f55b0dffee505b24073d3f'
freyther commit
oe at amethyst.openembedded.net
Mon Mar 17 08:55:24 UTC 2008
merge of '0bce6a5194a4bb1f18f55b0dffee505b24073d3f'
and '808dfc9a89643b5a9911166b217da753005549e9'
Author: freyther at openembedded.org
Branch: org.openembedded.dev
Revision: 1b0d358e4f17bb597966cdc2eb4e9cb40b10077c
ViewMTN: http://monotone.openembedded.org/revision/info/1b0d358e4f17bb597966cdc2eb4e9cb40b10077c
Files:
1
packages/espeak/espeak_1.30.bb
packages/espeak/espeak_1.35.bb
packages/speech-dispatcher/speech-dispatcher_0.6.5.bb
packages/speech-dispatcher/speech-dispatcher_0.6.6.bb
packages/directfb/++dfb_1.0.0.bb
packages/directfb/directfb-examples_1.0.0.bb
Diffs:
#
# mt diff -r0bce6a5194a4bb1f18f55b0dffee505b24073d3f -r1b0d358e4f17bb597966cdc2eb4e9cb40b10077c
#
#
#
# rename "packages/espeak/espeak_1.30.bb"
# to "packages/espeak/espeak_1.35.bb"
#
# rename "packages/speech-dispatcher/speech-dispatcher_0.6.5.bb"
# to "packages/speech-dispatcher/speech-dispatcher_0.6.6.bb"
#
# patch "packages/espeak/espeak_1.35.bb"
# from [a8eccd7e70daf05d588bdf9ab26438a62a6dfe71]
# to [7e4fb524c1a706474b8e218dbcef60f0d2db406d]
#
# patch "packages/speech-dispatcher/speech-dispatcher_0.6.6.bb"
# from [234b25c309b6b52f26d9fb1a049e4227b90ba438]
# to [a925ce6224d9321377cd2532c8d0678d21df0710]
#
============================================================
--- packages/espeak/espeak_1.30.bb a8eccd7e70daf05d588bdf9ab26438a62a6dfe71
+++ packages/espeak/espeak_1.35.bb 7e4fb524c1a706474b8e218dbcef60f0d2db406d
@@ -1,52 +1,42 @@
-#! /bin/sh
-#
-# Copyright Matthias Hentges <devel at hentges.net> (c) 2008
-# License: MIT (see http://www.opensource.org/licenses/mit-license.php
-# for a copy of the license)
-#
-# Filename: espeak_1.30.bb
-# Date: 20080104 (YMD)
-
DESCRIPTION = "eSpeak is a compact open source software speech synthesizer"
SECTION = "base"
LICENSE = "GPL"
-
DEPENDS = "portaudio-v19"
-######################################################################################
+PR = "r0"
-PR = "r2"
-
SRC_URI = "${SOURCEFORGE_MIRROR}/espeak/espeak-${PV}-source.zip"
S = "${WORKDIR}/${PN}-${PV}-source"
-FILES_${PN} += " /usr/share/espeak-data/ "
+FILES_${PN} += "${datadir}/espeak-data"
do_configure() {
- # espeak supports portaudio in APIs V18 and V19
+ # "speak" binary, a TTS engine, uses portaudio in either APIs V18 or V19
cp ${S}/src/portaudio19.h ${S}/src/portaudio.h
}
do_compile() {
- cd src
- oe_runmake
+ cd src
+ oe_runmake
}
do_install() {
install -d ${D}${bindir}
- install -d ${D}${libdir}
+ install -d ${D}${libdir}
install -d ${D}${includedir}
- install -d ${D}/usr/share/espeak-data
-
- install -m 0755 ${S}/src/espeak ${D}${bindir}
- oe_libinstall -so -C src libespeak ${D}${libdir}
-
- cp -prf ${S}/espeak-data/* ${D}/usr/share/espeak-data
+ install -d ${D}${datadir}/espeak-data
+
+ # we do not ship "speak" binary though.
+ install -m 0755 ${S}/src/espeak ${D}${bindir}
+ install -m 0644 ${S}/src/speak_lib.h ${D}${includedir}
+ oe_libinstall -so -C src libespeak ${D}${libdir}
+
+ cp -prf ${S}/espeak-data/* ${D}${datadir}/espeak-data
}
do_stage() {
- install -d ${STAGING_INCDIR}/espeak
- install -m 0644 ${S}/src/speak_lib.h ${STAGING_INCDIR}/espeak/
+ 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 234b25c309b6b52f26d9fb1a049e4227b90ba438
+++ packages/speech-dispatcher/speech-dispatcher_0.6.6.bb a925ce6224d9321377cd2532c8d0678d21df0710
@@ -5,7 +5,7 @@ RPROVIDES_${PN} += "speechd"
DEPENDS = "espeak flite pulseaudio libdotconf glib-2.0"
RPROVIDES_${PN} += "speechd"
-PR = "r8"
+PR = "r0"
inherit autotools update-rc.d
@@ -16,7 +16,7 @@ LEAD_SONAME = "libspeechd.so"
file://configSpeechd.conf.in_00.patch;patch=1"
LEAD_SONAME = "libspeechd.so"
-EXTRA_OECONF = " --with-espeak=yes --with-flite=yes --with-ibmtts=no --with-nas=no --with-alsa=yes --with-pulse=yes "
+EXTRA_OECONF = " --with-espeak --with-flite --without-ibmtts --without-nas --with-alsa --with-pulse "
INITSCRIPT_NAME = "speech-dispatcher"
INITSCRIPT_PARAMS = "defaults 45"
#
# mt diff -r808dfc9a89643b5a9911166b217da753005549e9 -r1b0d358e4f17bb597966cdc2eb4e9cb40b10077c
#
#
#
# patch "packages/directfb/++dfb_1.0.0.bb"
# from [91cd57143eb720377d3e2c83b0dbe525899f2d9d]
# to [a3a28b844e6601187428c14c8ff87def4ee6a800]
#
# patch "packages/directfb/directfb-examples_1.0.0.bb"
# from [3520b6cf0813b2e959b41d36fd3920af3b407573]
# to [8e765a6e6dcdbbd584d7dd2b3df4eb881390dd44]
#
============================================================
--- packages/directfb/++dfb_1.0.0.bb 91cd57143eb720377d3e2c83b0dbe525899f2d9d
+++ packages/directfb/++dfb_1.0.0.bb a3a28b844e6601187428c14c8ff87def4ee6a800
@@ -10,10 +10,6 @@ inherit autotools pkgconfig
inherit autotools pkgconfig
-do_configure_append() {
- find ${S} -type f | xargs sed -i 's:-I/usr/include::g'
-}
-
do_stage() {
autotools_stage_all
}
============================================================
--- packages/directfb/directfb-examples_1.0.0.bb 3520b6cf0813b2e959b41d36fd3920af3b407573
+++ packages/directfb/directfb-examples_1.0.0.bb 8e765a6e6dcdbbd584d7dd2b3df4eb881390dd44
@@ -10,11 +10,6 @@ inherit autotools
inherit autotools
-do_configure_append() {
-# find ${S} -type f | xargs sed -i 's:-L/usr/lib::g'
- find ${S} -type f | xargs sed -i 's:-I/usr/include::g'
-}
-
do_stage() {
autotools_stage_all
}
More information about the Openembedded-commits
mailing list