diff options
author | 2014-11-23 19:43:19 +0000 | |
---|---|---|
committer | 2014-11-23 19:43:19 +0000 | |
commit | cb6e923a596383051df11230d9dda06f293df0e2 (patch) | |
tree | eec6f10f6c598f4b8e79a46eb1aa63a593820bb6 /app-accessibility | |
parent | Install zsh-completion files unconditionally. (diff) | |
download | historical-cb6e923a596383051df11230d9dda06f293df0e2.tar.gz historical-cb6e923a596383051df11230d9dda06f293df0e2.tar.bz2 historical-cb6e923a596383051df11230d9dda06f293df0e2.zip |
Remove old versions from the tree, now that 1.4 is stable.
Package-Manager: portage-2.2.8-r2/cvs/Linux x86_64
Manifest-Sign-Key: 0x6521E06D
Diffstat (limited to 'app-accessibility')
-rw-r--r-- | app-accessibility/flite/ChangeLog | 11 | ||||
-rw-r--r-- | app-accessibility/flite/Manifest | 28 | ||||
-rw-r--r-- | app-accessibility/flite/files/const.patch | 14 | ||||
-rw-r--r-- | app-accessibility/flite/files/flite-1.2-tempfile.patch | 50 | ||||
-rw-r--r-- | app-accessibility/flite/files/flite-1.3-alsa-support.patch | 333 | ||||
-rw-r--r-- | app-accessibility/flite/files/flite-1.3-fix-static.patch | 29 | ||||
-rw-r--r-- | app-accessibility/flite/files/flite-1.3-libm.patch | 11 | ||||
-rw-r--r-- | app-accessibility/flite/files/flite-1.3-respect-ldflags.patch | 24 | ||||
-rw-r--r-- | app-accessibility/flite/files/flite-1.3-shared-libs.patch | 170 | ||||
-rw-r--r-- | app-accessibility/flite/files/flite-1.3-tempfile.patch | 50 | ||||
-rw-r--r-- | app-accessibility/flite/flite-1.2-r1.ebuild | 70 | ||||
-rw-r--r-- | app-accessibility/flite/flite-1.2-r2.ebuild | 78 | ||||
-rw-r--r-- | app-accessibility/flite/flite-1.3-r1.ebuild | 73 | ||||
-rw-r--r-- | app-accessibility/flite/flite-1.3.ebuild | 65 | ||||
-rw-r--r-- | app-accessibility/flite/flite-1.4-r3.ebuild | 71 |
15 files changed, 18 insertions, 1059 deletions
diff --git a/app-accessibility/flite/ChangeLog b/app-accessibility/flite/ChangeLog index 5f7536ea2a9c..ee0033f3d88c 100644 --- a/app-accessibility/flite/ChangeLog +++ b/app-accessibility/flite/ChangeLog @@ -1,6 +1,15 @@ # ChangeLog for app-accessibility/flite # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-accessibility/flite/ChangeLog,v 1.64 2014/10/11 13:08:18 maekke Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-accessibility/flite/ChangeLog,v 1.65 2014/11/23 19:43:18 teiresias Exp $ + + 23 Nov 2014; Christopher Brannon <teiresias@gentoo.org> -flite-1.2-r1.ebuild, + -flite-1.2-r2.ebuild, -flite-1.3.ebuild, -flite-1.3-r1.ebuild, + -flite-1.4-r3.ebuild, -files/flite-1.2-tempfile.patch, + -files/flite-1.3-alsa-support.patch, -files/flite-1.3-fix-static.patch, + -files/flite-1.3-libm.patch, -files/flite-1.3-respect-ldflags.patch, + -files/flite-1.3-shared-libs.patch, -files/flite-1.3-tempfile.patch, + -files/const.patch: + Remove old versions from the tree. 11 Oct 2014; Markus Meier <maekke@gentoo.org> flite-1.4-r4.ebuild: arm stable, bug #512012 diff --git a/app-accessibility/flite/Manifest b/app-accessibility/flite/Manifest index 01fa736087fb..133fcd22089d 100644 --- a/app-accessibility/flite/Manifest +++ b/app-accessibility/flite/Manifest @@ -1,35 +1,23 @@ -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA256 -AUX const.patch 466 SHA256 31df1356f8ada98927f786903c3f69ca45c46d810cb6c1971a029296ccbff4f3 SHA512 e4ae25cc69a8222cd64ecf290489485af943bdf00421bc93539a430632f1476874c032f33af68fa2d3565875490abed2b51f641e3804ff6e5dffd46c739b9790 WHIRLPOOL 52057e5815ccd06149f2d7e1a0add55f16a9a60368413b3bfbf26eb74ae94b9e0cd2c9da365f561af7ccbe2e0c17af6e15e47d279427ebb78afcc31bd2b6cb54 -AUX flite-1.2-tempfile.patch 1413 SHA256 597f1516060917faab008819e3ceb5bb487f5b3948e97eef1020dc10b62c6edf SHA512 ebf09b9067eb2e97486950bbc93f8d428fee3b762483cb6332fb93d17c1b444a1d2e2c07ee3d874415ef50449b7800dccb19d16924e124cd158b93a5340531df WHIRLPOOL 1f64c05fcf27ee9a1dfed76a93eb66cd4d76dba3da1a17c0845246c07521b3b46b2ee414f9a6b87366f36d34b5149dfc025336b0d531886fc6f8961fb02a80da -AUX flite-1.3-alsa-support.patch 11007 SHA256 f43266bc5c70c12512be6a8e1980d5d5551d7624bd27a678431d53df695cf01d SHA512 f8dedf677c18821c017c1720a730c0685cfaddd3fdc86f9c98c1380f1213843fb8aa29a19d1fef1927a563adf2ac7affdf121f65d3f315512b19ee4e1f1d0ba2 WHIRLPOOL 958bcdd66e033232a43de34284f07a23a0326a36f9ed76ffb2731f7debfec495965cf36dc47dce6585b60ebb1975bea40d00d1241bc6b073f3dfeb36469b52cb -AUX flite-1.3-fix-static.patch 1108 SHA256 bc2a1d0af435003752d0d4be7b45f7b9b7b018484b46cb7096bf11a5cec0051c SHA512 1959f272913f33f24a8213dd6d4b72121523c67505ec29001478005c66396b0de987d865e809ba9971ef9aefc7d05bb2f5b7e6fafdef0e9d367351aafdce556f WHIRLPOOL 324b802bed24b8e98ad7935b617163ef56a8774c2127c7e6cc0a63121b2e56d49f7cc696e15be10e8c910fbfeb400904dc4fff43982afb632b8ce03d85bd96d4 -AUX flite-1.3-libm.patch 432 SHA256 474135db4afdf81f73eda2280158cdc27997ec0423a9323d448d484cdd167aa7 SHA512 23a8dcfcca2b5c864393f3bb27e8c68092dfff59d178ae8c75213ea65f02a5079578095c72c24444e4be49faa52cb333079f4eca51b74e01cdd631ded6d04bdc WHIRLPOOL 5d5ea2596250ba4711edb92e33c8dc7faa67c97e61fbf39163189f4138d98a85081fb8865ed5b55a643a38086fe780dbec264919b2e9c5f556b5ffefed4d2613 -AUX flite-1.3-respect-ldflags.patch 1074 SHA256 5031f9f50f35729bd592aaf0b200fee48da205d279c45f7760127d5d3bc1da22 SHA512 350de1261e57e17cf0287b1b4435aae36e80863d707b1582632c3a6ba003be65c627761696b8431fb37f0490589a4ee0aee042af8150627eff143fb12bf0b615 WHIRLPOOL 9bf81d211ba4e4e5d6f1a973fe8ce0bfbd185f84f7d69282487be2f5fc6f03b9b54843d9e2935147b980f0858fe69f38a598cad3df46f8676d6a5fce3ae4ad90 -AUX flite-1.3-shared-libs.patch 7663 SHA256 b7cc0a8fe5f4e71a8bc83dd6e4442d641fb909fd812826dc66e9c3749c65027b SHA512 2ca57732413f0021f236df1f11097fa2600518846a89a427aed25ba862a1fc67433c13749f6871a781ab75ed646ff93a269ab3584e622e3bd660ac4bfca0f9fe WHIRLPOOL ae7499ff7c300f309de59091b6770dd300cbac31e74f9ca1d2d71df292ff61ee770dac14e94fce12a40bbf4ef2ef3d34ef3d85992e98d5070457450b33554181 -AUX flite-1.3-tempfile.patch 1413 SHA256 597f1516060917faab008819e3ceb5bb487f5b3948e97eef1020dc10b62c6edf SHA512 ebf09b9067eb2e97486950bbc93f8d428fee3b762483cb6332fb93d17c1b444a1d2e2c07ee3d874415ef50449b7800dccb19d16924e124cd158b93a5340531df WHIRLPOOL 1f64c05fcf27ee9a1dfed76a93eb66cd4d76dba3da1a17c0845246c07521b3b46b2ee414f9a6b87366f36d34b5149dfc025336b0d531886fc6f8961fb02a80da AUX flite-1.4-audio-interface.patch 520 SHA256 405320984e098c3d788b7751935b2774972ee7970dbe0fef0718ce1e5cc725c9 SHA512 06fea693abbb186e039cc371ce5cde2b77979964778a7c24d9d2d2de9994898fa8a8f2ff0a341fc97f813f61d6c9e7a011caa0963467398176ec04d69c750283 WHIRLPOOL 83902c9a8324cd25c188fb62d4012dcdea53df8cece4592384dc5aeb019c74a88fbd99b4f6f5ca6136d2de2ef3f0280811cb4f1a0d51dc9c0d114a9e13c1ae91 AUX flite-1.4-fix-parallel-builds.patch 599 SHA256 bfd51888ea533bb9ee74cadb68b2e507cb715ab5043aa679b7f42ab52336a7a1 SHA512 5adf675aadc3493ad70b1e7f447a1d7c0ff9c11a7dce90afbc6ccc7c811cc7226a7b1591a1a819209b26e93bf48c11cdaa8db1cfd55eb884a66b054c79590509 WHIRLPOOL 3329456e3c0f7c759a6a849b2e9bb148f809b94979bc8bbd56d0a35e5191614f2f4281d24899b85461387070311ed3c811e9bfb447afbecf37c58d60a69a2bba AUX flite-1.4-ldflags.patch 1806 SHA256 ff43e11241c9aea26483865c672c20421d12c688ae8b59b39471bafb52c1463e SHA512 87c91fca91e3edb84ef6e6fcffcb67ab9043547fded84ac2f407d02b880350223e860d976564e273ae5efebd9990e303bdd6818291d03fd74118e86c12aa59c5 WHIRLPOOL 7bf2fe75ae84c76555ba32571811cf295780105962710069795d9d21ff6c2d742441e2778650b5f52409d95ce57a664b4dd560b3fbf65e04e1935afac67fadc2 AUX flite-1.4-respect-destdir.patch 1902 SHA256 093538c3a7cd2b9b9edd1f0956a34c4261c3ccdd4feb55e8ecedc338562495f3 SHA512 acc37971361eda4ce91cf605e3ff7878842d605d12973c37ab80451e6a1f9dea96b54cbd39a9ca281f36f6ed6ec1e79af712692639f541c59a7cedad2af47de7 WHIRLPOOL 3585708abe73fc69c16aa747d565433c6eed1c682f17c8402ca50e5cce8fa99fb66e7848a19f301d50fbc96496f8ed4aeb8849d479ce9bfff2b949bbc9ddc6c9 AUX flite-1.4-tempfile.patch 1413 SHA256 597f1516060917faab008819e3ceb5bb487f5b3948e97eef1020dc10b62c6edf SHA512 ebf09b9067eb2e97486950bbc93f8d428fee3b762483cb6332fb93d17c1b444a1d2e2c07ee3d874415ef50449b7800dccb19d16924e124cd158b93a5340531df WHIRLPOOL 1f64c05fcf27ee9a1dfed76a93eb66cd4d76dba3da1a17c0845246c07521b3b46b2ee414f9a6b87366f36d34b5149dfc025336b0d531886fc6f8961fb02a80da -DIST flite-1.2-release.tar.bz2 7817919 SHA256 10ff42ce08a628c7fd84d26b5228d549e9eecb1eb03cb158e87d8be66bc58ae2 SHA512 2521389f5b887b02428516b556f13a78b80a4f29486f1c00aa326fe32521b851cd0d50548243ac4708a698a2b84d8218c8fb915c408ac0c3410a341cb8f36754 WHIRLPOOL 653f73704cff31581bbd3b8e003691af448ca041510b334ecfbe5d382691e98996db76fea6b05b1c3e3892b91fe036b7b9ff874905ae60bd549275b379aa0f91 -DIST flite-1.3-release.tar.gz 10663835 SHA256 922225f7001e57a0fbace8833b0a48790a68f6c7b491f2d47c78ad537ab78a8b SHA512 f528dcd103a4c000b62059c4e94dd3673737be92e4cf93474e95b1bbbc596fe487c973cce2ef91a71181ba9a84e9580311ce40bac96bc9ba3544b17074d78d25 WHIRLPOOL 2f5086aa12d00a12c542c3d109acb6a357028d364e07efbb939652dc4a593251d9eac9fd45f86fa03bac10a386e0797e4f7dffe651af9681ada223ada6cc7cdc DIST flite-1.4-release.tar.bz2 15163897 SHA256 45c662160aeca6560589f78daf42ab62c6111dd4d244afc28118c4e6f553cd0c SHA512 eec1022077fb7a47db3848ae6944509e18a6c86a25aa24f921b8b6c2af708fc9811b287e76d96cf64fc68f8e1d0a43b7e878659f15bfcf76957eddd75e599112 WHIRLPOOL 5e641fe58fb1c28609154377f009691587a74fbbad7a621947ca06382e5e2da52d3be86f1388730c42dc2a671881320b37dfc10a91185e601d0838526ddae2f2 -DIST flite_lexfix.tar.gz 2857920 SHA256 caa81ffa962b31dbbc0211bc20506a2bb02c707695b286f072c8ec264e32252c SHA512 7decfd0c09889ddbff642df7c8363313faa3aaa888cf20dfaa42d9bd88f64858d336fc9f9975c236f5bd4e6bce62c990c20c6edb73f5976b72733c5346c66a93 WHIRLPOOL d2b5473a98c69308bc7025de0e2432dddaf3d6532bfac0f688a5e09ab94765883412dec4f3ef0bcb4565676026dfa9c61c5d2c8e203d29d5f96acd39f980d16b -EBUILD flite-1.2-r1.ebuild 1753 SHA256 a47e4aa7e881f6142f3ff5a8eb7504e782a86ad876f9be8cc897b1b42a17dd25 SHA512 a48448620ee5aa483db797847609414dce611af0a8135cd41bfbcd06c88015d4fc008c329a15df2a3e237e37d799ec1c81e383d617371518c647d67e258ea5de WHIRLPOOL e00b9fb1f318b5c8747de628e51d4dd95a5ea6e46dd3f3264c247ed0ce071a36fb253c7577c1d8742ab03080ceeee3e39efe2a00d8249c3e0585a255d7f2bf5b -EBUILD flite-1.2-r2.ebuild 1804 SHA256 8843dee2ddda6621fe38a90a060deed9917564188a14d01d2e33cf417fa1acd1 SHA512 f310e3090c56fb2ef5eee03202cd229cf2c8d42bb60aa5697b770135945bf68947bde08062332f19f8ad8c2729d0e7e9e7758297c587d39cc4ef04888a2f9da3 WHIRLPOOL 87fda8790d4f52c817e66e062fffb42bd43c6ed5e92ce84357846b77972c419831827b501cb3c6cf1566fab02d56e28abf2e92406a5db5e789c01ce363903a09 -EBUILD flite-1.3-r1.ebuild 1756 SHA256 d48f105b5c092491d86e4044b329e7673b79450d3fe479d3d680e06c27049c06 SHA512 6d9b91f6eba55d6452584f6d5bd751695ce1a8c972fec6ee497234a4551e7f7191f674b7a1705edd97e020cdd598525f47c4bb1055dfe0a9192a15658a9f55a4 WHIRLPOOL b84e95c09c1a6daf73e3934da8d13588c2fdcdb4b237343e8f8db62460f409372e0bbfbaf59178540d702e5a399666fd20537b6a5c4301b7273c11837057acd7 -EBUILD flite-1.3.ebuild 1604 SHA256 09e269f204047e8358f2d8e160851e9462119330b4842ae215c358c2a887d0f2 SHA512 a0bf48901b7611fe1ca559cb48b239d175a2e04982abceade61487cf124e638147eb0d8765dcfbdcb6086a02ecee9abaf0a14fb58c9eba8d46b5caa249241b42 WHIRLPOOL 8f1593e86fea5c2f60a5f97d4aa50167d3b8a9ce49fef9a7283a951f312acec3b6abce5178df1d7ee66f0b420f180e81e5f5557f0d2fcee519f685ac49117831 -EBUILD flite-1.4-r3.ebuild 1706 SHA256 4fac8dbe48c83d64aec840994f2432e4ea80d90c4f17834e4ce00365323407f7 SHA512 df71caa0d817b6c8da2b0931cd9fcf1aeac53f27dc24efe0488ad31c7a17a8620938f6c7ed5b360a9b06f82b4a31250784c28188f4ce0276b99ac0a5d07adc05 WHIRLPOOL 548f5b43d30397da604834447f178cdfbc895a6c41a234effe85524f4997a9b6c04d8ddc890d8d7cfdc61213950306b162201751d79ecaabd908a16815615c93 EBUILD flite-1.4-r4.ebuild 1787 SHA256 1fdd79708c33fff1ef3e7ce13dd05e808725c8e20b0551ae18eb803797bd3a07 SHA512 ed563b4831fa1244a00fc2295d074e272e74431ae3b4684f076e7f2644ca6dd84479e47fed3b4a4bdf8c5a40c5662a02bf9e37518162d1c1dbc77c4b358980b2 WHIRLPOOL 5bda1cdacce85966c0c2cfcdf3efecf71b792d95a84383239ea05c56ccf8c75725f5331be1fa0390df5c663ab7ccb2d8db16671357e0f4f0b5374f5a8b707360 -MISC ChangeLog 8997 SHA256 39042ec43e9f51e009ba8fea1d69f01576d10ae6151bbf5169d186c00cd2126c SHA512 3386b7bf681e35be6c8791858712934d40f3e54d28b9aa399568d5131b003b6b0e5d2c6ddc20ea943f3e15389ffdf221e8b28e64cffac6e2f98d745a2bf2f0a1 WHIRLPOOL bec7024cda997f1dd6e49d8ac3832fed9533849134fff2f3591c458c062657fdd72857e182d7c9abac2c08d3217b58588cc94300746f92203526ffbd4dd9d407 +MISC ChangeLog 9478 SHA256 2d6ed1c63e2742783213ca6126e6acbc184615bf521dac58d896e5dd40cc992d SHA512 fb3dd2e50d648e46aed3f8040442fcdf09097377c14767c1839e6e4cf6e4b070010e0fe775bcbdddaf11558cecb9d3307865f9cca3bb71a85fc5c9bfa533ace2 WHIRLPOOL 6a0d15353a8876ea88eb3b8ecef7b8ca74be958e0ce4b26c3684cd16192cf912835d5aa39e479492d068c6fa62fa377c1f7efe049660922bc94130525146b718 MISC metadata.xml 185 SHA256 b6de40518e01d3ef5447352b3f476c1f5b8e6ae53d5e654a2fb9e4ee7fdbe135 SHA512 b517a1e240d965fedf735d9516946add59d4dc927b5948f623b29f3c65d74b59ecb0efae62460f5042a2bde63426c5a453c47e1f93acd75f1c620360ef4b6d4a WHIRLPOOL 4115233660bcee431f29bf5c4e59a8704258d204eb57b236ff059b74c220c0cba7a6fa3193014a293b3be96d5b759a19bff662c539ce063510a953f62f1dd48f -----BEGIN PGP SIGNATURE----- Version: GnuPG v2 -iEYEAREIAAYFAlQ5K8QACgkQkKaRLQcq0GIjYgCaA4sduG1M7IKvrl14ZHKcS1PB -AfkAn2PtTvrnGTuDni/D102fzfDU6hp1 -=8v1v +iQEcBAEBCAAGBQJUcjjXAAoJEH8qFnJlIeBtJVUH/ijxGKUCBS65Xx0ZLZUB5cZQ +5Jzj2UcEzPnJvqSS/HRiM97/KErGSE26uXO7+P+TfIHGLnGvCsIgQs2rNK/Jlofd +obg2JvUFrIN9H5lhJmeXAjAGAk73Lbe5OvnKf+TKzgQ725N39PrNslWqhyqsiwyf +A8raNkaag2c8Yh9+5AHafFbgMKKVcDxrljkZJSJjnR0lTgAjbWvs4O/Q9VxFo7yI +ZKk7tDVS1H/lL3hB4OrEqI56jzOd4j9cOmCSvleNN3qZYR7AZ7qsKZzoweb5aRff +xKC25Y4Qdc0hDhddBiQ8C4shJZyFr5sWHW4IaJE/akR8NUFo4UPbGdII1y1a+tw= +=4Viw -----END PGP SIGNATURE----- diff --git a/app-accessibility/flite/files/const.patch b/app-accessibility/flite/files/const.patch deleted file mode 100644 index cf5510f47f22..000000000000 --- a/app-accessibility/flite/files/const.patch +++ /dev/null @@ -1,14 +0,0 @@ -diff -Naur flite-1.2-release.orig/tools/find_sts_main.c flite-1.2-release/tools/find_sts_main.c ---- tools/find_sts_main.c 2002-12-26 17:18:30.000000000 +0000 -+++ tools/find_sts_main.c 2004-05-31 10:28:14.399281736 +0000 -@@ -40,6 +40,10 @@ - #include <stdio.h> - #include <math.h> - #include <string.h> -+ -+/* to allow some normally const fields to be manipulated during building */ -+#define const -+ - #include "cst_wave.h" - #include "cst_track.h" - #include "cst_sigpr.h" diff --git a/app-accessibility/flite/files/flite-1.2-tempfile.patch b/app-accessibility/flite/files/flite-1.2-tempfile.patch deleted file mode 100644 index 09b54f64ea2e..000000000000 --- a/app-accessibility/flite/files/flite-1.2-tempfile.patch +++ /dev/null @@ -1,50 +0,0 @@ -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 - -This isn't useful in regular builds and is actually a security -concern. ---- - 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 ---- 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) - 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) ? -@@ -107,7 +109,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); -@@ -116,7 +120,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; - --- -1.8.3.1 - diff --git a/app-accessibility/flite/files/flite-1.3-alsa-support.patch b/app-accessibility/flite/files/flite-1.3-alsa-support.patch deleted file mode 100644 index 9d3415e3fe4b..000000000000 --- a/app-accessibility/flite/files/flite-1.3-alsa-support.patch +++ /dev/null @@ -1,333 +0,0 @@ -diff -uNr flite-1.3-release/configure.in flite-1.3-release-mod/configure.in ---- flite-1.3-release/configure.in 2005-08-13 13:43:21.000000000 +0200 -+++ flite-1.3-release-mod/configure.in 2006-11-13 21:16:27.000000000 +0200 -@@ -206,10 +206,10 @@ - AC_CHECK_HEADER(sys/audioio.h, - [AUDIODRIVER="sun" - AUDIODEFS=-DCST_AUDIO_SUNOS]) --dnl AC_CHECK_HEADER(sys/asoundlib.h, --dnl [AUDIODRIVER="alsa" --dnl AUDIODEFS=-DCST_AUDIO_ALSA --dnl AUDIOLIBS=-lasound]) -+AC_CHECK_HEADER(alsa/asoundlib.h, -+ [AUDIODRIVER="alsa" -+ AUDIODEFS=-DCST_AUDIO_ALSA -+ AUDIOLIBS=-lasound]) - AC_CHECK_HEADER(mmsystem.h, - [AUDIODRIVER="wince" - AUDIODEFS=-DCST_AUDIO_WINCE -diff -uNr flite-1.3-release/src/audio/au_alsa.c flite-1.3-release-mod/src/audio/au_alsa.c ---- flite-1.3-release/src/audio/au_alsa.c 1970-01-01 02:00:00.000000000 +0200 -+++ flite-1.3-release-mod/src/audio/au_alsa.c 2006-11-13 21:16:54.000000000 +0200 -@@ -0,0 +1,311 @@ -+/*************************************************************************/ -+/* */ -+/* Language Technologies Institute */ -+/* Carnegie Mellon University */ -+/* Copyright (c) 2000 */ -+/* All Rights Reserved. */ -+/* */ -+/* Permission is hereby granted, free of charge, to use and distribute */ -+/* this software and its documentation without restriction, including */ -+/* without limitation the rights to use, copy, modify, merge, publish, */ -+/* distribute, sublicense, and/or sell copies of this work, and to */ -+/* permit persons to whom this work is furnished to do so, subject to */ -+/* the following conditions: */ -+/* 1. The code must retain the above copyright notice, this list of */ -+/* conditions and the following disclaimer. */ -+/* 2. Any modifications must be clearly marked as such. */ -+/* 3. Original authors' names are not deleted. */ -+/* 4. The authors' names are not used to endorse or promote products */ -+/* derived from this software without specific prior written */ -+/* permission. */ -+/* */ -+/* CARNEGIE MELLON UNIVERSITY AND THE CONTRIBUTORS TO THIS WORK */ -+/* DISCLAIM ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING */ -+/* ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO EVENT */ -+/* SHALL CARNEGIE MELLON UNIVERSITY NOR THE CONTRIBUTORS BE LIABLE */ -+/* FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES */ -+/* WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN */ -+/* AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, */ -+/* ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF */ -+/* THIS SOFTWARE. */ -+/* */ -+/*********************************************************************** */ -+/* Author: Lukas Loehrer ( */ -+/* Date: January 2005 */ -+/*************************************************************************/ -+/* */ -+/* Native access to alsa audio devices on Linux */ -+/* Tested with libasound version 1.0.10 */ -+/*************************************************************************/ -+ -+#include <stdlib.h> -+#include <unistd.h> -+#include <sys/types.h> -+#include <assert.h> -+#include <errno.h> -+ -+#include "cst_string.h" -+#include "cst_wave.h" -+#include "cst_audio.h" -+ -+#include <alsa/asoundlib.h> -+ -+ -+/*static char *pcm_dev_name = "hw:0,0"; */ -+static char *pcm_dev_name ="default"; -+ -+static inline void print_pcm_state(snd_pcm_t *handle, char *msg) -+{ -+ fprintf(stderr, "PCM state at %s = %s\n", msg, -+ snd_pcm_state_name(snd_pcm_state(handle))); -+} -+ -+cst_audiodev *audio_open_alsa(int sps, int channels, cst_audiofmt fmt) -+{ -+ cst_audiodev *ad; -+ unsigned int real_rate; -+ int err; -+ -+ /* alsa specific stuff */ -+ snd_pcm_t *pcm_handle; -+ snd_pcm_stream_t stream = SND_PCM_STREAM_PLAYBACK; -+ snd_pcm_hw_params_t *hwparams; -+ snd_pcm_format_t format; -+ snd_pcm_access_t access = SND_PCM_ACCESS_RW_INTERLEAVED; -+ -+ /* Allocate the snd_pcm_hw_params_t structure on the stack. */ -+ snd_pcm_hw_params_alloca(&hwparams); -+ -+ /* Open pcm device */ -+ err = snd_pcm_open(&pcm_handle, pcm_dev_name, stream, 0); -+ if (err < 0) -+ { -+ cst_errmsg("audio_open_alsa: failed to open audio device %s. %s\n", -+ pcm_dev_name, snd_strerror(err)); -+ return NULL; -+ } -+ -+ /* Init hwparams with full configuration space */ -+ err = snd_pcm_hw_params_any(pcm_handle, hwparams); -+ if (err < 0) -+ { -+ snd_pcm_close(pcm_handle); -+ cst_errmsg("audio_open_alsa: failed to get hardware parameters from audio device. %s\n", snd_strerror(err)); -+ return NULL; -+ } -+ -+ /* Set access mode */ -+ err = snd_pcm_hw_params_set_access(pcm_handle, hwparams, access); -+ if (err < 0) -+ { -+ snd_pcm_close(pcm_handle); -+ cst_errmsg("audio_open_alsa: failed to set access mode. %s.\n", snd_strerror(err)); -+ return NULL; -+ } -+ -+ /* Determine matching alsa sample format */ -+ /* This could be implemented in a more */ -+ /* flexible way (byte order conversion). */ -+ switch (fmt) -+ { -+ case CST_AUDIO_LINEAR16: -+ if (CST_LITTLE_ENDIAN) -+ format = SND_PCM_FORMAT_S16_LE; -+ else -+ format = SND_PCM_FORMAT_S16_BE; -+ break; -+ case CST_AUDIO_LINEAR8: -+ format = SND_PCM_FORMAT_U8; -+ break; -+ case CST_AUDIO_MULAW: -+ format = SND_PCM_FORMAT_MU_LAW; -+ break; -+ default: -+ snd_pcm_close(pcm_handle); -+ cst_errmsg("audio_open_alsa: failed to find suitable format.\n"); -+ return NULL; -+ break; -+ } -+ -+ /* Set samble format */ -+ err = snd_pcm_hw_params_set_format(pcm_handle, hwparams, format); -+ if (err <0) -+ { -+ snd_pcm_close(pcm_handle); -+ cst_errmsg("audio_open_alsa: failed to set format. %s.\n", snd_strerror(err)); -+ return NULL; -+ } -+ -+ /* Set sample rate near the disired rate */ -+ real_rate = sps; -+ err = snd_pcm_hw_params_set_rate_near(pcm_handle, hwparams, &real_rate, 0); -+ if (err < 0) -+ { -+ snd_pcm_close(pcm_handle); -+ cst_errmsg("audio_open_alsa: failed to set sample rate near %d. %s.\n", sps, snd_strerror(err)); -+ return NULL; -+ } -+ /*FIXME: This is probably too strict */ -+ assert(sps == real_rate); -+ -+ /* Set number of channels */ -+ assert(channels >0); -+ err = snd_pcm_hw_params_set_channels(pcm_handle, hwparams, channels); -+ if (err < 0) -+ { -+ snd_pcm_close(pcm_handle); -+ cst_errmsg("audio_open_alsa: failed to set number of channels to %d. %s.\n", channels, snd_strerror(err)); -+ return NULL; -+ } -+ -+ /* Commit hardware parameters */ -+ err = snd_pcm_hw_params(pcm_handle, hwparams); -+ if (err < 0) -+ { -+ snd_pcm_close(pcm_handle); -+ cst_errmsg("audio_open_alsa: failed to set hw parameters. %s.\n", snd_strerror(err)); -+ return NULL; -+ } -+ -+ /* Make sure the device is ready to accept data */ -+ assert(snd_pcm_state(pcm_handle) == SND_PCM_STATE_PREPARED); -+ -+ /* Write hardware parameters to flite audio device data structure */ -+ ad = cst_alloc(cst_audiodev, 1); -+ assert(ad != NULL); -+ ad->real_sps = ad->sps = sps; -+ ad->real_channels = ad->channels = channels; -+ ad->real_fmt = ad->fmt = fmt; -+ ad->platform_data = (void *) pcm_handle; -+ -+ return ad; -+} -+ -+int audio_close_alsa(cst_audiodev *ad) -+{ -+ int result; -+ snd_pcm_t *pcm_handle; -+ -+ if (ad == NULL) -+ return 0; -+ -+ pcm_handle = (snd_pcm_t *) ad->platform_data; -+ result = snd_pcm_close(pcm_handle); -+ if (result < 0) -+ { -+ cst_errmsg("audio_close_alsa: Error: %s.\n", snd_strerror(result)); -+ } -+ cst_free(ad); -+ return result; -+} -+ -+/* Returns zero if recovery was successful. */ -+static int recover_from_error(snd_pcm_t *pcm_handle, ssize_t res) -+{ -+ if (res == -EPIPE) /* xrun */ -+ { -+ res = snd_pcm_prepare(pcm_handle); -+ if (res < 0) -+ { -+ /* Failed to recover from xrun */ -+ cst_errmsg("recover_from_write_error: failed to recover from xrun. %s\n.", snd_strerror(res)); -+ return res; -+ } -+ } -+ else if (res == -ESTRPIPE) /* Suspend */ -+ { -+ while ((res = snd_pcm_resume(pcm_handle)) == -EAGAIN) -+ { -+ snd_pcm_wait(pcm_handle, 1000); -+ } -+ if (res < 0) -+ { -+ res = snd_pcm_prepare(pcm_handle); -+ if (res <0) -+ { -+ /* Resume failed */ -+ cst_errmsg("audio_recover_from_write_error: failed to resume after suspend. %s\n.", snd_strerror(res)); -+ return res; -+ } -+ } -+ } -+ else if (res < 0) -+ { -+ /* Unknown failure */ -+ cst_errmsg("audio_recover_from_write_error: %s.\n", snd_strerror(res)); -+ return res; -+ } -+ return 0; -+} -+ -+int audio_write_alsa(cst_audiodev *ad, void *samples, int num_bytes) -+{ -+ size_t frame_size; -+ ssize_t num_frames, res; -+ snd_pcm_t *pcm_handle; -+ char *buf = (char *) samples; -+ -+ /* Determine frame size in bytes */ -+ frame_size = audio_bps(ad->real_fmt) * ad->real_channels; -+ /* Require that only complete frames are handed in */ -+ assert((num_bytes % frame_size) == 0); -+ num_frames = num_bytes / frame_size; -+ pcm_handle = (snd_pcm_t *) ad->platform_data; -+ -+ while (num_frames > 0) -+ { -+ res = snd_pcm_writei(pcm_handle, buf, num_frames); -+ if (res != num_frames) -+ { -+ if (res == -EAGAIN || (res > 0 && res < num_frames)) -+ { -+ snd_pcm_wait(pcm_handle, 100); -+ } -+ else if (recover_from_error(pcm_handle, res) < 0) -+ { -+ return -1; -+ } -+ } -+ -+ if (res >0) -+ { -+ num_frames -= res; -+ buf += res * frame_size; -+ } -+ } -+ return num_bytes; -+} -+ -+int audio_flush_alsa(cst_audiodev *ad) -+{ -+ int result; -+ result = snd_pcm_drain((snd_pcm_t *) ad->platform_data); -+ if (result < 0) -+ { -+ cst_errmsg("audio_flush_alsa: Error: %s.\n", snd_strerror(result)); -+ } -+ /* Prepare device for more data */ -+ result = snd_pcm_prepare((snd_pcm_t *) ad->platform_data); -+if (result < 0) -+ { -+ cst_errmsg("audio_flush_alsa: Error: %s.\n", snd_strerror(result)); -+ } -+ return result; -+} -+ -+int audio_drain_alsa(cst_audiodev *ad) -+{ -+ int result; -+ result = snd_pcm_drop((snd_pcm_t *) ad->platform_data); -+ if (result < 0) -+ { -+ cst_errmsg("audio_drain_alsa: Error: %s.\n", snd_strerror(result)); -+ } -+/* Prepare device for more data */ -+ result = snd_pcm_prepare((snd_pcm_t *) ad->platform_data); -+if (result < 0) -+ { -+ cst_errmsg("audio_drain_alsa: Error: %s.\n", snd_strerror(result)); -+ } -+ return result; -+} diff --git a/app-accessibility/flite/files/flite-1.3-fix-static.patch b/app-accessibility/flite/files/flite-1.3-fix-static.patch deleted file mode 100644 index 156f145aa236..000000000000 --- a/app-accessibility/flite/files/flite-1.3-fix-static.patch +++ /dev/null @@ -1,29 +0,0 @@ -diff -Naur flite-1.3-release/main/Makefile flite-1.3-release.new/main/Makefile ---- flite-1.3-release/main/Makefile 2014-02-12 12:08:32.222776141 -0800 -+++ flite-1.3-release.new/main/Makefile 2014-02-12 12:29:32.308048276 -0800 -@@ -48,15 +48,23 @@ - ALL = $(BINDIR)/flite$(EXEEXT) $(BINDIR)/flite_time$(EXEEXT) \ - $(BINDIR)/t2p$(EXEEXT) - -+include $(TOP)/config/common_make_rules -+ - flite_LIBS = flite_$(FL_VOX) flite_$(FL_LANG) flite_$(FL_LEX) - flite_LIBS_flags = -L$(LIBDIR) $(flite_LIBS:%=-l%) -+ifdef SHFLAGS - flite_LIBS_deps = $(flite_LIBS:%=$(LIBDIR)/lib%.so) -+else -+flite_LIBS_deps = $(flite_LIBS:%=$(LIBDIR)/lib%.a) -+endif - - flite_time_LIBS = flite_cmu_time_awb flite_$(FL_LANG) flite_$(FL_LEX) - flite_time_LIBS_flags = -L$(LIBDIR) $(flite_time_LIBS:%=-l%) -+ifdef SHFLAGS - flite_time_LIBS_deps = $(flite_time_LIBS:%=$(LIBDIR)/lib%.so) -- --include $(TOP)/config/common_make_rules -+else -+flite_time_LIBS_deps = $(flite_time_LIBS:%=$(LIBDIR)/lib%.a) -+endif - - $(BINDIR)/flite$(EXEEXT): flite_main.o $(FLITELIBS) $(flite_LIBS_deps) - $(CC) $(CFLAGS) -o $@ flite_main.o $(flite_LIBS_flags) $(LDFLAGS) diff --git a/app-accessibility/flite/files/flite-1.3-libm.patch b/app-accessibility/flite/files/flite-1.3-libm.patch deleted file mode 100644 index 90eba91a3d6c..000000000000 --- a/app-accessibility/flite/files/flite-1.3-libm.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- flite-1.3-release/config/common_make_rules 2013-04-03 15:28:04.004893371 +0100 -+++ flite-1.3-release/config/common_make_rules 2013-04-03 15:27:50.574992901 +0100 -@@ -69,7 +69,7 @@ - - ifdef SHFLAGS - FLITELIBS = $(LIBDIR)/libflite.so --LDFLAGS += -L$(LIBDIR) -lflite $(OTHERLIBS) -+LDFLAGS += -L$(LIBDIR) -lflite -lm $(OTHERLIBS) - else - FLITELIBS = $(LIBDIR)/libflite.a - LDFLAGS += -L$(LIBDIR) -lflite -lm $(AUDIOLIBS) $(OTHERLIBS) diff --git a/app-accessibility/flite/files/flite-1.3-respect-ldflags.patch b/app-accessibility/flite/files/flite-1.3-respect-ldflags.patch deleted file mode 100644 index a8a8cb6fb445..000000000000 --- a/app-accessibility/flite/files/flite-1.3-respect-ldflags.patch +++ /dev/null @@ -1,24 +0,0 @@ -diff -Naur flite-1.3-release/config/common_make_rules flite-1.3-release.new/config/common_make_rules ---- flite-1.3-release/config/common_make_rules 2014-02-12 09:56:23.058678651 -0800 -+++ flite-1.3-release.new/config/common_make_rules 2014-02-12 11:27:18.039561163 -0800 -@@ -67,6 +67,11 @@ - - BUILDDIRS=$(OBJDIR) $(BINDIR) $(LIBDIR) - -+ifndef SO_LDFLAGS -+SO_LDFLAGS := $(LDFLAGS) -+endif -+export SO_LDFLAGS -+ - ifdef SHFLAGS - FLITELIBS = $(LIBDIR)/libflite.so - LDFLAGS += -L$(LIBDIR) -lflite -lm $(OTHERLIBS) -@@ -130,7 +135,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,$@.${PROJECT_SHLIB_VERSION} -o ../$@.${PROJECT_VERSION} *.os -L../ $($(@:%.so=%_LDLIBS))) -+ @ (cd shared_os && $(CC) -shared -Wl,-soname,$@.${PROJECT_SHLIB_VERSION} $(SO_LDFLAGS) -o ../$@.${PROJECT_VERSION} *.os -L../ $($(@:%.so=%_LDLIBS))) - @ ln -s $@.${PROJECT_VERSION} $@.${PROJECT_SHLIB_VERSION} - @ ln -s $@.${PROJECT_SHLIB_VERSION} $@ - @ rm -rf shared_os diff --git a/app-accessibility/flite/files/flite-1.3-shared-libs.patch b/app-accessibility/flite/files/flite-1.3-shared-libs.patch deleted file mode 100644 index ffab92551f30..000000000000 --- a/app-accessibility/flite/files/flite-1.3-shared-libs.patch +++ /dev/null @@ -1,170 +0,0 @@ -diff -uNr flite-1.3-release/config/common_make_rules flite-1.3-release-mod/config/common_make_rules ---- flite-1.3-release/config/common_make_rules 2004-12-20 00:20:43.000000000 +0200 -+++ flite-1.3-release-mod/config/common_make_rules 2006-11-12 12:17:25.000000000 +0200 -@@ -59,27 +59,35 @@ - endif - OBJDIR=$(BUILDDIR)/obj/$(DIRNAME) - BINDIR=$(BUILDDIR)/bin -+LIBDIR=$(BUILDDIR)/lib - ifeq ($(HOST_PLATFORM),$(TARGET_PLATFORM)) - BINDIR=$(TOP)/bin -+LIBDIR=$(TOP)/lib - endif - --LIBDIR=$(BUILDDIR)/lib - BUILDDIRS=$(OBJDIR) $(BINDIR) $(LIBDIR) - --FLITELIBS = $(BUILDDIR)/lib/libflite.a --LDFLAGS += -L$(BUILDDIR)/lib -lflite -lm $(AUDIOLIBS) $(OTHERLIBS) -+ifdef SHFLAGS -+FLITELIBS = $(LIBDIR)/libflite.so -+LDFLAGS += -L$(LIBDIR) -lflite $(OTHERLIBS) -+else -+FLITELIBS = $(LIBDIR)/libflite.a -+LDFLAGS += -L$(LIBDIR) -lflite -lm $(AUDIOLIBS) $(OTHERLIBS) -+endif - - FULLOBJS = $(OBJS:%=$(OBJDIR)/%) - ifdef SHFLAGS - SOOBJS = $(OBJS:.o=.os) --FULLSHOBJS = $(SOOBJS:%=$(OBJDIR)/%) -+FULLSOOBJS = $(SOOBJS:%=$(OBJDIR)/%) - ifdef LIBNAME - ALL += $(OBJDIR)/.build_so - endif --endif -+else - ifdef LIBNAME - ALL += $(OBJDIR)/.build_lib - endif -+endif -+ - # Only do some directories when you are not cross compiling - ifeq ($(HOST_PLATFORM),$(TARGET_PLATFORM)) - OTHER_BUILD_DIRS = $(HOST_ONLY_DIRS) -@@ -117,14 +125,14 @@ - @ touch $(OBJDIR)/.build_so - - # Used in the lib/ directory and in building new voices --$(OBJDIR)/%.so: %.shared.a -+%.so: %.shared.a - @ echo making $@ - @ rm -rf shared_os && mkdir shared_os -- @ rm -f $@ $(LIBDIR)/$@.${PROJECT_VERSION} $(LIBDIR)/$@.${PROJECT_SHLIB_VERSION} -+ @ rm -f $@ $@.${PROJECT_VERSION} $@.${PROJECT_SHLIB_VERSION} - @ (cd shared_os && ar x ../$<) -- @ (cd shared_os && $(CC) -shared -Wl,-soname,$@.${PROJECT_SHLIB_VERSION} -o ../$@.${PROJECT_VERSION} *.os) -- @ ln -s $(LIBDIR)/$@.${PROJECT_VERSION} $(LIBDIR)/$@.${PROJECT_SHLIB_VERSION} -- @ ln -s $(LIBDIR)/$@.${PROJECT_SHLIB_VERSION} $(LIBDIR)/$@ -+ @ (cd shared_os && $(CC) -shared -Wl,-soname,$@.${PROJECT_SHLIB_VERSION} -o ../$@.${PROJECT_VERSION} *.os -L../ $($(@:%.so=%_LDLIBS))) -+ @ ln -s $@.${PROJECT_VERSION} $@.${PROJECT_SHLIB_VERSION} -+ @ ln -s $@.${PROJECT_SHLIB_VERSION} $@ - @ rm -rf shared_os - - $(OBJDIR)/.make_build_dirs: -diff -uNr flite-1.3-release/lib/Makefile flite-1.3-release-mod/lib/Makefile ---- flite-1.3-release/lib/Makefile 1970-01-01 02:00:00.000000000 +0200 -+++ flite-1.3-release-mod/lib/Makefile 2006-11-12 12:17:40.000000000 +0200 -@@ -0,0 +1,73 @@ -+########################################################################### -+## ## -+## Language Technologies Institute ## -+## Carnegie Mellon University ## -+## Copyright (c) 1999 ## -+## All Rights Reserved. ## -+## ## -+## Permission is hereby granted, free of charge, to use and distribute ## -+## this software and its documentation without restriction, including ## -+## without limitation the rights to use, copy, modify, merge, publish, ## -+## distribute, sublicense, and/or sell copies of this work, and to ## -+## permit persons to whom this work is furnished to do so, subject to ## -+## the following conditions: ## -+## 1. The code must retain the above copyright notice, this list of ## -+## conditions and the following disclaimer. ## -+## 2. Any modifications must be clearly marked as such. ## -+## 3. Original authors' names are not deleted. ## -+## 4. The authors' names are not used to endorse or promote products ## -+## derived from this software without specific prior written ## -+## permission. ## -+## ## -+## CARNEGIE MELLON UNIVERSITY AND THE CONTRIBUTORS TO THIS WORK ## -+## DISCLAIM ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING ## -+## ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO EVENT ## -+## SHALL CARNEGIE MELLON UNIVERSITY NOR THE CONTRIBUTORS BE LIABLE ## -+## FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES ## -+## WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN ## -+## AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ## -+## ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF ## -+## THIS SOFTWARE. ## -+## ## -+########################################################################### -+## ## -+## FLITE libraries ## -+## ## -+########################################################################### -+TOP=.. -+DIRNAME=lib -+BUILD_DIRS = -+ALL_DIRS= -+FILES = Makefile -+LIBNAMES = flite flite_cmulex flite_usenglish \ -+ flite_cmu_us_kal flite_cmu_us_kal16 flite_cmu_time_awb -+ -+STATICLIBS= $(LIBNAMES:%=lib%.a) -+SHAREDARLIBS= $(LIBNAMES:%=lib%.shared.a) -+#SHAREDLIBS = $(LIBNAMES:%=lib%.so) -+SHAREDLIBS = $(SHAREDARLIBS:%.shared.a=%.so) -+VERSIONSHAREDLIBS = $(SHAREDLIBS:%=%.${PROJECT_VERSION}) \ -+ $(SHAREDLIBS:%=%.${PROJECT_SHLIB_VERSION}) -+ALL_LIBS = $(SHAREDLIBS) $(VERSIONSHAREDLIBS) -+ -+ALL = shared_libs -+ -+LOCAL_CLEAN=*.a *.so *.so.${PROJECT_VERSION} *.so.${PROJECT_SHLIB_VERSION} -+ -+include $(TOP)/config/common_make_rules -+ -+ifdef SHFLAGS -+shared_libs: $(SHAREDLIBS) -+libflite_LDLIBS = -lm $(AUDIOLIBS) -+libflite_cmulex_LDLIBS = -lflite -+libflite_usenglish_LDLIBS = -lflite -+libflite_cmu_us_kal_LDLIBS = -lflite_cmulex -lflite_usenglish -+libflite_cmu_us_kal16_LDLIBS = -lflite_cmulex -lflite_usenglish -+libflite_cmu_time_awb_LDLIBS = -lflite -lflite_cmulex -lflite_usenglish -+else -+shared_libs: nothing -+endif -+ -+install: -+ @ tar cvf - $(ALL_LIBS) | ( cd $(INSTALLLIBDIR) && tar xf -) -+ -diff -uNr flite-1.3-release/main/Makefile flite-1.3-release-mod/main/Makefile ---- flite-1.3-release/main/Makefile 2005-08-08 00:38:42.000000000 +0200 -+++ flite-1.3-release-mod/main/Makefile 2006-11-12 11:44:46.000000000 +0200 -@@ -50,11 +50,11 @@ - - flite_LIBS = flite_$(FL_VOX) flite_$(FL_LANG) flite_$(FL_LEX) - flite_LIBS_flags = -L$(LIBDIR) $(flite_LIBS:%=-l%) --flite_LIBS_deps = $(flite_LIBS:%=$(LIBDIR)/lib%.a) -+flite_LIBS_deps = $(flite_LIBS:%=$(LIBDIR)/lib%.so) - - flite_time_LIBS = flite_cmu_time_awb flite_$(FL_LANG) flite_$(FL_LEX) - flite_time_LIBS_flags = -L$(LIBDIR) $(flite_time_LIBS:%=-l%) --flite_time_LIBS_deps = $(flite_time_LIBS:%=$(LIBDIR)/lib%.a) -+flite_time_LIBS_deps = $(flite_time_LIBS:%=$(LIBDIR)/lib%.so) - - include $(TOP)/config/common_make_rules - -diff -uNr flite-1.3-release/Makefile flite-1.3-release-mod/Makefile ---- flite-1.3-release/Makefile 2005-11-01 15:40:45.000000000 +0200 -+++ flite-1.3-release-mod/Makefile 2006-11-12 11:44:46.000000000 +0200 -@@ -41,7 +41,7 @@ - ########################################################################### - TOP=. - DIRNAME= --BUILD_DIRS = include src lang doc -+BUILD_DIRS = include src lang lib doc - ALL_DIRS=config $(BUILD_DIRS) testsuite sapi palm tools main - CONFIG=configure configure.in config.sub config.guess \ - missing install-sh mkinstalldirs diff --git a/app-accessibility/flite/files/flite-1.3-tempfile.patch b/app-accessibility/flite/files/flite-1.3-tempfile.patch deleted file mode 100644 index 09b54f64ea2e..000000000000 --- a/app-accessibility/flite/files/flite-1.3-tempfile.patch +++ /dev/null @@ -1,50 +0,0 @@ -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 - -This isn't useful in regular builds and is actually a security -concern. ---- - 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 ---- 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) - 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) ? -@@ -107,7 +109,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); -@@ -116,7 +120,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; - --- -1.8.3.1 - diff --git a/app-accessibility/flite/flite-1.2-r1.ebuild b/app-accessibility/flite/flite-1.2-r1.ebuild deleted file mode 100644 index aa01a8b97269..000000000000 --- a/app-accessibility/flite/flite-1.2-r1.ebuild +++ /dev/null @@ -1,70 +0,0 @@ -# Copyright 1999-2013 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-accessibility/flite/flite-1.2-r1.ebuild,v 1.16 2013/08/25 14:42:09 jer Exp $ - -inherit eutils - -DESCRIPTION="Flite text to speech engine" -HOMEPAGE="http://www.speech.cs.cmu.edu/flite/index.html" -SRC_URI="http://www.speech.cs.cmu.edu/flite/packed/${P}/${P}-release.tar.bz2 - http://www.speech.cs.cmu.edu/flite/packed/${P}/${PN}_lexfix.tar.gz" - -LICENSE="BSD freetts public-domain regexp-UofT BSD-2" -SLOT="0" -KEYWORDS=" ~alpha amd64 ppc sparc x86" -IUSE="static" - -S=${WORKDIR}/${P}-release - -src_unpack() { - unpack ${P}-release.tar.bz2 - unpack ${PN}_lexfix.tar.gz - - # Move the update into ${S} - cd ${PN} - tar -cf - . | (cd "${S}"; tar -xf -) - cd "${S}" - epatch "${FILESDIR}"/const.patch -} - -src_compile() { - local myconf - if ! use static ; then - myconf="${myconf} --enable-shared" - fi - myconf="${myconf} --with-vox=cmu_us_kal16" - - econf ${myconf} || die "Failed configuration" - # -j2 borks when we make the shared libs - emake -j1 || die "Failed compilation" -} - -src_install() { - dobin bin/* || die - dodoc ACKNOWLEDGEMENTS README - - if use static ; then - dolib.a lib/*.a - else - for lib in lib/*.so*; do - if [ -f ${lib} ]; then - dolib.so ${lib} - lib=`basename ${lib}` - majlib=`echo ${lib} | sed 's:\(\.so\.[0-9]\)\(\.[0-9]*\)*$:\1:'` - noverlib=`echo ${lib} | sed 's:\(\.so\)\(\.[0-9]*\)*$:\1:'` - - dosym ${lib} /usr/lib/${majlib} - dosym ${lib} /usr/lib/${noverlib} - fi - done - fi - - insinto /usr/include/flite - cd "${S}"/include - for file in *.h; do - doins ${file} - dosed 's:#include "\(.*\)":#include <flite/\1>:g' /usr/include/flite/${file} - done - - dosym flite/flite.h /usr/include/flite.h -} diff --git a/app-accessibility/flite/flite-1.2-r2.ebuild b/app-accessibility/flite/flite-1.2-r2.ebuild deleted file mode 100644 index 8ed1b3c915c6..000000000000 --- a/app-accessibility/flite/flite-1.2-r2.ebuild +++ /dev/null @@ -1,78 +0,0 @@ -# Copyright 1999-2014 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-accessibility/flite/flite-1.2-r2.ebuild,v 1.4 2014/08/02 11:19:45 armin76 Exp $ - -EAPI=5 -inherit eutils - -DESCRIPTION="Flite text to speech engine" -HOMEPAGE="http://www.speech.cs.cmu.edu/flite/index.html" -SRC_URI="http://www.speech.cs.cmu.edu/flite/packed/${P}/${P}-release.tar.bz2 - http://www.speech.cs.cmu.edu/flite/packed/${P}/${PN}_lexfix.tar.gz" - -LICENSE="BSD freetts public-domain regexp-UofT BSD-2" -SLOT="0" -KEYWORDS="alpha amd64 ~ppc sparc ~x86" -IUSE="static" - -S=${WORKDIR}/${P}-release - -src_unpack() { - unpack ${P}-release.tar.bz2 - unpack ${PN}_lexfix.tar.gz - - # Move the update into ${S} - cd ${PN} - tar -cf - . | (cd "${S}"; tar -xf -) -} - -src_prepare() { - epatch "${FILESDIR}"/const.patch - epatch "${FILESDIR}"/${P}-tempfile.patch -} - -src_configure() { - local myconf - if ! use static ; then - myconf="${myconf} --enable-shared" - fi - myconf="${myconf} --with-vox=cmu_us_kal16" - - econf ${myconf} - # -j2 borks when we make the shared libs -} - -src_compile() { - emake -j1 -} - -src_install() { - dobin bin/* - dodoc ACKNOWLEDGEMENTS README - - if use static ; then - dolib.a lib/*.a - else - for lib in lib/*.so*; do - if [ -f ${lib} ]; then - dolib.so ${lib} - lib=`basename ${lib}` - majlib=`echo ${lib} | sed 's:\(\.so\.[0-9]\)\(\.[0-9]*\)*$:\1:'` - noverlib=`echo ${lib} | sed 's:\(\.so\)\(\.[0-9]*\)*$:\1:'` - - dosym ${lib} /usr/lib/${majlib} - dosym ${lib} /usr/lib/${noverlib} - fi - done - fi - - insinto /usr/include/flite - cd "${S}"/include - for file in *.h; do - doins ${file} - sed -i -e 's:#include "\(.*\)":#include <flite/\1>:g' \ - "${D}"/usr/include/flite/${file} || die "sed failed" - done - - dosym flite/flite.h /usr/include/flite.h -} diff --git a/app-accessibility/flite/flite-1.3-r1.ebuild b/app-accessibility/flite/flite-1.3-r1.ebuild deleted file mode 100644 index f2a61f745e2d..000000000000 --- a/app-accessibility/flite/flite-1.3-r1.ebuild +++ /dev/null @@ -1,73 +0,0 @@ -# Copyright 1999-2014 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-accessibility/flite/flite-1.3-r1.ebuild,v 1.6 2014/08/02 11:19:45 armin76 Exp $ - -EAPI=5 -inherit eutils - -DESCRIPTION="Flite text to speech engine" -HOMEPAGE="http://www.speech.cs.cmu.edu/flite/index.html" -SRC_URI="http://www.speech.cs.cmu.edu/flite/packed/${P}/${P}-release.tar.gz" - -LICENSE="BSD freetts public-domain regexp-UofT BSD-2" -SLOT="0" -KEYWORDS="alpha amd64 arm ~ppc ~ppc64 sparc x86" -IUSE="alsa static" - -S=${WORKDIR}/${P}-release - -src_prepare() { - epatch "${FILESDIR}"/${P}-tempfile.patch - if use alsa; then - epatch "${FILESDIR}"/${P}-alsa-support.patch - fi - epatch "${FILESDIR}"/${P}-shared-libs.patch - epatch "${FILESDIR}"/${P}-fix-static.patch - epatch "${FILESDIR}"/${P}-respect-ldflags.patch - epatch "${FILESDIR}"/${P}-libm.patch -} - -src_configure() { - local myconf - if ! use static ; then - myconf="--enable-shared" - fi - myconf="${myconf} --with-vox=cmu_us_kal16" - - econf ${myconf} -} - -src_compile() { - emake -j1 -} - -src_install() { - dobin bin/* - dodoc ACKNOWLEDGEMENTS README - - if use static ; then - dolib.a lib/*.a - else - for lib in lib/*.so*; do - if [ -f ${lib} ]; then - dolib.so ${lib} - lib=`basename ${lib}` - majlib=`echo ${lib} | sed 's:\(\.so\.[0-9]\)\(\.[0-9]*\)*$:\1:'` - noverlib=`echo ${lib} | sed 's:\(\.so\)\(\.[0-9]*\)*$:\1:'` - - dosym ${lib} /usr/lib/${majlib} - dosym ${lib} /usr/lib/${noverlib} - fi - done - fi - - insinto /usr/include/flite - cd "${S}"/include - for file in *.h; do - doins ${file} - sed -i -e 's:#include "\(.*\)":#include <flite/\1>:g' \ - "${D}"/usr/include/flite/${file} || die "sed failed" - done - - dosym flite/flite.h /usr/include/flite.h -} diff --git a/app-accessibility/flite/flite-1.3.ebuild b/app-accessibility/flite/flite-1.3.ebuild deleted file mode 100644 index e8969a441052..000000000000 --- a/app-accessibility/flite/flite-1.3.ebuild +++ /dev/null @@ -1,65 +0,0 @@ -# Copyright 1999-2013 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-accessibility/flite/flite-1.3.ebuild,v 1.14 2013/08/25 14:42:09 jer Exp $ - -inherit eutils - -DESCRIPTION="Flite text to speech engine" -HOMEPAGE="http://www.speech.cs.cmu.edu/flite/index.html" -SRC_URI="http://www.speech.cs.cmu.edu/flite/packed/${P}/${P}-release.tar.gz" - -LICENSE="BSD freetts public-domain regexp-UofT BSD-2" -SLOT="0" -KEYWORDS="alpha amd64 arm ppc ppc64 sparc x86" -IUSE="alsa static" - -S=${WORKDIR}/${P}-release - -src_unpack() { - unpack ${P}-release.tar.gz - if use alsa; then - epatch "${FILESDIR}"/${P}-alsa-support.patch - fi - epatch "${FILESDIR}"/${P}-shared-libs.patch -} - -src_compile() { - local myconf - if ! use static ; then - myconf="--enable-shared" - fi - myconf="${myconf} --with-vox=cmu_us_kal16" - - econf ${myconf} || die "Failed configuration" - emake -j1 || die "Failed compilation" -} - -src_install() { - dobin bin/* || die - dodoc ACKNOWLEDGEMENTS README - - if use static ; then - dolib.a lib/*.a - else - for lib in lib/*.so*; do - if [ -f ${lib} ]; then - dolib.so ${lib} - lib=`basename ${lib}` - majlib=`echo ${lib} | sed 's:\(\.so\.[0-9]\)\(\.[0-9]*\)*$:\1:'` - noverlib=`echo ${lib} | sed 's:\(\.so\)\(\.[0-9]*\)*$:\1:'` - - dosym ${lib} /usr/lib/${majlib} - dosym ${lib} /usr/lib/${noverlib} - fi - done - fi - - insinto /usr/include/flite - cd "${S}"/include - for file in *.h; do - doins ${file} - dosed 's:#include "\(.*\)":#include <flite/\1>:g' /usr/include/flite/${file} - done - - dosym flite/flite.h /usr/include/flite.h -} diff --git a/app-accessibility/flite/flite-1.4-r3.ebuild b/app-accessibility/flite/flite-1.4-r3.ebuild deleted file mode 100644 index 5e526bd98c47..000000000000 --- a/app-accessibility/flite/flite-1.4-r3.ebuild +++ /dev/null @@ -1,71 +0,0 @@ -# Copyright 1999-2014 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-accessibility/flite/flite-1.4-r3.ebuild,v 1.1 2014/02/12 21:21:11 teiresias Exp $ - -EAPI=4 -inherit autotools eutils - -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 ~ppc ~ppc64 ~sparc ~x86" -IUSE="alsa oss static-libs" - -DEPEND="alsa? ( >=media-libs/alsa-lib-1.0.24.1 )" -RDEPEND="${DEPEND}" - -S=${WORKDIR}/${P}-release - -get_audio() { - if use alsa; then - echo alsa - elif use oss; then - echo oss - else - echo none - fi -} - -src_prepare() { - epatch "${FILESDIR}"/${P}-tempfile.patch - epatch "${FILESDIR}"/${P}-fix-parallel-builds.patch - epatch "${FILESDIR}"/${P}-respect-destdir.patch - epatch "${FILESDIR}"/${P}-ldflags.patch - epatch "${FILESDIR}"/${P}-audio-interface.patch - sed -i main/Makefile \ - -e '/-rpath/s|$(LIBDIR)|$(INSTALLLIBDIR)|g' \ - || die - eautoreconf -} - -src_configure() { - local myconf - if ! use static-libs; then - myconf=--enable-shared - fi - myconf="${myconf} --with-audio=$(get_audio)" - econf ${myconf} -} - -src_compile() { - emake CC="$(tc-getCC)" CFLAGS="${CFLAGS}" -} - -src_install() { - emake DESTDIR="${D}" install - dodoc ACKNOWLEDGEMENTS README - if ! use static-libs; then - rm -rf "${D}"/usr/lib*/*.a - fi -} - -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 -} |