1 |
commit: 9b7b3fb457637abe19a33086ef908db3647a45fb |
2 |
Author: Miroslav Šulc <fordfrog <AT> gentoo <DOT> org> |
3 |
AuthorDate: Thu Apr 22 12:29:31 2021 +0000 |
4 |
Commit: Miroslav Šulc <fordfrog <AT> gentoo <DOT> org> |
5 |
CommitDate: Thu Apr 22 12:29:41 2021 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9b7b3fb4 |
7 |
|
8 |
app-accessibility/flite: removed obsolete 1.4-r1 & 2.1 |
9 |
|
10 |
Package-Manager: Portage-3.0.18, Repoman-3.0.3 |
11 |
Signed-off-by: Miroslav Šulc <fordfrog <AT> gentoo.org> |
12 |
|
13 |
app-accessibility/flite/Manifest | 2 - |
14 |
.../files/flite-1.4-fix-parallel-builds.patch | 25 ---- |
15 |
.../flite/files/flite-1.4-ldflags.patch | 34 ------ |
16 |
.../flite/files/flite-1.4-respect-destdir.patch | 59 ---------- |
17 |
.../files/flite-2.1-Improve-internal-linking.patch | 95 --------------- |
18 |
...audio-data-to-a-temporariy-file-in-debug-.patch | 59 ---------- |
19 |
.../flite/files/flite-2.1-prototype.patch | 13 --- |
20 |
app-accessibility/flite/flite-1.4-r4.ebuild | 75 ------------ |
21 |
app-accessibility/flite/flite-2.1.ebuild | 129 --------------------- |
22 |
9 files changed, 491 deletions(-) |
23 |
|
24 |
diff --git a/app-accessibility/flite/Manifest b/app-accessibility/flite/Manifest |
25 |
index 335587d8759..7fc37129768 100644 |
26 |
--- a/app-accessibility/flite/Manifest |
27 |
+++ b/app-accessibility/flite/Manifest |
28 |
@@ -29,6 +29,4 @@ DIST cmu_us_rms.flitevox 12845352 BLAKE2B eb48a7bd29e70d9782e16de8ac28030639f336 |
29 |
DIST cmu_us_rxr.flitevox 7645602 BLAKE2B 532ce8a72455a3d15728b799b8d9c15fcc7bc06e14bc8559fe9f8ce5ff537bfb6465f3069083ce45ff023c413ae6e7b7f19c1b19e010900f60bbdfb427d2370f SHA512 6f742bf4a94f72fb1383c60b2917f8001638c8ec2696b989c5ab2dd192cf4a08256e54fd5f8431a10ba164272e5bbfab474213b09d2dd3a2acf4bb4bdaca554e |
30 |
DIST cmu_us_slp.flitevox 7280743 BLAKE2B 99d5270f55374cad466de01b1764d1ffd072cd770d0630f30f96c13af44ac02bc841be5c7aff3fe189e1089e24544363093f4cab481ed1c018bf49c621591b4f SHA512 f19997ab1293bac785f8a8334512ae20d5c1feb20adac40fdc71da125069dedd1a8dc3c69b9247e20bc3f4db307be779e260172f5239622425603684766a5c44 |
31 |
DIST cmu_us_slt.flitevox 11156032 BLAKE2B 909d4d2adf94d5b40aee4b85aefaf1e8383718f491f8cc9639e0a91baccdad42b1b8a91443e4faa51ad9e1c0e25b8474f9b97c5a8d792102f87815bcdabaf230 SHA512 a17994d46b910434803e185820ad27a18caa1195b61f64cdbba1d6992c1bd65b3425d9e4ba40c279bdb6bce53c6b3529496c28c631c1684808f6a83f10846c41 |
32 |
-DIST flite-1.4-release.tar.bz2 15163897 BLAKE2B 34b721ecd98a5699c352346528374df1c1e8395b815ea9026dbc6e4de7584bd93efb83d64fe1ec32bef03311c19920b18b198e2543dd2f010b0a3ca229337ad0 SHA512 eec1022077fb7a47db3848ae6944509e18a6c86a25aa24f921b8b6c2af708fc9811b287e76d96cf64fc68f8e1d0a43b7e878659f15bfcf76957eddd75e599112 |
33 |
-DIST flite-2.1-release.tar.bz2 14816327 BLAKE2B a23db51594ec94131112e0f007e1a9e4ee7170eaeda37ecc461c08a0e4defa0bfcde87ca01df765f0bc7b85cc6b3d4ec355830eae7dcb47d243d08b04772217b SHA512 e9ef9ca4b6920178634d94bbe6e21a8b0ec471b010b07e6cc961ed2d120acb944c8e1d268fe26188f7dfe43fb7bd4bdff7fa53b2d2f12029d37e08d0316620d2 |
34 |
DIST flite-2.2.tar.gz 20233792 BLAKE2B c395c34d2739da523c4794da3a795f2febb7e9a26336c7688215f648c4aee03855c8ac7c9d3817efe3e3a41380a5e325aa8236d1b64af21f8100da3dbba2db23 SHA512 1ca2f4145651490ef8405fdb830a3b42e885020a7603d965f6a5581b01bed41047d396b38c2ceab138fc0b28d28078db17acd2b5a84c6444cb99d65c581afa72 |
35 |
|
36 |
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 |
37 |
deleted file mode 100644 |
38 |
index 270395877c5..00000000000 |
39 |
--- a/app-accessibility/flite/files/flite-1.4-fix-parallel-builds.patch |
40 |
+++ /dev/null |
41 |
@@ -1,25 +0,0 @@ |
42 |
-From dec7aff03916dce6ba4c244314c60cc7b9359585 Mon Sep 17 00:00:00 2001 |
43 |
-From: William Hubbs <w.d.hubbs@×××××.com> |
44 |
-Date: Fri, 1 Jan 2010 12:59:59 -0600 |
45 |
-Subject: [PATCH] fix parallel builds |
46 |
- |
47 |
---- |
48 |
- main/Makefile | 2 ++ |
49 |
- 1 files changed, 2 insertions(+), 0 deletions(-) |
50 |
- |
51 |
-diff --git a/main/Makefile b/main/Makefile |
52 |
-index 0513e59..e4d04fe 100644 |
53 |
---- a/main/Makefile |
54 |
-+++ b/main/Makefile |
55 |
-@@ -81,6 +81,8 @@ else |
56 |
- shared_libs: nothing |
57 |
- endif |
58 |
- |
59 |
-+.NOTPARALLEL: $(ALL) |
60 |
-+ |
61 |
- $(BINDIR)/flite$(EXEEXT): flite_main.o $(flite_LIBS_deps) |
62 |
- $(TOP)/tools/make_voice_list $(VOICES) |
63 |
- rm -f flite_voice_list.o |
64 |
--- |
65 |
-1.6.4.4 |
66 |
- |
67 |
|
68 |
diff --git a/app-accessibility/flite/files/flite-1.4-ldflags.patch b/app-accessibility/flite/files/flite-1.4-ldflags.patch |
69 |
deleted file mode 100644 |
70 |
index fd8f49059e7..00000000000 |
71 |
--- a/app-accessibility/flite/files/flite-1.4-ldflags.patch |
72 |
+++ /dev/null |
73 |
@@ -1,34 +0,0 @@ |
74 |
---- a/config/common_make_rules |
75 |
-+++ b/config/common_make_rules |
76 |
-@@ -68,7 +68,7 @@ |
77 |
- |
78 |
- FLITELIBS = $(BUILDDIR)/lib/libflite.a |
79 |
- FLITELIBFLAGS = -L$(BUILDDIR)/lib -lflite |
80 |
--LDFLAGS += -lm $(AUDIOLIBS) $(OTHERLIBS) |
81 |
-+LDLIBS += -lm $(AUDIOLIBS) $(OTHERLIBS) |
82 |
- |
83 |
- FULLOBJS = $(OBJS:%=$(OBJDIR)/%) |
84 |
- ifdef SHFLAGS |
85 |
-@@ -123,7 +123,7 @@ |
86 |
- @ rm -rf shared_os && mkdir shared_os |
87 |
- @ rm -f $@ $@.${PROJECT_VERSION} $@.${PROJECT_SHLIB_VERSION} |
88 |
- @ (cd shared_os && ar x ../$<) |
89 |
-- @ (cd shared_os && $(CC) -shared -Wl,-soname,`basename $@`.${PROJECT_SHLIB_VERSION} -o ../$@.${PROJECT_VERSION} *.os) |
90 |
-+ @ (cd shared_os && $(CC) ${LDFLAGS} -shared -Wl,-soname,`basename $@`.${PROJECT_SHLIB_VERSION} -o ../$@.${PROJECT_VERSION} *.os $(LDLIBS)) |
91 |
- @ (cd $(LIBDIR) && ln -s `basename $@.${PROJECT_VERSION}` `basename $@.${PROJECT_SHLIB_VERSION}` ) |
92 |
- @ (cd $(LIBDIR) && ln -s `basename $@.${PROJECT_SHLIB_VERSION}` `basename $@` ) |
93 |
- @ rm -rf shared_os |
94 |
---- a/tools/Makefile |
95 |
-+++ b/tools/Makefile |
96 |
-@@ -62,9 +62,9 @@ |
97 |
- LOCAL_CLEAN = $(BINDIR)/find_sts $(BINDIR)/flite_sort |
98 |
- |
99 |
- $(BINDIR)/find_sts: find_sts_main.o $(FLITELIBS) |
100 |
-- $(CC) $(CFLAGS) -o $@ find_sts_main.o $(FLITELIBFLAGS) $(LDFLAGS) |
101 |
-+ $(CC) $(CFLAGS) ${LDFLAGS} -o $@ find_sts_main.o $(FLITELIBFLAGS) $(LDLIBS) |
102 |
- $(BINDIR)/flite_sort: flite_sort_main.o $(FLITELIBS) |
103 |
-- $(CC) $(CFLAGS) -o $@ flite_sort_main.o $(FLITELIBFLAGS) $(LDFLAGS) |
104 |
-+ $(CC) $(CFLAGS) ${LDFLAGS} -o $@ flite_sort_main.o $(FLITELIBFLAGS) $(LDLIBS) |
105 |
- makescripts: |
106 |
- @ cp -p $(SCRIPTS) $(TOP)/bin |
107 |
- |
108 |
|
109 |
diff --git a/app-accessibility/flite/files/flite-1.4-respect-destdir.patch b/app-accessibility/flite/files/flite-1.4-respect-destdir.patch |
110 |
deleted file mode 100644 |
111 |
index d54771423e1..00000000000 |
112 |
--- a/app-accessibility/flite/files/flite-1.4-respect-destdir.patch |
113 |
+++ /dev/null |
114 |
@@ -1,59 +0,0 @@ |
115 |
-From a0ae616d84e9f051ae8536574a9d1289e5f0c060 Mon Sep 17 00:00:00 2001 |
116 |
-From: William Hubbs <w.d.hubbs@×××××.com> |
117 |
-Date: Thu, 31 Dec 2009 12:57:18 -0600 |
118 |
-Subject: [PATCH] respect destdir |
119 |
- |
120 |
---- |
121 |
- Makefile | 10 +++++----- |
122 |
- main/Makefile | 10 +++++----- |
123 |
- 2 files changed, 10 insertions(+), 10 deletions(-) |
124 |
- |
125 |
-diff --git a/Makefile b/Makefile |
126 |
-index 2d3ff09..26b2386 100644 |
127 |
---- a/Makefile |
128 |
-+++ b/Makefile |
129 |
-@@ -106,11 +106,11 @@ tags: |
130 |
- |
131 |
- install: |
132 |
- @echo Installing |
133 |
-- mkdir -p $(INSTALLBINDIR) |
134 |
-- mkdir -p $(INSTALLLIBDIR) |
135 |
-- mkdir -p $(INSTALLINCDIR) |
136 |
-- $(INSTALL) -m 644 include/*.h $(INSTALLINCDIR) |
137 |
-- @ $(MAKE) -C main --no-print-directory install |
138 |
-+ mkdir -p $(DESTDIR)$(INSTALLBINDIR) |
139 |
-+ mkdir -p $(DESTDIR)$(INSTALLLIBDIR) |
140 |
-+ mkdir -p $(DESTDIR)$(INSTALLINCDIR) |
141 |
-+ $(INSTALL) -m 644 include/*.h $(DESTDIR)$(INSTALLINCDIR) |
142 |
-+ @ $(MAKE) -C main --no-print-directory DESTDIR=$(DESTDIR) install |
143 |
- |
144 |
- time-stamp : |
145 |
- @ echo $(PROJECT_NAME) >.time-stamp |
146 |
-diff --git a/main/Makefile b/main/Makefile |
147 |
-index 8163e40..0513e59 100644 |
148 |
---- a/main/Makefile |
149 |
-+++ b/main/Makefile |
150 |
-@@ -111,15 +111,15 @@ $(BINDIR)/flite_${VOICE}: flite_main.o $(flite_LIBS_deps) |
151 |
- |
152 |
- install: |
153 |
- # The basic binaries |
154 |
-- @ $(INSTALL) -m 755 $(BINDIR)/flite $(INSTALLBINDIR) |
155 |
-+ @ $(INSTALL) -m 755 $(BINDIR)/flite $(DESTDIR)$(INSTALLBINDIR) |
156 |
- @ for i in $(VOICES) ; \ |
157 |
- do \ |
158 |
-- $(INSTALL) $(BINDIR)/flite_$$i $(INSTALLBINDIR); \ |
159 |
-+ $(INSTALL) $(BINDIR)/flite_$$i $(DESTDIR)$(INSTALLBINDIR); \ |
160 |
- done |
161 |
-- $(INSTALL) -m 755 $(BINDIR)/flite_time $(INSTALLBINDIR) |
162 |
-+ $(INSTALL) -m 755 $(BINDIR)/flite_time $(DESTDIR)$(INSTALLBINDIR) |
163 |
- # The libraries: static and shared (if built) |
164 |
-- cp -pd $(flite_LIBS_deps) $(INSTALLLIBDIR) |
165 |
-+ cp -pd $(flite_LIBS_deps) $(DESTDIR)$(INSTALLLIBDIR) |
166 |
- ifdef SHFLAGS |
167 |
-- cp -pd $(SHAREDLIBS) $(VERSIONSHAREDLIBS) $(INSTALLLIBDIR) |
168 |
-+ cp -pd $(SHAREDLIBS) $(VERSIONSHAREDLIBS) $(DESTDIR)$(INSTALLLIBDIR) |
169 |
- endif |
170 |
- |
171 |
--- |
172 |
-1.6.4.4 |
173 |
- |
174 |
|
175 |
diff --git a/app-accessibility/flite/files/flite-2.1-Improve-internal-linking.patch b/app-accessibility/flite/files/flite-2.1-Improve-internal-linking.patch |
176 |
deleted file mode 100644 |
177 |
index 4b377e80c33..00000000000 |
178 |
--- a/app-accessibility/flite/files/flite-2.1-Improve-internal-linking.patch |
179 |
+++ /dev/null |
180 |
@@ -1,95 +0,0 @@ |
181 |
-From 6e3c1a2fa29c066f7d1a25037a1f61cd295ac3af Mon Sep 17 00:00:00 2001 |
182 |
-From: Paul Gevers <elbrus@××××××.org> |
183 |
-Date: Tue, 2 Jan 2018 19:58:18 +0100 |
184 |
-Subject: [PATCH] Improve internal linking |
185 |
- |
186 |
-Building packages in Debian uses a tool to link libraries together at the |
187 |
-package level. It emits warnings when unknonw symbols are found. E.g: |
188 |
- |
189 |
-dpkg-shlibdeps: warning: symbol us_tokentowords used by debian/libflite1/usr/lib/x86_64-linux-gnu/libflite_cmu_indic_lang.so.2.0.0 found in none of the libraries |
190 |
---- |
191 |
- config/common_make_rules | 2 +- |
192 |
- main/Makefile | 16 ++++++++++++++-- |
193 |
- 2 files changed, 15 insertions(+), 3 deletions(-) |
194 |
- |
195 |
-diff --git a/config/common_make_rules b/config/common_make_rules |
196 |
-index 7a03785..34434fd 100644 |
197 |
---- a/config/common_make_rules |
198 |
-+++ b/config/common_make_rules |
199 |
-@@ -123,7 +123,7 @@ $(LIBDIR)/%.so: $(LIBDIR)/%.shared.a |
200 |
- @ rm -rf shared_os && mkdir shared_os |
201 |
- @ rm -f $@ $@.${PROJECT_VERSION} $@.${PROJECT_SHLIB_VERSION} |
202 |
- @ (cd shared_os && ar x ../$<) |
203 |
-- @ (cd shared_os && $(CC) -shared -Wl,-soname,`basename $@`.${PROJECT_SHLIB_VERSION} -o ../$@.${PROJECT_VERSION} *.os) |
204 |
-+ @ (cd shared_os && $(CC) -shared -Wl,-soname,`basename $@`.${PROJECT_SHLIB_VERSION} -o ../$@.${PROJECT_VERSION} *.os $(LDFLAGS)) |
205 |
- @ (cd $(LIBDIR) && ln -s `basename $@.${PROJECT_VERSION}` `basename $@.${PROJECT_SHLIB_VERSION}` ) |
206 |
- @ (cd $(LIBDIR) && ln -s `basename $@.${PROJECT_SHLIB_VERSION}` `basename $@` ) |
207 |
- @ rm -rf shared_os |
208 |
-diff --git a/main/Makefile b/main/Makefile |
209 |
-index ff422e0..47b6344 100644 |
210 |
---- a/main/Makefile |
211 |
-+++ b/main/Makefile |
212 |
-@@ -54,7 +54,8 @@ ALL = shared_libs \ |
213 |
- VOICES=$(VOXES) |
214 |
- VOICELIBS=$(VOICES:%=flite_%) |
215 |
- |
216 |
--flite_LIBS = $(VOICELIBS) $(LANGS:%=flite_%) $(LEXES:%=flite_%) flite |
217 |
-+flite_MODS = $(VOICELIBS) $(LANGS:%=flite_%) $(LEXES:%=flite_%) |
218 |
-+flite_LIBS = flite $(flite_MODS) |
219 |
- |
220 |
- flite_LIBS_flags = -L$(LIBDIR) $(flite_LIBS:%=-l%) |
221 |
- flite_LIBS_deps = $(flite_LIBS:%=$(LIBDIR)/lib%.a) |
222 |
-@@ -65,6 +66,10 @@ include $(TOP)/config/common_make_rules |
223 |
- # so make clean can remove them |
224 |
- SHAREDARLIBS= $(flite_LIBS:%=$(LIBDIR)/lib%.shared.a) |
225 |
- SHAREDLIBS = $(SHAREDARLIBS:%.shared.a=%.so) |
226 |
-+SHAREDMODS = $(flite_MODS:%=$(LIBDIR)/lib%.so) |
227 |
-+SHAREDusenMODS = $(LIBDIR)/libflite_cmu_time_awb.so $(LIBDIR)/libflite_cmu_us_awb.so $(LIBDIR)/libflite_cmu_us_kal16.so $(LIBDIR)/libflite_cmu_us_kal.so $(LIBDIR)/libflite_cmu_us_rms.so $(LIBDIR)/libflite_cmu_us_slt.so $(LIBDIR)/libflite_cmu_indic_lang.so |
228 |
-+SHAREDcmulexMODS = $(LIBDIR)/libflite_cmu_time_awb.so $(LIBDIR)/libflite_cmu_us_awb.so $(LIBDIR)/libflite_cmu_us_kal16.so $(LIBDIR)/libflite_cmu_us_kal.so $(LIBDIR)/libflite_cmu_us_rms.so $(LIBDIR)/libflite_cmu_us_slt.so $(LIBDIR)/libflite_cmu_indic_lex.so |
229 |
-+SHAREDindicMODS = $(LIBDIR)/libflite_cmu_indic_lex.so |
230 |
- VERSIONSHAREDLIBS = $(SHAREDLIBS:%=%.${PROJECT_VERSION}) \ |
231 |
- $(SHAREDLIBS:%=%.${PROJECT_SHLIB_VERSION}) |
232 |
- |
233 |
-@@ -79,7 +84,14 @@ LOCAL_CLEAN = $(BINDIR)/flite$(EXEEXT) $(BINDIR)/flite_time$(EXEEXT) \ |
234 |
- flite_voice_list.c |
235 |
- |
236 |
- ifdef SHFLAGS |
237 |
--flite_LIBS_flags += -Wl,-rpath $(LIBDIR) |
238 |
-+$(SHAREDMODS): $(LIBDIR)/libflite.so |
239 |
-+$(SHAREDMODS): LDFLAGS+=-L../$(LIBDIR) -lflite |
240 |
-+$(SHAREDusenMODS): $(LIBDIR)/libflite_usenglish.so |
241 |
-+$(SHAREDusenMODS): LDFLAGS+=-L../$(LIBDIR) -lflite_usenglish |
242 |
-+$(SHAREDcmulexMODS): $(LIBDIR)/libflite_cmulex.so |
243 |
-+$(SHAREDcmulexMODS): LDFLAGS+=-L../$(LIBDIR) -lflite_cmulex |
244 |
-+$(SHAREDindicMODS): $(LIBDIR)/libflite_cmu_indic_lang.so |
245 |
-+$(SHAREDindicMODS): LDFLAGS+=-L../$(LIBDIR) -lflite_cmu_indic_lang |
246 |
- shared_libs: $(SHAREDLIBS) |
247 |
- else |
248 |
- shared_libs: nothing |
249 |
--- |
250 |
-2.24.1 |
251 |
- |
252 |
-From d673f65b2c4a8cd3da7447079309a6dc4bcf1a5e Mon Sep 17 00:00:00 2001 |
253 |
-From: Alan W Black <awb@××××××.edu> |
254 |
-Date: Sun, 4 Mar 2018 08:55:40 -0500 |
255 |
-Subject: [PATCH] get libs in the right order |
256 |
- |
257 |
---- |
258 |
- main/Makefile | 2 +- |
259 |
- 1 file changed, 1 insertion(+), 1 deletion(-) |
260 |
- |
261 |
-diff --git a/main/Makefile b/main/Makefile |
262 |
-index 47b6344..1da18a8 100644 |
263 |
---- a/main/Makefile |
264 |
-+++ b/main/Makefile |
265 |
-@@ -55,7 +55,7 @@ VOICES=$(VOXES) |
266 |
- VOICELIBS=$(VOICES:%=flite_%) |
267 |
- |
268 |
- flite_MODS = $(VOICELIBS) $(LANGS:%=flite_%) $(LEXES:%=flite_%) |
269 |
--flite_LIBS = flite $(flite_MODS) |
270 |
-+flite_LIBS = $(flite_MODS) flite |
271 |
- |
272 |
- flite_LIBS_flags = -L$(LIBDIR) $(flite_LIBS:%=-l%) |
273 |
- flite_LIBS_deps = $(flite_LIBS:%=$(LIBDIR)/lib%.a) |
274 |
--- |
275 |
-2.24.1 |
276 |
|
277 |
diff --git a/app-accessibility/flite/files/flite-2.1-Only-write-audio-data-to-a-temporariy-file-in-debug-.patch b/app-accessibility/flite/files/flite-2.1-Only-write-audio-data-to-a-temporariy-file-in-debug-.patch |
278 |
deleted file mode 100644 |
279 |
index 5ddaecd6590..00000000000 |
280 |
--- a/app-accessibility/flite/files/flite-2.1-Only-write-audio-data-to-a-temporariy-file-in-debug-.patch |
281 |
+++ /dev/null |
282 |
@@ -1,59 +0,0 @@ |
283 |
-From a3ff166a5a99ea97f9037a82f5c2a578348291ac Mon Sep 17 00:00:00 2001 |
284 |
-From: Paul Gevers <elbrus@××××××.org> |
285 |
-Date: Tue, 2 Jan 2018 06:20:03 +0100 |
286 |
-Subject: [PATCH] Only write audio data to a temporariy file in debug builds |
287 |
- |
288 |
-This isn't useful in regular builds and is actually a security concern, |
289 |
-although it seems (see discussion in [Bug-Debian]) that this is most likely |
290 |
-only reached during testsuite calls. |
291 |
- |
292 |
-CVE-2014-0027 |
293 |
- |
294 |
-Original patch from Rui Matos <tiagomatos@×××××.com> |
295 |
-Date: Mon, 6 Jan 2014 13:45:00 +0000 |
296 |
-Bug-Debian: http://bugs.debian.org/734746 |
297 |
-Bug-Redhat: https://bugzilla.redhat.com/show_bug.cgi?id=1048678 |
298 |
-Source: https://bugzilla.redhat.com/attachment.cgi?id=846118 |
299 |
---- |
300 |
- src/audio/auserver.c | 6 ++++++ |
301 |
- 1 file changed, 6 insertions(+) |
302 |
- |
303 |
-diff --git a/src/audio/auserver.c b/src/audio/auserver.c |
304 |
-index 800c27d..cfcad7d 100644 |
305 |
---- a/src/audio/auserver.c |
306 |
-+++ b/src/audio/auserver.c |
307 |
-@@ -67,9 +67,11 @@ static int play_wave_from_socket(snd_header *header,int audiostream) |
308 |
- int q,i,n,r; |
309 |
- unsigned char bytes[CST_AUDIOBUFFSIZE]; |
310 |
- short shorts[CST_AUDIOBUFFSIZE]; |
311 |
-+#ifdef DEBUG |
312 |
- cst_file fff; |
313 |
- |
314 |
- fff = cst_fopen("/tmp/awb.wav",CST_OPEN_WRITE|CST_OPEN_BINARY); |
315 |
-+#endif |
316 |
- |
317 |
- if ((audio_device = audio_open(header->sample_rate,1, |
318 |
- (header->encoding == CST_SND_SHORT) ? |
319 |
-@@ -116,7 +118,9 @@ static int play_wave_from_socket(snd_header *header,int audiostream) |
320 |
- for (q=r; q > 0; q-=n) |
321 |
- { |
322 |
- n = audio_write(audio_device,shorts,q); |
323 |
-+#ifdef DEBUG |
324 |
- cst_fwrite(fff,shorts,2,q); |
325 |
-+#endif |
326 |
- if (n <= 0) |
327 |
- { |
328 |
- audio_close(audio_device); |
329 |
-@@ -125,7 +129,9 @@ static int play_wave_from_socket(snd_header *header,int audiostream) |
330 |
- } |
331 |
- } |
332 |
- audio_close(audio_device); |
333 |
-+#ifdef DEBUG |
334 |
- cst_fclose(fff); |
335 |
-+#endif |
336 |
- |
337 |
- return CST_OK_FORMAT; |
338 |
- |
339 |
--- |
340 |
-2.24.1 |
341 |
- |
342 |
|
343 |
diff --git a/app-accessibility/flite/files/flite-2.1-prototype.patch b/app-accessibility/flite/files/flite-2.1-prototype.patch |
344 |
deleted file mode 100644 |
345 |
index 2fe301774d0..00000000000 |
346 |
--- a/app-accessibility/flite/files/flite-2.1-prototype.patch |
347 |
+++ /dev/null |
348 |
@@ -1,13 +0,0 @@ |
349 |
-diff --git a/lang/cmu_indic_lex/cmu_indic_lex.c b/lang/cmu_indic_lex/cmu_indic_lex.c |
350 |
-index e0ae73f..f48ffe6 100644 |
351 |
---- a/lang/cmu_indic_lex/cmu_indic_lex.c |
352 |
-+++ b/lang/cmu_indic_lex/cmu_indic_lex.c |
353 |
-@@ -283,6 +283,8 @@ static int cmu_indic_get_char_type(const cst_val *indic_char) |
354 |
- return cmu_indic_offset_char[c].type; |
355 |
- } |
356 |
- |
357 |
-+int indic_digit_to_offset(const char *ind_digit); |
358 |
-+ |
359 |
- static int indic_text_splitable(const char *s,int i,int len1) |
360 |
- { |
361 |
- /* Returns true only if this and next chars are not both digits */ |
362 |
|
363 |
diff --git a/app-accessibility/flite/flite-1.4-r4.ebuild b/app-accessibility/flite/flite-1.4-r4.ebuild |
364 |
deleted file mode 100644 |
365 |
index 7ba4e221b44..00000000000 |
366 |
--- a/app-accessibility/flite/flite-1.4-r4.ebuild |
367 |
+++ /dev/null |
368 |
@@ -1,75 +0,0 @@ |
369 |
-# Copyright 1999-2020 Gentoo Authors |
370 |
-# Distributed under the terms of the GNU General Public License v2 |
371 |
- |
372 |
-EAPI=6 |
373 |
-inherit autotools multilib-minimal toolchain-funcs |
374 |
- |
375 |
-DESCRIPTION="Flite text to speech engine" |
376 |
-HOMEPAGE="http://www.speech.cs.cmu.edu/flite/index.html" |
377 |
-SRC_URI=" http://www.speech.cs.cmu.edu/${PN}/packed/${P}/${P}-release.tar.bz2" |
378 |
- |
379 |
-LICENSE="BSD freetts public-domain regexp-UofT BSD-2" |
380 |
-SLOT="0" |
381 |
-KEYWORDS="~alpha amd64 arm arm64 ppc ppc64 sparc x86" |
382 |
-IUSE="alsa oss" |
383 |
- |
384 |
-DEPEND="alsa? ( >=media-libs/alsa-lib-1.0.27.2[${MULTILIB_USEDEP}] )" |
385 |
-RDEPEND="${DEPEND}" |
386 |
- |
387 |
-S=${WORKDIR}/${P}-release |
388 |
- |
389 |
-PATCHES=( |
390 |
- "${FILESDIR}"/${PN}-2.1-Only-write-audio-data-to-a-temporariy-file-in-debug-.patch |
391 |
- "${FILESDIR}"/${PN}-1.4-fix-parallel-builds.patch |
392 |
- "${FILESDIR}"/${PN}-1.4-respect-destdir.patch |
393 |
- "${FILESDIR}"/${PN}-1.4-ldflags.patch |
394 |
- "${FILESDIR}"/${PN}-1.4-audio-interface.patch |
395 |
-) |
396 |
- |
397 |
-get_audio() { |
398 |
- if use alsa; then |
399 |
- echo alsa |
400 |
- elif use oss; then |
401 |
- echo oss |
402 |
- else |
403 |
- echo none |
404 |
- fi |
405 |
-} |
406 |
- |
407 |
-src_prepare() { |
408 |
- default |
409 |
- |
410 |
- sed -i main/Makefile \ |
411 |
- -e '/-rpath/s|$(LIBDIR)|$(INSTALLLIBDIR)|g' \ |
412 |
- || die |
413 |
- eautoreconf |
414 |
- |
415 |
- # custom makefiles |
416 |
- multilib_copy_sources |
417 |
-} |
418 |
- |
419 |
-multilib_src_configure() { |
420 |
- local myconf=( |
421 |
- --enable-shared |
422 |
- --with-audio=$(get_audio) |
423 |
- ) |
424 |
- econf "${myconf[@]}" |
425 |
-} |
426 |
- |
427 |
-multilib_src_compile() { |
428 |
- emake CC="$(tc-getCC)" CFLAGS="${CFLAGS}" |
429 |
-} |
430 |
- |
431 |
-multilib_src_install_all() { |
432 |
- dodoc ACKNOWLEDGEMENTS README |
433 |
- |
434 |
- find "${ED}" -name '*.a' ! -name '*.dll.a' -delete || die |
435 |
-} |
436 |
- |
437 |
-pkg_postinst() { |
438 |
- if [[ "$(get_audio)" = "none" ]]; then |
439 |
- ewarn "you have built flite without audio support." |
440 |
- ewarn "If you want audio support, re-emerge" |
441 |
- ewarn "flite with alsa or oss in your use flags." |
442 |
- fi |
443 |
-} |
444 |
|
445 |
diff --git a/app-accessibility/flite/flite-2.1.ebuild b/app-accessibility/flite/flite-2.1.ebuild |
446 |
deleted file mode 100644 |
447 |
index 0ecace3285d..00000000000 |
448 |
--- a/app-accessibility/flite/flite-2.1.ebuild |
449 |
+++ /dev/null |
450 |
@@ -1,129 +0,0 @@ |
451 |
-# Copyright 1999-2020 Gentoo Authors |
452 |
-# Distributed under the terms of the GNU General Public License v2 |
453 |
- |
454 |
-EAPI=7 |
455 |
-inherit autotools multilib-minimal |
456 |
- |
457 |
-DESCRIPTION="Flite text to speech engine" |
458 |
-HOMEPAGE="http://www.festvox.org/flite/ https://github.com/festvox/flite" |
459 |
-SRC_URI=" http://www.festvox.org/${PN}/packed/${P}/${P}-release.tar.bz2 |
460 |
- voices? ( |
461 |
- http://www.festvox.org/${PN}/packed/${P}/voices/cmu_indic_ben_rm.flitevox |
462 |
- http://www.festvox.org/${PN}/packed/${P}/voices/cmu_indic_guj_ad.flitevox |
463 |
- http://www.festvox.org/${PN}/packed/${P}/voices/cmu_indic_guj_dp.flitevox |
464 |
- http://www.festvox.org/${PN}/packed/${P}/voices/cmu_indic_guj_kt.flitevox |
465 |
- http://www.festvox.org/${PN}/packed/${P}/voices/cmu_indic_hin_ab.flitevox |
466 |
- http://www.festvox.org/${PN}/packed/${P}/voices/cmu_indic_kan_plv.flitevox |
467 |
- http://www.festvox.org/${PN}/packed/${P}/voices/cmu_indic_mar_aup.flitevox |
468 |
- http://www.festvox.org/${PN}/packed/${P}/voices/cmu_indic_mar_slp.flitevox |
469 |
- http://www.festvox.org/${PN}/packed/${P}/voices/cmu_indic_pan_amp.flitevox |
470 |
- http://www.festvox.org/${PN}/packed/${P}/voices/cmu_indic_tam_sdr.flitevox |
471 |
- http://www.festvox.org/${PN}/packed/${P}/voices/cmu_indic_tel_kpn.flitevox |
472 |
- http://www.festvox.org/${PN}/packed/${P}/voices/cmu_indic_tel_sk.flitevox |
473 |
- http://www.festvox.org/${PN}/packed/${P}/voices/cmu_indic_tel_ss.flitevox |
474 |
- http://www.festvox.org/${PN}/packed/${P}/voices/cmu_us_aew.flitevox |
475 |
- http://www.festvox.org/${PN}/packed/${P}/voices/cmu_us_ahw.flitevox |
476 |
- http://www.festvox.org/${PN}/packed/${P}/voices/cmu_us_aup.flitevox |
477 |
- http://www.festvox.org/${PN}/packed/${P}/voices/cmu_us_awb.flitevox |
478 |
- http://www.festvox.org/${PN}/packed/${P}/voices/cmu_us_axb.flitevox |
479 |
- http://www.festvox.org/${PN}/packed/${P}/voices/cmu_us_bdl.flitevox |
480 |
- http://www.festvox.org/${PN}/packed/${P}/voices/cmu_us_clb.flitevox |
481 |
- http://www.festvox.org/${PN}/packed/${P}/voices/cmu_us_eey.flitevox |
482 |
- http://www.festvox.org/${PN}/packed/${P}/voices/cmu_us_fem.flitevox |
483 |
- http://www.festvox.org/${PN}/packed/${P}/voices/cmu_us_gka.flitevox |
484 |
- http://www.festvox.org/${PN}/packed/${P}/voices/cmu_us_jmk.flitevox |
485 |
- http://www.festvox.org/${PN}/packed/${P}/voices/cmu_us_ksp.flitevox |
486 |
- http://www.festvox.org/${PN}/packed/${P}/voices/cmu_us_ljm.flitevox |
487 |
- http://www.festvox.org/${PN}/packed/${P}/voices/cmu_us_lnh.flitevox |
488 |
- http://www.festvox.org/${PN}/packed/${P}/voices/cmu_us_rms.flitevox |
489 |
- http://www.festvox.org/${PN}/packed/${P}/voices/cmu_us_rxr.flitevox |
490 |
- http://www.festvox.org/${PN}/packed/${P}/voices/cmu_us_slp.flitevox |
491 |
- http://www.festvox.org/${PN}/packed/${P}/voices/cmu_us_slt.flitevox |
492 |
- )" |
493 |
- |
494 |
-LICENSE="BSD freetts public-domain regexp-UofT BSD-2" |
495 |
-SLOT="0" |
496 |
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86" |
497 |
-IUSE="alsa oss pulseaudio voices" |
498 |
- |
499 |
-DEPEND=" |
500 |
- pulseaudio? ( media-sound/pulseaudio[${MULTILIB_USEDEP}] ) |
501 |
- !pulseaudio? ( alsa? ( >=media-libs/alsa-lib-1.0.27.2[${MULTILIB_USEDEP}] ) ) |
502 |
-" |
503 |
-RDEPEND="${DEPEND}" |
504 |
- |
505 |
-PATCHES=( |
506 |
- "${FILESDIR}"/${P}-Only-write-audio-data-to-a-temporariy-file-in-debug-.patch |
507 |
- "${FILESDIR}"/${P}-Improve-internal-linking.patch |
508 |
- "${FILESDIR}"/${PN}-1.4-audio-interface.patch |
509 |
- "${FILESDIR}"/${P}-prototype.patch |
510 |
-) |
511 |
- |
512 |
-S=${WORKDIR}/${P}-release |
513 |
- |
514 |
-get_audio() { |
515 |
- if use pulseaudio; then |
516 |
- echo pulseaudio |
517 |
- elif use alsa; then |
518 |
- echo alsa |
519 |
- elif use oss; then |
520 |
- echo oss |
521 |
- else |
522 |
- echo none |
523 |
- fi |
524 |
-} |
525 |
- |
526 |
-src_unpack() { |
527 |
- for file in ${A}; do |
528 |
- case "${file}" in |
529 |
- *.flitevox) |
530 |
- cp -av "${DISTDIR}/${file}" "${WORKDIR}/" || die "Unable to copy ${file}" |
531 |
- ;; |
532 |
- *) |
533 |
- unpack "${file}" |
534 |
- ;; |
535 |
- esac |
536 |
- done |
537 |
-} |
538 |
- |
539 |
-src_prepare() { |
540 |
- default |
541 |
- sed -i main/Makefile \ |
542 |
- -e '/-rpath/s|$(LIBDIR)|$(INSTALLLIBDIR)|g' \ |
543 |
- || die |
544 |
- mv configure.{in,ac} || die |
545 |
- eautoreconf |
546 |
- |
547 |
- # custom makefiles |
548 |
- multilib_copy_sources |
549 |
-} |
550 |
- |
551 |
-multilib_src_configure() { |
552 |
- local myconf=( |
553 |
- --enable-shared |
554 |
- --with-audio=$(get_audio) |
555 |
- ) |
556 |
- econf "${myconf[@]}" |
557 |
-} |
558 |
- |
559 |
-multilib_src_compile() { |
560 |
- emake CC="$(tc-getCC)" CFLAGS="${CFLAGS}" |
561 |
-} |
562 |
- |
563 |
-multilib_src_install_all() { |
564 |
- dodoc ACKNOWLEDGEMENTS README.md |
565 |
- |
566 |
- rm -rf "${D}"/usr/lib*/*.a |
567 |
- |
568 |
- if use voices; then |
569 |
- insinto /usr/share/flite |
570 |
- doins "${WORKDIR}"/*.flitevox |
571 |
- fi |
572 |
-} |
573 |
- |
574 |
-pkg_postinst() { |
575 |
- if [[ "$(get_audio)" = "none" ]]; then |
576 |
- ewarn "flite is built without audio support. Enable the" |
577 |
- ewarn "alsa, oss, or pulseaudio USE flags for audio support." |
578 |
- fi |
579 |
-} |