From bbb2e867dd02bb2f0cf021a7e426facbf12ff992 Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Wed, 12 Aug 2020 16:51:20 -0700 Subject: mimic: Upgrade to 1.3.0.1 Add a patch to fix build with -fno-common Backport a patch to fix build with musl Signed-off-by: Khem Raj --- .../mimic/mimic/0001-Fix-musl-compatibility.patch | 30 ++++++++++++++++++++ ...ang-Make-cst_rx_not_indic-as-extern-decla.patch | 29 ++++++++++++++++++++ .../recipes-multimedia/mimic/mimic_1.2.0.2.bb | 29 -------------------- .../recipes-multimedia/mimic/mimic_1.3.0.1.bb | 32 ++++++++++++++++++++++ 4 files changed, 91 insertions(+), 29 deletions(-) create mode 100644 meta-multimedia/recipes-multimedia/mimic/mimic/0001-Fix-musl-compatibility.patch create mode 100644 meta-multimedia/recipes-multimedia/mimic/mimic/0001-cmu_indic_lang-Make-cst_rx_not_indic-as-extern-decla.patch delete mode 100644 meta-multimedia/recipes-multimedia/mimic/mimic_1.2.0.2.bb create mode 100644 meta-multimedia/recipes-multimedia/mimic/mimic_1.3.0.1.bb diff --git a/meta-multimedia/recipes-multimedia/mimic/mimic/0001-Fix-musl-compatibility.patch b/meta-multimedia/recipes-multimedia/mimic/mimic/0001-Fix-musl-compatibility.patch new file mode 100644 index 0000000000..1352fdde64 --- /dev/null +++ b/meta-multimedia/recipes-multimedia/mimic/mimic/0001-Fix-musl-compatibility.patch @@ -0,0 +1,30 @@ +From d7d00ec681dc430192cf2192b3de7b7c30c4753d Mon Sep 17 00:00:00 2001 +From: Bart Ribbers +Date: Sat, 9 May 2020 11:42:32 +0200 +Subject: [PATCH] Fix musl compatibility + +Signed-off-by: Khem Raj +Upstream-Status: Backport [https://github.com/MycroftAI/mimic1/commit/5282ff075091c3d1a635fb20f2b8a35a377f4b42.patch] +--- + src/hts/hts_engine_API/lib/HTS_misc.c | 4 +++- + 1 file changed, 3 insertions(+), 1 deletion(-) + +diff --git a/src/hts/hts_engine_API/lib/HTS_misc.c b/src/hts/hts_engine_API/lib/HTS_misc.c +index 72306cb..afcaaec 100644 +--- a/src/hts/hts_engine_API/lib/HTS_misc.c ++++ b/src/hts/hts_engine_API/lib/HTS_misc.c +@@ -247,8 +247,10 @@ size_t HTS_ftell(HTS_File * fp) + fgetpos((FILE *) fp->pointer, &pos); + #if defined(_WIN32) || defined(__CYGWIN__) || defined(__APPLE__) || defined(__ANDROID__) + return (size_t) pos; +-#else ++#elif defined(__GLIBC__) + return (size_t) pos.__pos; ++#else ++ return (size_t) ftell(fp->pointer); + #endif /* _WIN32 || __CYGWIN__ || __APPLE__ || __ANDROID__ */ + } else if (fp->type == HTS_DATA) { + HTS_Data *d = (HTS_Data *) fp->pointer; +-- +2.28.0 + diff --git a/meta-multimedia/recipes-multimedia/mimic/mimic/0001-cmu_indic_lang-Make-cst_rx_not_indic-as-extern-decla.patch b/meta-multimedia/recipes-multimedia/mimic/mimic/0001-cmu_indic_lang-Make-cst_rx_not_indic-as-extern-decla.patch new file mode 100644 index 0000000000..e6bf9eb2be --- /dev/null +++ b/meta-multimedia/recipes-multimedia/mimic/mimic/0001-cmu_indic_lang-Make-cst_rx_not_indic-as-extern-decla.patch @@ -0,0 +1,29 @@ +From 7d38a72f9ae14a2416f7a78e28152aa33685aec7 Mon Sep 17 00:00:00 2001 +From: Khem Raj +Date: Wed, 12 Aug 2020 16:47:27 -0700 +Subject: [PATCH] cmu_indic_lang: Make cst_rx_not_indic as extern declaration + +Fixes build with gcc-10 which has -fno-common turned on by default + +Upstream-Status: Submitted [https://github.com/MycroftAI/mimic1/pull/211] +Signed-off-by: Khem Raj +--- + lang/cmu_indic_lang/cmu_indic_lang.h | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/lang/cmu_indic_lang/cmu_indic_lang.h b/lang/cmu_indic_lang/cmu_indic_lang.h +index 75ee46c..83e2afa 100644 +--- a/lang/cmu_indic_lang/cmu_indic_lang.h ++++ b/lang/cmu_indic_lang/cmu_indic_lang.h +@@ -51,7 +51,7 @@ void cmu_indic_lang_init(cst_voice *v); + extern const cst_phoneset cmu_indic_phoneset; + extern const cst_cart cmu_indic_phrasing_cart; + +-const cst_regex * const cst_rx_not_indic; ++extern const cst_regex * const cst_rx_not_indic; + + #ifdef __cplusplus + } /* extern "C" */ +-- +2.28.0 + diff --git a/meta-multimedia/recipes-multimedia/mimic/mimic_1.2.0.2.bb b/meta-multimedia/recipes-multimedia/mimic/mimic_1.2.0.2.bb deleted file mode 100644 index b313b110cc..0000000000 --- a/meta-multimedia/recipes-multimedia/mimic/mimic_1.2.0.2.bb +++ /dev/null @@ -1,29 +0,0 @@ -SUMMARY = "A fast lightweight Text-to-speech engine" -DESCRIPTION = "Mimic is a fast, lightweight Text-to-speech engine developed by Mycroft A.I. and VocaliD, based on Carnegie Mellon University’s Flite (Festival-Lite) software. Mimic takes in text and reads it out loud to create a high quality voice." -HOMEPAGE = "https://mimic.mycroft.ai/" -SECTION = "multimedia" - -# "Mimic is available under permissive BSD-like licenses" -LICENSE = "MIT-X & \ - PD & \ - CMU-Tex & \ - BSD & \ - BSD-2-Clause & \ - BSD-3-Clause & \ - flite & \ - (flite & Sun) & \ - BellBird & \ - Apache-2.0 \ - " -LIC_FILES_CHKSUM = "file://COPYING;md5=416ef1ca5167707fe381d7be33664a33" - -DEPENDS = "curl-native icu" - -SRCREV = "67e43bf0fa56008276b878ec3790aa5f32eb2a16" -SRC_URI = "git://github.com/MycroftAI/mimic.git" - -inherit autotools - -S = "${WORKDIR}/git" - -CPPFLAGS_append = " -Wno-error" diff --git a/meta-multimedia/recipes-multimedia/mimic/mimic_1.3.0.1.bb b/meta-multimedia/recipes-multimedia/mimic/mimic_1.3.0.1.bb new file mode 100644 index 0000000000..0cac2bea53 --- /dev/null +++ b/meta-multimedia/recipes-multimedia/mimic/mimic_1.3.0.1.bb @@ -0,0 +1,32 @@ +SUMMARY = "A fast lightweight Text-to-speech engine" +DESCRIPTION = "Mimic is a fast, lightweight Text-to-speech engine developed by Mycroft A.I. and VocaliD, based on Carnegie Mellon University’s Flite (Festival-Lite) software. Mimic takes in text and reads it out loud to create a high quality voice." +HOMEPAGE = "https://mimic.mycroft.ai/" +SECTION = "multimedia" + +# "Mimic is available under permissive BSD-like licenses" +LICENSE = "MIT-X & \ + PD & \ + CMU-Tex & \ + BSD & \ + BSD-2-Clause & \ + BSD-3-Clause & \ + flite & \ + (flite & Sun) & \ + BellBird & \ + Apache-2.0 \ + " +LIC_FILES_CHKSUM = "file://COPYING;md5=a2c2c7371b58b9cdeae0dc68846fe9f1" + +DEPENDS = "curl-native libpcre2" + +SRCREV = "adf655da0399530ac1b586590257847eb61be232" +SRC_URI = "git://github.com/MycroftAI/mimic1.git \ + file://0001-Fix-musl-compatibility.patch \ + file://0001-cmu_indic_lang-Make-cst_rx_not_indic-as-extern-decla.patch \ + " + +inherit autotools + +S = "${WORKDIR}/git" + +CPPFLAGS_append = " -Wno-error" -- cgit v1.2.3-54-g00ecf