diff options
author | Christopher Brannon <teiresias@gentoo.org> | 2014-02-12 21:21:14 +0000 |
---|---|---|
committer | Christopher Brannon <teiresias@gentoo.org> | 2014-02-12 21:21:14 +0000 |
commit | 4f5144c65d2379e56e0e7c54f80c077c5a18cb05 (patch) | |
tree | 010fd4c44f5696d8f6e86583624340a6b0748549 /app-accessibility | |
parent | Update to python-any-r1. Respect $EPREFIX. Fix path to regulatory.bin. Mov... (diff) | |
download | historical-4f5144c65d2379e56e0e7c54f80c077c5a18cb05.tar.gz historical-4f5144c65d2379e56e0e7c54f80c077c5a18cb05.tar.bz2 historical-4f5144c65d2379e56e0e7c54f80c077c5a18cb05.zip |
Bugfixes.
For flite 1.2, 1.3, and 1.4, add a patch to prevent
the use of a temporary file. (bug #498020).
For flite 1.3, respect LDFLAGS (bug #476810).
For flite 1.3, fix build failure (bug #456986).
For flite 1.3, allow static flite to be built. USE=static has been
broken for a long time. No bug was ever opened, and I just found the
problem today.
Package-Manager: portage-2.2.7/cvs/Linux x86_64
Manifest-Sign-Key: 0x6521E06D
Diffstat (limited to 'app-accessibility')
-rw-r--r-- | app-accessibility/flite/ChangeLog | 21 | ||||
-rw-r--r-- | app-accessibility/flite/Manifest | 24 | ||||
-rw-r--r-- | app-accessibility/flite/files/flite-1.2-tempfile.patch | 50 | ||||
-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-tempfile.patch | 50 | ||||
-rw-r--r-- | app-accessibility/flite/files/flite-1.4-tempfile.patch | 50 | ||||
-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.4-r3.ebuild (renamed from app-accessibility/flite/flite-1.4-r2.ebuild) | 5 |
11 files changed, 405 insertions, 10 deletions
diff --git a/app-accessibility/flite/ChangeLog b/app-accessibility/flite/ChangeLog index 6f3ef8993fb5..e04a63a681bd 100644 --- a/app-accessibility/flite/ChangeLog +++ b/app-accessibility/flite/ChangeLog @@ -1,6 +1,23 @@ # ChangeLog for app-accessibility/flite -# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-accessibility/flite/ChangeLog,v 1.47 2013/08/25 14:42:09 jer Exp $ +# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/app-accessibility/flite/ChangeLog,v 1.48 2014/02/12 21:21:11 teiresias Exp $ + +*flite-1.4-r3 (12 Feb 2014) +*flite-1.3-r1 (12 Feb 2014) +*flite-1.2-r2 (12 Feb 2014) + + 12 Feb 2014; Christopher Brannon <teiresias@gentoo.org> +flite-1.2-r2.ebuild, + +files/flite-1.2-tempfile.patch, +flite-1.3-r1.ebuild, + +files/flite-1.3-fix-static.patch, +files/flite-1.3-libm.patch, + +files/flite-1.3-respect-ldflags.patch, +files/flite-1.3-tempfile.patch, + -flite-1.4-r2.ebuild, +flite-1.4-r3.ebuild, +files/flite-1.4-tempfile.patch: + For flite 1.2, 1.3, and 1.4, add a patch to prevent + the use of a temporary file. (bug #498020). + For flite 1.3, respect LDFLAGS (bug #476810). + For flite 1.3, fix build failure (bug #456986). + For flite 1.3, allow static flite to be built. USE=static has been + broken for a long time. No bug was ever opened, and I just found the + problem today. 25 Aug 2013; Jeroen Roovers <jer@gentoo.org> flite-1.2-r1.ebuild, flite-1.3.ebuild, flite-1.4-r2.ebuild: diff --git a/app-accessibility/flite/Manifest b/app-accessibility/flite/Manifest index c6be366b633e..3a8e80d9ebac 100644 --- a/app-accessibility/flite/Manifest +++ b/app-accessibility/flite/Manifest @@ -2,25 +2,37 @@ 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 1810 SHA256 ce9378dcd437d6bcb53a0c788abf4551d81a7003db5558f1455bfd9436516f14 SHA512 8e919747696c01df875f5cac0d762141c3fc2bfe3904bba90d6d5319fe5111ac2f469ec32be2e7aafbb9704d5dfd751be3955f80182b48a8208e76a345658bc0 WHIRLPOOL 7771acc40d1a488f6740a99bd3e85f12e3e3cb67e1f4817ab6618394f3757a6893d3b838a4e7a74e5c93c0e9003177ee76f6b8623706a061f4a97e82949c6e74 +EBUILD flite-1.3-r1.ebuild 1763 SHA256 dfa7d3c9850f82d26bfac408a0ae32422702cf902c52ee9797e51686673cbc60 SHA512 767423cd4c8b73f88e5f35539ff3edf2bbe5eb00d385c83c0fdc83a43480fe04bab13cf8197584d392834d2a9701f97cecd1df81ae825f52ab405ed0ed624e49 WHIRLPOOL 1e51741354a88a808e57fb9e64b4028331dc3441a3cafa4f743b2864f21a95bf646d17f91dfbe98f716aedd0844bbb8c981f6a9d37d0f6c4b2303698047ce3fd EBUILD flite-1.3.ebuild 1604 SHA256 09e269f204047e8358f2d8e160851e9462119330b4842ae215c358c2a887d0f2 SHA512 a0bf48901b7611fe1ca559cb48b239d175a2e04982abceade61487cf124e638147eb0d8765dcfbdcb6086a02ecee9abaf0a14fb58c9eba8d46b5caa249241b42 WHIRLPOOL 8f1593e86fea5c2f60a5f97d4aa50167d3b8a9ce49fef9a7283a951f312acec3b6abce5178df1d7ee66f0b420f180e81e5f5557f0d2fcee519f685ac49117831 -EBUILD flite-1.4-r2.ebuild 1658 SHA256 ef80cc02b52c2f33e0b02954aa2f58d856d39982acf210715982f5f8abdd26e4 SHA512 cfe96e972d8bb3e9a9c94ea4bd15962c2314999691d0d9e59087f3d7199b0f77b24ae24762a7f7844e68e018b1b9da8e9b7d7a4b26f21fdda81a2a37801b6a64 WHIRLPOOL 5b538a276cc2549228befa496cc2094c3b3cebe008561a6245c5619a681d72c840e0545a096a1d906dfb4be75243ef3ac39d4ff9ac10761eadfcf43e69eda18b -MISC ChangeLog 6410 SHA256 48bf828efa269a3071f7738274d27709e9ba8fd64f9bb36236449b0754d9d0d0 SHA512 ed8ac719ea1a41b3b622650d50da65094d08aed6a02c2ffbe05296ed5074311e68359bbad8157dfc11ed9547934cd2e5af8f873601a3c5cef70b010bda8accd9 WHIRLPOOL 318e7c466a95e00b7f7e5ed8101512bd7da18865df1b300cc9d23f8c81024416cc143e43405d578c9bada99359036452d82b6a1203f297de18f546406178d55e +EBUILD flite-1.4-r3.ebuild 1706 SHA256 4fac8dbe48c83d64aec840994f2432e4ea80d90c4f17834e4ce00365323407f7 SHA512 df71caa0d817b6c8da2b0931cd9fcf1aeac53f27dc24efe0488ad31c7a17a8620938f6c7ed5b360a9b06f82b4a31250784c28188f4ce0276b99ac0a5d07adc05 WHIRLPOOL 548f5b43d30397da604834447f178cdfbc895a6c41a234effe85524f4997a9b6c04d8ddc890d8d7cfdc61213950306b162201751d79ecaabd908a16815615c93 +MISC ChangeLog 7214 SHA256 a13f2a7023ce68105d4c49fc8be64e19cb09bbd230d9e281b1dbfd8d88d1ea90 SHA512 5bf64edb9fd4f9de50f5cffc37effec6c588de442812d0fa41507123a7a5134628cf810bf249e4f64e2134269a52dbc86f554822ec1ac3dfb31791216cd62e98 WHIRLPOOL 9a634021ef69527cd691547defc80348cd4e3fd193f7565af0bd758ed8b5c322dbd917bf931e4293c11ac5f7ea094acafbc11f1f80d9dd9c68abc6743ea38a29 MISC metadata.xml 185 SHA256 b6de40518e01d3ef5447352b3f476c1f5b8e6ae53d5e654a2fb9e4ee7fdbe135 SHA512 b517a1e240d965fedf735d9516946add59d4dc927b5948f623b29f3c65d74b59ecb0efae62460f5042a2bde63426c5a453c47e1f93acd75f1c620360ef4b6d4a WHIRLPOOL 4115233660bcee431f29bf5c4e59a8704258d204eb57b236ff059b74c220c0cba7a6fa3193014a293b3be96d5b759a19bff662c539ce063510a953f62f1dd48f -----BEGIN PGP SIGNATURE----- -Version: GnuPG v2.0.20 (GNU/Linux) +Version: GnuPG v2.0.22 (GNU/Linux) -iEYEAREIAAYFAlIaF8MACgkQVWmRsqeSphNXJgCdG4oleQzUHud1Sm3NEzRiHgFX -Hn8AnjFnKIduFBKkXjMgo9iTHfPYELEg -=JNeU +iQEcBAEBCAAGBQJS++XIAAoJEH8qFnJlIeBtxhQIAIRjoTaaldfYsQjOifdZU8gU +25cg4l3/1C59nZm1/vJiBecPfpaZOgS3a7hYDwnRZia0wyFZjyPvYIAb4qw35CyH +ldXsSskFz9FhUoCWyKsjE8bM8xjA36E0FLhrxG7SrPP6FREHUiQx4cvmFGGays4z +Vk5ZGptfUvvmkAJ6oZ0k4O9G0OeEwW0QbxKM4V4IQWO8tQfW3xBDbjtNZPNaJzJF +wmIUig/5loMvi97UcWvrwygpDOKqkMrC2b5mmRKwPoccj4M5SlVjttkI4v7tFmyA +Q6KSrUMBo+4+VcbfLCPafkIrHXuMQrgHlwx2HYg6p9qOMdCRKChaNBzsCUE8cGY= +=h2wI -----END PGP SIGNATURE----- diff --git a/app-accessibility/flite/files/flite-1.2-tempfile.patch b/app-accessibility/flite/files/flite-1.2-tempfile.patch new file mode 100644 index 000000000000..09b54f64ea2e --- /dev/null +++ b/app-accessibility/flite/files/flite-1.2-tempfile.patch @@ -0,0 +1,50 @@ +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-fix-static.patch b/app-accessibility/flite/files/flite-1.3-fix-static.patch new file mode 100644 index 000000000000..156f145aa236 --- /dev/null +++ b/app-accessibility/flite/files/flite-1.3-fix-static.patch @@ -0,0 +1,29 @@ +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 new file mode 100644 index 000000000000..90eba91a3d6c --- /dev/null +++ b/app-accessibility/flite/files/flite-1.3-libm.patch @@ -0,0 +1,11 @@ +--- 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 new file mode 100644 index 000000000000..a8a8cb6fb445 --- /dev/null +++ b/app-accessibility/flite/files/flite-1.3-respect-ldflags.patch @@ -0,0 +1,24 @@ +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-tempfile.patch b/app-accessibility/flite/files/flite-1.3-tempfile.patch new file mode 100644 index 000000000000..09b54f64ea2e --- /dev/null +++ b/app-accessibility/flite/files/flite-1.3-tempfile.patch @@ -0,0 +1,50 @@ +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.4-tempfile.patch b/app-accessibility/flite/files/flite-1.4-tempfile.patch new file mode 100644 index 000000000000..09b54f64ea2e --- /dev/null +++ b/app-accessibility/flite/files/flite-1.4-tempfile.patch @@ -0,0 +1,50 @@ +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-r2.ebuild b/app-accessibility/flite/flite-1.2-r2.ebuild new file mode 100644 index 000000000000..3d48142a52c4 --- /dev/null +++ b/app-accessibility/flite/flite-1.2-r2.ebuild @@ -0,0 +1,78 @@ +# 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.1 2014/02/12 21:21:11 teiresias 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 new file mode 100644 index 000000000000..633d902112c2 --- /dev/null +++ b/app-accessibility/flite/flite-1.3-r1.ebuild @@ -0,0 +1,73 @@ +# 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.1 2014/02/12 21:21:11 teiresias 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.4-r2.ebuild b/app-accessibility/flite/flite-1.4-r3.ebuild index 0fd9d2fc63d4..5e526bd98c47 100644 --- a/app-accessibility/flite/flite-1.4-r2.ebuild +++ b/app-accessibility/flite/flite-1.4-r3.ebuild @@ -1,6 +1,6 @@ -# Copyright 1999-2013 Gentoo Foundation +# 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-r2.ebuild,v 1.3 2013/08/25 14:42:09 jer Exp $ +# $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 @@ -30,6 +30,7 @@ get_audio() { } 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 |