diff options
Diffstat (limited to 'import-layers/meta-openembedded/meta-oe/recipes-support/espeak')
| -rw-r--r-- | import-layers/meta-openembedded/meta-oe/recipes-support/espeak/espeak-data_1.48.04.bb (renamed from import-layers/meta-openembedded/meta-oe/recipes-support/espeak/espeak-data_1.37.bb) | 3 | ||||
| -rw-r--r-- | import-layers/meta-openembedded/meta-oe/recipes-support/espeak/espeak.inc | 7 | ||||
| -rw-r--r-- | import-layers/meta-openembedded/meta-oe/recipes-support/espeak/espeak_1.48.04.bb (renamed from import-layers/meta-openembedded/meta-oe/recipes-support/espeak/espeak_1.37.bb) | 3 | ||||
| -rw-r--r-- | import-layers/meta-openembedded/meta-oe/recipes-support/espeak/files/fix-gcc6-errors.patch | 19 | ||||
| -rw-r--r-- | import-layers/meta-openembedded/meta-oe/recipes-support/espeak/files/gcc-narrowing-warning-fix.patch | 56 |
5 files changed, 61 insertions, 27 deletions
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-support/espeak/espeak-data_1.37.bb b/import-layers/meta-openembedded/meta-oe/recipes-support/espeak/espeak-data_1.48.04.bb index 914bf3601..79b2cc1f4 100644 --- a/import-layers/meta-openembedded/meta-oe/recipes-support/espeak/espeak-data_1.37.bb +++ b/import-layers/meta-openembedded/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/import-layers/meta-openembedded/meta-oe/recipes-support/espeak/espeak.inc b/import-layers/meta-openembedded/meta-oe/recipes-support/espeak/espeak.inc index 5d0b40308..60b3f73c8 100644 --- a/import-layers/meta-openembedded/meta-oe/recipes-support/espeak/espeak.inc +++ b/import-layers/meta-openembedded/meta-oe/recipes-support/espeak/espeak.inc @@ -3,8 +3,11 @@ 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 \ + file://gcc-narrowing-warning-fix.patch \ +" +SRC_URI[md5sum] = "cadd7482eaafe9239546bdc09fa244c3" +SRC_URI[sha256sum] = "bf9a17673adffcc28ff7ea18764f06136547e97bbd9edf2ec612f09b207f0659" S = "${WORKDIR}/espeak-${PV}-source" diff --git a/import-layers/meta-openembedded/meta-oe/recipes-support/espeak/espeak_1.37.bb b/import-layers/meta-openembedded/meta-oe/recipes-support/espeak/espeak_1.48.04.bb index 273fe340e..552f40413 100644 --- a/import-layers/meta-openembedded/meta-oe/recipes-support/espeak/espeak_1.37.bb +++ b/import-layers/meta-openembedded/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/import-layers/meta-openembedded/meta-oe/recipes-support/espeak/files/fix-gcc6-errors.patch b/import-layers/meta-openembedded/meta-oe/recipes-support/espeak/files/fix-gcc6-errors.patch deleted file mode 100644 index 9cf23cf03..000000000 --- a/import-layers/meta-openembedded/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; diff --git a/import-layers/meta-openembedded/meta-oe/recipes-support/espeak/files/gcc-narrowing-warning-fix.patch b/import-layers/meta-openembedded/meta-oe/recipes-support/espeak/files/gcc-narrowing-warning-fix.patch new file mode 100644 index 000000000..2a9b4607d --- /dev/null +++ b/import-layers/meta-openembedded/meta-oe/recipes-support/espeak/files/gcc-narrowing-warning-fix.patch @@ -0,0 +1,56 @@ +From f09c83640b9173552fd9277c3a48619b903fa436 Mon Sep 17 00:00:00 2001 +From: "Reece H. Dunn" <msclrhd@gmail.com> +Date: Wed, 20 Jan 2016 20:48:29 +0000 +Subject: [PATCH] Fix GCC -Wnarrowing warnings. + +--- + src/tr_languages.cpp | 7 ++++--- + src/translate.h | 2 +- + 2 files changed, 5 insertions(+), 4 deletions(-) + +Index: espeak-1.48.04-source/src/tr_languages.cpp +=================================================================== +--- espeak-1.48.04-source.orig/src/tr_languages.cpp ++++ espeak-1.48.04-source/src/tr_languages.cpp +@@ -198,8 +198,8 @@ static const unsigned short chars_ignore + 0x200d, 1, // zero width joiner + 0, 0 }; + +-const char string_ordinal[] = {0xc2,0xba,0}; // masculine ordinal character, UTF-8 +- ++const unsigned char string_ordinal[] = {0xc2,0xba,0}; // masculine ordinal character, UTF-8 ++const unsigned char utf8_null[] = { 0 }; // null string, UTF-8 + + static Translator* NewTranslator(void) + {//=================================== +@@ -296,7 +296,7 @@ static const char transpose_map_latin[] + tr->langopts.replace_chars = NULL; + tr->langopts.ascii_language[0] = 0; // Non-Latin alphabet languages, use this language to speak Latin words, default is English + tr->langopts.alt_alphabet_lang = L('e','n'); +- tr->langopts.roman_suffix = ""; ++ tr->langopts.roman_suffix = utf8_null; + + SetLengthMods(tr,201); + // tr->langopts.length_mods = length_mods_en; +@@ -758,7 +758,7 @@ Translator *SelectTranslator(const char + tr->langopts.stress_flags = S_FINAL_SPANISH | S_FINAL_DIM_ONLY | S_FINAL_NO_2; + tr->langopts.numbers = NUM_SINGLE_STRESS | NUM_DECIMAL_COMMA | NUM_AND_UNITS | NUM_OMIT_1_HUNDRED | NUM_OMIT_1_THOUSAND | NUM_ROMAN | NUM_ROMAN_ORDINAL; + tr->langopts.numbers2 = NUM2_ORDINAL_NO_AND; +- tr->langopts.roman_suffix = string_ordinal; ++ tr->langopts.roman_suffix = utf8_null; + } + else + if(name2 == L_pap) +Index: espeak-1.48.04-source/src/translate.h +=================================================================== +--- espeak-1.48.04-source.orig/src/translate.h ++++ espeak-1.48.04-source/src/translate.h +@@ -545,7 +545,7 @@ typedef struct { + int decimal_sep; + int max_digits; // max number of digits which can be spoken as an integer number (rather than individual digits) + const char *ordinal_indicator; // UTF-8 string +- const char *roman_suffix; // add this (ordinal) suffix to Roman numbers (LANG=an) ++ const unsigned char *roman_suffix; // add this (ordinal) suffix to Roman numbers (LANG=an) + + // bit 0, accent name before the letter name, bit 1 "capital" after letter name + int accents; |
