[gentoo-commits] repo/gentoo:master commit in: app-accessibility/speech-tools/
commit: dc60c720e7d5a4bc0a885dd6ccde16c8daf6e953 Author: Arthur Zamarin gentoo org> AuthorDate: Sat Dec 16 07:05:22 2023 + Commit: Arthur Zamarin gentoo org> CommitDate: Sat Dec 16 07:05:22 2023 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=dc60c720 app-accessibility/speech-tools: Stabilize 2.5.0-r2 x86, #920076 Signed-off-by: Arthur Zamarin gentoo.org> app-accessibility/speech-tools/speech-tools-2.5.0-r2.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app-accessibility/speech-tools/speech-tools-2.5.0-r2.ebuild b/app-accessibility/speech-tools/speech-tools-2.5.0-r2.ebuild index 883344a6cdf5..9c9c205344e9 100644 --- a/app-accessibility/speech-tools/speech-tools-2.5.0-r2.ebuild +++ b/app-accessibility/speech-tools/speech-tools-2.5.0-r2.ebuild @@ -16,7 +16,7 @@ S="${WORKDIR}/speech_tools" LICENSE="FESTIVAL HPND BSD rc regexp-UofT" SLOT="0" -KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 sparc ~x86" +KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 sparc x86" IUSE="nas openmp X" RDEPEND="
[gentoo-commits] repo/gentoo:master commit in: app-accessibility/speech-tools/
commit: f63c7ed8a831a4e2870ce24da3b25d1624c47a77 Author: Sam James gentoo org> AuthorDate: Sat Dec 16 04:44:41 2023 + Commit: Sam James gentoo org> CommitDate: Sat Dec 16 04:45:18 2023 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f63c7ed8 app-accessibility/speech-tools: Stabilize 2.5.0-r2 amd64, #920076 Signed-off-by: Sam James gentoo.org> app-accessibility/speech-tools/speech-tools-2.5.0-r2.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app-accessibility/speech-tools/speech-tools-2.5.0-r2.ebuild b/app-accessibility/speech-tools/speech-tools-2.5.0-r2.ebuild index d4656bc579eb..883344a6cdf5 100644 --- a/app-accessibility/speech-tools/speech-tools-2.5.0-r2.ebuild +++ b/app-accessibility/speech-tools/speech-tools-2.5.0-r2.ebuild @@ -16,7 +16,7 @@ S="${WORKDIR}/speech_tools" LICENSE="FESTIVAL HPND BSD rc regexp-UofT" SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 sparc ~x86" +KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 sparc ~x86" IUSE="nas openmp X" RDEPEND="
[gentoo-commits] repo/gentoo:master commit in: app-accessibility/speech-tools/
commit: 0a43766dd55dfb6824ddc7e1ffe1d12df077a600 Author: Sam James gentoo org> AuthorDate: Sat Dec 16 00:46:16 2023 + Commit: Sam James gentoo org> CommitDate: Sat Dec 16 00:46:16 2023 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0a43766d app-accessibility/speech-tools: Stabilize 2.5.0-r2 sparc, #920076 Signed-off-by: Sam James gentoo.org> app-accessibility/speech-tools/speech-tools-2.5.0-r2.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app-accessibility/speech-tools/speech-tools-2.5.0-r2.ebuild b/app-accessibility/speech-tools/speech-tools-2.5.0-r2.ebuild index 649cf3b379e0..d4656bc579eb 100644 --- a/app-accessibility/speech-tools/speech-tools-2.5.0-r2.ebuild +++ b/app-accessibility/speech-tools/speech-tools-2.5.0-r2.ebuild @@ -16,7 +16,7 @@ S="${WORKDIR}/speech_tools" LICENSE="FESTIVAL HPND BSD rc regexp-UofT" SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86" +KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 sparc ~x86" IUSE="nas openmp X" RDEPEND="
[gentoo-commits] repo/gentoo:master commit in: app-accessibility/speech-tools/files/, app-accessibility/speech-tools/
commit: 3a5a7f52627f48f5d7f1fae63564af6c953bd3b0 Author: Sam James gentoo org> AuthorDate: Wed Apr 19 03:00:49 2023 + Commit: Sam James gentoo org> CommitDate: Wed Apr 19 03:00:49 2023 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3a5a7f52 app-accessibility/speech-tools: fix musl build Closes: https://bugs.gentoo.org/829344 Closes: https://bugs.gentoo.org/896170 Signed-off-by: Sam James gentoo.org> .../files/speech-tools-2.5.0-musl-isnan.patch | 65 + .../speech-tools/speech-tools-2.5.0-r2.ebuild | 156 + 2 files changed, 221 insertions(+) diff --git a/app-accessibility/speech-tools/files/speech-tools-2.5.0-musl-isnan.patch b/app-accessibility/speech-tools/files/speech-tools-2.5.0-musl-isnan.patch new file mode 100644 index ..da0077313abd --- /dev/null +++ b/app-accessibility/speech-tools/files/speech-tools-2.5.0-musl-isnan.patch @@ -0,0 +1,65 @@ +See https://bugs.openjdk.org/browse/JDK-8178689 for some analysis - we can +safely replace the deprecated/obsolete isnanf (which musl doesn't immplement) +with isnan. + +https://bugs.gentoo.org/896170 +https://bugs.gentoo.org/829344 +--- a/intonation/tilt/tilt_utils.cc b/intonation/tilt/tilt_utils.cc +@@ -133,7 +133,7 @@ float rfc_to_t_tilt(EST_Features &e) + { + float t_tilt; + t_tilt = (rfc_to_a_tilt(e) + rfc_to_d_tilt(e)) / 2; +-if (isnanf(t_tilt)) ++if (isnan(t_tilt)) + t_tilt = 0.0; + return t_tilt; + } +--- a/sigpr/pda/smooth_pda.cc b/sigpr/pda/smooth_pda.cc +@@ -112,7 +112,7 @@ void smooth_portion(EST_Track &c, EST_Features &op) + + for (i = 0; i < c.num_frames(); ++i) + { // occasionally NaNs result... +- if (isnanf(a[i])) ++ if (isnan(a[i])) + { + c.set_break(i); + c.a(i) = 0.0; +--- a/sigpr/sigpr_frame.cc b/sigpr/sigpr_frame.cc +@@ -314,7 +314,7 @@ void lpc2cep(const EST_FVector &lpc, EST_FVector &cep) + for (n = 0; n < cep.length(); n++) + { + // check if NaN -- happens on some frames of silence +- if (isnanf(cep[n]) ) cep[n] = 0.0; ++ if (isnan(cep[n]) ) cep[n] = 0.0; + + if (cep[n] > MAX_ABS_CEPS){ + cerr << "WARNING : cepstral coeff " << n << " was " << +--- a/stats/confusion.cc b/stats/confusion.cc +@@ -138,7 +138,7 @@ void print_confusion(const EST_FMatrix &a, EST_StrStr_KVL &list, + cout.precision(3); + cout.setf(ios::right); + //cout.setf(ios::fixed, ios::floatfield); +- if (isnanf(correct(i))) ++ if (isnan(correct(i))) + cout << endl; + else + cout << correct(i) << endl; +--- a/include/EST_math.h b/include/EST_math.h +@@ -81,12 +81,6 @@ extern "C" { + #define isnanf(X) isnan(X) + #endif + +-/* Linux (and presumably Hurd too as Linux is GNU libc based) */ +-/* Sorry I haven't confirmed this cpp symbol yet */ +-#if defined(linux) +-#define isnanf(X) __isnanf(X) +-#endif +- + /* OS/2 with gcc EMX */ + #if defined(__EMX__) + #define isnanf(X) isnan(X) diff --git a/app-accessibility/speech-tools/speech-tools-2.5.0-r2.ebuild b/app-accessibility/speech-tools/speech-tools-2.5.0-r2.ebuild new file mode 100644 index ..649cf3b379e0 --- /dev/null +++ b/app-accessibility/speech-tools/speech-tools-2.5.0-r2.ebuild @@ -0,0 +1,156 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit autotools flag-o-matic toolchain-funcs + +MY_P=${P/speech-/speech_} +PATCHSET="r3" + +DESCRIPTION="Speech tools for Festival Text to Speech engine" +HOMEPAGE="https://www.cstr.ed.ac.uk/projects/speech_tools/"; +SRC_URI="http://www.festvox.org/packed/festival/$(ver_cut 1-2)/${MY_P}-release.tar.gz + https://dev.gentoo.org/~neurogeek/${PN}/speech_tools-2.1-${PATCHSET}-patches.tar.gz"; +S="${WORKDIR}/speech_tools" + +LICENSE="FESTIVAL HPND BSD rc regexp-UofT" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86" +IUSE="nas openmp X" + +RDEPEND=" + media-libs/alsa-lib + sys-libs/ncurses:= + nas? ( media-libs/nas ) + X? ( + x11-libs/libX11 + x11-libs/libXt + ) +" +DEPEND="${RDEPEND}" +BDEPEND="virtual/pkgconfig" + +DOCS=( README.md lib/cstrutt.dtd lib/example_data ) + +PATCHES=( + "${WORKDIR}/patch/02_all_gcc42.patch" + "${WORKDIR}/patch/03_all_GentooLinux.patch" + "${WORKDIR}/patch/05_all_sharedlib.patch" + "${WORKDIR}/patch/06_all_gcc43-include.patch" + "${WORKDIR}/patch/09_all_remove-shared-refs.patch" + "${WORKDIR}/patch/10_all_base_class.patch" + "${WORKDIR}/patch/81_all_etcpath.patch" + "${WORKDIR}/patch/91_all_gentoo-config.patch" + "${WORKDIR}/patch/92_all_ldflags_fix.patch" + "${WORKDIR}/patch/94_all_ncurses_tinfo.patch" + + # Fix underlinking, bug #493204 + "${FILESDIR}/${PN}-2.1-underlinking.patch" + "${FI
[gentoo-commits] repo/gentoo:master commit in: app-accessibility/speech-tools/
commit: 50f5b53df24d84c30846cec9f3de31f11b707ca1 Author: Sam James gentoo org> AuthorDate: Mon Feb 13 23:01:59 2023 + Commit: Sam James gentoo org> CommitDate: Mon Feb 13 23:01:59 2023 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=50f5b53d app-accessibility/speech-tools: fix build w/ clang 16 Upstream seems gone. Closes: https://bugs.gentoo.org/881863 Closes: https://bugs.gentoo.org/894184 Signed-off-by: Sam James gentoo.org> app-accessibility/speech-tools/speech-tools-2.5.0-r1.ebuild | 9 +++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/app-accessibility/speech-tools/speech-tools-2.5.0-r1.ebuild b/app-accessibility/speech-tools/speech-tools-2.5.0-r1.ebuild index c2d113a7a6c6..90155ff033cd 100644 --- a/app-accessibility/speech-tools/speech-tools-2.5.0-r1.ebuild +++ b/app-accessibility/speech-tools/speech-tools-2.5.0-r1.ebuild @@ -1,9 +1,9 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 -inherit autotools toolchain-funcs +inherit autotools flag-o-matic toolchain-funcs MY_P=${P/speech-/speech_} PATCHSET="r3" @@ -99,6 +99,11 @@ src_configure() { } src_compile() { + # Lacks prototypes, bug #881863 + append-cflags -std=gnu89 + # Uses 'register' keyword removed in C++17, bug #894184 + append-cxxflags -std=c++14 + emake -j1 \ CC="$(tc-getCC)" \ CXX="$(tc-getCXX)" \
[gentoo-commits] repo/gentoo:master commit in: app-accessibility/speech-tools/
commit: 02a0855bad0f1149d4f8ed5e6b3e7b66490d9c8a Author: Sam James gentoo org> AuthorDate: Sat Dec 24 02:59:05 2022 + Commit: Sam James gentoo org> CommitDate: Sat Dec 24 02:59:19 2022 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=02a0855b app-accessibility/speech-tools: fix HttpsUrlAvailable Signed-off-by: Sam James gentoo.org> app-accessibility/speech-tools/speech-tools-2.5.0-r1.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app-accessibility/speech-tools/speech-tools-2.5.0-r1.ebuild b/app-accessibility/speech-tools/speech-tools-2.5.0-r1.ebuild index 5e3d29432faa..c2d113a7a6c6 100644 --- a/app-accessibility/speech-tools/speech-tools-2.5.0-r1.ebuild +++ b/app-accessibility/speech-tools/speech-tools-2.5.0-r1.ebuild @@ -9,7 +9,7 @@ MY_P=${P/speech-/speech_} PATCHSET="r3" DESCRIPTION="Speech tools for Festival Text to Speech engine" -HOMEPAGE="http://www.cstr.ed.ac.uk/projects/speech_tools/"; +HOMEPAGE="https://www.cstr.ed.ac.uk/projects/speech_tools/"; SRC_URI="http://www.festvox.org/packed/festival/$(ver_cut 1-2)/${MY_P}-release.tar.gz https://dev.gentoo.org/~neurogeek/${PN}/speech_tools-2.1-${PATCHSET}-patches.tar.gz"; S="${WORKDIR}/speech_tools"
[gentoo-commits] repo/gentoo:master commit in: app-accessibility/speech-tools/
commit: 8450874622957739e90e5531460d7aa05f23e7a4 Author: Miroslav Šulc gentoo org> AuthorDate: Wed Jul 27 04:55:55 2022 + Commit: Miroslav Šulc gentoo org> CommitDate: Wed Jul 27 04:55:55 2022 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=84508746 app-accessibility/speech-tools: dropped obsolete 2.5.0 Bug: https://bugs.gentoo.org/861107 Signed-off-by: Miroslav Šulc gentoo.org> .../speech-tools/speech-tools-2.5.0.ebuild | 146 - 1 file changed, 146 deletions(-) diff --git a/app-accessibility/speech-tools/speech-tools-2.5.0.ebuild b/app-accessibility/speech-tools/speech-tools-2.5.0.ebuild deleted file mode 100644 index 1c0615542e77.. --- a/app-accessibility/speech-tools/speech-tools-2.5.0.ebuild +++ /dev/null @@ -1,146 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit toolchain-funcs - -MY_P=${P/speech-/speech_} -PATCHSET="r3" - -DESCRIPTION="Speech tools for Festival Text to Speech engine" -HOMEPAGE="http://www.cstr.ed.ac.uk/projects/speech_tools/"; -SRC_URI="http://www.festvox.org/packed/festival/$(ver_cut 1-2)/${MY_P}-release.tar.gz - https://dev.gentoo.org/~neurogeek/${PN}/speech_tools-2.1-${PATCHSET}-patches.tar.gz"; -S="${WORKDIR}/speech_tools" - -LICENSE="FESTIVAL HPND BSD rc regexp-UofT" -SLOT="0" -KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~mips ppc ppc64 sparc x86" -IUSE="nas openmp X" - -RDEPEND=" - media-libs/alsa-lib - sys-libs/ncurses:0= - nas? ( media-libs/nas ) - X? ( - x11-libs/libX11 - x11-libs/libXt - ) -" -DEPEND="${RDEPEND}" -BDEPEND="virtual/pkgconfig" - -DOCS=( README.md lib/cstrutt.dtd lib/example_data ) - -PATCHES=( - "${WORKDIR}/patch/02_all_gcc42.patch" - "${WORKDIR}/patch/03_all_GentooLinux.patch" - "${WORKDIR}/patch/05_all_sharedlib.patch" - "${WORKDIR}/patch/06_all_gcc43-include.patch" - "${WORKDIR}/patch/09_all_remove-shared-refs.patch" - "${WORKDIR}/patch/10_all_base_class.patch" - "${WORKDIR}/patch/81_all_etcpath.patch" - "${WORKDIR}/patch/91_all_gentoo-config.patch" - "${WORKDIR}/patch/92_all_ldflags_fix.patch" - "${WORKDIR}/patch/94_all_ncurses_tinfo.patch" - - # Fix underlinking, bug #493204 - "${FILESDIR}/${PN}-2.1-underlinking.patch" - "${FILESDIR}/${PN}-2.5.0-fno-common.patch" -) - -pkg_pretend() { - [[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp -} - -pkg_setup() { - [[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp -} - -src_prepare() { - default - - sed -i -e '/^CXXFLAGS =/s|CC_OTHER_FLAGS|CXX_OTHER_FLAGS|' \ - config/compilers/gcc_defaults.mak || die - - sed -i -e 's,{{HORRIBLELIBARCHKLUDGE}},"/usr/$(get_libdir)",' \ - main/siod_main.cc || die - - # bug #309983 - sed -i -e "s:\(GCC_SYSTEM_OPTIONS =\).*:\1:" \ - "${S}"/config/systems/sparc_SunOS5.mak || die - - sed -i -e "s|\$(OMP_OPTS)|$(use openmp && echo -fopenmp)|g" \ - -e "s|\$(OMP_DEFS)|$(use openmp && echo -DOMP_WAGON=1)|g" \ - -e "/MAKE_SHARED_LIB =/s|-shared|$(use openmp && echo -fopenmp) -shared|" \ - config/compilers/gcc_defaults.mak || die -} - -src_configure() { - local CONFIG=config/config.in - - sed -i -e 's/@COMPILERTYPE@/gcc42/' ${CONFIG} || die - - if use nas; then - sed -i -e "s/#.*\(INCLUDE_MODULES += NAS_AUDIO\)/\1/" \ - ${CONFIG} || die - fi - - if ! use X; then - sed -i -e "s/-lX11 -lXt//" config/modules/esd_audio.mak || die - fi - - econf -} - -src_compile() { - emake -j1 \ - CC="$(tc-getCC)" \ - CXX="$(tc-getCXX)" \ - CC_OTHER_FLAGS="${CFLAGS}" \ - CXX_OTHER_FLAGS="${CXXFLAGS}" \ - LDFLAGS="${LDFLAGS}" \ - AR="$(tc-getAR)" \ - RANLIB="$(tc-getRANLIB)" -} - -src_install() { - default - - dolib.so lib/libest*.so* - - insinto /usr/share/speech-tools - doins -r config base_class - - insinto /usr/share/speech-tools/lib - doins -r lib/siod - - mv include speech-tools || die - doheader -r speech-tools - dosym ../../include/speech-tools /usr/share/speech-tools/include - - for file in bin/*; do - [ "${file}" = "bin/Makefile" ] && continue - dobin ${file} - dstfile="${ED}/usr/${file}" - sed -i -e "s:${S}/testsuite/data:/usr/share/speech-tools/testsuite:g" \ - ${dstfile} || die - sed -i -e "s:${S}/bin:/usr/$(get_libdir)/speech-tools:g" \ - ${dstfile} || die - sed -i -e "s:${S}/main:/usr/$(get_libdir)/speech-tools:g" \ - ${dstfile} |
[gentoo-commits] repo/gentoo:master commit in: app-accessibility/speech-tools/
commit: d2a46005296ea28b8a1c9fb3d531e979ae96933c Author: Agostino Sarubbo gentoo org> AuthorDate: Tue Jul 26 15:20:14 2022 + Commit: Agostino Sarubbo gentoo org> CommitDate: Tue Jul 26 15:20:14 2022 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d2a46005 app-accessibility/speech-tools: ppc64 stable wrt bug #861107 Signed-off-by: Agostino Sarubbo gentoo.org> app-accessibility/speech-tools/speech-tools-2.5.0-r1.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app-accessibility/speech-tools/speech-tools-2.5.0-r1.ebuild b/app-accessibility/speech-tools/speech-tools-2.5.0-r1.ebuild index b81611b4773a..5e3d29432faa 100644 --- a/app-accessibility/speech-tools/speech-tools-2.5.0-r1.ebuild +++ b/app-accessibility/speech-tools/speech-tools-2.5.0-r1.ebuild @@ -16,7 +16,7 @@ S="${WORKDIR}/speech_tools" LICENSE="FESTIVAL HPND BSD rc regexp-UofT" SLOT="0" -KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~mips ppc ~ppc64 sparc x86" +KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~mips ppc ppc64 sparc x86" IUSE="nas openmp X" RDEPEND="
[gentoo-commits] repo/gentoo:master commit in: app-accessibility/speech-tools/
commit: 58db7f3f1bf4f82b81aee7aa1387e458b5c714ce Author: Agostino Sarubbo gentoo org> AuthorDate: Tue Jul 26 15:19:07 2022 + Commit: Agostino Sarubbo gentoo org> CommitDate: Tue Jul 26 15:19:07 2022 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=58db7f3f app-accessibility/speech-tools: ppc stable wrt bug #861107 Signed-off-by: Agostino Sarubbo gentoo.org> app-accessibility/speech-tools/speech-tools-2.5.0-r1.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app-accessibility/speech-tools/speech-tools-2.5.0-r1.ebuild b/app-accessibility/speech-tools/speech-tools-2.5.0-r1.ebuild index 70fd1c72b861..b81611b4773a 100644 --- a/app-accessibility/speech-tools/speech-tools-2.5.0-r1.ebuild +++ b/app-accessibility/speech-tools/speech-tools-2.5.0-r1.ebuild @@ -16,7 +16,7 @@ S="${WORKDIR}/speech_tools" LICENSE="FESTIVAL HPND BSD rc regexp-UofT" SLOT="0" -KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 sparc x86" +KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~mips ppc ~ppc64 sparc x86" IUSE="nas openmp X" RDEPEND="
[gentoo-commits] repo/gentoo:master commit in: app-accessibility/speech-tools/
commit: 555032e8b4b2cca9d22e85848d6337d77de91c94 Author: Sam James gentoo org> AuthorDate: Tue Jul 26 07:05:02 2022 + Commit: Sam James gentoo org> CommitDate: Tue Jul 26 07:05:02 2022 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=555032e8 app-accessibility/speech-tools: Stabilize 2.5.0-r1 sparc, #861107 Signed-off-by: Sam James gentoo.org> app-accessibility/speech-tools/speech-tools-2.5.0-r1.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app-accessibility/speech-tools/speech-tools-2.5.0-r1.ebuild b/app-accessibility/speech-tools/speech-tools-2.5.0-r1.ebuild index 490a413d8da1..70fd1c72b861 100644 --- a/app-accessibility/speech-tools/speech-tools-2.5.0-r1.ebuild +++ b/app-accessibility/speech-tools/speech-tools-2.5.0-r1.ebuild @@ -16,7 +16,7 @@ S="${WORKDIR}/speech_tools" LICENSE="FESTIVAL HPND BSD rc regexp-UofT" SLOT="0" -KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc x86" +KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 sparc x86" IUSE="nas openmp X" RDEPEND="
[gentoo-commits] repo/gentoo:master commit in: app-accessibility/speech-tools/
commit: c4bda65c6e35de4e11fa07474f1dec6114cb71de Author: Sam James gentoo org> AuthorDate: Tue Jul 26 07:03:43 2022 + Commit: Sam James gentoo org> CommitDate: Tue Jul 26 07:03:43 2022 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c4bda65c app-accessibility/speech-tools: Stabilize 2.5.0-r1 x86, #861107 Signed-off-by: Sam James gentoo.org> app-accessibility/speech-tools/speech-tools-2.5.0-r1.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app-accessibility/speech-tools/speech-tools-2.5.0-r1.ebuild b/app-accessibility/speech-tools/speech-tools-2.5.0-r1.ebuild index 60ce14c9f84e..490a413d8da1 100644 --- a/app-accessibility/speech-tools/speech-tools-2.5.0-r1.ebuild +++ b/app-accessibility/speech-tools/speech-tools-2.5.0-r1.ebuild @@ -16,7 +16,7 @@ S="${WORKDIR}/speech_tools" LICENSE="FESTIVAL HPND BSD rc regexp-UofT" SLOT="0" -KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86" +KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc x86" IUSE="nas openmp X" RDEPEND="
[gentoo-commits] repo/gentoo:master commit in: app-accessibility/speech-tools/
commit: 344f223718ba1336b7832a9fd49e97275ffc9aed Author: Sam James gentoo org> AuthorDate: Tue Jul 26 07:03:18 2022 + Commit: Sam James gentoo org> CommitDate: Tue Jul 26 07:03:18 2022 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=344f2237 app-accessibility/speech-tools: Stabilize 2.5.0-r1 amd64, #861107 Signed-off-by: Sam James gentoo.org> app-accessibility/speech-tools/speech-tools-2.5.0-r1.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app-accessibility/speech-tools/speech-tools-2.5.0-r1.ebuild b/app-accessibility/speech-tools/speech-tools-2.5.0-r1.ebuild index 76fc1ff30431..60ce14c9f84e 100644 --- a/app-accessibility/speech-tools/speech-tools-2.5.0-r1.ebuild +++ b/app-accessibility/speech-tools/speech-tools-2.5.0-r1.ebuild @@ -16,7 +16,7 @@ S="${WORKDIR}/speech_tools" LICENSE="FESTIVAL HPND BSD rc regexp-UofT" SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86" +KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86" IUSE="nas openmp X" RDEPEND="
[gentoo-commits] repo/gentoo:master commit in: app-accessibility/speech-tools/, app-accessibility/speech-tools/files/
commit: aa9db8863d577f8e34d67a19dd57c8596c9a5b80 Author: Sam James gentoo org> AuthorDate: Fri Jun 24 23:40:23 2022 + Commit: Sam James gentoo org> CommitDate: Fri Jun 24 23:40:26 2022 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=aa9db886 app-accessibility/speech-tools: fix build w/ newer ncurses; fix strict-aliasing Closes: https://bugs.gentoo.org/837800 Closes: https://bugs.gentoo.org/854051 Signed-off-by: Sam James gentoo.org> .../files/speech-tools-2.5.0-drop-curses.patch | 43 ++ .../files/speech-tools-2.5.0-warnings.patch| 35 + .../speech-tools/speech-tools-2.5.0-r1.ebuild | 150 + 3 files changed, 228 insertions(+) diff --git a/app-accessibility/speech-tools/files/speech-tools-2.5.0-drop-curses.patch b/app-accessibility/speech-tools/files/speech-tools-2.5.0-drop-curses.patch new file mode 100644 index ..30b5448e820a --- /dev/null +++ b/app-accessibility/speech-tools/files/speech-tools-2.5.0-drop-curses.patch @@ -0,0 +1,43 @@ +We already force in the correct detection via another patch and this +logic (being dropped in this patch) assumes no -ltinfo. + +https://bugs.gentoo.org/837800 +--- a/configure.in b/configure.in +@@ -42,12 +42,6 @@ AC_CHECK_TOOL(AR, ar) + + AC_C_BIGENDIAN + +-AC_CHECK_LIB(ncurses, tputs, [TERMCAPLIB=-lncurses], [TERMCAPLIB=-lcurses]) +-dnl if test "$TERMCAPLIB" != "-ltermcap"; then +-dnlAC_CHECK_LIB(termcap, tputs, [TERMCAPLIB=-ltermcap], [TERMCAPLIB=-lncurses]) +-dnl +-AC_SUBST(TERMCAPLIB) +- + dnl Which version of GCC do we have here + COMPILERTYPE=gcc + AC_TRY_COMPILE([#include ], +diff --git a/config/config.in b/config/config.in +index c7a268a..6c7f16a 100644 +--- a/config/config.in b/config/config.in +@@ -98,7 +98,6 @@ LINUXAUDIO = @LINUXAUDIO@ + ## It may not work under all systems, so may be optionally omitted. + INCLUDE_MODULES += EDITLINE + +-TERMCAPLIB = @TERMCAPLIB@ + # speech recognition + #INCLUDE_MODULES += ASR + +diff --git a/config/modules/editline.mak b/config/modules/editline.mak +index fe83c37..2d48b39 100644 +--- a/config/modules/editline.mak b/config/modules/editline.mak +@@ -43,7 +43,6 @@ INCLUDE_EDITLINE=1 + MOD_DESC_EDITLINE=Use editline for command line editing and history + + IO_DEFINES += -DSUPPORT_EDITLINE $(MODULE_EDITLINE_OPTIONS:%=-DEDITLINE_%) +-MODULE_LIBS += $(TERMCAPLIB) + + ifeq ($(DIRNAME),siod) + CSRCS := $(CSRCS) el_complete.c editline.c el_sys_unix.c diff --git a/app-accessibility/speech-tools/files/speech-tools-2.5.0-warnings.patch b/app-accessibility/speech-tools/files/speech-tools-2.5.0-warnings.patch new file mode 100644 index ..4242700e6c2d --- /dev/null +++ b/app-accessibility/speech-tools/files/speech-tools-2.5.0-warnings.patch @@ -0,0 +1,35 @@ +https://github.com/festvox/speech_tools/commit/4b677d6f3bc560248da369a86d5f2ec17c116da5 +(Just the strict aliasing hunk.) + +From 4b677d6f3bc560248da369a86d5f2ec17c116da5 Mon Sep 17 00:00:00 2001 +From: Sergio Oller +Date: Sat, 29 Aug 2020 19:14:47 +0200 +Subject: [PATCH] Compile with gcc-9 without warnings (-Wall) + +--- a/speech_class/esps_utils.cc b/speech_class/esps_utils.cc +@@ -1050,7 +1050,7 @@ enum EST_read_status read_esps_hdr(esps_hdr *uhdr,FILE *fd) + hdr->field_name[0] = wstrdup("samples"); + fseek(fd,hdr->hdr_size,SEEK_SET); + /* In this cases its just in the header as a float */ +- sd_sample_rate = *((float *)(void *)&fhdr.fil4[0]); ++ memcpy(&sd_sample_rate, &fhdr.fil4[0], sizeof(float)); + add_fea_d(hdr,"record_freq",0,(double)sd_sample_rate); + *uhdr = hdr; + return format_ok; +@@ -1215,11 +1215,13 @@ enum EST_write_status write_esps_hdr(esps_hdr hdr,FILE *fd) + fhdr.thirteen = 13; /* must be for luck */ + fhdr.sdr_size = 0; + fhdr.magic = ESPS_MAGIC; +-strncpy(fhdr.date,ctime(&tx),26); ++strncpy(fhdr.date,ctime(&tx),25); ++fhdr.date[25] = 0; + sprintf(fhdr.version,"1.91"); /* that's what all the others have */ + sprintf(fhdr.prog,"EDST"); + sprintf(fhdr.vers,"0.1"); +-strncpy(fhdr.progcompdate,ctime(&tx),26); ++strncpy(fhdr.progcompdate,ctime(&tx),25); ++fhdr.progcompdate[25] = 0; + fhdr.num_samples = hdr->num_records; + fhdr.filler = 0; + /* in each record */ diff --git a/app-accessibility/speech-tools/speech-tools-2.5.0-r1.ebuild b/app-accessibility/speech-tools/speech-tools-2.5.0-r1.ebuild new file mode 100644 index ..76fc1ff30431 --- /dev/null +++ b/app-accessibility/speech-tools/speech-tools-2.5.0-r1.ebuild @@ -0,0 +1,150 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit autotools toolchain-funcs + +MY_P=${P/speech-/speech_} +PATCHSET="r3" + +DESCRIPTION="Speech tools for Festival Text to Speech engine" +HOMEPAGE="http://www.cstr.ed.ac.uk/projects/speech_tools/"; +SRC_URI="http://www.festvox.org/pa
[gentoo-commits] repo/gentoo:master commit in: app-accessibility/speech-tools/, app-accessibility/speech-tools/files/
commit: 9651ecdd87fa56219abe24f00196dabc5db54102 Author: Miroslav Šulc gentoo org> AuthorDate: Mon May 10 06:38:12 2021 + Commit: Miroslav Šulc gentoo org> CommitDate: Mon May 10 06:38:12 2021 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9651ecdd app-accessibility/speech-tools: removed obsolete 2.4-r1 Closes: https://bugs.gentoo.org/685810 Package-Manager: Portage-3.0.18, Repoman-3.0.3 Signed-off-by: Miroslav Šulc gentoo.org> app-accessibility/speech-tools/Manifest| 1 - .../speech-tools/files/speech-tools-2.1-gcc7.patch | 20 .../speech-tools/speech-tools-2.1-r4.ebuild| 120 - 3 files changed, 141 deletions(-) diff --git a/app-accessibility/speech-tools/Manifest b/app-accessibility/speech-tools/Manifest index d618947e53a..359cc88438c 100644 --- a/app-accessibility/speech-tools/Manifest +++ b/app-accessibility/speech-tools/Manifest @@ -1,3 +1,2 @@ DIST speech_tools-2.1-r3-patches.tar.gz 6876 BLAKE2B 84ddc30de90459f913cc32d4338097feb35dc08c48cbda7fc47a78ee0384668828d7166a5ebb1264272a6c326afd4ff2efdf1d793bb8f33937c09d2c7cd9a2b5 SHA512 db4d656a77e3fcfc43447c11b160cf9b45f0c4ec10f2697e4357f0ec86ea56e2841f1b887493a781406975003f5d8065ffbb75eeebb79fcd9873055b52c248e3 -DIST speech_tools-2.1-release.tar.gz 1681999 BLAKE2B 572e7877e195c098dd2df03cda86fe58b7a55379cd01adcc22faf5e12b8c004e8c006b852cfe88c5c20df4a0e54e357b445050cdb63088edd55714a98e3eda90 SHA512 6ef9a7dd01ede152c4dafd0b2037312d62a79d875813d74ea048899a52eee505b93ffbabef9b6c0a1d15aeadb5508fd18a2f392e85276847fe071173aec5db96 DIST speech_tools-2.5.0-release.tar.gz 1328624 BLAKE2B 445dd5a5e39c02352a850fd92de5b3852ae382a4bd013dccb3fdd46b0b22ce0bd10d089f9e860ae3d3e73a489b20b7c8b78335e57a49e40ae01b0f4997d55315 SHA512 013540a5252efb57633f442143a51bc87aac719dfb46c8f47e750322d19dac9b504f55125462a2ee74a6b0bd2661a63a1fc73a8c3c6d2886e38b136a80447fd7 diff --git a/app-accessibility/speech-tools/files/speech-tools-2.1-gcc7.patch b/app-accessibility/speech-tools/files/speech-tools-2.1-gcc7.patch deleted file mode 100644 index 9e1067fa1dc..000 --- a/app-accessibility/speech-tools/files/speech-tools-2.1-gcc7.patch +++ /dev/null @@ -1,20 +0,0 @@ a/siod/siod.cc -+++ b/siod/siod.cc -@@ -459,7 +459,7 @@ char **siod_variable_generator(char *text,int length) - matches = walloc(char *,siod_llength(lmatches)+1); - for (l=lmatches,i=0; l; l=cdr(l),i++) - matches[i] = wstrdup(PNAME(car(l))); --matches[i] = '\0'; -+*matches[i] = '\0'; - - return matches; - } -@@ -498,7 +498,7 @@ char **siod_command_generator (char *text,int length) - matches = walloc(char *,siod_llength(lmatches)+1); - for (l=lmatches,i=0; l; l=cdr(l),i++) - matches[i] = wstrdup(PNAME(car(l))); --matches[i] = '\0'; -+*matches[i] = '\0'; - - return matches; - } diff --git a/app-accessibility/speech-tools/speech-tools-2.1-r4.ebuild b/app-accessibility/speech-tools/speech-tools-2.1-r4.ebuild deleted file mode 100644 index 2f487ae007a..000 --- a/app-accessibility/speech-tools/speech-tools-2.1-r4.ebuild +++ /dev/null @@ -1,120 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 - -inherit eutils epatch flag-o-matic multilib toolchain-funcs - -MY_P=${P/speech-/speech_} -PATCHSET="r3" - -DESCRIPTION="Speech tools for Festival Text to Speech engine" -HOMEPAGE="http://www.cstr.ed.ac.uk/projects/speech_tools/"; -SRC_URI="http://www.festvox.org/packed/festival/${PV}/${MY_P}-release.tar.gz - https://dev.gentoo.org/~neurogeek/${PN}/${MY_P}-${PATCHSET}-patches.tar.gz"; - -LICENSE="FESTIVAL HPND BSD rc regexp-UofT" -SLOT="0" -KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~mips ppc ppc64 sparc x86" -IUSE="nas X" - -RDEPEND=" - nas? ( media-libs/nas ) - X? ( x11-libs/libX11 - x11-libs/libXt ) - >=media-libs/alsa-lib-1.0.20-r1 - !=sys-libs/ncurses-5.6-r2:0= -" -DEPEND="${RDEPEND} - virtual/pkgconfig -" - -S="${WORKDIR}/speech_tools" - -src_prepare() { - EPATCH_SUFFIX="patch" - epatch - - sed -i -e 's,{{HORRIBLELIBARCHKLUDGE}},"/usr/$(get_libdir)",' \ - main/siod_main.cc || die - - #WRT bug #309983 - sed -i -e "s:\(GCC_SYSTEM_OPTIONS =\).*:\1:" \ - "${S}"/config/systems/sparc_SunOS5.mak || die - - # Fix underlinking, bug #493204 - epatch "${FILESDIR}"/${PN}-2.1-underlinking.patch - - # Fix gcc7 build failure, bug #634224 - epatch "${FILESDIR}"/${PN}-2.1-gcc7.patch -} - -src_configure() { - local CONFIG=config/config.in - sed -i -e 's/@COMPILERTYPE@/gcc42/' ${CONFIG} || die - if use nas; then - sed -i -e "s/#.*\(INCLUDE_MODULES += NAS_AUDIO\)/\1/" \ - ${CONFIG} || die - fi - if ! use X; then - sed -i -e "s/-lX11 -lXt//" config/modules/esd_audio.mak || die - fi -
[gentoo-commits] repo/gentoo:master commit in: app-accessibility/speech-tools/
commit: 32e72c2bc7704ea9a22c7e604346ad7d8398138a Author: Sam James gentoo org> AuthorDate: Mon May 10 04:25:40 2021 + Commit: Sam James gentoo org> CommitDate: Mon May 10 04:25:40 2021 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=32e72c2b app-accessibility/speech-tools: Stabilize 2.5.0 x86, #783633 Signed-off-by: Sam James gentoo.org> app-accessibility/speech-tools/speech-tools-2.5.0.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app-accessibility/speech-tools/speech-tools-2.5.0.ebuild b/app-accessibility/speech-tools/speech-tools-2.5.0.ebuild index 997aac84719..1c0615542e7 100644 --- a/app-accessibility/speech-tools/speech-tools-2.5.0.ebuild +++ b/app-accessibility/speech-tools/speech-tools-2.5.0.ebuild @@ -16,7 +16,7 @@ S="${WORKDIR}/speech_tools" LICENSE="FESTIVAL HPND BSD rc regexp-UofT" SLOT="0" -KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~mips ppc ppc64 sparc ~x86" +KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~mips ppc ppc64 sparc x86" IUSE="nas openmp X" RDEPEND="
[gentoo-commits] repo/gentoo:master commit in: app-accessibility/speech-tools/
commit: d053df701c6724dd7413a232f5d03385de9b35ca Author: Sam James gentoo org> AuthorDate: Mon May 10 00:06:54 2021 + Commit: Sam James gentoo org> CommitDate: Mon May 10 00:06:54 2021 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d053df70 app-accessibility/speech-tools: Stabilize 2.5.0 amd64, #783633 Signed-off-by: Sam James gentoo.org> app-accessibility/speech-tools/speech-tools-2.5.0.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app-accessibility/speech-tools/speech-tools-2.5.0.ebuild b/app-accessibility/speech-tools/speech-tools-2.5.0.ebuild index f14ff35bfac..997aac84719 100644 --- a/app-accessibility/speech-tools/speech-tools-2.5.0.ebuild +++ b/app-accessibility/speech-tools/speech-tools-2.5.0.ebuild @@ -16,7 +16,7 @@ S="${WORKDIR}/speech_tools" LICENSE="FESTIVAL HPND BSD rc regexp-UofT" SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ppc ppc64 sparc ~x86" +KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~mips ppc ppc64 sparc ~x86" IUSE="nas openmp X" RDEPEND="
[gentoo-commits] repo/gentoo:master commit in: app-accessibility/speech-tools/
commit: c14c7b47ffc2629a0e7a20dbd088690ecc236c0e Author: Sergei Trofimovich gentoo org> AuthorDate: Wed Apr 28 18:18:42 2021 + Commit: Sergei Trofimovich gentoo org> CommitDate: Wed Apr 28 18:18:42 2021 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c14c7b47 app-accessibility/speech-tools: stable 2.5.0 for ppc64 stable wrt bug #783633 Tested-by: ernsteiswuerfel Package-Manager: Portage-3.0.18, Repoman-3.0.3 RepoMan-Options: --include-arches="ppc64" Signed-off-by: Sergei Trofimovich gentoo.org> app-accessibility/speech-tools/speech-tools-2.5.0.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app-accessibility/speech-tools/speech-tools-2.5.0.ebuild b/app-accessibility/speech-tools/speech-tools-2.5.0.ebuild index 2b174823252..f14ff35bfac 100644 --- a/app-accessibility/speech-tools/speech-tools-2.5.0.ebuild +++ b/app-accessibility/speech-tools/speech-tools-2.5.0.ebuild @@ -16,7 +16,7 @@ S="${WORKDIR}/speech_tools" LICENSE="FESTIVAL HPND BSD rc regexp-UofT" SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ppc ~ppc64 sparc ~x86" +KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ppc ppc64 sparc ~x86" IUSE="nas openmp X" RDEPEND="
[gentoo-commits] repo/gentoo:master commit in: app-accessibility/speech-tools/
commit: b61dbcbd6e7758faa8de1e78b9819fe2dc130998 Author: Sergei Trofimovich gentoo org> AuthorDate: Sun Apr 25 09:13:16 2021 + Commit: Sergei Trofimovich gentoo org> CommitDate: Sun Apr 25 09:18:05 2021 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b61dbcbd app-accessibility/speech-tools: stable 2.5.0 for ppc stable wrt bug #783633 Package-Manager: Portage-3.0.18, Repoman-3.0.3 RepoMan-Options: --include-arches="ppc" Signed-off-by: Sergei Trofimovich gentoo.org> app-accessibility/speech-tools/speech-tools-2.5.0.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app-accessibility/speech-tools/speech-tools-2.5.0.ebuild b/app-accessibility/speech-tools/speech-tools-2.5.0.ebuild index 666c4c1c58a..2b174823252 100644 --- a/app-accessibility/speech-tools/speech-tools-2.5.0.ebuild +++ b/app-accessibility/speech-tools/speech-tools-2.5.0.ebuild @@ -16,7 +16,7 @@ S="${WORKDIR}/speech_tools" LICENSE="FESTIVAL HPND BSD rc regexp-UofT" SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 sparc ~x86" +KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ppc ~ppc64 sparc ~x86" IUSE="nas openmp X" RDEPEND="
[gentoo-commits] repo/gentoo:master commit in: app-accessibility/speech-tools/
commit: 009f5cad3d8702bf0d3f9574bf6abcb738b72a0c Author: Rolf Eike Beer sf-mail de> AuthorDate: Fri Apr 23 14:26:18 2021 + Commit: Sergei Trofimovich gentoo org> CommitDate: Fri Apr 23 17:46:44 2021 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=009f5cad app-accessibility/speech-tools: stable 2.5.0 for sparc, bug #783633 Package-Manager: Portage-3.0.17, Repoman-3.0.2 RepoMan-Options: --include-arches="sparc" Signed-off-by: Rolf Eike Beer sf-mail.de> Signed-off-by: Sergei Trofimovich gentoo.org> app-accessibility/speech-tools/speech-tools-2.5.0.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app-accessibility/speech-tools/speech-tools-2.5.0.ebuild b/app-accessibility/speech-tools/speech-tools-2.5.0.ebuild index 438c9aa873f..666c4c1c58a 100644 --- a/app-accessibility/speech-tools/speech-tools-2.5.0.ebuild +++ b/app-accessibility/speech-tools/speech-tools-2.5.0.ebuild @@ -16,7 +16,7 @@ S="${WORKDIR}/speech_tools" LICENSE="FESTIVAL HPND BSD rc regexp-UofT" SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86" +KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 sparc ~x86" IUSE="nas openmp X" RDEPEND="
[gentoo-commits] repo/gentoo:master commit in: app-accessibility/speech-tools/
commit: 54f2636245a763c03c1c4de79a84ce6ccf2fdf86 Author: Sam James gentoo org> AuthorDate: Thu Apr 1 02:23:43 2021 + Commit: Sam James gentoo org> CommitDate: Thu Apr 1 22:08:38 2021 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=54f26362 app-accessibility/speech-tools: add explicit epatch inherit to 2.1-r4 Signed-off-by: Sam James gentoo.org> app-accessibility/speech-tools/speech-tools-2.1-r4.ebuild | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/app-accessibility/speech-tools/speech-tools-2.1-r4.ebuild b/app-accessibility/speech-tools/speech-tools-2.1-r4.ebuild index 4a54649722d..2f487ae007a 100644 --- a/app-accessibility/speech-tools/speech-tools-2.1-r4.ebuild +++ b/app-accessibility/speech-tools/speech-tools-2.1-r4.ebuild @@ -1,9 +1,9 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI="5" +EAPI=5 -inherit eutils flag-o-matic multilib toolchain-funcs +inherit eutils epatch flag-o-matic multilib toolchain-funcs MY_P=${P/speech-/speech_} PATCHSET="r3"
[gentoo-commits] repo/gentoo:master commit in: app-accessibility/speech-tools/
commit: cc766f3f37c73390ef217b9cd12ace377d0ffc78 Author: Sam James gentoo org> AuthorDate: Thu Apr 1 02:24:04 2021 + Commit: Sam James gentoo org> CommitDate: Thu Apr 1 22:08:39 2021 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cc766f3f app-accessibility/speech-tools: modernise 2.5.0, drop useless multilib inherit Signed-off-by: Sam James gentoo.org> .../speech-tools/speech-tools-2.5.0.ebuild | 30 +- 1 file changed, 18 insertions(+), 12 deletions(-) diff --git a/app-accessibility/speech-tools/speech-tools-2.5.0.ebuild b/app-accessibility/speech-tools/speech-tools-2.5.0.ebuild index 8a41ef40284..438c9aa873f 100644 --- a/app-accessibility/speech-tools/speech-tools-2.5.0.ebuild +++ b/app-accessibility/speech-tools/speech-tools-2.5.0.ebuild @@ -1,9 +1,9 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI="7" +EAPI=7 -inherit multilib toolchain-funcs +inherit toolchain-funcs MY_P=${P/speech-/speech_} PATCHSET="r3" @@ -12,6 +12,7 @@ DESCRIPTION="Speech tools for Festival Text to Speech engine" HOMEPAGE="http://www.cstr.ed.ac.uk/projects/speech_tools/"; SRC_URI="http://www.festvox.org/packed/festival/$(ver_cut 1-2)/${MY_P}-release.tar.gz https://dev.gentoo.org/~neurogeek/${PN}/speech_tools-2.1-${PATCHSET}-patches.tar.gz"; +S="${WORKDIR}/speech_tools" LICENSE="FESTIVAL HPND BSD rc regexp-UofT" SLOT="0" @@ -22,15 +23,14 @@ RDEPEND=" media-libs/alsa-lib sys-libs/ncurses:0= nas? ( media-libs/nas ) - X? ( x11-libs/libX11 + X? ( + x11-libs/libX11 x11-libs/libXt ) " DEPEND="${RDEPEND}" BDEPEND="virtual/pkgconfig" -S="${WORKDIR}/speech_tools" - DOCS=( README.md lib/cstrutt.dtd lib/example_data ) PATCHES=( @@ -67,14 +67,14 @@ src_prepare() { sed -i -e 's,{{HORRIBLELIBARCHKLUDGE}},"/usr/$(get_libdir)",' \ main/siod_main.cc || die - #WRT bug #309983 + # bug #309983 sed -i -e "s:\(GCC_SYSTEM_OPTIONS =\).*:\1:" \ "${S}"/config/systems/sparc_SunOS5.mak || die sed -i -e "s|\$(OMP_OPTS)|$(use openmp && echo -fopenmp)|g" \ -e "s|\$(OMP_DEFS)|$(use openmp && echo -DOMP_WAGON=1)|g" \ -e "/MAKE_SHARED_LIB =/s|-shared|$(use openmp && echo -fopenmp) -shared|" \ - config/compilers/gcc_defaults.mak + config/compilers/gcc_defaults.mak || die } src_configure() { @@ -95,8 +95,14 @@ src_configure() { } src_compile() { - emake -j1 CC="$(tc-getCC)" CXX="$(tc-getCXX)" CXX_OTHER_FLAGS="${CXXFLAGS}" CC_OTHER_FLAGS="${CFLAGS}" \ - AR="$(tc-getAR)" RANLIB="$(tc-getRANLIB)" LDFLAGS="${LDFLAGS}" + emake -j1 \ + CC="$(tc-getCC)" \ + CXX="$(tc-getCXX)" \ + CC_OTHER_FLAGS="${CFLAGS}" \ + CXX_OTHER_FLAGS="${CXXFLAGS}" \ + LDFLAGS="${LDFLAGS}" \ + AR="$(tc-getAR)" \ + RANLIB="$(tc-getRANLIB)" } src_install() { @@ -135,6 +141,6 @@ src_install() { done # Remove bcat (only useful for testing on windows, see bug #418301). - rm "${D}/usr/bin/bcat" || die - rm "${D}/usr/$(get_libdir)/speech-tools/bcat" || die + rm "${ED}/usr/bin/bcat" || die + rm "${ED}/usr/$(get_libdir)/speech-tools/bcat" || die }
[gentoo-commits] repo/gentoo:master commit in: app-accessibility/speech-tools/
commit: 797f7f7c8100d087277eef031b671a9acb34f7fe Author: Miroslav Šulc gentoo org> AuthorDate: Sun Sep 27 10:19:42 2020 + Commit: Miroslav Šulc gentoo org> CommitDate: Sun Sep 27 10:19:56 2020 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=797f7f7c app-accessibility/speech-tools: fixed calling ar and ranlib in 2.5.0 Closes: https://bugs.gentoo.org/738880 Package-Manager: Portage-3.0.8, Repoman-3.0.1 Signed-off-by: Miroslav Šulc gentoo.org> app-accessibility/speech-tools/speech-tools-2.5.0.ebuild | 6 +- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/app-accessibility/speech-tools/speech-tools-2.5.0.ebuild b/app-accessibility/speech-tools/speech-tools-2.5.0.ebuild index 184920c2800..8a41ef40284 100644 --- a/app-accessibility/speech-tools/speech-tools-2.5.0.ebuild +++ b/app-accessibility/speech-tools/speech-tools-2.5.0.ebuild @@ -79,20 +79,24 @@ src_prepare() { src_configure() { local CONFIG=config/config.in + sed -i -e 's/@COMPILERTYPE@/gcc42/' ${CONFIG} || die + if use nas; then sed -i -e "s/#.*\(INCLUDE_MODULES += NAS_AUDIO\)/\1/" \ ${CONFIG} || die fi + if ! use X; then sed -i -e "s/-lX11 -lXt//" config/modules/esd_audio.mak || die fi + econf } src_compile() { emake -j1 CC="$(tc-getCC)" CXX="$(tc-getCXX)" CXX_OTHER_FLAGS="${CXXFLAGS}" CC_OTHER_FLAGS="${CFLAGS}" \ - LDFLAGS="${LDFLAGS}" + AR="$(tc-getAR)" RANLIB="$(tc-getRANLIB)" LDFLAGS="${LDFLAGS}" } src_install() {
[gentoo-commits] repo/gentoo:master commit in: app-accessibility/speech-tools/
commit: 65f0bd0d1c311cdc0b4f751bbdb1d12912bbc8e5 Author: Miroslav Šulc gentoo org> AuthorDate: Sun Aug 23 15:32:54 2020 + Commit: Miroslav Šulc gentoo org> CommitDate: Sun Aug 23 15:33:19 2020 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=65f0bd0d app-accessibility/speech-tools: minor cleanup in 2.5 Package-Manager: Portage-3.0.4, Repoman-3.0.1 Signed-off-by: Miroslav Šulc gentoo.org> app-accessibility/speech-tools/speech-tools-2.5.0.ebuild | 15 +-- 1 file changed, 5 insertions(+), 10 deletions(-) diff --git a/app-accessibility/speech-tools/speech-tools-2.5.0.ebuild b/app-accessibility/speech-tools/speech-tools-2.5.0.ebuild index 745c05c9150..184920c2800 100644 --- a/app-accessibility/speech-tools/speech-tools-2.5.0.ebuild +++ b/app-accessibility/speech-tools/speech-tools-2.5.0.ebuild @@ -19,24 +19,19 @@ KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86" IUSE="nas openmp X" RDEPEND=" + media-libs/alsa-lib + sys-libs/ncurses:0= nas? ( media-libs/nas ) X? ( x11-libs/libX11 - x11-libs/libXt ) - >=media-libs/alsa-lib-1.0.20-r1 - !=sys-libs/ncurses-5.6-r2:0= + x11-libs/libXt + ) " DEPEND="${RDEPEND}" BDEPEND="virtual/pkgconfig" S="${WORKDIR}/speech_tools" -DOCS=( - README.md - lib/cstrutt.dtd - lib/example_data -) +DOCS=( README.md lib/cstrutt.dtd lib/example_data ) PATCHES=( "${WORKDIR}/patch/02_all_gcc42.patch"
[gentoo-commits] repo/gentoo:master commit in: app-accessibility/speech-tools/files/, app-accessibility/speech-tools/
commit: 063df9aae04bc82fef0ec6d51144052251cb4b3b Author: Peter Levine gmail com> AuthorDate: Sat May 30 07:14:29 2020 + Commit: Miroslav Šulc gentoo org> CommitDate: Sun Aug 23 15:33:19 2020 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=063df9aa app-accessibility/speech-tools: Bump speech-tools-2.5.0 Closes: https://bugs.gentoo.org/650474 Closes: https://github.com/gentoo/gentoo/pull/16011 Bug: https://bugs.gentoo.org/685810 Package-Manager: Portage-2.3.100, Repoman-2.3.22 Signed-off-by: Peter Levine gmail.com> Signed-off-by: Miroslav Šulc gentoo.org> app-accessibility/speech-tools/Manifest| 1 + .../files/speech-tools-2.5.0-fno-common.patch | 22 .../speech-tools/speech-tools-2.5.0.ebuild | 141 + 3 files changed, 164 insertions(+) diff --git a/app-accessibility/speech-tools/Manifest b/app-accessibility/speech-tools/Manifest index 3f3053884aa..d618947e53a 100644 --- a/app-accessibility/speech-tools/Manifest +++ b/app-accessibility/speech-tools/Manifest @@ -1,2 +1,3 @@ DIST speech_tools-2.1-r3-patches.tar.gz 6876 BLAKE2B 84ddc30de90459f913cc32d4338097feb35dc08c48cbda7fc47a78ee0384668828d7166a5ebb1264272a6c326afd4ff2efdf1d793bb8f33937c09d2c7cd9a2b5 SHA512 db4d656a77e3fcfc43447c11b160cf9b45f0c4ec10f2697e4357f0ec86ea56e2841f1b887493a781406975003f5d8065ffbb75eeebb79fcd9873055b52c248e3 DIST speech_tools-2.1-release.tar.gz 1681999 BLAKE2B 572e7877e195c098dd2df03cda86fe58b7a55379cd01adcc22faf5e12b8c004e8c006b852cfe88c5c20df4a0e54e357b445050cdb63088edd55714a98e3eda90 SHA512 6ef9a7dd01ede152c4dafd0b2037312d62a79d875813d74ea048899a52eee505b93ffbabef9b6c0a1d15aeadb5508fd18a2f392e85276847fe071173aec5db96 +DIST speech_tools-2.5.0-release.tar.gz 1328624 BLAKE2B 445dd5a5e39c02352a850fd92de5b3852ae382a4bd013dccb3fdd46b0b22ce0bd10d089f9e860ae3d3e73a489b20b7c8b78335e57a49e40ae01b0f4997d55315 SHA512 013540a5252efb57633f442143a51bc87aac719dfb46c8f47e750322d19dac9b504f55125462a2ee74a6b0bd2661a63a1fc73a8c3c6d2886e38b136a80447fd7 diff --git a/app-accessibility/speech-tools/files/speech-tools-2.5.0-fno-common.patch b/app-accessibility/speech-tools/files/speech-tools-2.5.0-fno-common.patch new file mode 100644 index 000..de34f4fdbc7 --- /dev/null +++ b/app-accessibility/speech-tools/files/speech-tools-2.5.0-fno-common.patch @@ -0,0 +1,22 @@ +From b3a1f6e778c0dad12ce65f9f1fb25354e2667ef6 Mon Sep 17 00:00:00 2001 +From: Peter Levine +Date: Fri, 29 May 2020 21:18:55 -0400 +Subject: [PATCH] Remove erroneous declaration of editline_history_file + +An extern qualified forward declaration of editline_history_file is supplied in editline.h and its definition/initialization is supplied in siodeditline.c. +--- + siod/editline.c | 1 - + 1 file changed, 1 deletion(-) + +diff --git a/siod/editline.c b/siod/editline.c +index f6eb5c6..138f476 100644 +--- a/siod/editline.c b/siod/editline.c +@@ -73,7 +73,6 @@ + /* modified by awb to allow specifcation of history size at run time */ + /* (though only once) */ + int editline_histsize=256; +-char *editline_history_file; + /* If this is defined it'll be called for completion first, before the */ + /* internal file name completion will be */ + EL_USER_COMPLETION_FUNCTION_TYPE*el_user_completion_function = NULL; diff --git a/app-accessibility/speech-tools/speech-tools-2.5.0.ebuild b/app-accessibility/speech-tools/speech-tools-2.5.0.ebuild new file mode 100644 index 000..745c05c9150 --- /dev/null +++ b/app-accessibility/speech-tools/speech-tools-2.5.0.ebuild @@ -0,0 +1,141 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI="7" + +inherit multilib toolchain-funcs + +MY_P=${P/speech-/speech_} +PATCHSET="r3" + +DESCRIPTION="Speech tools for Festival Text to Speech engine" +HOMEPAGE="http://www.cstr.ed.ac.uk/projects/speech_tools/"; +SRC_URI="http://www.festvox.org/packed/festival/$(ver_cut 1-2)/${MY_P}-release.tar.gz + https://dev.gentoo.org/~neurogeek/${PN}/speech_tools-2.1-${PATCHSET}-patches.tar.gz"; + +LICENSE="FESTIVAL HPND BSD rc regexp-UofT" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86" +IUSE="nas openmp X" + +RDEPEND=" + nas? ( media-libs/nas ) + X? ( x11-libs/libX11 + x11-libs/libXt ) + >=media-libs/alsa-lib-1.0.20-r1 + !=sys-libs/ncurses-5.6-r2:0= +" +DEPEND="${RDEPEND}" +BDEPEND="virtual/pkgconfig" + +S="${WORKDIR}/speech_tools" + +DOCS=( + README.md + lib/cstrutt.dtd + lib/example_data +) + +PATCHES=( + "${WORKDIR}/patch/02_all_gcc42.patch" + "${WORKDIR}/patch/03_all_GentooLinux.patch" + "${WORKDIR}/patch/05_all_sharedlib.patch" + "${WORKDIR}/patch/06_all_gcc43-include.patch" + "${WORKDIR}/patch/09_all_remove-shared-refs.patch" + "${WORKDIR}/patch/10_all_base_class.patch" +
[gentoo-commits] repo/gentoo:master commit in: app-accessibility/speech-tools/
commit: fe339a090ca1d6b76f409e6a3f294efa20faa3e0 Author: Andrew Savchenko gentoo org> AuthorDate: Sun Jun 9 17:08:56 2019 + Commit: Andrew Savchenko gentoo org> CommitDate: Sun Jun 9 17:19:59 2019 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fe339a09 app-accessibility/speech-tools: add myself to maintainers Package-Manager: Portage-2.3.67, Repoman-2.3.13 Signed-off-by: Andrew Savchenko gentoo.org> app-accessibility/speech-tools/metadata.xml | 4 1 file changed, 4 insertions(+) diff --git a/app-accessibility/speech-tools/metadata.xml b/app-accessibility/speech-tools/metadata.xml index 1dacdab965c..587a705d02c 100644 --- a/app-accessibility/speech-tools/metadata.xml +++ b/app-accessibility/speech-tools/metadata.xml @@ -9,4 +9,8 @@ so...@gentoo.org Gentoo Sound project + + birc...@gentoo.org + Andrew Savchenko +
[gentoo-commits] repo/gentoo:master commit in: app-accessibility/speech-tools/
commit: d0d66cd2a254be3899835f2722edff688e2e2b8e Author: Pacho Ramos gentoo org> AuthorDate: Tue Jun 19 07:01:01 2018 + Commit: Pacho Ramos gentoo org> CommitDate: Tue Jun 19 07:04:20 2018 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d0d66cd2 app-accessibility/speech-tools: Drop old Package-Manager: Portage-2.3.40, Repoman-2.3.9 .../speech-tools/speech-tools-2.1-r2.ebuild| 107 --- .../speech-tools/speech-tools-2.1-r3.ebuild| 117 - 2 files changed, 224 deletions(-) diff --git a/app-accessibility/speech-tools/speech-tools-2.1-r2.ebuild b/app-accessibility/speech-tools/speech-tools-2.1-r2.ebuild deleted file mode 100644 index 0dff90d91bd..000 --- a/app-accessibility/speech-tools/speech-tools-2.1-r2.ebuild +++ /dev/null @@ -1,107 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI="5" - -inherit eutils flag-o-matic multilib toolchain-funcs - -MY_P=${P/speech-/speech_} -PATCHSET="r3" - -DESCRIPTION="Speech tools for Festival Text to Speech engine" -HOMEPAGE="http://www.cstr.ed.ac.uk/projects/speech_tools/"; -SRC_URI="http://www.festvox.org/packed/festival/${PV}/${MY_P}-release.tar.gz - https://dev.gentoo.org/~neurogeek/${PN}/${MY_P}-${PATCHSET}-patches.tar.gz"; - -LICENSE="FESTIVAL HPND BSD rc regexp-UofT" -SLOT="0" -KEYWORDS="alpha amd64 ~arm hppa ia64 ~mips ppc ppc64 sparc x86 ~x86-fbsd" -IUSE="nas X" - -RDEPEND=" - nas? ( media-libs/nas ) - X? ( x11-libs/libX11 - x11-libs/libXt ) - >=media-libs/alsa-lib-1.0.20-r1 - !=sys-libs/ncurses-5.6-r2:0= -" -DEPEND="${RDEPEND} - virtual/pkgconfig -" - -S="${WORKDIR}/speech_tools" - -src_prepare() { - EPATCH_SUFFIX="patch" - epatch - - sed -i -e 's,{{HORRIBLELIBARCHKLUDGE}},"/usr/$(get_libdir)",' main/siod_main.cc - - #WRT bug #309983 - sed -i -e "s:\(GCC_SYSTEM_OPTIONS =\).*:\1:" "${S}"/config/systems/sparc_SunOS5.mak - - # Fix underlinking, bug #493204 - epatch "${FILESDIR}"/${PN}-2.1-underlinking.patch -} - -src_configure() { - local CONFIG=config/config.in - sed -i -e 's/@COMPILERTYPE@/gcc42/' ${CONFIG} - if use nas; then - sed -i -e "s/#.*\(INCLUDE_MODULES += NAS_AUDIO\)/\1/" ${CONFIG} - fi - if ! use X; then - sed -i -e "s/-lX11 -lXt//" config/modules/esd_audio.mak - fi - econf -} - -src_compile() { - emake -j1 CC="$(tc-getCC)" CXX="$(tc-getCXX)" CXX_OTHER_FLAGS="${CXXFLAGS}" CC_OTHER_FLAGS="${CFLAGS}" \ - LDFLAGS="${LDFLAGS}" -} - -src_install() { - dolib.so lib/libest*.so* - - dodoc "${S}"/README - dodoc "${S}"/lib/cstrutt.dtd - - insinto /usr/share/doc/${PF} - doins -r lib/example_data - - insinto /usr/share/speech-tools - doins -r config base_class - - insinto /usr/share/speech-tools/lib - doins -r lib/siod - - cd include - insinto /usr/include/speech-tools - doins -r * - dosym ../../include/speech-tools /usr/share/speech-tools/include - - cd ../bin - for file in *; do - [ "${file}" = "Makefile" ] && continue - dobin ${file} - dstfile="${D}/usr/bin/${file}" - sed -i -e "s:${S}/testsuite/data:/usr/share/speech-tools/testsuite:g" ${dstfile} - sed -i -e "s:${S}/bin:/usr/$(get_libdir)/speech-tools:g" ${dstfile} - sed -i -e "s:${S}/main:/usr/$(get_libdir)/speech-tools:g" ${dstfile} - - # This just changes LD_LIBRARY_PATH - sed -i -e "s:${S}/lib:/usr/$(get_libdir):g" ${dstfile} - done - - cd "${S}" - exeinto /usr/$(get_libdir)/speech-tools - for file in `find main -perm +100 -type f`; do - doexe ${file} - done - - #Remove /usr/bin/resynth as it is broken. See bug #253556 - rm "${D}/usr/bin/resynth" -} diff --git a/app-accessibility/speech-tools/speech-tools-2.1-r3.ebuild b/app-accessibility/speech-tools/speech-tools-2.1-r3.ebuild deleted file mode 100644 index c04286d3513..000 --- a/app-accessibility/speech-tools/speech-tools-2.1-r3.ebuild +++ /dev/null @@ -1,117 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI="5" - -inherit eutils flag-o-matic multilib toolchain-funcs - -MY_P=${P/speech-/speech_} -PATCHSET="r3" - -DESCRIPTION="Speech tools for Festival Text to Speech engine" -HOMEPAGE="http://www.cstr.ed.ac.uk/projects/speech_tools/"; -SRC_URI="http://www.festvox.org/packed/festival/${PV}/${MY_P}-release.tar.gz - https://dev.gentoo.org/~neurogeek/${PN}/${MY_P}-${PATCHSET}-patches.tar.gz"; - -LICENSE="FESTIVAL HPND BSD rc regexp-UofT" -SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd" -IUSE="
[gentoo-commits] repo/gentoo:master commit in: app-accessibility/speech-tools/
commit: d75d81d9ab54585f276dc3b518a39a14b70152fd Author: Mikle Kolyada gentoo org> AuthorDate: Sat May 26 10:18:47 2018 + Commit: Mikle Kolyada gentoo org> CommitDate: Sat May 26 10:19:11 2018 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d75d81d9 app-accessibility/speech-tools: ppc stable wrt bug #649448 Package-Manager: Portage-2.3.24, Repoman-2.3.6 app-accessibility/speech-tools/speech-tools-2.1-r4.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app-accessibility/speech-tools/speech-tools-2.1-r4.ebuild b/app-accessibility/speech-tools/speech-tools-2.1-r4.ebuild index 425ca0dc2f0..9611369cead 100644 --- a/app-accessibility/speech-tools/speech-tools-2.1-r4.ebuild +++ b/app-accessibility/speech-tools/speech-tools-2.1-r4.ebuild @@ -15,7 +15,7 @@ SRC_URI="http://www.festvox.org/packed/festival/${PV}/${MY_P}-release.tar.gz LICENSE="FESTIVAL HPND BSD rc regexp-UofT" SLOT="0" -KEYWORDS="alpha amd64 ~arm ~hppa ia64 ~mips ~ppc ppc64 sparc x86 ~x86-fbsd" +KEYWORDS="alpha amd64 ~arm ~hppa ia64 ~mips ppc ppc64 sparc x86 ~x86-fbsd" IUSE="nas X" RDEPEND="
[gentoo-commits] repo/gentoo:master commit in: app-accessibility/speech-tools/
commit: d8d9f836fb47e75a6e59e3bd9be5a4210ef029fd Author: Sergei Trofimovich gentoo org> AuthorDate: Sun Apr 15 18:39:34 2018 + Commit: Sergei Trofimovich gentoo org> CommitDate: Sun Apr 15 18:39:34 2018 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d8d9f836 app-accessibility/speech-tools: stable 2.1-r4 for ppc64, bug #649448 Bug: https://bugs.gentoo.org/649448 Package-Manager: Portage-2.3.28, Repoman-2.3.9 RepoMan-Options: --include-arches="ppc64" app-accessibility/speech-tools/speech-tools-2.1-r4.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app-accessibility/speech-tools/speech-tools-2.1-r4.ebuild b/app-accessibility/speech-tools/speech-tools-2.1-r4.ebuild index 3fff59e8182..425ca0dc2f0 100644 --- a/app-accessibility/speech-tools/speech-tools-2.1-r4.ebuild +++ b/app-accessibility/speech-tools/speech-tools-2.1-r4.ebuild @@ -15,7 +15,7 @@ SRC_URI="http://www.festvox.org/packed/festival/${PV}/${MY_P}-release.tar.gz LICENSE="FESTIVAL HPND BSD rc regexp-UofT" SLOT="0" -KEYWORDS="alpha amd64 ~arm ~hppa ia64 ~mips ~ppc ~ppc64 sparc x86 ~x86-fbsd" +KEYWORDS="alpha amd64 ~arm ~hppa ia64 ~mips ~ppc ppc64 sparc x86 ~x86-fbsd" IUSE="nas X" RDEPEND="
[gentoo-commits] repo/gentoo:master commit in: app-accessibility/speech-tools/
commit: 0f5104c2532faad76f45dcfb4a8853d8e18e11e9 Author: Sergei Trofimovich gentoo org> AuthorDate: Fri Apr 6 22:43:33 2018 + Commit: Sergei Trofimovich gentoo org> CommitDate: Fri Apr 6 22:43:33 2018 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0f5104c2 app-accessibility/speech-tools: stable 2.1-r4 for ia64, bug #649448 Package-Manager: Portage-2.3.28, Repoman-2.3.9 RepoMan-Options: --include-arches="ia64" app-accessibility/speech-tools/speech-tools-2.1-r4.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app-accessibility/speech-tools/speech-tools-2.1-r4.ebuild b/app-accessibility/speech-tools/speech-tools-2.1-r4.ebuild index 4b41663033f..3fff59e8182 100644 --- a/app-accessibility/speech-tools/speech-tools-2.1-r4.ebuild +++ b/app-accessibility/speech-tools/speech-tools-2.1-r4.ebuild @@ -15,7 +15,7 @@ SRC_URI="http://www.festvox.org/packed/festival/${PV}/${MY_P}-release.tar.gz LICENSE="FESTIVAL HPND BSD rc regexp-UofT" SLOT="0" -KEYWORDS="alpha amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 sparc x86 ~x86-fbsd" +KEYWORDS="alpha amd64 ~arm ~hppa ia64 ~mips ~ppc ~ppc64 sparc x86 ~x86-fbsd" IUSE="nas X" RDEPEND="
[gentoo-commits] repo/gentoo:master commit in: app-accessibility/speech-tools/
commit: 2ab153acfd49f948910e88eaca29b8391b0b2e29 Author: Thomas Deutschmann gentoo org> AuthorDate: Thu Apr 5 23:12:56 2018 + Commit: Thomas Deutschmann gentoo org> CommitDate: Thu Apr 5 23:16:34 2018 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2ab153ac app-accessibility/speech-tools: x86 stable (bug #649448) Package-Manager: Portage-2.3.28, Repoman-2.3.9 app-accessibility/speech-tools/speech-tools-2.1-r4.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app-accessibility/speech-tools/speech-tools-2.1-r4.ebuild b/app-accessibility/speech-tools/speech-tools-2.1-r4.ebuild index 3b7f386dbf4..4b41663033f 100644 --- a/app-accessibility/speech-tools/speech-tools-2.1-r4.ebuild +++ b/app-accessibility/speech-tools/speech-tools-2.1-r4.ebuild @@ -15,7 +15,7 @@ SRC_URI="http://www.festvox.org/packed/festival/${PV}/${MY_P}-release.tar.gz LICENSE="FESTIVAL HPND BSD rc regexp-UofT" SLOT="0" -KEYWORDS="alpha amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 sparc ~x86 ~x86-fbsd" +KEYWORDS="alpha amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 sparc x86 ~x86-fbsd" IUSE="nas X" RDEPEND="
[gentoo-commits] repo/gentoo:master commit in: app-accessibility/speech-tools/
commit: d6588eda9959de5eceb81e57fe3479ca24dc028b Author: Rolf Eike Beer sf-mail de> AuthorDate: Wed Apr 4 17:37:15 2018 + Commit: Sergei Trofimovich gentoo org> CommitDate: Wed Apr 4 22:25:44 2018 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d6588eda app-accessibility/speech-tools: stable 2.1-r4 for sparc Bug: https://bugs.gentoo.org/649448 Package-Manager: Portage-2.3.24, Repoman-2.3.6 RepoMan-Options: --include-arches="sparc" app-accessibility/speech-tools/speech-tools-2.1-r4.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app-accessibility/speech-tools/speech-tools-2.1-r4.ebuild b/app-accessibility/speech-tools/speech-tools-2.1-r4.ebuild index 80fc09c5ff5..af7374f9d94 100644 --- a/app-accessibility/speech-tools/speech-tools-2.1-r4.ebuild +++ b/app-accessibility/speech-tools/speech-tools-2.1-r4.ebuild @@ -15,7 +15,7 @@ SRC_URI="http://www.festvox.org/packed/festival/${PV}/${MY_P}-release.tar.gz LICENSE="FESTIVAL HPND BSD rc regexp-UofT" SLOT="0" -KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd" +KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 sparc ~x86 ~x86-fbsd" IUSE="nas X" RDEPEND="
[gentoo-commits] repo/gentoo:master commit in: app-accessibility/speech-tools/
commit: 03c8778fdd79627aa5782f9f96d6cc82a8469a2a Author: Aaron Bauman gentoo org> AuthorDate: Wed Apr 4 17:12:11 2018 + Commit: Aaron Bauman gentoo org> CommitDate: Wed Apr 4 17:15:08 2018 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=03c8778f app-accessibility/speech-tools: amd64 stable Bug: https://bugs.gentoo.org/649448 Package-Manager: Portage-2.3.28, Repoman-2.3.9 app-accessibility/speech-tools/speech-tools-2.1-r4.ebuild | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app-accessibility/speech-tools/speech-tools-2.1-r4.ebuild b/app-accessibility/speech-tools/speech-tools-2.1-r4.ebuild index 495fb2fc75b..80fc09c5ff5 100644 --- a/app-accessibility/speech-tools/speech-tools-2.1-r4.ebuild +++ b/app-accessibility/speech-tools/speech-tools-2.1-r4.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2017 Gentoo Foundation +# Copyright 1999-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 EAPI="5" @@ -15,7 +15,7 @@ SRC_URI="http://www.festvox.org/packed/festival/${PV}/${MY_P}-release.tar.gz LICENSE="FESTIVAL HPND BSD rc regexp-UofT" SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd" +KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd" IUSE="nas X" RDEPEND="
[gentoo-commits] repo/gentoo:master commit in: app-accessibility/speech-tools/, app-accessibility/speech-tools/files/
commit: bde1d2d0a2289811e5b499fc279925cb47480ef9 Author: Christian Strahl gmail com> AuthorDate: Sun Oct 15 20:01:41 2017 + Commit: Alexis Ballier gentoo org> CommitDate: Tue Oct 17 05:47:06 2017 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bde1d2d0 app-accessibility/speech-tools-2.1-r4: fix gcc-7 build, #634224 .../speech-tools/files/speech-tools-2.1-gcc7.patch | 20 .../speech-tools/speech-tools-2.1-r4.ebuild| 120 + 2 files changed, 140 insertions(+) diff --git a/app-accessibility/speech-tools/files/speech-tools-2.1-gcc7.patch b/app-accessibility/speech-tools/files/speech-tools-2.1-gcc7.patch new file mode 100644 index 000..9e1067fa1dc --- /dev/null +++ b/app-accessibility/speech-tools/files/speech-tools-2.1-gcc7.patch @@ -0,0 +1,20 @@ +--- a/siod/siod.cc b/siod/siod.cc +@@ -459,7 +459,7 @@ char **siod_variable_generator(char *text,int length) + matches = walloc(char *,siod_llength(lmatches)+1); + for (l=lmatches,i=0; l; l=cdr(l),i++) + matches[i] = wstrdup(PNAME(car(l))); +-matches[i] = '\0'; ++*matches[i] = '\0'; + + return matches; + } +@@ -498,7 +498,7 @@ char **siod_command_generator (char *text,int length) + matches = walloc(char *,siod_llength(lmatches)+1); + for (l=lmatches,i=0; l; l=cdr(l),i++) + matches[i] = wstrdup(PNAME(car(l))); +-matches[i] = '\0'; ++*matches[i] = '\0'; + + return matches; + } diff --git a/app-accessibility/speech-tools/speech-tools-2.1-r4.ebuild b/app-accessibility/speech-tools/speech-tools-2.1-r4.ebuild new file mode 100644 index 000..254a17f1544 --- /dev/null +++ b/app-accessibility/speech-tools/speech-tools-2.1-r4.ebuild @@ -0,0 +1,120 @@ +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI="5" + +inherit eutils flag-o-matic multilib toolchain-funcs + +MY_P=${P/speech-/speech_} +PATCHSET="r3" + +DESCRIPTION="Speech tools for Festival Text to Speech engine" +HOMEPAGE="http://www.cstr.ed.ac.uk/projects/speech_tools/"; +SRC_URI="http://www.festvox.org/packed/festival/${PV}/${MY_P}-release.tar.gz + https://dev.gentoo.org/~neurogeek/${PN}/${MY_P}-${PATCHSET}-patches.tar.gz"; + +LICENSE="FESTIVAL HPND BSD rc regexp-UofT" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd" +IUSE="nas X" + +RDEPEND=" + nas? ( media-libs/nas ) + X? ( x11-libs/libX11 + x11-libs/libXt ) + >=media-libs/alsa-lib-1.0.20-r1 + !=sys-libs/ncurses-5.6-r2 +" +DEPEND="${RDEPEND} + virtual/pkgconfig +" + +S="${WORKDIR}/speech_tools" + +src_prepare() { + EPATCH_SUFFIX="patch" + epatch + + sed -i -e 's,{{HORRIBLELIBARCHKLUDGE}},"/usr/$(get_libdir)",' \ + main/siod_main.cc || die + + #WRT bug #309983 + sed -i -e "s:\(GCC_SYSTEM_OPTIONS =\).*:\1:" \ + "${S}"/config/systems/sparc_SunOS5.mak || die + + # Fix underlinking, bug #493204 + epatch "${FILESDIR}"/${PN}-2.1-underlinking.patch + + # Fix gcc7 build failure, bug #634224 + epatch "${FILESDIR}"/${PN}-2.1-gcc7.patch +} + +src_configure() { + local CONFIG=config/config.in + sed -i -e 's/@COMPILERTYPE@/gcc42/' ${CONFIG} || die + if use nas; then + sed -i -e "s/#.*\(INCLUDE_MODULES += NAS_AUDIO\)/\1/" \ + ${CONFIG} || die + fi + if ! use X; then + sed -i -e "s/-lX11 -lXt//" config/modules/esd_audio.mak || die + fi + econf +} + +src_compile() { + emake -j1 CC="$(tc-getCC)" CXX="$(tc-getCXX)" CXX_OTHER_FLAGS="${CXXFLAGS}" CC_OTHER_FLAGS="${CFLAGS}" \ + LDFLAGS="${LDFLAGS}" +} + +src_install() { + dolib.so lib/libest*.so* + + dodoc "${S}"/README + dodoc "${S}"/lib/cstrutt.dtd + + insinto /usr/share/doc/${PF} + doins -r lib/example_data + + insinto /usr/share/speech-tools + doins -r config base_class + + insinto /usr/share/speech-tools/lib + doins -r lib/siod + + cd include || die + insinto /usr/include/speech-tools + doins -r * + dosym ../../include/speech-tools /usr/share/speech-tools/include + + cd ../bin || die + for file in *; do + [ "${file}" = "Makefile" ] && continue + dobin ${file} + dstfile="${D}/usr/bin/${file}" + sed -i -e "s:${S}/testsuite/data:/usr/share/speech-tools/testsuite:g" \ + ${dstfile} || die + sed -i -e "s:${S}/bin:/usr/$(get_libdir)/speech-tools:g" \ + ${dstfile} || die + sed -i -e "s:${S}/main:/usr/$(get_libdir)/speech-tools:g" \ + ${dstfile} || die + + # This just changes LD_LIBRARY_PATH + sed -i -e "s:${S}/lib:/usr/$(get_libdir):g" ${dstfile} || die + done
[gentoo-commits] repo/gentoo:master commit in: app-accessibility/speech-tools/
commit: 012a4b30d36fa8e080b1d3e1009f2077d24c1760 Author: Michał Górny gentoo org> AuthorDate: Tue Aug 22 17:23:09 2017 + Commit: Michał Górny gentoo org> CommitDate: Tue Aug 22 19:59:28 2017 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=012a4b30 app-accessibility/speech-tools: [QA] Use relative symlink target(s) app-accessibility/speech-tools/speech-tools-2.1-r2.ebuild | 2 +- app-accessibility/speech-tools/speech-tools-2.1-r3.ebuild | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/app-accessibility/speech-tools/speech-tools-2.1-r2.ebuild b/app-accessibility/speech-tools/speech-tools-2.1-r2.ebuild index 30bef6b5b8d..89c675a99f1 100644 --- a/app-accessibility/speech-tools/speech-tools-2.1-r2.ebuild +++ b/app-accessibility/speech-tools/speech-tools-2.1-r2.ebuild @@ -81,7 +81,7 @@ src_install() { cd include insinto /usr/include/speech-tools doins -r * - dosym /usr/include/speech-tools /usr/share/speech-tools/include + dosym ../../include/speech-tools /usr/share/speech-tools/include cd ../bin for file in *; do diff --git a/app-accessibility/speech-tools/speech-tools-2.1-r3.ebuild b/app-accessibility/speech-tools/speech-tools-2.1-r3.ebuild index da5a84b9a9d..8608bb592a5 100644 --- a/app-accessibility/speech-tools/speech-tools-2.1-r3.ebuild +++ b/app-accessibility/speech-tools/speech-tools-2.1-r3.ebuild @@ -84,7 +84,7 @@ src_install() { cd include || die insinto /usr/include/speech-tools doins -r * - dosym /usr/include/speech-tools /usr/share/speech-tools/include + dosym ../../include/speech-tools /usr/share/speech-tools/include cd ../bin || die for file in *; do
[gentoo-commits] repo/gentoo:master commit in: app-accessibility/speech-tools/
commit: e61794beeaebcc2f6f4898990d14aa895c840bf3 Author: Pacho Ramos gentoo org> AuthorDate: Sat Aug 6 12:35:54 2016 + Commit: Pacho Ramos gentoo org> CommitDate: Sat Aug 6 12:45:42 2016 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e61794be app-accessibility/speech-tools: Cleanup per bug #231477 Package-Manager: portage-2.3.0 app-accessibility/speech-tools/metadata.xml | 3 --- 1 file changed, 3 deletions(-) diff --git a/app-accessibility/speech-tools/metadata.xml b/app-accessibility/speech-tools/metadata.xml index 78e53c2..1dacdab 100644 --- a/app-accessibility/speech-tools/metadata.xml +++ b/app-accessibility/speech-tools/metadata.xml @@ -1,9 +1,6 @@ http://www.gentoo.org/dtd/metadata.dtd";> - - neurog...@gentoo.org - accessibil...@gentoo.org Gentoo Accessibility Project