aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDekedro <dekedro@tankers.xyz>2022-11-08 08:53:25 +0000
committeralice <alice@ayaya.dev>2022-11-08 13:56:57 +0000
commit5f77cf2cbcf3ab51bcfa641d8a786e3d6c2a596e (patch)
tree984d3c71eff42af8f30cbdc13aedc216ffe4493b
parent7d7e1dac7e907a8a30556c6ef6da9b49ff07e984 (diff)
downloadaports-5f77cf2cbcf3ab51bcfa641d8a786e3d6c2a596e.tar.gz
aports-5f77cf2cbcf3ab51bcfa641d8a786e3d6c2a596e.tar.bz2
aports-5f77cf2cbcf3ab51bcfa641d8a786e3d6c2a596e.tar.xz
testing/espeak-ng: upgrade to 1.15.1
-rw-r--r--testing/espeak-ng/APKBUILD31
-rw-r--r--testing/espeak-ng/disable-failing-test-784.patch16
-rw-r--r--testing/espeak-ng/disable-failing-tests.patch16
-rw-r--r--testing/espeak-ng/fix-grc-handling-690.patch45
-rw-r--r--testing/espeak-ng/fix-incorrect-breath-usage.patch77
-rw-r--r--testing/espeak-ng/fix-newline-expansion.patch22
6 files changed, 111 insertions, 96 deletions
diff --git a/testing/espeak-ng/APKBUILD b/testing/espeak-ng/APKBUILD
index ad78f7b894..05b9dcd8b4 100644
--- a/testing/espeak-ng/APKBUILD
+++ b/testing/espeak-ng/APKBUILD
@@ -1,18 +1,21 @@
# Maintainer: Dekedro <dekedro@tankers.xyz>
pkgname=espeak-ng
-pkgver=1.50
-pkgrel=1
+pkgver=1.51.1
+pkgrel=0
pkgdesc="Multi-lingual software speech synthesizer"
url="https://github.com/espeak-ng/espeak-ng"
-arch="all !s390x" # Fails to build on s390x
+arch="all !s390x !x86" # Tests fail on s390x, x86
license="GPL-3.0-or-later"
makedepends="autoconf automake libtool pcaudiolib-dev ronn"
+checkdepends="grep python3 sox"
subpackages="$pkgname-dev $pkgname-doc $pkgname-vim::noarch"
source="$pkgname-$pkgver.tar.gz::https://github.com/espeak-ng/espeak-ng/archive/refs/tags/$pkgver.tar.gz
- fix-samplerate-definition-699.patch::https://github.com/espeak-ng/espeak-ng/commit/e11cd42b03d1628f7a0cf45c9406123282e25c63.patch
- fix-grc-handling-690.patch
- fix-newline-expansion.patch
- disable-failing-test-784.patch"
+ https://github.com/espeak-ng/espeak-ng/commit/bc0ceab7b9a6b5c7f811bbf4c487cfe51d8398e5.patch
+ https://github.com/espeak-ng/espeak-ng/commit/0da49dc3361a8437ba82adbb5de6e6f9b7508de9.patch
+ disable-failing-tests.patch
+ fix-incorrect-breath-usage.patch
+ https://github.com/espeak-ng/espeak-ng/commit/e8253c6513e604bb2a4aa9de18682b6f96eeef25.patch
+ https://github.com/espeak-ng/espeak-ng/commit/a34d74ed438a6c2e2a11ae52c586bad645d36e52.patch"
prepare() {
default_prepare
@@ -27,7 +30,7 @@ build() {
--sysconfdir=/etc \
--mandir=/usr/share/man \
--localstatedir=/var
- make -j1
+ make
}
check() {
@@ -46,9 +49,11 @@ vim() {
}
sha512sums="
-297dd80a6cdae3e2b8acf6823475220ce89d6a5fb68ea303156ad52cb3e7388049b6921759d4ed4e3d2e2ebd19bf931259e454f74a2ac0b7ecf4ce56c1d60c0c espeak-ng-1.50.tar.gz
-9270fdcfb1f94108f0ac2109a66491df0c0f60183c500ba4dbf1db6734d4d8dae14aacb967499566ae726ba545e82f869a39a4dd7e3900ba8c4ab066f02f5e46 fix-samplerate-definition-699.patch
-f1d4fe9c45c1b7130303f8eaadf4e6331c8f82bb249ceeb40b015f02515ed78ba91b682e537301ab22528bc9e173ac3e5fed29136f8738794f88b8699bf3633d fix-grc-handling-690.patch
-b64e22b51ce17eedc2e35a52e3f1a74e6f6c8668738c97f0736544764b48c881edf9cd8ca3fb6c2341588ccb411d76d1cc127d48a5d7fc47a7aa94142f3e1a26 fix-newline-expansion.patch
-0886ac3511536f259d59ce76277585c0406fa788feea6032a05d33ca1c2720f51faf60fd36dfa4bcccfdea0cb88f916af6cf4a77f4602b7f0aea45856d424f4e disable-failing-test-784.patch
+291958c2d3a1e38f9006416347d40d98be7afc84057475c9394788610897d19c02fabc32ebb8efa6dac291d106f97bf63907d0688ef7d93ea24439cba22392d1 espeak-ng-1.51.1.tar.gz
+abbb95e6d04c1563e51d79a2b29b7666e69a831d98b47149b03e3f487066e717fbdfb319ba8f0c32e5dbdba1a02f669247272b93e2b1abc4212d9548f8818dd1 bc0ceab7b9a6b5c7f811bbf4c487cfe51d8398e5.patch
+821508991e5c31988a74ea516b8e1af3bd191b219095ee74ab93933bcfe3b62493de7141b6ae83f5031707decdee146fb91aeb8352c314b55a76132b9fea986f 0da49dc3361a8437ba82adbb5de6e6f9b7508de9.patch
+d95b96911e9ecda7d70a9aed614147b0cefee1ea10eac7183e685e83d68b8e73740e20f1ed774be939e87f42feaa3555709b876242c20f8a74fa6e812b735e2d disable-failing-tests.patch
+f5983e5d9493b2bdb9793bc94660ca7691717c74ac0e1f5499678d51e21523894a3ba16fe3836a034cd9ac6608742837247af3297ed7df2296e5ab2a8e13c042 fix-incorrect-breath-usage.patch
+510bcce7293abad35cd89aa3b55048bf9730206bbada87a66ba75971e293171510446c8cc2986cbdea388e95195e762a5bf49bc01b2405f14a5323f8460d772e e8253c6513e604bb2a4aa9de18682b6f96eeef25.patch
+8eb47972d81ce3d7c41a1184b624eca40793ee2403f912f1f1452b3cfb2213eb37cf71537e27a69333262bdd6e62bdb67ed5d2d066c766c7f08062be143f2e64 a34d74ed438a6c2e2a11ae52c586bad645d36e52.patch
"
diff --git a/testing/espeak-ng/disable-failing-test-784.patch b/testing/espeak-ng/disable-failing-test-784.patch
deleted file mode 100644
index b59b89b893..0000000000
--- a/testing/espeak-ng/disable-failing-test-784.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-One test is reported to be failing:
-https://github.com/espeak-ng/espeak-ng/issues/784
-
-This particular issue should dissapear with next release.
-
---- a/tests/language-phonemes.test
-+++ b/tests/language-phonemes.test
-@@ -95,7 +95,7 @@
- test_lang la 080bd53c20991eae7baec73b8c735eacc8aae076 "ma na Na pa p<h>a ba ta t<h>a da ka k<h>a ga fa sa za ha Ra la ja wa _:_ ma mE mI mO mU ma: me: mi: mo: mu: my my: maU maI meI mEU mOI"
- test_lang lfn 044e27a5100528760a185e0773dccaca504b5bd4 "ma na Na pa ba ta da ka ga fa va sa za Sa Za ha la ja R2a **a wa _:_ ma me mi mo mu maI maU meU moI"
- test_lang lt 615e503b996ea5f7b267ebd77b91e77c5b874e18 "ma m;a na n;a pa p;a ta t;a ka k;a ba b;a da d;a ga g;a tsa ts;a tSa tS;a dza dz;a dZa dZ;a fa f;a sa s;a Sa S;a xa x;a va v;a za z;a Za Z;a la l;a ra r;a ja _:_ m@ ma mA ma: me mE me: mee meA mi mI mi: mo mO mo: mu mU mu: mw mW mai mei mau muo moi mui mie maU meU moU maI meI"
--test_lang lv 060b6f94cd505e5c3e649d94c41856d801c0c695 "ma na n^a Na pa ba ta da ca Ja ka ga tsa dza Dz\`a tSa dZa DZ\`a fa va sa za Sa Za xa ha ja la l^a Ra ra _:_ mi my mu mE me mo ma mi: my: mu: mE: me: mo: ma: mai mau mei mie miu mui muo muo\` moi"
-+#test_lang lv 060b6f94cd505e5c3e649d94c41856d801c0c695 "ma na n^a Na pa ba ta da ca Ja ka ga tsa dza Dz\`a tSa dZa DZ\`a fa va sa za Sa Za xa ha ja la l^a Ra ra _:_ mi my mu mE me mo ma mi: my: mu: mE: me: mo: ma: mai mau mei mie miu mui muo muo\` moi"
- test_lang mi b6e622de46c33181cdfea351b907f932da9a0a1a "ma na Na pa ta ka fa ha ra wa _:_ ma ma: me me: mi mi: mo mo: mu mu:"
- test_lang mk 072d0a74acf54bea528e7dde427eb04808d38364 "ma na n^a Na pa ta xa k^a ka ba da Ja ga tsa tSa tS;a dza dZa dZ;a fa sa Sa xa va za Za l^a la ja Ra @-*a ra _:_ ma me mi mo mu mA mE ma: me: mi: mo: mu: moU"
- test_lang shn e568aca66c2f58fdaf5dda8a67f4d21f05710234 "ma na Ja Na pa p_ha ba ta t_ha da ka k_ha ga ?a fa sa za Ta ha tS;a Ra ja wa la _:_ mi mI mW mu me m@ mo mE ma ma: mO miu meu mEu mau ma:u mWi mui m@i moi mai ma:i mOi maW _:_ ma1 ma2 ma3 ma4 ma5 ma6"
diff --git a/testing/espeak-ng/disable-failing-tests.patch b/testing/espeak-ng/disable-failing-tests.patch
new file mode 100644
index 0000000000..8300168b7c
--- /dev/null
+++ b/testing/espeak-ng/disable-failing-tests.patch
@@ -0,0 +1,16 @@
+Disable tests relying on platform specific behaviour.
+
+Known and tracked upstream:
+https://github.com/espeak-ng/espeak-ng/issues/1368
+
+--- a/tests/ssml.test
++++ b/tests/ssml.test
+@@ -39,7 +39,7 @@
+ for i in `ls tests/ssml/*.ssml` ; do test_ssml $i; done
+ for i in `ls tests/ssml/*.ssml2` ; do test_ssml $i punct; done
+
+-test_ssml_audio "<prosody>" fcb28f00670959980038171ceda3c6bdec61b884 "<speak><prosody rate=\"x-slow\" pitch=\"low\"> Slow and low </prosody><prosody rate=\"x-fast\" pitch=\"x-high\"> Fast and high.</prosody></speak>"
++#test_ssml_audio "<prosody>" fcb28f00670959980038171ceda3c6bdec61b884 "<speak><prosody rate=\"x-slow\" pitch=\"low\"> Slow and low </prosody><prosody rate=\"x-fast\" pitch=\"x-high\"> Fast and high.</prosody></speak>"
+ # #410 is a bug in SSML. Sentence termination causes prosody stack to misfunction.
+ # Hash 00879af is the buggy version and should fail:
+ test_ssml_audio "<prosody> bug #410" 00879aff11dc28a352736ca397ce9567e6f39029 "<speak><prosody rate=\"x-slow\" pitch=\"low\"> Slow and low. </prosody><prosody rate=\"x-fast\" pitch=\"x-high\"> Fast and high.</prosody></speak>"
diff --git a/testing/espeak-ng/fix-grc-handling-690.patch b/testing/espeak-ng/fix-grc-handling-690.patch
deleted file mode 100644
index 08bf8524a9..0000000000
--- a/testing/espeak-ng/fix-grc-handling-690.patch
+++ /dev/null
@@ -1,45 +0,0 @@
-From 00c37d667f58e5a36853eb9ac08b09567a150704 Mon Sep 17 00:00:00 2001
-From: "Reece H. Dunn" <msclrhd@gmail.com>
-Date: Wed, 4 Dec 2019 07:41:21 +0000
-Subject: [PATCH] grc: add Greek variant letter form support; fixes
- pronunciation of the test
-
-Fixes: https://github.com/espeak-ng/espeak-ng/issues/690
-Original patch: https://github.com/espeak-ng/espeak-ng/commit/00c37d667f58e5a36853eb9ac08b09567a150704.patch
-
-diff --git a/dictsource/grc_rules b/dictsource/grc_rules
-index 94b0c6ca2..cd1f3054c 100644
---- a/dictsource/grc_rules
-+++ b/dictsource/grc_rules
-@@ -52,6 +52,18 @@ u υ
- y υ
- w ω // (long o; not standard transliteration but may be easier to type
-
-+// replace variant letter forms with their standard equivalents
-+ϐ β // U+03d0
-+ϑ θ // U+03d1
-+ϒ υ // U+03d2
-+ϕ φ // U+03d5
-+ϖ π // U+03d6
-+ϰ κ // U+03f0
-+ϱ ρ // U+03f1
-+ϲ ς // U+03f2
-+ϴ θ // U+03f4
-+ϵ ε // U+03f5
-+Ϲ ς // U+03f9
-
- // alpha
- ά ὰ // tonos
-diff --git a/tests/language-pronunciation.test b/tests/language-pronunciation.test
-index c6db1f261..b46df44da 100755
---- a/tests/language-pronunciation.test
-+++ b/tests/language-pronunciation.test
-@@ -50,7 +50,7 @@ test_phonemes fr "Latn" "byv'e d@- s@- (en)w'Iski(fr) k@ l@- patr'O~ Z'yZ fam'Y\
- test_phonemes ga "Latn" "d'u@skIl; 'i:@s@ 'u:rva#k n@ h'o:iQ\"@ b'anIh@ p'o:r 'e:v@ ,0g@s 'A:a#v" "D’fhuascail Íosa Úrmhac na hÓighe Beannaithe pór Éava agus Ádhaimh"
- test_phonemes gd "Latn" "m'us d'a:g_:_: k;'E:d;'u:n@ R'O:b 'i: l^'e 'ob" "Mus d’fhàg Cèit-Ùna ròp Ì le ob."
- test_phonemes gn "Latn" "m,aym'a_| ,yByp'o**a_| o'u k'o_| yB'y_| 'a**i_| ,in^ap,yty_!y**'e h'a_| ,ete'i~Sa t,eko**,uBiS,a**eNd'a h'a_| ,akat'uap,e J^,eQu,e**ek'ope\nh'a_| ,ikat'u **up'i_| ,oik,ua'a n^et'eBa h'a_| ,an^et,e_!yB'a\n,ipo**'a~Ba h'a_| ,iBa'iBa\nt,ekoteB'e~ p,eheNgu'eiS,a_| ,oik'o_| ,on^oNd,iBeku'e**a" "Mayma yvypóra ou ko yvy ári iñapyty'yre ha eteĩcha tecoruvicharendá ha acatúape jeguerekópe; ha ikatu rupi oikuaa ñetéva ha añete'yva, iporãva ha ivaíva, tekotevẽ pehenguéicha oiko oñondivekuéra."
--test_phonemes grc "Grek" "hoI_: d'e_: f_: 'o_: 'i_: n_: 'i_: l'et@_|_|f_|_:_: 'e_: s_: h'u:toI_: hoI_: s'yn_: k'admOI:_: 'a_: p_: 'i_: l'et@_|_|f_|_:_: 'o_: m_: 'e_: n_: 'o_: 'i_: es'E:gag,on_: d_: 'i_: d_: 'a_: s_: l'et@_|_|f_|_:_: 'a_: l_: 'i_: 'a_: 'es_: tu:s_: ell'E:nas_: 'aI_: d'E:_: 'aI_: gR'ammat,a_:\n'o_: 'y_: l'et@_|_|f_|_:_: e'onta_: pR'in_: ell'E:si_: h'O:s_: em'oI_: d_: 'o_: l'et@_|_|f_|_:_: 'e_: 'e_: 'i_: n_:\npR'O:ta_: m'en_: t'oIsi_: 'aI_: h'apant,es_: xR'eO:nt,aI_: f_: 'o_: 'i_: n_: 'i_: l'et@_|_|f_|_:_: 'e_: s_:\nmet'a_: d'e_: xR'onu:_: pRob'aInont,os_: h'ama_: tEI:_: O:n'EI:_: met'ebal,on_: 'aI_: ton_: l'et@_|_|f_|_:_: 'y_: l'et@_|_|d_|_:_: m_: 'o_: n_: tO:n_: gRamm'atO:n_:" "Οἱ δὲ Φοίνιϰες οὗτοι οἱ σὺν Κάδμῳ ἀπιϰόμενοι.. ἐσήγαγον διδασϰάλια ἐς τοὺς ῞Ελληνας ϰαὶ δὴ ϰαὶ γράμματα, οὐϰ ἐόντα πρὶν ῞Ελλησι ὡς ἐμοὶ δοϰέειν, πρῶτα μὲν τοῖσι ϰαὶ ἅπαντες χρέωνται Φοίνιϰες· μετὰ δὲ χρόνου προβαίνοντος ἅμα τῇ ϕωνῇ μετέβαλον ϰαὶ τὸν ϱυϑμὸν τῶν γραμμάτων."
-+test_phonemes grc "Grek" "hoI_: d'e_: f'oInik,es_: h'u:toI_: hoI_: s'yn_: k'admOI:_: ,apik'omen,oI_: es'E:gag,on_: d,idask'ali;,a_: 'es_: tu:s_: ell'E:nas_: k'aI_: d'E:_: k'aI_: gR'ammat,a_:\n'u:k_: e'onta_: pR'in_: ell'E:si_: h'O:s_: em'oI_: dok'ee:n_:\npR'O:ta_: m'en_: t'oIsi_: k'aI_: h'apant,es_: xR'eO:nt,aI_: f'oInik,es_:\nmet'a_: d'e_: xR'onu:_: pRob'aInont,os_: h'ama_: tEI:_: fO:n'EI:_: met'ebal,on_: k'aI_: ton_: RyTm'on_: tO:n_: gRamm'atO:n_:" "Οἱ δὲ Φοίνιϰες οὗτοι οἱ σὺν Κάδμῳ ἀπιϰόμενοι.. ἐσήγαγον διδασϰάλια ἐς τοὺς ῞Ελληνας ϰαὶ δὴ ϰαὶ γράμματα, οὐϰ ἐόντα πρὶν ῞Ελλησι ὡς ἐμοὶ δοϰέειν, πρῶτα μὲν τοῖσι ϰαὶ ἅπαντες χρέωνται Φοίνιϰες· μετὰ δὲ χρόνου προβαίνοντος ἅμα τῇ ϕωνῇ μετέβαλον ϰαὶ τὸν ϱυϑμὸν τῶν γραμμάτων."
- test_phonemes gu "Gujr" "d@*'e:k vj@kt'Ine: S,IkS@n.'Vno: Vd#'Ika:r c#'e:\no:c#'a:mV~ 'o:c#u~ pr,a:t#m'Ik 'Vne: pa:j'a:na: t,@bk:a:'o:mV~ SIkS'Vn. m@p#'Vt r@2H'e:Se:\npr,a:t#m'Ik SIkS'Vn. p#,@*JIj'a:t r@2H'e:Se:\nwIS'e:s. w,Ig#a:v,Is.@j'@k 'Vne: vj,@vs'a:ji SIkS'Vn. s,a:ma:nj'@t@H ,Up@l'Vbd# r@2H'e:Se: 'Vne: j,o:gj@t'a:na: d#o:r'Vn. p'Vr 'Uc: SIkS'Vn. pr'a:pt k,@rv'a:no: s@rv'Vne: s@m'a:n Vd#'Ika:r r@2H'e:Se:" "દરેક વ્યક્તિને શિક્ષણનો અધિકાર છે. ઓછામાં ઓછું પ્રાથમિક અને પાયાના તબક્કાઓમાં શિક્ષણ મફત રહેશે. પ્રાથમિક શિક્ષણ ફરજિયાત રહેશે. વિશેષ વિઘાવિષયક અને વ્યવસાયી શિક્ષણ સામાન્યતઃ ઉપલબ્ધ રહેશે અને યોગ્યતાના ધોરણ પર ઉચ્ચ શિક્ષણ પ્રાપ્ત કરવાનો સર્વને સમાન અધિકાર રહેશે."
- test_phonemes hi "Deva" "r'Is.Ij,o~ ko: s@t'a:ne: v'a:le: d'Us.t. r'a:kS@s,o~ ke: r'a:Ja: r'a:v@n. ka: s,@rv@n'a:S k'Vrn,e: v'a:le: v,Is.n.Uvt'a:r b#,@gv'a:n Sri*'a:m\nVj'o:d#ja: ke: m,aha:*'a:J d'VS@*,@t# ke: b'Vr.e: s@p'Utr@- t#e:" "ऋषियों को सताने वाले दुष्ट राक्षसों के राजा रावण का सर्वनाश करने वाले विष्णुवतार भगवान श्रीराम, अयोध्या के महाराज दशरथ के बड़े सपुत्र थे।"
- test_phonemes hy "Armn" "k@rn'am ,apak'i ut'el j'ev ints'i ,anhang'ist tS#@n'er" "Կրնամ ապակի ուտել և ինծի անհանգիստ չըներ։"
diff --git a/testing/espeak-ng/fix-incorrect-breath-usage.patch b/testing/espeak-ng/fix-incorrect-breath-usage.patch
new file mode 100644
index 0000000000..0624f0b5af
--- /dev/null
+++ b/testing/espeak-ng/fix-incorrect-breath-usage.patch
@@ -0,0 +1,77 @@
+Based on: https://github.com/espeak-ng/espeak-ng/commit/14088025d204d7d0203ec84c691a75c577bbd84c
+
+diff --git a/espeak-ng-data/lang/aav/vi-VN-x-central b/espeak-ng-data/lang/aav/vi-VN-x-central
+index 6d2b9ed00..0defacaa6 100644
+--- a/espeak-ng-data/lang/aav/vi-VN-x-central
++++ b/espeak-ng-data/lang/aav/vi-VN-x-central
+@@ -5,7 +5,5 @@ dictrules 1
+
+ words 1
+ pitch 82 118 //80 118
+-//breath 75 75 60 40 15 10
+- //breathw 150 150 200 200 400 400
+ voicing 90 //18
+ flutter 20
+diff --git a/espeak-ng-data/lang/aav/vi-VN-x-south b/espeak-ng-data/lang/aav/vi-VN-x-south
+index b1da9a50a..4c32561d6 100644
+--- a/espeak-ng-data/lang/aav/vi-VN-x-south
++++ b/espeak-ng-data/lang/aav/vi-VN-x-south
+@@ -5,7 +5,5 @@ dictrules 2
+
+ words 1
+ pitch 82 118 //80 118
+-//breath 75 75 60 40 15 10
+- //breathw 150 150 200 200 400 400
+ voicing 90 //18
+ flutter 20
+diff --git a/espeak-ng-data/lang/bat/ltg b/espeak-ng-data/lang/bat/ltg
+index 021faa8a8..1041d9e3b 100644
+--- a/espeak-ng-data/lang/bat/ltg
++++ b/espeak-ng-data/lang/bat/ltg
+@@ -7,8 +7,6 @@ dictionary lv
+ dictrules 2 // Setting for Latgalian pronunciation
+ words 0 2
+ pitch 64 118
+-breath 10 2 1 0 0 0 0 0
+-breathw 20 42 85 200 500 1000
+ tone 60 150 204 100 400 255 700 10 3000 255
+ stressAmp 12 10 8 8 0 0 15 16
+ stressLength 160 140 200 140 0 0 240 160
+diff --git a/espeak-ng-data/lang/bat/lv b/espeak-ng-data/lang/bat/lv
+index 8c53415b1..70eb61dcb 100644
+--- a/espeak-ng-data/lang/bat/lv
++++ b/espeak-ng-data/lang/bat/lv
+@@ -4,8 +4,6 @@ maintainer Valdis Vitolins <valdis.vitolins@odo.lv>
+ status mature
+ words 0 2
+ pitch 67 123
+-breath 10 2 1 0 0 0 0 0
+-breathw 20 42 85 200 500 1000
+ tone 60 150 204 100 400 255 700 10 3000 255
+ stressAmp 11 8 11 9 0 0 14 12
+ stressLength 160 120 200 130 0 0 230 180
+
+From 5b132923907bba60e3a77ab292490aa338586fcd Mon Sep 17 00:00:00 2001
+From: Yury Popov <dev@syncleo-iot.com>
+Date: Tue, 18 Oct 2022 17:09:39 +0300
+Subject: [PATCH 2/2] Re-enable ltg/lv phonemes tests
+
+---
+ tests/language-phonemes.test | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/tests/language-phonemes.test b/tests/language-phonemes.test
+index 9b178a52c..d1a229788 100755
+--- a/tests/language-phonemes.test
++++ b/tests/language-phonemes.test
+@@ -89,8 +89,8 @@ test_phwav la 080bd53c20991eae7baec73b8c735eacc8aae076 "ma na Na pa p<h>a ba ta
+ test_phwav lb 423fae731272b6cbcb4bb8669bd2f7da7ccacacd "a a: aE e E e: @E eR i i: o o: u u: y y: eA iA oA OU aI aU AU eI OI eU iE oU uE ma na Na pa ba ta da ka ga TSa dZa fa va wa sa za Sa Ja xa Xa rRa Za ha la ja ra"
+ test_phwav lfn 044e27a5100528760a185e0773dccaca504b5bd4 "ma na Na pa ba ta da ka ga fa va sa za Sa Za ha la ja R2a **a wa _:_ ma me mi mo mu maI maU meU moI"
+ test_phwav lt 615e503b996ea5f7b267ebd77b91e77c5b874e18 "ma m;a na n;a pa p;a ta t;a ka k;a ba b;a da d;a ga g;a tsa ts;a tSa tS;a dza dz;a dZa dZ;a fa f;a sa s;a Sa S;a xa x;a va v;a za z;a Za Z;a la l;a ra r;a ja _:_ m@ ma mA ma: me mE me: mee meA mi mI mi: mo mO mo: mu mU mu: mw mW mai mei mau muo moi mui mie maU meU moU maI meI"
+-test_phwav ltg 9e0ee2a095cd074860c3db7aa89b2011ffb38ee8 "ma m;a na n;a pa p;a ta t;a ka k;a ba b;a da d;a ga g;a tsa ts;a tSa tS;a dza dz;a dZa dZ;a fa f;a sa s;a Sa S;a xa x;a va v;a za z;a Za Z;a la l;a ra r;a ja _:_ m@ ma mA ma: me mE me: mee meA mi mI mi: mo mO mo: mu mU mu: mw mW mai mei mau muo moi mui mie maU meU moU maI meI"
+-test_phwav lv d1a84f9881e4819b46f907723184587e28e885d9 "ma na n^a Na pa ba ta da ca Ja ka ga tsa dza Dz\`a tSa dZa DZ\`a fa va sa za Sa Za xa ha ja la l^a Ra ra _:_ mi my mu mE me mo ma mi: my: mu: mE: me: mo: ma: mai mau mei mie miu mui muo muo\` moi"
++test_phwav ltg 6afb6cca448f49fc8fb5f2474a4a6e088acf19d5 "ma m;a na n;a pa p;a ta t;a ka k;a ba b;a da d;a ga g;a tsa ts;a tSa tS;a dza dz;a dZa dZ;a fa f;a sa s;a Sa S;a xa x;a va v;a za z;a Za Z;a la l;a ra r;a ja _:_ m@ ma mA ma: me mE me: mee meA mi mI mi: mo mO mo: mu mU mu: mw mW mai mei mau muo moi mui mie maU meU moU maI meI"
++test_phwav lv e7305992051362eee53bfc5303cb368f14cd49cd "ma na n^a Na pa ba ta da ca Ja ka ga tsa dza Dz\`a tSa dZa DZ\`a fa va sa za Sa Za xa ha ja la l^a Ra ra _:_ mi my mu mE me mo ma mi: my: mu: mE: me: mo: ma: mai mau mei mie miu mui muo muo\` moi"
+ test_phwav mi 2f2a08d9cf9ba62cbe3569bdb45137fa9d21c0e6 "ma na Na pa ta ka fa ha ra wa _:_ ma ma: me me: mi mi: mo mo: mu mu:"
+ test_phwav ml 15b746145a8575fc5e671284ad83b9b3be9244f0 "ma na n.a n^a Na pa p#a ba b#a ta t#a da d#a t.a t.#a d.a d.#a ka k#a ga g#a fa va sa S;a s.a ca c#a Ja J#a ha ja ra la l.a r-a _:_ ma ma: mi mi: mu mu: me me: mo mo: maI"
+ test_phwav mk 072d0a74acf54bea528e7dde427eb04808d38364 "ma na n^a Na pa ta xa k^a ka ba da Ja ga tsa tSa tS;a dza dZa dZ;a fa sa Sa xa va za Za l^a la ja Ra @-*a ra _:_ ma me mi mo mu mA mE ma: me: mi: mo: mu: moU"
diff --git a/testing/espeak-ng/fix-newline-expansion.patch b/testing/espeak-ng/fix-newline-expansion.patch
deleted file mode 100644
index b3a65b9aa1..0000000000
--- a/testing/espeak-ng/fix-newline-expansion.patch
+++ /dev/null
@@ -1,22 +0,0 @@
---- a/tests/language-pronunciation.test
-+++ b/tests/language-pronunciation.test
-@@ -14,7 +14,7 @@
- fi
- ESPEAK_DATA_PATH=`pwd` LD_LIBRARY_PATH=src:${LD_LIBRARY_PATH} \
- src/espeak-ng -xq -v ${TEST_LANG} "${TEST_TEXT}" > actual.txt
-- echo "${EXPECTED}" > expected.txt
-+ echo -e "${EXPECTED}" > expected.txt
- if [ x$TEST_BROKEN = xbroken ] ; then
- diff expected.txt actual.txt || (echo "... ignoring error (broken)" && true)
- else
---- a/tests/translate.test
-+++ b/tests/translate.test
-@@ -8,7 +8,7 @@
- echo "testing ${TEST_LANG} \"${TEST_TEXT}\""
- ESPEAK_DATA_PATH=`pwd` LD_LIBRARY_PATH=src:${LD_LIBRARY_PATH} \
- src/espeak-ng -xq -v ${TEST_LANG} "${TEST_TEXT}" > actual.txt
-- echo "${EXPECTED}" > expected.txt
-+ echo -e "${EXPECTED}" > expected.txt
- diff expected.txt actual.txt || exit 1
- }
-