espeak: Generate phondata based on endianness of targer
PATCH 1/2 espeak: Generate phondata based on endianness of targer
Use qemu usermode to generate it, so we are always in correct endian-ness
espeak-data is no longer needed now, since sole purpose of it was to provide the data for bigendian systems
Signed-off-by Khem Raj <[email protected]>
--- .../espeak/espeak-data_1.48.04.bb | 24 ---------- meta-oe/recipes-support/espeak/espeak.inc | 15 ------ .../recipes-support/espeak/espeak_1.48.04.bb | 47 +++++++++++++++---- ...ages-cast-string_ordinal-init-values.patch | 34 ++++++++++++++ .../espeak/files/espeak-1.48-gcc-6-fix.patch | 12 ----- 5 files changed, 71 insertions(+), 61 deletions(-) delete mode 100644 meta-oe/recipes-support/espeak/espeak-data_1.48.04.bb delete mode 100644 meta-oe/recipes-support/espeak/espeak.inc create mode 100644 meta-oe/recipes-support/espeak/files/0002-tr_languages-cast-string_ordinal-init-values.patch delete mode 100644 meta-oe/recipes-support/espeak/files/espeak-1.48-gcc-6-fix.patch
meta-oe/recipes-support/espeak/espeak-data_1.48.04.bb deleted +0 -24
@@ -1,24 +0,0 @@ -require espeak.inc - -inherit native - -PACKAGES = "${PN}" -FILES_${PN} = "${layout_datadir}" - -PACKAGE_ARCH = "${MACHINE_ARCH}" -TARGET_ARCH = "${MACHINE_ARCH}" - -do_compile() { - # Fixing byte order of phoneme data files - cd "${S}/platforms/big_endian" - sed -i '/^ *CC *=/d' Makefile - sed -i 's/\(.*BYTE_ORDER\)/#undef BYTE_ORDER\n#define BYTE_ORDER BIG_ENDIAN\n\1/' espeak-phoneme-data.c - oe_runmake - ./espeak-phoneme-data "${S}/espeak-data" "." "${S}/espeak-data/phondata-manifest" - cp -f phondata phonindex phontab "${S}/espeak-data" -} - -do_install() { - install -d ${D}${layout_datadir}/espeak-data - install -m 0644 ${S}/espeak-data/phon* ${D}${layout_datadir}/espeak-data -}
meta-oe/recipes-support/espeak/espeak.inc deleted +0 -15
@@ -1,15 +0,0 @@ -DESCRIPTION = "eSpeak is a compact open source software speech synthesizer" -SECTION = "base" -LICENSE = "GPLv3" -LIC_FILES_CHKSUM = "file://License.txt;md5=cb7a20edb4c9f5f478de6523dcd7362c" - -SRC_URI = "http://downloads.sourceforge.net/espeak/espeak-1.48.04-source.zip \ - file://0001-Fix-build-of-shared-library-on-architectures-needing.patch \ - file://espeak-1.48-gcc-6-fix.patch \ -" -SRC_URI[md5sum] = "cadd7482eaafe9239546bdc09fa244c3" -SRC_URI[sha256sum] = "bf9a17673adffcc28ff7ea18764f06136547e97bbd9edf2ec612f09b207f0659" - -S = "${WORKDIR}/espeak-${PV}-source" - -DEPENDS = "portaudio-v19"
meta-oe/recipes-support/espeak/espeak_1.48.04.bb +37 -10
67 lines not on this page · raw message
meta-oe/recipes-support/espeak/files/0002-tr_languages-cast-string_ordinal-init-values.patch new file +34 -0
@@ -0,0 +1,34 @@ +From 451330d09a6a3500b40bc4f5896ba790ab46cd6c Mon Sep 17 00:00:00 2001 +From: Romain Naour <[email protected]> +Date: Sun, 15 Jan 2017 19:37:31 +0100 +Subject: [PATCH 2/2] tr_languages: cast string_ordinal init values + +On some architecture, "char" is signed (x86_64, nios2...) so the +compiler try to convert int 0xc2 and 0xba to a signed char. +This is an error since gcc6 (Wnarrowing). + +Fixes: +http://autobuild.buildroot.net/results/bae/baef9888b1979d18171668a675985e3f3b45fda6 + +Upstream-Status: Pending [imported from BR] +Signed-off-by: Romain Naour <[email protected]> +--- + src/tr_languages.cpp | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/tr_languages.cpp b/src/tr_languages.cpp +index 5c80286..dbc6e36 100644 +--- a/src/tr_languages.cpp ++++ b/src/tr_languages.cpp +@@ -200,7 +200,7 @@ static const unsigned short chars_ignore_zwnj_hyphen[] = { + 0x200d, 1, // zero width joiner + 0, 0 }; + +-const char string_ordinal[] = {0xc2,0xba,0}; // masculine ordinal character, UTF-8 ++const char string_ordinal[] = {(char)0xc2,(char)0xba,0}; // masculine ordinal character, UTF-8 + + + static Translator* NewTranslator(void) +-- +2.9.3 +
meta-oe/recipes-support/espeak/files/espeak-1.48-gcc-6-fix.patch deleted +0 -12
@@ -1,12 +0,0 @@ -diff --git a/src/tr_languages.cpp b/src/tr_languages.cpp ---- a/src/tr_languages.cpp -+++ b/src/tr_languages.cpp -@@ -198,7 +198,7 @@ static const unsigned short chars_ignore_zwnj_hyphen[] = { - 0x200d, 1, // zero width joiner - 0, 0 }; - --const char string_ordinal[] = {0xc2,0xba,0}; // masculine ordinal character, UTF-8 -+const char string_ordinal[] = {'\xc2','\xba',0}; // masculine ordinal character, UTF-8 - - - static Translator* NewTranslator(void)
Signature · 1 line
2.20.1
PATCH 2/2 packagegroup-meta-oe: espeak-data is gone
Signed-off-by Khem Raj <[email protected]>
--- meta-oe/recipes-core/packagegroups/packagegroup-meta-oe.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
meta-oe/recipes-core/packagegroups/packagegroup-meta-oe.bb +1 -1
@@ -226,7 +226,7 @@ RDEPENDS_packagegroup-meta-oe-support ="\ anthy asio atop augeas avro-c bdwgc frame grail \ ccid ceres-solver ckermit cpprest ctapi-common daemonize \ daemontools debsums devmem2 dfu-util dfu-util-native digitemp \ - dstat eject enca epeg espeak espeak-data fbset fbset-modes \ + dstat eject enca epeg espeak fbset fbset-modes \ fftw fltk-native gd gflags glog gnulib gperftools \ gpm gradm gsl gsoap hddtemp hidapi htop hunspell hwdata iksemel \ libinih inotify-tools joe lcms lcov libatasmart libbytesize \
Signature · 1 line
2.20.1