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

public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed

* [gentoo-commits] repo/gentoo:master commit in: app-accessibility/flite/files/, app-accessibility/flite/
@ 2020-02-20  2:55 Matt Turner
  0 siblings, 0 replies; 3+ messages in thread
From: Matt Turner @ 2020-02-20  2:55 UTC (permalink / raw
  To: gentoo-commits

commit:     be655cb34af29811e96fdb4f6e41a8cfe28f8a19
Author:     Mihai Moldovan <ionic <AT> ionic <DOT> de>
AuthorDate: Thu Feb 20 01:31:56 2020 +0000
Commit:     Matt Turner <mattst88 <AT> gentoo <DOT> org>
CommitDate: Thu Feb 20 02:54:40 2020 +0000
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 <use>, <upstream> info to metadata.xml

Closes: https://bugs.gentoo.org/593274
Closes: https://bugs.gentoo.org/625978
Signed-off-by: Matt Turner <mattst88 <AT> 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 2c916a142809999ed69a0cc6bf94ee11380f5a6d5362f347fac5c83ddd25861b7b42d2c4071c1646a26cb5bfef86552ed51d0f708b998c7e3d02fc2815df9445 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 cmu_indic_tel_sk.flitevox 13740312 BLAKE2B ae96efc490e5bf17840c7bb94b4e88090e4370bdfa88fb50de7bdaa63135d6b270d943d3b8e61afb6436b4cefe0d2d1b7e3e4deaba79fb3ba19299addeeee25f SHA512 faf85d60298fdecfdb3469bcf644daef27a960ff6ff46929d61f3515420c308cf8cfe68cb4b577ffb35255daeaf5b9db2dc4b7a1625d20d5904e7255471afd0d
+DIST cmu_indic_tel_ss.flitevox 22656084 BLAKE2B c4f8b1a0b6f87d8c919f99ec22c212bf71d94214674d16131d1ba284b98b28e48d312f1c5220d9d6e27fc04c6fb078ea5d164ed44b799389214a4e02fb9edc6f SHA512 c3cac4bad3b70b2028f2189d9249bb4c4352904825d962366833fbdb4e1db5927f815a7476690ab735a3911fa914c6a21c2ab7e01850a7c5f926038824804662
+DIST cmu_us_aew.flitevox 12640161 BLAKE2B 4f2befb6198e1f6dcc022b7e14f8bab443c9953e3d3d7a0775e8cbd9be0e9637290779d6c4979fcf7a62057cb2d949ca68ebfc07ee01187eb3c6ab96c92c41a8 SHA512 e9778ced18d9203e810bc9a31bed0208f0db2d87f1a9540853f3ba7dae37e0d0dd4a0b36bba48fe737d59b096a40bf47473215bf8dcade2cf42a0f2a0c6232ed
+DIST cmu_us_ahw.flitevox 6949326 BLAKE2B 33cf69167c352c0f2615ce7faa835ea6fad9f4a7ae78ce1296ec1c0caf20a610f1e39b7edf70cf4f48932071819e0efddd4dd98d8574c9f38a37813228aa3004 SHA512 5c7751936818892b742fe09c0ad446e83c220c723888e364dd78cd8a7ef2eeeb0c87640cc0b9b96a33e862e942db3a4ce4685012ecf60f62e4a6fe55a0b6097a
+DIST cmu_us_aup.flitevox 5701990 BLAKE2B 8cf089166788c464e1e47fb73d7c8285922c8d26d48baa51d253c46a8b947063479f70ca2f44ef93879de6b659bcb6b927a2be57deb87990d981f2c3fedce6bc SHA512 08874c06e3d3a056211e14e69dff6563e41581b180d5c5a6f8625e8ce854b16d0ff37ba21a8e950cababd9d00ee242f58cbddc4385662b8743379c27901b30e3
+DIST cmu_us_awb.flitevox 11113361 BLAKE2B 0af4e9b88c828f50c04d3480ecab4cf3096b0040a102a478787458c88f95a1a024cbbe233200afef06c83d39aef9ebfdd65a01acdf9b07ebd187b9f967787dc6 SHA512 663427a5bfd296e3f72be931ac15fef58b3556a27a66f693f09afe139d3d8287cb6bf804d8a1556f271ae422ed175035df7c90771842a4d1b44211b1371c6e2c
+DIST cmu_us_axb.flitevox 7260569 BLAKE2B 48966bfc6477aeb4daeabf1215feb32dd390c0e08974e0b58d0d08ebc09ba4127db02d3f61fc2f1513480333ac445140ed895510c8958814873c7a117a7e941e SHA512 c680841b5cc3792a9cb4e4c8c5abdb4604986fc5b590865f513d1cb45f868d8072ade5502ac609a4ef930b219ab2db3abe804a82883441f143f5641a6b93107a
+DIST cmu_us_bdl.flitevox 10283514 BLAKE2B bfe3a7965a337848f98196f748efadc1212213b75bb2129bb3ff8f61d8f7c64bb0f5130c9210eb550a06262e59036ddd79310cb03dbc5ab55a925d80eb18cce9 SHA512 568b309aa98fe6a900a9b4f4bc585fd4d8b1a02aad3508720e30f3ab49c0ac1610830520c44621109fa90d4ed080b79085000f913a28461b7fc8a79900b14a63
+DIST cmu_us_clb.flitevox 12538083 BLAKE2B 7126dfb660369b91f4ee2aec5a8f8204fe729020c3262032c4db24aa979bb761a3dfacb84dab0228062588edfaf5111db9084e05556a82f45e50a9b9717643f1 SHA512 5dc64b22fcb75fe378a9ef0a627a2a3ce30cabfb49196adb21aaf94afe33c70ec563b30e95703ab255ac116040bfc43500b343b61a596c48705cccffb0bf6bde
+DIST cmu_us_eey.flitevox 6092398 BLAKE2B 02cbedb2a536beffa55c8c88cb5f328b5640fca8d24f3abcd07f169b782201982d97661f4a352f47c1966f00fb11aa789b3e0bb94916be1af7c8ee59ab1aebb6 SHA512 a433a7e752ac1fcc6ade1ec25e5c5564603317cdeb5995b1f8d5305abd49ae66f65b41068ba30f41d790a11ba4a0f28c178fcaa06cfd9329a43abdbff9ea699b
+DIST cmu_us_fem.flitevox 6193447 BLAKE2B 29e521df9366498e7df509943c12c8633719ce991d8cffe0ba3696bf6dbc2ca27bf5530688f3e4a8ce1b1a9571e667e2e0dc307fb3f1224796226b6f29cd6048 SHA512 127a5f413219497d9f49a1a257cb4f02480d59eecdf99f88cc8df08e43c442b862c19b6569b92a07e3d18f00d3f5a794eac0be4a4e251917019a6b56a212dc22
+DIST cmu_us_gka.flitevox 6902785 BLAKE2B 3340ece67511ab0f8264a820a2bd5cd05e1efeef7cd5263629f83860e30b1bef5684068ba59a35b9830a32057bb9a079e98b2f42037185013aa119b3b438204a SHA512 8d83460843b942ccc1fd74050bab4ce42e9e37e82e035ae07e7adfac1b4a67ac9d76958a154343f85fa3715f0d3911354b7a34eb0b4841046f3c452b313348b7
+DIST cmu_us_jmk.flitevox 10401617 BLAKE2B bad07f3fe90a07d7b8025bd8a95c4aebc0d46362b3cf0b50d6bdf4d0dec4bb78cc8bfc57313234536d7d01a0b6e27dcdb6029fd7b32d0fc121a8194787b720f0 SHA512 fc9f505cf088c6e9549c4aa77134de1c257fe099b03fa17ec178bb87022984f82d1eaa9ba40e9122d51d27645cc3aaa980e653a3d906c2de9de583e4264bf77e
+DIST cmu_us_ksp.flitevox 11765452 BLAKE2B bf2039a8c9c18b625ae0d1d364427db0f8d906f7a29d33bf533a5365e5cc20c0bc841d7c40da01d486090fd7ea7146dd48f892ef3970884a0a07c5bdd5ef857d SHA512 a0f88c312cd1551defa0b2a9c631748ef145d5671400bbcfe1e43adf98b6983622800067c82e9d40cc5ee082dbb8cff8c776c59582bef08dee4bccd12fbddda0
+DIST cmu_us_ljm.flitevox 5688553 BLAKE2B ab6f6d5991ffee9bfd6624c6da30561a85fc0e2e1b94336d0b2dc8a224c389a14394c503e55588ca5be96bde0e930d3411a15537a02551a06ab748b07a707a8e SHA512 1a7a7631856c6b11c8fafc849d401d92e5f74eea8558a43ce3d6cfc3335b4aee886e246665779c02734f532154dcb9371a505c1cb6e77bce0e15731952c1efae
+DIST cmu_us_lnh.flitevox 11903497 BLAKE2B 66b3e0aa9e2867ad608aaad8448c9d1b09c953e9453c2f9f3a1c1eb9d71bef921ce76d22e13ccef5bd5872bce518bdcdd5c7893774cc86e7bee1961f44af71a8 SHA512 7990182a5c5720a08b17f9bcf97d69b1eb6a7aa4f4815f2aa43b2c244a3f3165c32b687ece747b6dd751dc180b875fe10e16f5364e3b5c77d9e509d7afc2821c
+DIST cmu_us_rms.flitevox 12845352 BLAKE2B eb48a7bd29e70d9782e16de8ac28030639f336c6256fb51f6ebf8ed97c8fecae27991e3fe4a845784f0be31a53d419cf01f04fef5bdb56d5889fbea4865b3d72 SHA512 f5b42d56ef077164eb370459b6e9852e1385b5075d775727573f1c9a9de41a76db89bb14f342d5065c13d437ebc3f64005b30986e282c838d98ce2271e9e7283
+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

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
new file mode 100644
index 00000000000..4b377e80c33
--- /dev/null
+++ b/app-accessibility/flite/files/flite-2.1-Improve-internal-linking.patch
@@ -0,0 +1,95 @@
+From 6e3c1a2fa29c066f7d1a25037a1f61cd295ac3af Mon Sep 17 00:00:00 2001
+From: Paul Gevers <elbrus@debian.org>
+Date: Tue, 2 Jan 2018 19:58:18 +0100
+Subject: [PATCH] Improve internal linking
+
+Building packages in Debian uses a tool to link libraries together at the
+package level. It emits warnings when unknonw symbols are found. E.g:
+
+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
+---
+ config/common_make_rules |  2 +-
+ main/Makefile            | 16 ++++++++++++++--
+ 2 files changed, 15 insertions(+), 3 deletions(-)
+
+diff --git a/config/common_make_rules b/config/common_make_rules
+index 7a03785..34434fd 100644
+--- a/config/common_make_rules
++++ b/config/common_make_rules
+@@ -123,7 +123,7 @@ $(LIBDIR)/%.so: $(LIBDIR)/%.shared.a
+ 	@ rm -rf shared_os && mkdir shared_os
+ 	@ rm -f $@ $@.${PROJECT_VERSION} $@.${PROJECT_SHLIB_VERSION} 
+ 	@ (cd shared_os && ar x ../$<)
+-	@ (cd shared_os && $(CC) -shared -Wl,-soname,`basename $@`.${PROJECT_SHLIB_VERSION} -o ../$@.${PROJECT_VERSION} *.os)
++	@ (cd shared_os && $(CC) -shared -Wl,-soname,`basename $@`.${PROJECT_SHLIB_VERSION} -o ../$@.${PROJECT_VERSION} *.os $(LDFLAGS))
+ 	@ (cd $(LIBDIR) && ln -s `basename $@.${PROJECT_VERSION}` `basename $@.${PROJECT_SHLIB_VERSION}` )
+ 	@ (cd $(LIBDIR) && ln -s `basename $@.${PROJECT_SHLIB_VERSION}` `basename $@` )
+ 	@ rm -rf shared_os
+diff --git a/main/Makefile b/main/Makefile
+index ff422e0..47b6344 100644
+--- a/main/Makefile
++++ b/main/Makefile
+@@ -54,7 +54,8 @@ ALL = shared_libs \
+ VOICES=$(VOXES)
+ VOICELIBS=$(VOICES:%=flite_%)
+ 
+-flite_LIBS = $(VOICELIBS) $(LANGS:%=flite_%) $(LEXES:%=flite_%) flite
++flite_MODS = $(VOICELIBS) $(LANGS:%=flite_%) $(LEXES:%=flite_%) 
++flite_LIBS = flite $(flite_MODS)
+ 
+ flite_LIBS_flags = -L$(LIBDIR) $(flite_LIBS:%=-l%)
+ flite_LIBS_deps = $(flite_LIBS:%=$(LIBDIR)/lib%.a)
+@@ -65,6 +66,10 @@ include $(TOP)/config/common_make_rules
+ # so make clean can remove them
+ SHAREDARLIBS= $(flite_LIBS:%=$(LIBDIR)/lib%.shared.a)
+ SHAREDLIBS = $(SHAREDARLIBS:%.shared.a=%.so)
++SHAREDMODS = $(flite_MODS:%=$(LIBDIR)/lib%.so)
++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
++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
++SHAREDindicMODS = $(LIBDIR)/libflite_cmu_indic_lex.so
+ VERSIONSHAREDLIBS = $(SHAREDLIBS:%=%.${PROJECT_VERSION}) \
+                     $(SHAREDLIBS:%=%.${PROJECT_SHLIB_VERSION})
+ 
+@@ -79,7 +84,14 @@ LOCAL_CLEAN = $(BINDIR)/flite$(EXEEXT) $(BINDIR)/flite_time$(EXEEXT) \
+               flite_voice_list.c
+ 
+ ifdef SHFLAGS
+-flite_LIBS_flags += -Wl,-rpath $(LIBDIR) 
++$(SHAREDMODS): $(LIBDIR)/libflite.so
++$(SHAREDMODS): LDFLAGS+=-L../$(LIBDIR) -lflite
++$(SHAREDusenMODS): $(LIBDIR)/libflite_usenglish.so
++$(SHAREDusenMODS): LDFLAGS+=-L../$(LIBDIR) -lflite_usenglish
++$(SHAREDcmulexMODS): $(LIBDIR)/libflite_cmulex.so
++$(SHAREDcmulexMODS): LDFLAGS+=-L../$(LIBDIR) -lflite_cmulex
++$(SHAREDindicMODS): $(LIBDIR)/libflite_cmu_indic_lang.so
++$(SHAREDindicMODS): LDFLAGS+=-L../$(LIBDIR) -lflite_cmu_indic_lang
+ shared_libs: $(SHAREDLIBS)
+ else
+ shared_libs: nothing
+-- 
+2.24.1
+
+From d673f65b2c4a8cd3da7447079309a6dc4bcf1a5e Mon Sep 17 00:00:00 2001
+From: Alan W Black <awb@cs.cmu.edu>
+Date: Sun, 4 Mar 2018 08:55:40 -0500
+Subject: [PATCH] get libs in the right order
+
+---
+ main/Makefile | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/main/Makefile b/main/Makefile
+index 47b6344..1da18a8 100644
+--- a/main/Makefile
++++ b/main/Makefile
+@@ -55,7 +55,7 @@ VOICES=$(VOXES)
+ VOICELIBS=$(VOICES:%=flite_%)
+ 
+ flite_MODS = $(VOICELIBS) $(LANGS:%=flite_%) $(LEXES:%=flite_%) 
+-flite_LIBS = flite $(flite_MODS)
++flite_LIBS = $(flite_MODS) flite
+ 
+ flite_LIBS_flags = -L$(LIBDIR) $(flite_LIBS:%=-l%)
+ flite_LIBS_deps = $(flite_LIBS:%=$(LIBDIR)/lib%.a)
+-- 
+2.24.1

diff --git a/app-accessibility/flite/files/flite-1.4-tempfile.patch b/app-accessibility/flite/files/flite-2.1-Only-write-audio-data-to-a-temporariy-file-in-debug-.patch
similarity index 51%
rename from app-accessibility/flite/files/flite-1.4-tempfile.patch
rename to app-accessibility/flite/files/flite-2.1-Only-write-audio-data-to-a-temporariy-file-in-debug-.patch
index 09b54f64ea2..5ddaecd6590 100644
--- a/app-accessibility/flite/files/flite-1.4-tempfile.patch
+++ b/app-accessibility/flite/files/flite-2.1-Only-write-audio-data-to-a-temporariy-file-in-debug-.patch
@@ -1,19 +1,28 @@
-From a85193f122b7ec0d377e0a39ac58c64f12c51085 Mon Sep 17 00:00:00 2001
-From: Rui Matos <tiagomatos@gmail.com>
-Date: Mon, 6 Jan 2014 13:45:00 +0000
-Subject: [PATCH] auserver.c: Only write audio data to a file in debug builds
+From a3ff166a5a99ea97f9037a82f5c2a578348291ac Mon Sep 17 00:00:00 2001
+From: Paul Gevers <elbrus@debian.org>
+Date: Tue, 2 Jan 2018 06:20:03 +0100
+Subject: [PATCH] Only write audio data to a temporariy file in debug builds
+
+This isn't useful in regular builds and is actually a security concern,
+although it seems (see discussion in [Bug-Debian]) that this is most likely
+only reached during testsuite calls.
 
-This isn't useful in regular builds and is actually a security
-concern.
+CVE-2014-0027
+
+Original patch from Rui Matos <tiagomatos@gmail.com>
+Date: Mon, 6 Jan 2014 13:45:00 +0000
+Bug-Debian: http://bugs.debian.org/734746
+Bug-Redhat: https://bugzilla.redhat.com/show_bug.cgi?id=1048678
+Source: https://bugzilla.redhat.com/attachment.cgi?id=846118
 ---
  src/audio/auserver.c | 6 ++++++
  1 file changed, 6 insertions(+)
 
 diff --git a/src/audio/auserver.c b/src/audio/auserver.c
-index 29716d3..3e838d0 100644
+index 800c27d..cfcad7d 100644
 --- a/src/audio/auserver.c
 +++ b/src/audio/auserver.c
-@@ -58,9 +58,11 @@ static int play_wave_from_socket(snd_header *header,int audiostream)
+@@ -67,9 +67,11 @@ static int play_wave_from_socket(snd_header *header,int audiostream)
      int q,i,n,r;
      unsigned char bytes[CST_AUDIOBUFFSIZE];
      short shorts[CST_AUDIOBUFFSIZE];
@@ -25,7 +34,7 @@ index 29716d3..3e838d0 100644
  
      if ((audio_device = audio_open(header->sample_rate,1,
  				   (header->encoding == CST_SND_SHORT) ?
-@@ -107,7 +109,9 @@ static int play_wave_from_socket(snd_header *header,int audiostream)
+@@ -116,7 +118,9 @@ static int play_wave_from_socket(snd_header *header,int audiostream)
  	for (q=r; q > 0; q-=n)
  	{
  	    n = audio_write(audio_device,shorts,q);
@@ -35,7 +44,7 @@ index 29716d3..3e838d0 100644
  	    if (n <= 0)
  	    {
  		audio_close(audio_device);
-@@ -116,7 +120,9 @@ static int play_wave_from_socket(snd_header *header,int audiostream)
+@@ -125,7 +129,9 @@ static int play_wave_from_socket(snd_header *header,int audiostream)
  	}
      }
      audio_close(audio_device);
@@ -46,5 +55,5 @@ index 29716d3..3e838d0 100644
      return CST_OK_FORMAT;
  
 -- 
-1.8.3.1
+2.24.1
 

diff --git a/app-accessibility/flite/files/flite-2.1-prototype.patch b/app-accessibility/flite/files/flite-2.1-prototype.patch
new file mode 100644
index 00000000000..2fe301774d0
--- /dev/null
+++ b/app-accessibility/flite/files/flite-2.1-prototype.patch
@@ -0,0 +1,13 @@
+diff --git a/lang/cmu_indic_lex/cmu_indic_lex.c b/lang/cmu_indic_lex/cmu_indic_lex.c
+index e0ae73f..f48ffe6 100644
+--- a/lang/cmu_indic_lex/cmu_indic_lex.c
++++ b/lang/cmu_indic_lex/cmu_indic_lex.c
+@@ -283,6 +283,8 @@ static int cmu_indic_get_char_type(const cst_val *indic_char)
+     return cmu_indic_offset_char[c].type;
+ }
+ 
++int indic_digit_to_offset(const char *ind_digit);
++
+ static int indic_text_splitable(const char *s,int i,int len1)
+ {
+     /* Returns true only if this and next chars are not both digits */

diff --git a/app-accessibility/flite/flite-1.4-r4.ebuild b/app-accessibility/flite/flite-1.4-r4.ebuild
index 9164855c02b..7ba4e221b44 100644
--- a/app-accessibility/flite/flite-1.4-r4.ebuild
+++ b/app-accessibility/flite/flite-1.4-r4.ebuild
@@ -19,7 +19,7 @@ RDEPEND="${DEPEND}"
 S=${WORKDIR}/${P}-release
 
 PATCHES=(
-	"${FILESDIR}"/${PN}-1.4-tempfile.patch
+	"${FILESDIR}"/${PN}-2.1-Only-write-audio-data-to-a-temporariy-file-in-debug-.patch
 	"${FILESDIR}"/${PN}-1.4-fix-parallel-builds.patch
 	"${FILESDIR}"/${PN}-1.4-respect-destdir.patch
 	"${FILESDIR}"/${PN}-1.4-ldflags.patch

diff --git a/app-accessibility/flite/flite-2.1.ebuild b/app-accessibility/flite/flite-2.1.ebuild
new file mode 100644
index 00000000000..5e8358ad098
--- /dev/null
+++ b/app-accessibility/flite/flite-2.1.ebuild
@@ -0,0 +1,129 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit autotools multilib-minimal
+
+DESCRIPTION="Flite text to speech engine"
+HOMEPAGE="http://www.festvox.org/flite/ https://github.com/festvox/flite"
+SRC_URI=" http://www.festvox.org/${PN}/packed/${P}/${P}-release.tar.bz2
+	voices? (
+		http://www.festvox.org/${PN}/packed/${P}/voices/cmu_indic_ben_rm.flitevox
+		http://www.festvox.org/${PN}/packed/${P}/voices/cmu_indic_guj_ad.flitevox
+		http://www.festvox.org/${PN}/packed/${P}/voices/cmu_indic_guj_dp.flitevox
+		http://www.festvox.org/${PN}/packed/${P}/voices/cmu_indic_guj_kt.flitevox
+		http://www.festvox.org/${PN}/packed/${P}/voices/cmu_indic_hin_ab.flitevox
+		http://www.festvox.org/${PN}/packed/${P}/voices/cmu_indic_kan_plv.flitevox
+		http://www.festvox.org/${PN}/packed/${P}/voices/cmu_indic_mar_aup.flitevox
+		http://www.festvox.org/${PN}/packed/${P}/voices/cmu_indic_mar_slp.flitevox
+		http://www.festvox.org/${PN}/packed/${P}/voices/cmu_indic_pan_amp.flitevox
+		http://www.festvox.org/${PN}/packed/${P}/voices/cmu_indic_tam_sdr.flitevox
+		http://www.festvox.org/${PN}/packed/${P}/voices/cmu_indic_tel_kpn.flitevox
+		http://www.festvox.org/${PN}/packed/${P}/voices/cmu_indic_tel_sk.flitevox
+		http://www.festvox.org/${PN}/packed/${P}/voices/cmu_indic_tel_ss.flitevox
+		http://www.festvox.org/${PN}/packed/${P}/voices/cmu_us_aew.flitevox
+		http://www.festvox.org/${PN}/packed/${P}/voices/cmu_us_ahw.flitevox
+		http://www.festvox.org/${PN}/packed/${P}/voices/cmu_us_aup.flitevox
+		http://www.festvox.org/${PN}/packed/${P}/voices/cmu_us_awb.flitevox
+		http://www.festvox.org/${PN}/packed/${P}/voices/cmu_us_axb.flitevox
+		http://www.festvox.org/${PN}/packed/${P}/voices/cmu_us_bdl.flitevox
+		http://www.festvox.org/${PN}/packed/${P}/voices/cmu_us_clb.flitevox
+		http://www.festvox.org/${PN}/packed/${P}/voices/cmu_us_eey.flitevox
+		http://www.festvox.org/${PN}/packed/${P}/voices/cmu_us_fem.flitevox
+		http://www.festvox.org/${PN}/packed/${P}/voices/cmu_us_gka.flitevox
+		http://www.festvox.org/${PN}/packed/${P}/voices/cmu_us_jmk.flitevox
+		http://www.festvox.org/${PN}/packed/${P}/voices/cmu_us_ksp.flitevox
+		http://www.festvox.org/${PN}/packed/${P}/voices/cmu_us_ljm.flitevox
+		http://www.festvox.org/${PN}/packed/${P}/voices/cmu_us_lnh.flitevox
+		http://www.festvox.org/${PN}/packed/${P}/voices/cmu_us_rms.flitevox
+		http://www.festvox.org/${PN}/packed/${P}/voices/cmu_us_rxr.flitevox
+		http://www.festvox.org/${PN}/packed/${P}/voices/cmu_us_slp.flitevox
+		http://www.festvox.org/${PN}/packed/${P}/voices/cmu_us_slt.flitevox
+	)"
+
+LICENSE="BSD freetts public-domain regexp-UofT BSD-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE="alsa oss pulseaudio voices"
+
+DEPEND="
+	pulseaudio? ( media-sound/pulseaudio[${MULTILIB_USEDEP}] )
+	!pulseaudio? ( alsa? ( >=media-libs/alsa-lib-1.0.27.2[${MULTILIB_USEDEP}] ) )
+"
+RDEPEND="${DEPEND}"
+
+PATCHES=(
+	"${FILESDIR}"/${P}-Only-write-audio-data-to-a-temporariy-file-in-debug-.patch
+	"${FILESDIR}"/${P}-Improve-internal-linking.patch
+	"${FILESDIR}"/${PN}-1.4-audio-interface.patch
+	"${FILESDIR}"/${P}-prototype.patch
+)
+
+S=${WORKDIR}/${P}-release
+
+get_audio() {
+	if use pulseaudio; then
+		echo pulseaudio
+	elif use alsa; then
+		echo alsa
+	elif use oss; then
+		echo oss
+	else
+		echo none
+	fi
+}
+
+src_unpack() {
+	for file in ${A}; do
+		case "${file}" in
+			*.flitevox)
+				cp -av "${DISTDIR}/${file}" "${WORKDIR}/" || die "Unable to copy ${file}"
+				;;
+			*)
+				unpack "${file}"
+				;;
+		esac
+	done
+}
+
+src_prepare() {
+	default
+	sed -i main/Makefile \
+		-e '/-rpath/s|$(LIBDIR)|$(INSTALLLIBDIR)|g' \
+		|| die
+	mv configure.{in,ac} || die
+	eautoreconf
+
+	# custom makefiles
+	multilib_copy_sources
+}
+
+multilib_src_configure() {
+	local myconf=(
+		--enable-shared
+		--with-audio=$(get_audio)
+	)
+	econf "${myconf[@]}"
+}
+
+multilib_src_compile() {
+	emake CC="$(tc-getCC)" CFLAGS="${CFLAGS}"
+}
+
+multilib_src_install_all() {
+	dodoc ACKNOWLEDGEMENTS README.md
+
+	rm -rf "${D}"/usr/lib*/*.a
+
+	if use voices; then
+		insinto /usr/share/flite
+		doins "${WORKDIR}"/*.flitevox
+	fi
+}
+
+pkg_postinst() {
+	if [[ "$(get_audio)" = "none" ]]; then
+		ewarn "flite is built without audio support. Enable the"
+		ewarn "alsa, oss, or pulseaudio USE flags for audio support."
+	fi
+}

diff --git a/app-accessibility/flite/metadata.xml b/app-accessibility/flite/metadata.xml
index 1dacdab965c..e128f807497 100644
--- a/app-accessibility/flite/metadata.xml
+++ b/app-accessibility/flite/metadata.xml
@@ -9,4 +9,10 @@
 	<email>sound@gentoo.org</email>
 	<name>Gentoo Sound project</name>
 </maintainer>
+<use>
+	<flag name="voices">Install synthetic voices</flag>
+</use>
+<upstream>
+	<remote-id type="github">festvox/flite</remote-id>
+</upstream>
 </pkgmetadata>


^ permalink raw reply related	[flat|nested] 3+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: app-accessibility/flite/files/, app-accessibility/flite/
@ 2021-04-22 12:29 Miroslav Šulc
  0 siblings, 0 replies; 3+ messages in thread
From: Miroslav Šulc @ 2021-04-22 12:29 UTC (permalink / raw
  To: gentoo-commits

commit:     9b7b3fb457637abe19a33086ef908db3647a45fb
Author:     Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
AuthorDate: Thu Apr 22 12:29:31 2021 +0000
Commit:     Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
CommitDate: Thu Apr 22 12:29:41 2021 +0000
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 <fordfrog <AT> 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..00000000000
--- 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 <w.d.hubbs@gmail.com>
-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..00000000000
--- 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 -Wl,-soname,`basename $@`.${PROJECT_SHLIB_VERSION} -o ../$@.${PROJECT_VERSION} *.os)
-+	@ (cd shared_os && $(CC) ${LDFLAGS} -shared -Wl,-soname,`basename $@`.${PROJECT_SHLIB_VERSION} -o ../$@.${PROJECT_VERSION} *.os $(LDLIBS))
- 	@ (cd $(LIBDIR) && ln -s `basename $@.${PROJECT_VERSION}` `basename $@.${PROJECT_SHLIB_VERSION}` )
- 	@ (cd $(LIBDIR) && ln -s `basename $@.${PROJECT_SHLIB_VERSION}` `basename $@` )
- 	@ rm -rf shared_os
---- a/tools/Makefile
-+++ b/tools/Makefile
-@@ -62,9 +62,9 @@
- LOCAL_CLEAN = $(BINDIR)/find_sts $(BINDIR)/flite_sort
- 
- $(BINDIR)/find_sts: find_sts_main.o $(FLITELIBS) 
--	$(CC) $(CFLAGS) -o $@ find_sts_main.o $(FLITELIBFLAGS) $(LDFLAGS)
-+	$(CC) $(CFLAGS) ${LDFLAGS} -o $@ find_sts_main.o $(FLITELIBFLAGS) $(LDLIBS)
- $(BINDIR)/flite_sort: flite_sort_main.o $(FLITELIBS)
--	$(CC) $(CFLAGS) -o $@ flite_sort_main.o $(FLITELIBFLAGS) $(LDFLAGS)
-+	$(CC) $(CFLAGS) ${LDFLAGS} -o $@ flite_sort_main.o $(FLITELIBFLAGS) $(LDLIBS)
- makescripts:
- 	@ cp -p $(SCRIPTS) $(TOP)/bin
- 

diff --git a/app-accessibility/flite/files/flite-1.4-respect-destdir.patch b/app-accessibility/flite/files/flite-1.4-respect-destdir.patch
deleted file mode 100644
index d54771423e1..00000000000
--- a/app-accessibility/flite/files/flite-1.4-respect-destdir.patch
+++ /dev/null
@@ -1,59 +0,0 @@
-From a0ae616d84e9f051ae8536574a9d1289e5f0c060 Mon Sep 17 00:00:00 2001
-From: William Hubbs <w.d.hubbs@gmail.com>
-Date: Thu, 31 Dec 2009 12:57:18 -0600
-Subject: [PATCH] respect destdir
-
----
- Makefile      |   10 +++++-----
- main/Makefile |   10 +++++-----
- 2 files changed, 10 insertions(+), 10 deletions(-)
-
-diff --git a/Makefile b/Makefile
-index 2d3ff09..26b2386 100644
---- a/Makefile
-+++ b/Makefile
-@@ -106,11 +106,11 @@ tags:
- 
- install:
- 	@echo Installing 
--	mkdir -p $(INSTALLBINDIR)
--	mkdir -p $(INSTALLLIBDIR)
--	mkdir -p $(INSTALLINCDIR)
--	$(INSTALL) -m 644 include/*.h $(INSTALLINCDIR)
--	@ $(MAKE) -C main --no-print-directory install
-+	mkdir -p $(DESTDIR)$(INSTALLBINDIR)
-+	mkdir -p $(DESTDIR)$(INSTALLLIBDIR)
-+	mkdir -p $(DESTDIR)$(INSTALLINCDIR)
-+	$(INSTALL) -m 644 include/*.h $(DESTDIR)$(INSTALLINCDIR)
-+	@ $(MAKE) -C main --no-print-directory DESTDIR=$(DESTDIR) install
- 
- time-stamp :
- 	@ echo $(PROJECT_NAME) >.time-stamp
-diff --git a/main/Makefile b/main/Makefile
-index 8163e40..0513e59 100644
---- a/main/Makefile
-+++ b/main/Makefile
-@@ -111,15 +111,15 @@ $(BINDIR)/flite_${VOICE}: flite_main.o $(flite_LIBS_deps)
- 
- install:
- #       The basic binaries
--	@ $(INSTALL) -m 755 $(BINDIR)/flite $(INSTALLBINDIR)
-+	@ $(INSTALL) -m 755 $(BINDIR)/flite $(DESTDIR)$(INSTALLBINDIR)
- 	@ for i in $(VOICES) ; \
- 	do \
--	   $(INSTALL) $(BINDIR)/flite_$$i $(INSTALLBINDIR); \
-+	   $(INSTALL) $(BINDIR)/flite_$$i $(DESTDIR)$(INSTALLBINDIR); \
- 	done
--	$(INSTALL) -m 755 $(BINDIR)/flite_time $(INSTALLBINDIR)
-+	$(INSTALL) -m 755 $(BINDIR)/flite_time $(DESTDIR)$(INSTALLBINDIR)
- #       The libraries: static and shared (if built)
--	cp -pd $(flite_LIBS_deps) $(INSTALLLIBDIR)
-+	cp -pd $(flite_LIBS_deps) $(DESTDIR)$(INSTALLLIBDIR)
- ifdef SHFLAGS
--	cp -pd $(SHAREDLIBS) $(VERSIONSHAREDLIBS) $(INSTALLLIBDIR)
-+	cp -pd $(SHAREDLIBS) $(VERSIONSHAREDLIBS) $(DESTDIR)$(INSTALLLIBDIR)
- endif
- 
--- 
-1.6.4.4
-

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
deleted file mode 100644
index 4b377e80c33..00000000000
--- a/app-accessibility/flite/files/flite-2.1-Improve-internal-linking.patch
+++ /dev/null
@@ -1,95 +0,0 @@
-From 6e3c1a2fa29c066f7d1a25037a1f61cd295ac3af Mon Sep 17 00:00:00 2001
-From: Paul Gevers <elbrus@debian.org>
-Date: Tue, 2 Jan 2018 19:58:18 +0100
-Subject: [PATCH] Improve internal linking
-
-Building packages in Debian uses a tool to link libraries together at the
-package level. It emits warnings when unknonw symbols are found. E.g:
-
-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
----
- config/common_make_rules |  2 +-
- main/Makefile            | 16 ++++++++++++++--
- 2 files changed, 15 insertions(+), 3 deletions(-)
-
-diff --git a/config/common_make_rules b/config/common_make_rules
-index 7a03785..34434fd 100644
---- a/config/common_make_rules
-+++ b/config/common_make_rules
-@@ -123,7 +123,7 @@ $(LIBDIR)/%.so: $(LIBDIR)/%.shared.a
- 	@ rm -rf shared_os && mkdir shared_os
- 	@ rm -f $@ $@.${PROJECT_VERSION} $@.${PROJECT_SHLIB_VERSION} 
- 	@ (cd shared_os && ar x ../$<)
--	@ (cd shared_os && $(CC) -shared -Wl,-soname,`basename $@`.${PROJECT_SHLIB_VERSION} -o ../$@.${PROJECT_VERSION} *.os)
-+	@ (cd shared_os && $(CC) -shared -Wl,-soname,`basename $@`.${PROJECT_SHLIB_VERSION} -o ../$@.${PROJECT_VERSION} *.os $(LDFLAGS))
- 	@ (cd $(LIBDIR) && ln -s `basename $@.${PROJECT_VERSION}` `basename $@.${PROJECT_SHLIB_VERSION}` )
- 	@ (cd $(LIBDIR) && ln -s `basename $@.${PROJECT_SHLIB_VERSION}` `basename $@` )
- 	@ rm -rf shared_os
-diff --git a/main/Makefile b/main/Makefile
-index ff422e0..47b6344 100644
---- a/main/Makefile
-+++ b/main/Makefile
-@@ -54,7 +54,8 @@ ALL = shared_libs \
- VOICES=$(VOXES)
- VOICELIBS=$(VOICES:%=flite_%)
- 
--flite_LIBS = $(VOICELIBS) $(LANGS:%=flite_%) $(LEXES:%=flite_%) flite
-+flite_MODS = $(VOICELIBS) $(LANGS:%=flite_%) $(LEXES:%=flite_%) 
-+flite_LIBS = flite $(flite_MODS)
- 
- flite_LIBS_flags = -L$(LIBDIR) $(flite_LIBS:%=-l%)
- flite_LIBS_deps = $(flite_LIBS:%=$(LIBDIR)/lib%.a)
-@@ -65,6 +66,10 @@ include $(TOP)/config/common_make_rules
- # so make clean can remove them
- SHAREDARLIBS= $(flite_LIBS:%=$(LIBDIR)/lib%.shared.a)
- SHAREDLIBS = $(SHAREDARLIBS:%.shared.a=%.so)
-+SHAREDMODS = $(flite_MODS:%=$(LIBDIR)/lib%.so)
-+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
-+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
-+SHAREDindicMODS = $(LIBDIR)/libflite_cmu_indic_lex.so
- VERSIONSHAREDLIBS = $(SHAREDLIBS:%=%.${PROJECT_VERSION}) \
-                     $(SHAREDLIBS:%=%.${PROJECT_SHLIB_VERSION})
- 
-@@ -79,7 +84,14 @@ LOCAL_CLEAN = $(BINDIR)/flite$(EXEEXT) $(BINDIR)/flite_time$(EXEEXT) \
-               flite_voice_list.c
- 
- ifdef SHFLAGS
--flite_LIBS_flags += -Wl,-rpath $(LIBDIR) 
-+$(SHAREDMODS): $(LIBDIR)/libflite.so
-+$(SHAREDMODS): LDFLAGS+=-L../$(LIBDIR) -lflite
-+$(SHAREDusenMODS): $(LIBDIR)/libflite_usenglish.so
-+$(SHAREDusenMODS): LDFLAGS+=-L../$(LIBDIR) -lflite_usenglish
-+$(SHAREDcmulexMODS): $(LIBDIR)/libflite_cmulex.so
-+$(SHAREDcmulexMODS): LDFLAGS+=-L../$(LIBDIR) -lflite_cmulex
-+$(SHAREDindicMODS): $(LIBDIR)/libflite_cmu_indic_lang.so
-+$(SHAREDindicMODS): LDFLAGS+=-L../$(LIBDIR) -lflite_cmu_indic_lang
- shared_libs: $(SHAREDLIBS)
- else
- shared_libs: nothing
--- 
-2.24.1
-
-From d673f65b2c4a8cd3da7447079309a6dc4bcf1a5e Mon Sep 17 00:00:00 2001
-From: Alan W Black <awb@cs.cmu.edu>
-Date: Sun, 4 Mar 2018 08:55:40 -0500
-Subject: [PATCH] get libs in the right order
-
----
- main/Makefile | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/main/Makefile b/main/Makefile
-index 47b6344..1da18a8 100644
---- a/main/Makefile
-+++ b/main/Makefile
-@@ -55,7 +55,7 @@ VOICES=$(VOXES)
- VOICELIBS=$(VOICES:%=flite_%)
- 
- flite_MODS = $(VOICELIBS) $(LANGS:%=flite_%) $(LEXES:%=flite_%) 
--flite_LIBS = flite $(flite_MODS)
-+flite_LIBS = $(flite_MODS) flite
- 
- flite_LIBS_flags = -L$(LIBDIR) $(flite_LIBS:%=-l%)
- flite_LIBS_deps = $(flite_LIBS:%=$(LIBDIR)/lib%.a)
--- 
-2.24.1

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
deleted file mode 100644
index 5ddaecd6590..00000000000
--- a/app-accessibility/flite/files/flite-2.1-Only-write-audio-data-to-a-temporariy-file-in-debug-.patch
+++ /dev/null
@@ -1,59 +0,0 @@
-From a3ff166a5a99ea97f9037a82f5c2a578348291ac Mon Sep 17 00:00:00 2001
-From: Paul Gevers <elbrus@debian.org>
-Date: Tue, 2 Jan 2018 06:20:03 +0100
-Subject: [PATCH] Only write audio data to a temporariy file in debug builds
-
-This isn't useful in regular builds and is actually a security concern,
-although it seems (see discussion in [Bug-Debian]) that this is most likely
-only reached during testsuite calls.
-
-CVE-2014-0027
-
-Original patch from Rui Matos <tiagomatos@gmail.com>
-Date: Mon, 6 Jan 2014 13:45:00 +0000
-Bug-Debian: http://bugs.debian.org/734746
-Bug-Redhat: https://bugzilla.redhat.com/show_bug.cgi?id=1048678
-Source: https://bugzilla.redhat.com/attachment.cgi?id=846118
----
- src/audio/auserver.c | 6 ++++++
- 1 file changed, 6 insertions(+)
-
-diff --git a/src/audio/auserver.c b/src/audio/auserver.c
-index 800c27d..cfcad7d 100644
---- a/src/audio/auserver.c
-+++ b/src/audio/auserver.c
-@@ -67,9 +67,11 @@ static int play_wave_from_socket(snd_header *header,int audiostream)
-     int q,i,n,r;
-     unsigned char bytes[CST_AUDIOBUFFSIZE];
-     short shorts[CST_AUDIOBUFFSIZE];
-+#ifdef DEBUG
-     cst_file fff;
- 
-     fff = cst_fopen("/tmp/awb.wav",CST_OPEN_WRITE|CST_OPEN_BINARY);
-+#endif
- 
-     if ((audio_device = audio_open(header->sample_rate,1,
- 				   (header->encoding == CST_SND_SHORT) ?
-@@ -116,7 +118,9 @@ static int play_wave_from_socket(snd_header *header,int audiostream)
- 	for (q=r; q > 0; q-=n)
- 	{
- 	    n = audio_write(audio_device,shorts,q);
-+#ifdef DEBUG
- 	    cst_fwrite(fff,shorts,2,q);
-+#endif
- 	    if (n <= 0)
- 	    {
- 		audio_close(audio_device);
-@@ -125,7 +129,9 @@ static int play_wave_from_socket(snd_header *header,int audiostream)
- 	}
-     }
-     audio_close(audio_device);
-+#ifdef DEBUG
-     cst_fclose(fff);
-+#endif
- 
-     return CST_OK_FORMAT;
- 
--- 
-2.24.1
-

diff --git a/app-accessibility/flite/files/flite-2.1-prototype.patch b/app-accessibility/flite/files/flite-2.1-prototype.patch
deleted file mode 100644
index 2fe301774d0..00000000000
--- a/app-accessibility/flite/files/flite-2.1-prototype.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/lang/cmu_indic_lex/cmu_indic_lex.c b/lang/cmu_indic_lex/cmu_indic_lex.c
-index e0ae73f..f48ffe6 100644
---- a/lang/cmu_indic_lex/cmu_indic_lex.c
-+++ b/lang/cmu_indic_lex/cmu_indic_lex.c
-@@ -283,6 +283,8 @@ static int cmu_indic_get_char_type(const cst_val *indic_char)
-     return cmu_indic_offset_char[c].type;
- }
- 
-+int indic_digit_to_offset(const char *ind_digit);
-+
- static int indic_text_splitable(const char *s,int i,int len1)
- {
-     /* Returns true only if this and next chars are not both digits */

diff --git a/app-accessibility/flite/flite-1.4-r4.ebuild b/app-accessibility/flite/flite-1.4-r4.ebuild
deleted file mode 100644
index 7ba4e221b44..00000000000
--- a/app-accessibility/flite/flite-1.4-r4.ebuild
+++ /dev/null
@@ -1,75 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit autotools multilib-minimal toolchain-funcs
-
-DESCRIPTION="Flite text to speech engine"
-HOMEPAGE="http://www.speech.cs.cmu.edu/flite/index.html"
-SRC_URI=" http://www.speech.cs.cmu.edu/${PN}/packed/${P}/${P}-release.tar.bz2"
-
-LICENSE="BSD freetts public-domain regexp-UofT BSD-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ppc ppc64 sparc x86"
-IUSE="alsa oss"
-
-DEPEND="alsa? ( >=media-libs/alsa-lib-1.0.27.2[${MULTILIB_USEDEP}] )"
-RDEPEND="${DEPEND}"
-
-S=${WORKDIR}/${P}-release
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-2.1-Only-write-audio-data-to-a-temporariy-file-in-debug-.patch
-	"${FILESDIR}"/${PN}-1.4-fix-parallel-builds.patch
-	"${FILESDIR}"/${PN}-1.4-respect-destdir.patch
-	"${FILESDIR}"/${PN}-1.4-ldflags.patch
-	"${FILESDIR}"/${PN}-1.4-audio-interface.patch
-)
-
-get_audio() {
-	if use alsa; then
-		echo alsa
-	elif use oss; then
-		echo oss
-	else
-		echo none
-	fi
-}
-
-src_prepare() {
-	default
-
-	sed -i main/Makefile \
-		-e '/-rpath/s|$(LIBDIR)|$(INSTALLLIBDIR)|g' \
-		|| die
-	eautoreconf
-
-	# custom makefiles
-	multilib_copy_sources
-}
-
-multilib_src_configure() {
-	local myconf=(
-		--enable-shared
-		--with-audio=$(get_audio)
-	)
-	econf "${myconf[@]}"
-}
-
-multilib_src_compile() {
-	emake CC="$(tc-getCC)" CFLAGS="${CFLAGS}"
-}
-
-multilib_src_install_all() {
-	dodoc ACKNOWLEDGEMENTS README
-
-	find "${ED}" -name '*.a' ! -name '*.dll.a' -delete || die
-}
-
-pkg_postinst() {
-	if [[ "$(get_audio)" = "none" ]]; then
-		ewarn "you have built flite without audio support."
-		ewarn "If you want audio support, re-emerge"
-		ewarn "flite with alsa or oss in your use flags."
-	fi
-}

diff --git a/app-accessibility/flite/flite-2.1.ebuild b/app-accessibility/flite/flite-2.1.ebuild
deleted file mode 100644
index 0ecace3285d..00000000000
--- a/app-accessibility/flite/flite-2.1.ebuild
+++ /dev/null
@@ -1,129 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit autotools multilib-minimal
-
-DESCRIPTION="Flite text to speech engine"
-HOMEPAGE="http://www.festvox.org/flite/ https://github.com/festvox/flite"
-SRC_URI=" http://www.festvox.org/${PN}/packed/${P}/${P}-release.tar.bz2
-	voices? (
-		http://www.festvox.org/${PN}/packed/${P}/voices/cmu_indic_ben_rm.flitevox
-		http://www.festvox.org/${PN}/packed/${P}/voices/cmu_indic_guj_ad.flitevox
-		http://www.festvox.org/${PN}/packed/${P}/voices/cmu_indic_guj_dp.flitevox
-		http://www.festvox.org/${PN}/packed/${P}/voices/cmu_indic_guj_kt.flitevox
-		http://www.festvox.org/${PN}/packed/${P}/voices/cmu_indic_hin_ab.flitevox
-		http://www.festvox.org/${PN}/packed/${P}/voices/cmu_indic_kan_plv.flitevox
-		http://www.festvox.org/${PN}/packed/${P}/voices/cmu_indic_mar_aup.flitevox
-		http://www.festvox.org/${PN}/packed/${P}/voices/cmu_indic_mar_slp.flitevox
-		http://www.festvox.org/${PN}/packed/${P}/voices/cmu_indic_pan_amp.flitevox
-		http://www.festvox.org/${PN}/packed/${P}/voices/cmu_indic_tam_sdr.flitevox
-		http://www.festvox.org/${PN}/packed/${P}/voices/cmu_indic_tel_kpn.flitevox
-		http://www.festvox.org/${PN}/packed/${P}/voices/cmu_indic_tel_sk.flitevox
-		http://www.festvox.org/${PN}/packed/${P}/voices/cmu_indic_tel_ss.flitevox
-		http://www.festvox.org/${PN}/packed/${P}/voices/cmu_us_aew.flitevox
-		http://www.festvox.org/${PN}/packed/${P}/voices/cmu_us_ahw.flitevox
-		http://www.festvox.org/${PN}/packed/${P}/voices/cmu_us_aup.flitevox
-		http://www.festvox.org/${PN}/packed/${P}/voices/cmu_us_awb.flitevox
-		http://www.festvox.org/${PN}/packed/${P}/voices/cmu_us_axb.flitevox
-		http://www.festvox.org/${PN}/packed/${P}/voices/cmu_us_bdl.flitevox
-		http://www.festvox.org/${PN}/packed/${P}/voices/cmu_us_clb.flitevox
-		http://www.festvox.org/${PN}/packed/${P}/voices/cmu_us_eey.flitevox
-		http://www.festvox.org/${PN}/packed/${P}/voices/cmu_us_fem.flitevox
-		http://www.festvox.org/${PN}/packed/${P}/voices/cmu_us_gka.flitevox
-		http://www.festvox.org/${PN}/packed/${P}/voices/cmu_us_jmk.flitevox
-		http://www.festvox.org/${PN}/packed/${P}/voices/cmu_us_ksp.flitevox
-		http://www.festvox.org/${PN}/packed/${P}/voices/cmu_us_ljm.flitevox
-		http://www.festvox.org/${PN}/packed/${P}/voices/cmu_us_lnh.flitevox
-		http://www.festvox.org/${PN}/packed/${P}/voices/cmu_us_rms.flitevox
-		http://www.festvox.org/${PN}/packed/${P}/voices/cmu_us_rxr.flitevox
-		http://www.festvox.org/${PN}/packed/${P}/voices/cmu_us_slp.flitevox
-		http://www.festvox.org/${PN}/packed/${P}/voices/cmu_us_slt.flitevox
-	)"
-
-LICENSE="BSD freetts public-domain regexp-UofT BSD-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
-IUSE="alsa oss pulseaudio voices"
-
-DEPEND="
-	pulseaudio? ( media-sound/pulseaudio[${MULTILIB_USEDEP}] )
-	!pulseaudio? ( alsa? ( >=media-libs/alsa-lib-1.0.27.2[${MULTILIB_USEDEP}] ) )
-"
-RDEPEND="${DEPEND}"
-
-PATCHES=(
-	"${FILESDIR}"/${P}-Only-write-audio-data-to-a-temporariy-file-in-debug-.patch
-	"${FILESDIR}"/${P}-Improve-internal-linking.patch
-	"${FILESDIR}"/${PN}-1.4-audio-interface.patch
-	"${FILESDIR}"/${P}-prototype.patch
-)
-
-S=${WORKDIR}/${P}-release
-
-get_audio() {
-	if use pulseaudio; then
-		echo pulseaudio
-	elif use alsa; then
-		echo alsa
-	elif use oss; then
-		echo oss
-	else
-		echo none
-	fi
-}
-
-src_unpack() {
-	for file in ${A}; do
-		case "${file}" in
-			*.flitevox)
-				cp -av "${DISTDIR}/${file}" "${WORKDIR}/" || die "Unable to copy ${file}"
-				;;
-			*)
-				unpack "${file}"
-				;;
-		esac
-	done
-}
-
-src_prepare() {
-	default
-	sed -i main/Makefile \
-		-e '/-rpath/s|$(LIBDIR)|$(INSTALLLIBDIR)|g' \
-		|| die
-	mv configure.{in,ac} || die
-	eautoreconf
-
-	# custom makefiles
-	multilib_copy_sources
-}
-
-multilib_src_configure() {
-	local myconf=(
-		--enable-shared
-		--with-audio=$(get_audio)
-	)
-	econf "${myconf[@]}"
-}
-
-multilib_src_compile() {
-	emake CC="$(tc-getCC)" CFLAGS="${CFLAGS}"
-}
-
-multilib_src_install_all() {
-	dodoc ACKNOWLEDGEMENTS README.md
-
-	rm -rf "${D}"/usr/lib*/*.a
-
-	if use voices; then
-		insinto /usr/share/flite
-		doins "${WORKDIR}"/*.flitevox
-	fi
-}
-
-pkg_postinst() {
-	if [[ "$(get_audio)" = "none" ]]; then
-		ewarn "flite is built without audio support. Enable the"
-		ewarn "alsa, oss, or pulseaudio USE flags for audio support."
-	fi
-}


^ permalink raw reply related	[flat|nested] 3+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: app-accessibility/flite/files/, app-accessibility/flite/
@ 2023-03-09  1:09 Sam James
  0 siblings, 0 replies; 3+ messages in thread
From: Sam James @ 2023-03-09  1:09 UTC (permalink / raw
  To: gentoo-commits

commit:     608191e30730b3bf41ddce46054df7119d43ea60
Author:     Matoro Mahri <matoro <AT> users <DOT> noreply <DOT> github <DOT> com>
AuthorDate: Wed Mar  8 22:20:37 2023 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Thu Mar  9 01:08:01 2023 +0000
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 <matoro <AT> users.noreply.github.com>
Closes: https://github.com/gentoo/gentoo/pull/30006
Signed-off-by: Sam James <sam <AT> 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 000000000000..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 <matoro@users.noreply.github.com>
+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 License v2
 
 EAPI=7
@@ -44,7 +44,9 @@ SRC_URI="https://github.com/festvox/flite/archive/v${PV}.tar.gz -> ${P}.tar.gz
 LICENSE="BSD freetts public-domain regexp-UofT BSD-2"
 SLOT="0"
 KEYWORDS="~alpha amd64 arm arm64 ~ia64 ~loong ppc ppc64 ~riscv sparc x86"
-IUSE="alsa oss pulseaudio voices"
+IUSE="alsa oss pulseaudio test voices"
+RESTRICT="!test? ( test )"
+REQUIRED_USE="test? ( alsa )"
 
 DEPEND="
 	pulseaudio? ( media-sound/pulseaudio[${MULTILIB_USEDEP}] )
@@ -54,6 +56,7 @@ RDEPEND="${DEPEND}"
 
 PATCHES=(
 	"${FILESDIR}"/${PN}-1.4-audio-interface.patch
+	"${FILESDIR}"/${PN}-2.2-backport-pr30.patch
 )
 
 get_audio() {


^ permalink raw reply related	[flat|nested] 3+ messages in thread

end of thread, other threads:[~2023-03-09  1:09 UTC | newest]

Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2020-02-20  2:55 [gentoo-commits] repo/gentoo:master commit in: app-accessibility/flite/files/, app-accessibility/flite/ Matt Turner
  -- strict thread matches above, loose matches on Subject: below --
2021-04-22 12:29 Miroslav Šulc
2023-03-09  1:09 Sam James

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox