commit: 0589822be3601d78bad38165a9fe574e497a08f5 Author: Takuya Wakazono <pastalian46 <AT> gmail <DOT> com> AuthorDate: Fri Nov 1 13:26:02 2024 +0000 Commit: David Roman <davidroman96 <AT> gmail <DOT> com> CommitDate: Fri Nov 1 13:26:02 2024 +0000 URL: https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=0589822b
app-accessibility/mimic1: fix lto build Closes: https://bugs.gentoo.org/859640 Signed-off-by: Takuya Wakazono <pastalian46 <AT> gmail.com> .../mimic1/files/mimic1-1.3.0.1-lto.patch | 41 ++++++++++++++++++++++ app-accessibility/mimic1/mimic1-1.3.0.1-r1.ebuild | 14 +++++--- app-accessibility/mimic1/mimic1-9999.ebuild | 10 +++--- 3 files changed, 54 insertions(+), 11 deletions(-) diff --git a/app-accessibility/mimic1/files/mimic1-1.3.0.1-lto.patch b/app-accessibility/mimic1/files/mimic1-1.3.0.1-lto.patch new file mode 100644 index 000000000..d3aff70b5 --- /dev/null +++ b/app-accessibility/mimic1/files/mimic1-1.3.0.1-lto.patch @@ -0,0 +1,41 @@ +https://bugs.gentoo.org/859640 +https://github.com/MycroftAI/mimic1/commit/8b7bb9678035c54d5249062be89eadb5067483c2 +--- a/lang/cmu_grapheme_lex/cmu_grapheme_lex.h ++++ b/lang/cmu_grapheme_lex/cmu_grapheme_lex.h +@@ -43,8 +43,9 @@ extern "C" { + #include "cst_lexicon.h" + cst_lexicon *cmu_grapheme_lex_init(void); + ++#define UNICODE_SAMPA_MAPPING_SIZE 16674 + extern const int num_unicode_sampa_mapping; +-extern const char * const unicode_sampa_mapping[16663][5]; ++extern const char * const unicode_sampa_mapping[UNICODE_SAMPA_MAPPING_SIZE][5]; + + #ifdef __cplusplus + } /* extern "C" */ +--- a/lang/cmu_grapheme_lex/grapheme_unitran_tables.c ++++ b/lang/cmu_grapheme_lex/grapheme_unitran_tables.c +@@ -5,8 +5,10 @@ + /* Ported for Festvox by Gopala Anumachipalli gopal...@cs.cmu.edu Sep 2012 */ + /* Then converted to C for CMU Mimic (cmuflite.org) */ + #include <mimic.h> +-const int num_unicode_sampa_mapping = 16673; +-const char * const unicode_sampa_mapping[16674][5] = ++#include "cmu_grapheme_lex.h" ++ ++const int num_unicode_sampa_mapping = UNICODE_SAMPA_MAPPING_SIZE - 1; ++const char * const unicode_sampa_mapping[UNICODE_SAMPA_MAPPING_SIZE][5] = + { + {"let_a", "A", NULL, NULL, NULL}, + {"let_b", "b", NULL, NULL, NULL}, +--- a/lang/cmulex/cmu_lex.c ++++ b/lang/cmulex/cmu_lex.c +@@ -46,7 +46,7 @@ extern const int cmu_lex_entry[]; + extern const unsigned char cmu_lex_data[]; + extern const int cmu_lex_num_entries; + extern const int cmu_lex_num_bytes; +-extern const char * const cmu_lex_phone_table[54]; ++extern const char * const cmu_lex_phone_table[57]; + extern const char * const cmu_lex_phones_huff_table[]; + extern const char * const cmu_lex_entries_huff_table[]; + diff --git a/app-accessibility/mimic1/mimic1-1.3.0.1-r1.ebuild b/app-accessibility/mimic1/mimic1-1.3.0.1-r1.ebuild index 408a0e183..dc72bfb1e 100644 --- a/app-accessibility/mimic1/mimic1-1.3.0.1-r1.ebuild +++ b/app-accessibility/mimic1/mimic1-1.3.0.1-r1.ebuild @@ -1,7 +1,7 @@ -# Copyright 2019-2020 Gentoo Authors +# Copyright 2019-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 inherit autotools @@ -14,7 +14,7 @@ else fi DESCRIPTION="Mycroft's TTS engine, based on CMU's Flite (Festival Lite)" -HOMEPAGE="https://mimic.mycroft.ai/"; +HOMEPAGE="https://community.openconversational.ai/"; LICENSE="BSD MIT public-domain freetts BSD-2 Apache-2.0" SLOT="0" @@ -31,10 +31,14 @@ DEPEND=" RDEPEND="${DEPEND}" BDEPEND="virtual/pkgconfig" -PATCHES=( "${FILESDIR}/${P}-gcc10.patch" ) +PATCHES=( + "${FILESDIR}/${P}-gcc10.patch" + # bug 859640 + "${FILESDIR}/${P}-lto.patch" +) src_prepare() { default - sed -i 's/-Werror//' Makefile.am + sed -i 's/-Werror //' Makefile.am || die eautoreconf } diff --git a/app-accessibility/mimic1/mimic1-9999.ebuild b/app-accessibility/mimic1/mimic1-9999.ebuild index 4182a7d6f..e0b80586a 100644 --- a/app-accessibility/mimic1/mimic1-9999.ebuild +++ b/app-accessibility/mimic1/mimic1-9999.ebuild @@ -1,7 +1,7 @@ -# Copyright 2019-2020 Gentoo Authors +# Copyright 2019-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 inherit autotools @@ -14,7 +14,7 @@ else fi DESCRIPTION="Mycroft's TTS engine, based on CMU's Flite (Festival Lite)" -HOMEPAGE="https://mimic.mycroft.ai/"; +HOMEPAGE="https://community.openconversational.ai/"; LICENSE="BSD MIT public-domain freetts BSD-2 Apache-2.0" SLOT="0" @@ -31,10 +31,8 @@ DEPEND=" RDEPEND="${DEPEND}" BDEPEND="virtual/pkgconfig" -PATCHES=( "${FILESDIR}/${PN}-1.3.0.1-gcc10.patch" ) - src_prepare() { default - sed -i 's/-Werror//' Makefile.am + sed -i 's/-Werror //' Makefile.am || die eautoreconf }
