diff options
author | Khem Raj <raj.khem@gmail.com> | 2017-05-18 13:32:13 -0700 |
---|---|---|
committer | Martin Jansa <Martin.Jansa@gmail.com> | 2017-06-05 11:01:41 +0200 |
commit | e2bd3e64d97d351a5ae61970e8507f0f5b547586 (patch) | |
tree | 238f0352dfafcd0c314951bb62ef8774f610a32f | |
parent | ab1c74fcd0f468e8de56888dc0ebe0bd139eb06f (diff) | |
download | meta-openembedded-contrib-e2bd3e64d97d351a5ae61970e8507f0f5b547586.tar.gz |
espeak, espeak-data: Update to 1.48.04 release
Disable audio codecs
Signed-off-by: Khem Raj <raj.khem@gmail.com>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
-rw-r--r-- | meta-oe/recipes-support/espeak/espeak-data_1.48.04.bb (renamed from meta-oe/recipes-support/espeak/espeak-data_1.37.bb) | 3 | ||||
-rw-r--r-- | meta-oe/recipes-support/espeak/espeak.inc | 6 | ||||
-rw-r--r-- | meta-oe/recipes-support/espeak/espeak_1.48.04.bb (renamed from meta-oe/recipes-support/espeak/espeak_1.37.bb) | 3 | ||||
-rw-r--r-- | meta-oe/recipes-support/espeak/files/fix-gcc6-errors.patch | 19 |
4 files changed, 4 insertions, 27 deletions
diff --git a/meta-oe/recipes-support/espeak/espeak-data_1.37.bb b/meta-oe/recipes-support/espeak/espeak-data_1.48.04.bb index 914bf36013..79b2cc1f41 100644 --- a/meta-oe/recipes-support/espeak/espeak-data_1.37.bb +++ b/meta-oe/recipes-support/espeak/espeak-data_1.48.04.bb @@ -22,6 +22,3 @@ do_install() { install -d ${D}${layout_datadir}/espeak-data install -m 0644 ${S}/espeak-data/phon* ${D}${layout_datadir}/espeak-data } - -SRC_URI[md5sum] = "5c7b292d0537232868b4ac1317d76c02" -SRC_URI[sha256sum] = "77f406c345362185ec4f362bf49f61d202e01ac9b9cd5c14f803195a544ce6d3" diff --git a/meta-oe/recipes-support/espeak/espeak.inc b/meta-oe/recipes-support/espeak/espeak.inc index 5d0b403085..97873f22e8 100644 --- a/meta-oe/recipes-support/espeak/espeak.inc +++ b/meta-oe/recipes-support/espeak/espeak.inc @@ -3,8 +3,10 @@ SECTION = "base" LICENSE = "GPLv3" LIC_FILES_CHKSUM = "file://License.txt;md5=cb7a20edb4c9f5f478de6523dcd7362c" -SRC_URI = "${SOURCEFORGE_MIRROR}/espeak/espeak-${PV}-source.zip \ - file://fix-gcc6-errors.patch" +SRC_URI = "http://downloads.sourceforge.net/espeak/espeak-1.48.04-source.zip \ +" +SRC_URI[md5sum] = "cadd7482eaafe9239546bdc09fa244c3" +SRC_URI[sha256sum] = "bf9a17673adffcc28ff7ea18764f06136547e97bbd9edf2ec612f09b207f0659" S = "${WORKDIR}/espeak-${PV}-source" diff --git a/meta-oe/recipes-support/espeak/espeak_1.37.bb b/meta-oe/recipes-support/espeak/espeak_1.48.04.bb index 273fe340e3..552f40413b 100644 --- a/meta-oe/recipes-support/espeak/espeak_1.37.bb +++ b/meta-oe/recipes-support/espeak/espeak_1.48.04.bb @@ -4,9 +4,6 @@ inherit siteinfo EXTRA_PHONEMES = '${@bb.utils.contains("SITEINFO_ENDIANNESS", "be", "espeak-data (= ${PV})", "", d)}' RDEPENDS_${PN} = "portaudio-v19 ${EXTRA_PHONEMES}" -SRC_URI[md5sum] = "5c7b292d0537232868b4ac1317d76c02" -SRC_URI[sha256sum] = "77f406c345362185ec4f362bf49f61d202e01ac9b9cd5c14f803195a544ce6d3" - CXXFLAGS += "-DUSE_PORTAUDIO" TARGET_CC_ARCH += "${LDFLAGS}" diff --git a/meta-oe/recipes-support/espeak/files/fix-gcc6-errors.patch b/meta-oe/recipes-support/espeak/files/fix-gcc6-errors.patch deleted file mode 100644 index 9cf23cf031..0000000000 --- a/meta-oe/recipes-support/espeak/files/fix-gcc6-errors.patch +++ /dev/null @@ -1,19 +0,0 @@ -Fix gcc6 errors with narrowing - -| tr_languages.cpp:462:73: error: narrowing conversion of '171' from 'int' to 'char' inside { } [-Wnarrowing] -| static const char ko_voiced[] = {0x02,0x05,0x06,0xab,0xaf,0xb7,0xbc,0}; // voiced consonants, l,m,n,N - -Upstream-Status: Backport - -Signed-off-by: Derek Straka <derek@asterius.io> ---- a/src/tr_languages.cpp -+++ b/src/tr_languages.cpp -@@ -459,7 +459,7 @@ - case L('k','o'): // Korean, TEST - { - static const char ko_ivowels[] = {0x63,0x64,0x67,0x68,0x6d,0x72,0x74,0x75,0}; // y and i vowels -- static const char ko_voiced[] = {0x02,0x05,0x06,0xab,0xaf,0xb7,0xbc,0}; // voiced consonants, l,m,n,N -+ static const char ko_voiced[] = {0x02,0x05,0x06,(char)0xab,(char)0xaf,(char)0xb7,(char)0xbc,0}; // voiced consonants, l,m,n,N - tr = new Translator(); - - tr->letter_bits_offset = OFFSET_KOREAN; |