summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorOpenEmbedded Project <openembedded-devel@lists.openembedded.org>2008-04-23 00:35:34 +0000
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>2008-04-23 00:35:34 +0000
commit0bb7eb9614eed4ad395ba3ca90b9a58177fdd878 (patch)
tree9f3a37c835e1aace40a93c28ab9c42d82e6be08b
parentcaf011037f508f9657495e0ee6f997ee6787937c (diff)
parenteca9b17c852a77b8e473d7d2009da5ebea6e47eb (diff)
merge of '16e6a3ff4cb1c69984bf7ae782e19b11c3d95e44'
and 'f2d24d867c478e840f017de36fe85bacaa8a0e42'
-rw-r--r--packages/espeak/espeak-data_1.37.bb (renamed from packages/espeak/espeak-data_1.35.bb)0
-rw-r--r--packages/espeak/espeak.inc2
-rw-r--r--packages/espeak/espeak_1.37.bb (renamed from packages/espeak/espeak_1.35.bb)4
-rw-r--r--packages/speex/speex_1.2-beta3.bb4
4 files changed, 6 insertions, 4 deletions
diff --git a/packages/espeak/espeak-data_1.35.bb b/packages/espeak/espeak-data_1.37.bb
index 4dc9aa9882..4dc9aa9882 100644
--- a/packages/espeak/espeak-data_1.35.bb
+++ b/packages/espeak/espeak-data_1.37.bb
diff --git a/packages/espeak/espeak.inc b/packages/espeak/espeak.inc
index c0502b6ca3..9a31dfdadd 100644
--- a/packages/espeak/espeak.inc
+++ b/packages/espeak/espeak.inc
@@ -5,3 +5,5 @@ LICENSE = "GPL"
SRC_URI = "${SOURCEFORGE_MIRROR}/espeak/espeak-${PV}-source.zip"
S = "${WORKDIR}/espeak-${PV}-source"
+
+DEPENDS = "portaudio-v19"
diff --git a/packages/espeak/espeak_1.35.bb b/packages/espeak/espeak_1.37.bb
index f7dacf54bc..4ea82e14b4 100644
--- a/packages/espeak/espeak_1.35.bb
+++ b/packages/espeak/espeak_1.37.bb
@@ -1,9 +1,9 @@
require espeak.inc
EXTRA_PHONEMES = '${@base_contains("SITEINFO_ENDIANESS", "be", "espeak-data (= ${PV})", "", d)}'
-RDEPENDS = "portaudio-v19 ${EXTRA_PHONEMES}"
+RDEPENDS_${PN} = "portaudio-v19 ${EXTRA_PHONEMES}"
-PR = "r1"
+PR = "r0"
CXXFLAGS += "-DUSE_PORTAUDIO"
diff --git a/packages/speex/speex_1.2-beta3.bb b/packages/speex/speex_1.2-beta3.bb
index 5f060c2321..a2aa6652f7 100644
--- a/packages/speex/speex_1.2-beta3.bb
+++ b/packages/speex/speex_1.2-beta3.bb
@@ -24,8 +24,8 @@ LEAD_SONAME = "libspeex.so"
#
EXTRA_OECONF_append_openmn = " --enable-arm5e-asm --enable-fixed-point --disable-float-api --disable-vbr "
-EXTRA_OECONF_append_amsdelta = " --enable-arm4-asm --enable-fixed-point --disable-float-api --diable-vbr "
-EXTRA_OECONF_append_bfin = " --enable-blackfin-asm --enable-fixed-point --disable-float-api --diable-vbr "
+EXTRA_OECONF_append_amsdelta = " --enable-arm4-asm --enable-fixed-point --disable-float-api --disable-vbr "
+EXTRA_OECONF_append_bfin = " --enable-blackfin-asm --enable-fixed-point --disable-float-api --disable-vbr "
EXTRA_OECONF_append_arm = " --enable-fixed-point --disable-float-api --disable-vbr "
EXTRA_OECONF_append_dht-walnut = " --enable-fixed-point --disable-float-api --disable-vbr "