commit: 063df9aae04bc82fef0ec6d51144052251cb4b3b Author: Peter Levine <plevine457 <AT> gmail <DOT> com> AuthorDate: Sat May 30 07:14:29 2020 +0000 Commit: Miroslav Šulc <fordfrog <AT> gentoo <DOT> org> CommitDate: Sun Aug 23 15:33:19 2020 +0000 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 <plevine457 <AT> gmail.com> Signed-off-by: Miroslav Šulc <fordfrog <AT> 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 00000000000..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 <[email protected]> +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 00000000000..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 + !<app-accessibility/festival-1.96_beta + !sys-power/powerman + >=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" + "${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 + + #WRT 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 +} + +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() { + 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} || die + + # This just changes LD_LIBRARY_PATH + sed -i -e "s:${S}/lib:/usr/$(get_libdir):g" ${dstfile} || die + done + + exeinto /usr/$(get_libdir)/speech-tools + for file in `find main -perm /111 -type f`; do + doexe ${file} + 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 +}
