From aeea9ec7b3476392e0a54e8c969a6e4acca43056 Mon Sep 17 00:00:00 2001 From: Gerasim Troeglazov <3dEyes@gmail.com> Date: Mon, 13 Feb 2023 23:04:37 +1000 Subject: [PATCH] flite: bump version --- .../{flite-2.1.recipe => flite-2.2.recipe} | 8 ++--- ...{flite-2.1.patchset => flite-2.2.patchset} | 36 +++++++++---------- 2 files changed, 22 insertions(+), 22 deletions(-) rename app-accessibility/flite/{flite-2.1.recipe => flite-2.2.recipe} (94%) rename app-accessibility/flite/patches/{flite-2.1.patchset => flite-2.2.patchset} (79%) diff --git a/app-accessibility/flite/flite-2.1.recipe b/app-accessibility/flite/flite-2.2.recipe similarity index 94% rename from app-accessibility/flite/flite-2.1.recipe rename to app-accessibility/flite/flite-2.2.recipe index b3cf6332a..565a6b00c 100644 --- a/app-accessibility/flite/flite-2.1.recipe +++ b/app-accessibility/flite/flite-2.2.recipe @@ -19,13 +19,13 @@ COPYRIGHT="1986 University of Toronto # license covers all the files. LICENSE="Flite" REVISION="1" -SOURCE_URI="http://www.festvox.org/flite/packed/flite-${portVersion}/flite-${portVersion}-release.tar.bz2" -CHECKSUM_SHA256="c73c3f6a2ea764977d6eaf0a287722d1e2066b4697088c552e342c790f3d2b85" -SOURCE_DIR="flite-${portVersion}-release" +SOURCE_URI="https://github.com/festvox/flite/archive/refs/tags/v$portVersion.tar.gz" +CHECKSUM_SHA256="ab1555fe5adc3f99f1d4a1a0eb1596d329fd6d74f1464a0097c81f53c0cf9e5c" +SOURCE_DIR="flite-${portVersion}" PATCHES="flite-$portVersion.patchset" ARCHITECTURES="all ?x86_gcc2" -SECONDARY_ARCHITECTURES="?x86_gcc2 x86" +SECONDARY_ARCHITECTURES="x86" commandBinDir=$binDir commandSuffix=$secondaryArchSuffix diff --git a/app-accessibility/flite/patches/flite-2.1.patchset b/app-accessibility/flite/patches/flite-2.2.patchset similarity index 79% rename from app-accessibility/flite/patches/flite-2.1.patchset rename to app-accessibility/flite/patches/flite-2.2.patchset index c5a2e259e..9f00789ae 100644 --- a/app-accessibility/flite/patches/flite-2.1.patchset +++ b/app-accessibility/flite/patches/flite-2.2.patchset @@ -1,4 +1,4 @@ -From a85d0966e3b57f5df919fa4814b2503fb2c180c3 Mon Sep 17 00:00:00 2001 +From 9bc733bcd1c31172230c9b0af3a1de6a46e622d1 Mon Sep 17 00:00:00 2001 From: Timothy Gu Date: Wed, 24 Dec 2014 22:37:15 +0000 Subject: Support shared libraries on Haiku @@ -20,40 +20,40 @@ index 54a782d..65df51b 100644 SHFLAGS="-fPIC" ;; -- -2.19.0 +2.37.3 -From 93527d24ecb02fe5a5c9e4ef30d76ea45a484007 Mon Sep 17 00:00:00 2001 +From 514906b52b82bf45a4f26e6d05b12a12f685646a Mon Sep 17 00:00:00 2001 From: Timothy Gu Date: Wed, 24 Dec 2014 23:44:02 +0000 Subject: Bump shlib version to libflite.so.2 diff --git a/config/project.mak b/config/project.mak -index 1d655d9..a1d0729 100644 +index 47553f2..fa791bf 100644 --- a/config/project.mak +++ b/config/project.mak -@@ -40,4 +40,4 @@ PROJECT_VERSION = 2.1 - PROJECT_DATE = Dec 2017 - PROJECT_STATE = release +@@ -40,4 +40,4 @@ PROJECT_VERSION = 2.2 + PROJECT_DATE = Sep 2018 + PROJECT_STATE = current -PROJECT_SHLIB_VERSION = 1 +PROJECT_SHLIB_VERSION = 2 -- -2.19.0 +2.37.3 -From b496372f06a8292255a1e64ffa4211344252e8df Mon Sep 17 00:00:00 2001 +From 61f91dc752576b7a1e9e15ce6bf5a2f3b1d5c0d1 Mon Sep 17 00:00:00 2001 From: Timothy Gu Date: Wed, 24 Dec 2014 22:39:36 +0000 Subject: Separate code and declaration diff --git a/lang/cmu_indic_lex/cmu_indic_lex.c b/lang/cmu_indic_lex/cmu_indic_lex.c -index e0ae73f..7444472 100644 +index d55f1db..b370545 100644 --- a/lang/cmu_indic_lex/cmu_indic_lex.c +++ b/lang/cmu_indic_lex/cmu_indic_lex.c -@@ -420,6 +420,9 @@ cst_val *cmu_indic_lex_ord_to_phones(const cst_val *ords, +@@ -392,6 +392,9 @@ cst_val *cmu_indic_lex_ord_to_phones(const cst_val *ords, int cmu_indic_variant_deletes_word_final_schwa, const cst_features *feats) { @@ -63,7 +63,7 @@ index e0ae73f..7444472 100644 cst_val *in_ords = 0; cst_val *t_ords = 0; cst_val *out_phone_strings = 0; -@@ -587,8 +590,6 @@ cst_val *cmu_indic_lex_ord_to_phones(const cst_val *ords, +@@ -559,8 +562,6 @@ cst_val *cmu_indic_lex_ord_to_phones(const cst_val *ords, /* There may be multiple phones in the expansion, but they are just */ /* space separated tokens in the val, so we need to make them into */ /* an actual val list of phones */ @@ -73,20 +73,20 @@ index e0ae73f..7444472 100644 ph = val_readlist_string(val_string(val_car(v))); for(vx=ph; vx; vx=val_cdr(vx)) { -- -2.19.0 +2.37.3 -From e265c30eb34893a59d17c87f88870ea08ae4e295 Mon Sep 17 00:00:00 2001 +From 83a0cb49147022c469748000a5b3e47e05439535 Mon Sep 17 00:00:00 2001 From: Panagiotis Vasilopoulos Date: Sat, 4 Jan 2020 19:00:00 +0000 Subject: Made cmu_indic_lang.c C89 compatible diff --git a/lang/cmu_indic_lang/cmu_indic_lang.c b/lang/cmu_indic_lang/cmu_indic_lang.c -index 27371ea..fdd8676 100644 +index 5b0111e..aca78d7 100644 --- a/lang/cmu_indic_lang/cmu_indic_lang.c +++ b/lang/cmu_indic_lang/cmu_indic_lang.c -@@ -411,6 +411,10 @@ static int indic_nump_old(const char *number) +@@ -424,6 +424,10 @@ static int indic_nump_old(const char *number) static int indic_nump(const char *number) { @@ -97,7 +97,7 @@ index 27371ea..fdd8676 100644 /* Check if non-empty string */ if (!number[0]) return FALSE; -@@ -418,15 +422,12 @@ static int indic_nump(const char *number) +@@ -431,15 +435,12 @@ static int indic_nump(const char *number) /* Catch lone commas */ if (number[0] == ',') return indic_nump(&number[1]); @@ -119,5 +119,5 @@ index 27371ea..fdd8676 100644 p = cst_utf8_explode(number); for (q=p; q && (flag==TRUE); q=val_cdr(q)) -- -2.19.0 +2.37.3