[gentoo-commits] repo/gentoo:master commit in: app-accessibility/flite/files/, app-accessibility/flite/

2023-03-08 Thread Sam James 
commit: 608191e30730b3bf41ddce46054df7119d43ea60
Author: Matoro Mahri  users  noreply  github  
com>
AuthorDate: Wed Mar  8 22:20:37 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Thu Mar  9 01:08:01 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=608191e3

app-accessibility/flite: wire up tests

See https://github.com/festvox/flite/pull/90

Bug: https://bugs.gentoo.org/896106
Signed-off-by: Matoro Mahri  users.noreply.github.com>
Closes: https://github.com/gentoo/gentoo/pull/30006
Signed-off-by: Sam James  gentoo.org>

 .../flite/files/flite-2.2-backport-pr30.patch  | 91 ++
 app-accessibility/flite/flite-2.2.ebuild   |  7 +-
 2 files changed, 96 insertions(+), 2 deletions(-)

diff --git a/app-accessibility/flite/files/flite-2.2-backport-pr30.patch 
b/app-accessibility/flite/files/flite-2.2-backport-pr30.patch
new file mode 100644
index ..7c859a5bb03e
--- /dev/null
+++ b/app-accessibility/flite/files/flite-2.2-backport-pr30.patch
@@ -0,0 +1,91 @@
+https://bugs.gentoo.org/896106
+https://github.com/festvox/flite/pull/90
+
+From 56ef01e5a7cd8d8606b4ccd13b4366039269f9d7 Mon Sep 17 00:00:00 2001
+From: matoro 
+Date: Fri, 24 Feb 2023 14:25:16 -0500
+Subject: [PATCH] Expose automated tests under "make check"
+
+The following unit tests can be run automatically without specifying any
+user-provided arguments:
+hrg_test lex_test multi_thread nums_test regex_test token_test
+
+Fix up the Makefiles to expose the ability to run these tests via "make
+check" or "make test", since it is currently broken (exposed at the top
+level, but missing the "test" target in testsuite/).
+---
+ Makefile   |  2 +-
+ testsuite/Makefile | 22 --
+ 2 files changed, 13 insertions(+), 11 deletions(-)
+
+diff --git a/Makefile b/Makefile
+index 511f8cf..1b627b2 100644
+--- a/Makefile
 b/Makefile
+@@ -129,6 +129,6 @@ voices: ./bin/flite_cmu_us_awb ./bin/flite_cmu_us_rms 
./bin/flite_cmu_us_rms
+   ./bin/flite_cmu_us_rms -voicedump voices/cmu_us_rms.flitevox
+   ./bin/flite_cmu_us_slt -voicedump voices/cmu_us_slt.flitevox
+ 
+-test:
++check test:
+   @ $(MAKE) --no-print-directory -C testsuite test
+ 
+diff --git a/testsuite/Makefile b/testsuite/Makefile
+index b60e98a..275a3e8 100644
+--- a/testsuite/Makefile
 b/testsuite/Makefile
+@@ -49,15 +49,17 @@ SRCS = token_test_main.c hrg_test_main.c \
+bin2ascii_main.c record_in_noise_main.c \
+compare_wave_main.c rfc_main.c lpc_resynth_main.c \
+by_word_main.c flite_test_main.c \
+-   dcoffset_wave_main.c tris1_main.c
++   dcoffset_wave_main.c tris1_main.c \
++   multi_thread_main.c
+ FC = us.flitecheck indic_hin.flitecheck indic_tam.flitecheck
+-OTHERS = kal_test_main.c multi_thread_main.c 
++OTHERS = kal_test_main.c
+ 
+ FILES = Makefile $(SRCS) $(DATAFILES) $(OTHERS) $(FC)
+ 
+ LOCAL_INCLUDES = -I$(TOP)/lang/usenglish
+ 
+ MAIN_EXECS = $(SRCS:_main.c=$(EXEEXT))
++AUTO_EXECS = hrg_test lex_test multi_thread nums_test regex_test token_test
+ lex_test_LIBS = -lflite_cmulex
+ nums_test_LIBS = -lflite_usenglish
+ utt_test_LIBS = -lflite_cmulex
+@@ -65,6 +67,7 @@ lex_lookup_LIBS = -lflite_cmulex
+ ldom_time_LIBS = -L/home/awb/data/ldom/time_flite/flite/lib -lcmu_time_awb 
-lflite_usenglish -lflite_cmulex
+ flite_test_LIBS = -lflite_usenglish -lflite_cmulex
+ by_word_LIBS = -lflite_cmu_us_kal -lflite_usenglish -lflite_cmulex
++multi_thread_LIBS = -lflite_cmu_us_slt -lflite_cmulex -lflite_usenglish 
-lflite -lm -lasound -lgomp
+ #kal_test_LIBS = -lflite_cmu_us_kal -lflite_usenglish -lflite_cmulex \
+ #   /home/awb/src/malloc/gmalloc.o
+ 
+@@ -73,19 +76,18 @@ LOCAL_CLEAN = $(MAIN_EXECS)
+ 
+ include $(TOP)/config/common_make_rules
+ 
++multi_thread : CFLAGS += -fopenmp
++
+ MAIN_O = $(SRCS:%=%_main.o)
+ $(MAIN_O) : %_main.o : %_main.c
+   $(CC) $(CFLAGS) -o $@ $< 
+ $(MAIN_EXECS) : %$(EXEEXT) : %_main.o $(FLITELIBS)
+   $(CC) $(CFLAGS) -o $@ $@_main.o $($(@:=_LIBS)) $(FLITELIBFLAGS) 
$(LDFLAGS)
+ 
+-multi_thread: multi_thread_main.c
+-  gcc -fopenmp -o multi_thread multi_thread_main.c \
+-  $(CFLAGS) -I$(TOP)/include $(FLITELIBFLAGS) $(LDFLAGS) \
+-  -l flite_cmu_us_slt -lflite_cmulex -lflite_usenglish \
+-  -lflite -lm -lasound -lgomp
+-do_thread_test: multi_thread
+-# This shouldn't segfault
+-  export OMP_NUM_THREADS=100 && ./multi_thread
++check test: $(patsubst %, run_%, $(AUTO_EXECS))
+ 
++run_%: %
++  ./$<
+ 
++run_multi_thread: multi_thread
++  OMP_NUM_THREADS=100 ./$<

diff --git a/app-accessibility/flite/flite-2.2.ebuild 
b/app-accessibility/flite/flite-2.2.ebuild
index 0b4c34e70ff8..5833e0487797 100644
--- a/app-accessibility/flite/flite-2.2.ebuild
+++ b/app-accessibility/flite/flite-2.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public

[gentoo-commits] repo/gentoo:master commit in: app-accessibility/flite/files/, app-accessibility/flite/

2021-04-22 Thread Miroslav Šulc 
commit: 9b7b3fb457637abe19a33086ef908db3647a45fb
Author: Miroslav Šulc  gentoo  org>
AuthorDate: Thu Apr 22 12:29:31 2021 +
Commit: Miroslav Šulc  gentoo  org>
CommitDate: Thu Apr 22 12:29:41 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9b7b3fb4

app-accessibility/flite: removed obsolete 1.4-r1 & 2.1

Package-Manager: Portage-3.0.18, Repoman-3.0.3
Signed-off-by: Miroslav Šulc  gentoo.org>

 app-accessibility/flite/Manifest   |   2 -
 .../files/flite-1.4-fix-parallel-builds.patch  |  25 
 .../flite/files/flite-1.4-ldflags.patch|  34 --
 .../flite/files/flite-1.4-respect-destdir.patch|  59 --
 .../files/flite-2.1-Improve-internal-linking.patch |  95 ---
 ...audio-data-to-a-temporariy-file-in-debug-.patch |  59 --
 .../flite/files/flite-2.1-prototype.patch  |  13 ---
 app-accessibility/flite/flite-1.4-r4.ebuild|  75 
 app-accessibility/flite/flite-2.1.ebuild   | 129 -
 9 files changed, 491 deletions(-)

diff --git a/app-accessibility/flite/Manifest b/app-accessibility/flite/Manifest
index 335587d8759..7fc37129768 100644
--- a/app-accessibility/flite/Manifest
+++ b/app-accessibility/flite/Manifest
@@ -29,6 +29,4 @@ DIST cmu_us_rms.flitevox 12845352 BLAKE2B 
eb48a7bd29e70d9782e16de8ac28030639f336
 DIST cmu_us_rxr.flitevox 7645602 BLAKE2B 
532ce8a72455a3d15728b799b8d9c15fcc7bc06e14bc8559fe9f8ce5ff537bfb6465f3069083ce45ff023c413ae6e7b7f19c1b19e010900f60bbdfb427d2370f
 SHA512 
6f742bf4a94f72fb1383c60b2917f8001638c8ec2696b989c5ab2dd192cf4a08256e54fd5f8431a10ba164272e5bbfab474213b09d2dd3a2acf4bb4bdaca554e
 DIST cmu_us_slp.flitevox 7280743 BLAKE2B 
99d5270f55374cad466de01b1764d1ffd072cd770d0630f30f96c13af44ac02bc841be5c7aff3fe189e1089e24544363093f4cab481ed1c018bf49c621591b4f
 SHA512 
f19997ab1293bac785f8a8334512ae20d5c1feb20adac40fdc71da125069dedd1a8dc3c69b9247e20bc3f4db307be779e260172f5239622425603684766a5c44
 DIST cmu_us_slt.flitevox 11156032 BLAKE2B 
909d4d2adf94d5b40aee4b85aefaf1e8383718f491f8cc9639e0a91baccdad42b1b8a91443e4faa51ad9e1c0e25b8474f9b97c5a8d792102f87815bcdabaf230
 SHA512 
a17994d46b910434803e185820ad27a18caa1195b61f64cdbba1d6992c1bd65b3425d9e4ba40c279bdb6bce53c6b3529496c28c631c1684808f6a83f10846c41
-DIST flite-1.4-release.tar.bz2 15163897 BLAKE2B 
34b721ecd98a5699c352346528374df1c1e8395b815ea9026dbc6e4de7584bd93efb83d64fe1ec32bef03311c19920b18b198e2543dd2f010b0a3ca229337ad0
 SHA512 
eec1022077fb7a47db3848ae6944509e18a6c86a25aa24f921b8b6c2af708fc9811b287e76d96cf64fc68f8e1d0a43b7e878659f15bfcf76957eddd75e599112
-DIST flite-2.1-release.tar.bz2 14816327 BLAKE2B 
a23db51594ec94131112e0f007e1a9e4ee7170eaeda37ecc461c08a0e4defa0bfcde87ca01df765f0bc7b85cc6b3d4ec355830eae7dcb47d243d08b04772217b
 SHA512 
e9ef9ca4b6920178634d94bbe6e21a8b0ec471b010b07e6cc961ed2d120acb944c8e1d268fe26188f7dfe43fb7bd4bdff7fa53b2d2f12029d37e08d0316620d2
 DIST flite-2.2.tar.gz 20233792 BLAKE2B 
c395c34d2739da523c4794da3a795f2febb7e9a26336c7688215f648c4aee03855c8ac7c9d3817efe3e3a41380a5e325aa8236d1b64af21f8100da3dbba2db23
 SHA512 
1ca2f4145651490ef8405fdb830a3b42e885020a7603d965f6a5581b01bed41047d396b38c2ceab138fc0b28d28078db17acd2b5a84c6444cb99d65c581afa72

diff --git a/app-accessibility/flite/files/flite-1.4-fix-parallel-builds.patch 
b/app-accessibility/flite/files/flite-1.4-fix-parallel-builds.patch
deleted file mode 100644
index 270395877c5..000
--- a/app-accessibility/flite/files/flite-1.4-fix-parallel-builds.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From dec7aff03916dce6ba4c244314c60cc7b9359585 Mon Sep 17 00:00:00 2001
-From: William Hubbs 
-Date: Fri, 1 Jan 2010 12:59:59 -0600
-Subject: [PATCH] fix parallel builds
-

- main/Makefile |2 ++
- 1 files changed, 2 insertions(+), 0 deletions(-)
-
-diff --git a/main/Makefile b/main/Makefile
-index 0513e59..e4d04fe 100644
 a/main/Makefile
-+++ b/main/Makefile
-@@ -81,6 +81,8 @@ else
- shared_libs: nothing
- endif
- 
-+.NOTPARALLEL: $(ALL)
-+
- $(BINDIR)/flite$(EXEEXT): flite_main.o $(flite_LIBS_deps)
-   $(TOP)/tools/make_voice_list $(VOICES)
-   rm -f flite_voice_list.o
--- 
-1.6.4.4
-

diff --git a/app-accessibility/flite/files/flite-1.4-ldflags.patch 
b/app-accessibility/flite/files/flite-1.4-ldflags.patch
deleted file mode 100644
index fd8f49059e7..000
--- a/app-accessibility/flite/files/flite-1.4-ldflags.patch
+++ /dev/null
@@ -1,34 +0,0 @@
 a/config/common_make_rules
-+++ b/config/common_make_rules
-@@ -68,7 +68,7 @@
- 
- FLITELIBS = $(BUILDDIR)/lib/libflite.a
- FLITELIBFLAGS = -L$(BUILDDIR)/lib -lflite 
--LDFLAGS += -lm $(AUDIOLIBS) $(OTHERLIBS)
-+LDLIBS += -lm $(AUDIOLIBS) $(OTHERLIBS)
- 
- FULLOBJS = $(OBJS:%=$(OBJDIR)/%)
- ifdef SHFLAGS
-@@ -123,7 +123,7 @@
-   @ rm -rf shared_os && mkdir shared_os
-   @ rm -f $@ $@.${PROJECT_VERSION} $@.${PROJECT_SHLIB_VERSION} 
-   @ (cd shared_os && ar x ../$<)
--  @ (cd shared_os && $(CC) -shared

[gentoo-commits] repo/gentoo:master commit in: app-accessibility/flite/files/, app-accessibility/flite/

2020-02-19 Thread Matt Turner 
commit: be655cb34af29811e96fdb4f6e41a8cfe28f8a19
Author: Mihai Moldovan  ionic  de>
AuthorDate: Thu Feb 20 01:31:56 2020 +
Commit: Matt Turner  gentoo  org>
CommitDate: Thu Feb 20 02:54:40 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=be655cb3

app-accessibility/flite: Version bump to 2.1

Lots of changes by mattst88:
- EAPI=7
- Update homepage
- Drop IUSE=static-libs
- Only depend on alsa-lib if USE="alsa -pulseaudio"
- Pull in patches from upstream
- Rename configure.in -> configure.ac
- Rewrite pkg_postinst() message
- Add ,  info to metadata.xml

Closes: https://bugs.gentoo.org/593274
Closes: https://bugs.gentoo.org/625978
Signed-off-by: Matt Turner  gentoo.org>

 app-accessibility/flite/Manifest   |  32 +
 .../files/flite-2.1-Improve-internal-linking.patch |  95 +++
 ...udio-data-to-a-temporariy-file-in-debug-.patch} |  31 +++--
 .../flite/files/flite-2.1-prototype.patch  |  13 +++
 app-accessibility/flite/flite-1.4-r4.ebuild|   2 +-
 app-accessibility/flite/flite-2.1.ebuild   | 129 +
 app-accessibility/flite/metadata.xml   |   6 +
 7 files changed, 296 insertions(+), 12 deletions(-)

diff --git a/app-accessibility/flite/Manifest b/app-accessibility/flite/Manifest
index 9404eba6c5d..afec3bc9b09 100644
--- a/app-accessibility/flite/Manifest
+++ b/app-accessibility/flite/Manifest
@@ -1 +1,33 @@
+DIST cmu_indic_ben_rm.flitevox 8868578 BLAKE2B 
2c916a14280ed69a0cc6bf94ee11380f5a6d5362f347fac5c83ddd25861b7b42d2c4071c1646a26cb5bfef86552ed51d0f708b998c7e3d02fc2815df9445
 SHA512 
26b6bb62cd00a2c2f51abd04fc8917a2b44472abf99b09b156218fa90499056c96652a984ee9fac4820db513cd2fdba396c1ceb5d26a67e312505b73d1d2b3d1
+DIST cmu_indic_guj_ad.flitevox 11368818 BLAKE2B 
972e01ab3e06d830435645eadc34bcefde9c3fdd4c302271847e2f66d5e179c88456ce80164ee1a8e2145b123af634a70929e6d9340e59189ea7e03e405c1a3e
 SHA512 
e309cabdc2f8bd049c7b43e48a55898d1adeefbfedf2dc28785c57d9606030fd9c00769f88955d514e537f5ecdac49fd4297fb2cde5a575f2927a98b38b92829
+DIST cmu_indic_guj_dp.flitevox 10235186 BLAKE2B 
e609657306b1f8a99850b9d69ee6ad7d037f60537a7b5e63c8e9962001cf0c4b87771574f29570f8a58c7684d8b7293e54aba35e931c54c5a825ad59b8c6d595
 SHA512 
8ad73d24ebf6026daae701549b783441c522bbb0e2db958b139553446a8b488f068dc14c6136e3e98f564f27a4a62b086aa45d8dfb3cadd440d08db9e9faef3b
+DIST cmu_indic_guj_kt.flitevox 5912668 BLAKE2B 
c88682589165a45fafbe207521fa2612af784e07993806a969c5de6da4606a4604d91a294a59ffaf8674409cead131490d02d0e7d5e7c2030a3bb4652ddc016b
 SHA512 
3ecda0b3d511072fec149ea4490870d1055ea683a49afa9910aa01204f5248b046fad845ae8523220ad044c08e95b36b72fbb2d33c566c21ed3412d50af2e1e0
+DIST cmu_indic_hin_ab.flitevox 30897320 BLAKE2B 
6fd9cbbd123b48809657bf42368cdae25c394bb7e0eec1f09ca998a6036082036a8eda6e7b2667737c66e2744304a3f674b852c36c6b79e2a026faabb2190459
 SHA512 
c84a8a2e76ff237a9ab3678acddc8874e20be6693d3f00d08354537dc0ce7938059227024e89d9cd06aa1b16817a8d4c0b3872eae67c8980970226899bf0ed17
+DIST cmu_indic_kan_plv.flitevox 8901763 BLAKE2B 
2f27e82eff5ff2c12c1ef0ea82c20ea007a7dfedffc3b9f4fbbb963ce4f19161b3ab06412200b43fb913d8ff454428a523140d33ac5ae0f36c9c0a178225d757
 SHA512 
590b292ff8e30b57555056869c9b7c886ff39a289b2a05ca7fad13f043880ebda83399d079e69f2a17318879699c5ecb897c99863b3f122a47488017dd52bdd2
+DIST cmu_indic_mar_aup.flitevox 11815465 BLAKE2B 
b79f5d7e1225f261ab932b659217c94a8fd858655d04feb29a72e77b74c48b10d656c9076e965d9981bd91c7357ee656a160586d9e063e2bda2017d01563bf2b
 SHA512 
c15e73dfc20082bc837f9ecc86a12584628ddcaa3eb5ffa54b76270fb8bf48fb6f48652495421db494fa26a623324d6fd6ed219fc6eaf0ce77b3910a70989c6f
+DIST cmu_indic_mar_slp.flitevox 13418271 BLAKE2B 
fae872ba6b69036932dd32ce67ded8503a91e355bf2eccb526170f0a8fe8cfd2ed7cb8c4a886b12a8901ca4c4a2b22b2c8fae4e53a20ce250d6cc814afb34a08
 SHA512 
0674d39cbfd52bcf7a1eba289ba0fd364a8db875fa05ef461965e7fc3fd972cfdb2273670da047471439ec252a73a9cf734985f0e4ff6d6520ea5c44bf60711a
+DIST cmu_indic_pan_amp.flitevox 8035698 BLAKE2B 
dfa2415e9a97ffb7945c7d49d593a48a53402cd8abc0b5eb5f07c609e480cd113d27591d8623d6bd6fa2d0132be138e389c80fb5196bd7521b13513cc0a1271e
 SHA512 
8cbcdb129e4e1269b59a45605dfbaee5471bddf128986e625b61356acb09ff188c95257acf9649881ba6e33e03c743e03c096cdc2619af24113493ca59060453
+DIST cmu_indic_tam_sdr.flitevox 11361848 BLAKE2B 
156c894986ee75b72840b6543d1e8272a1dca3d008ce6981bbfd301f0848bb4948b91f32a92a1fdfe93c67cb1ba4a8aa3acc98672e985338050f577dc06a8437
 SHA512 
0bec074a52f2070e8d353cfd8f05bfb4dd20a90a75a68d6e5ab39a9d9cd432ce967931b35b498e35781c709e8feb1d8be9388da24567781542d3ecce255e91c0
+DIST cmu_indic_tel_kpn.flitevox 13379640 BLAKE2B 
8543cce3a50add90bc62e1745e60c43d47c39d8ee45aaccea32d526feda285d3b49b043bb9608f82d441d0bc8decc987671dadfa1ba65eba6e44418ea9418763
 SHA512 
0d8c5d740d4ccee273ab6b9fe06d3448e0709ca1fa873355c4e8b76401b7ab3d86028ec7e456f1dbc7defaffdb756657b01bfcd70631452664dc83ed2f2df005
+DIST