similarity index 82%
rename from meta-oe/recipes-support/espeak/espeak-data_1.37.bb
rename to 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"
@@ -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"
similarity index 89%
rename from meta-oe/recipes-support/espeak/espeak_1.37.bb
rename to 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}"
deleted file mode 100644
@@ -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;
Disable audio codecs Signed-off-by: Khem Raj <raj.khem@gmail.com> --- .../{espeak-data_1.37.bb => espeak-data_1.48.04.bb} | 3 --- meta-oe/recipes-support/espeak/espeak.inc | 6 ++++-- .../espeak/{espeak_1.37.bb => espeak_1.48.04.bb} | 3 --- .../espeak/files/fix-gcc6-errors.patch | 19 ------------------- 4 files changed, 4 insertions(+), 27 deletions(-) rename meta-oe/recipes-support/espeak/{espeak-data_1.37.bb => espeak-data_1.48.04.bb} (82%) rename meta-oe/recipes-support/espeak/{espeak_1.37.bb => espeak_1.48.04.bb} (89%) delete mode 100644 meta-oe/recipes-support/espeak/files/fix-gcc6-errors.patch -- 2.13.0 -- _______________________________________________ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-devel