From cf0192f4b5930354719aa48a262230035877c29d Mon Sep 17 00:00:00 2001 From: Alexander Golubev Date: Fri, 29 Dec 2023 14:45:10 +0300 Subject: [PATCH] trinity-base/kttsd: several improvements - fix REQUIRED_USE - Improve arts dependencies handling - remove dependencies for festival - make build of hadifix optional Signed-off-by: Alexander Golubev --- trinity-base/kttsd/kttsd-14.1.0.ebuild | 41 ++++++++++++++++++++---- trinity-base/kttsd/kttsd-14.1.1.ebuild | 41 ++++++++++++++++++++---- trinity-base/kttsd/kttsd-9999.ebuild | 43 +++++++++++++++++++++----- trinity-base/kttsd/metadata.xml | 1 + 4 files changed, 107 insertions(+), 19 deletions(-) diff --git a/trinity-base/kttsd/kttsd-14.1.0.ebuild b/trinity-base/kttsd/kttsd-14.1.0.ebuild index c80e972c..a3ef0e65 100644 --- a/trinity-base/kttsd/kttsd-14.1.0.ebuild +++ b/trinity-base/kttsd/kttsd-14.1.0.ebuild @@ -6,6 +6,7 @@ EAPI="8" TRINITY_MODULE_NAME="tdeaccessibility" TRINITY_MODULE_TYPE="core" TRINITY_HANDBOOK="optional" +TRINITY_NEED_ARTS="optional" TSM_EXTRACT_ALSO="kspeechsink translations" inherit trinity-meta-2 @@ -14,31 +15,59 @@ if [[ ${PV} != *9999* ]] ; then KEYWORDS="~amd64 ~arm64 ~x86" fi -IUSE="akode alsa arts epos festival flite +freetts kate" -REQUIRED_USE="!arts? ( akode )" +IUSE="akode +alsa epos festival flite freetts hadifix kate" +REQUIRED_USE="|| ( akode alsa arts )" DEPEND=" akode? ( ~media-libs/akode-${PV} ) alsa? ( media-libs/alsa-lib ) ~trinity-base/kcontrol-${PV}" RDEPEND=" ${DEPEND} - arts? ( trinity-base/arts ) - festival? ( app-accessibility/festival ) epos? ( app-accessibility/epos ) flite? ( app-accessibility/flite ) freetts? ( app-accessibility/freetts ) + hadifix? ( app-accessibility/mbrola ) kate? ( trinity-base/kate )" +# Missing dependencies: +# festival? ( app-accessibility/festival ) +# hadifix? ( app-accessibility/txt2pho ) +# Note: tha flags should me masked + +pkg_setup() { + if use festival; then + ewarn + ewarn "app-accessibility/festival was removed from portage. In order to use it" + ewarn "as your TTS engine you will have to provide the festival binary yourself." + fi + + if use hadifix; then + ewarn + ewarn "Hadifix TTS engine requires txt2pho utility which is not currently in portage." + ewarn "In order to use Hadifix as your TTS engine you will have to provide the binary yourself." + fi + + elog "Besides built-in support for several engines kttsd includes generic 'Command'" + elog "module which may utilize other 3rd-party TTS engines like:" + elog " - app-accessibility/espeak-ng" + elog " - app-accessibility/rhvoice" + elog " - app-accessibility/speech-dispatcher" + elog "and others. You are welcome to install one of them." + + trinity-meta-2_pkg_setup +} + src_configure() { local mycmakeargs=( - -DWITH_ARTS="$(usex arts)" + -DWITH_ALSA="$(usex alsa)" -DWITH_AKODE="$(usex akode)" -DBUILD_KTTSD_FESTIVAL="$(usex festival)" -DBUILD_KTTSD_EPOS="$(usex epos)" -DBUILD_KTTSD_FLITE="$(usex flite)" -DBUILD_KTTSD_FREETTS="$(usex freetts)" + -DBUILD_KTTSD_HADIFIX=$(usex hadifix) -DBUILD_KTTSD_KATE="$(usex kate)" -DBUILD_KTTSD_COMMAND=ON - -DBUILD_KTTSD_HADIFIX=ON + -DWITH_GSTREAMER=OFF # gstreamer support is not really finished ) trinity-meta-2_src_configure diff --git a/trinity-base/kttsd/kttsd-14.1.1.ebuild b/trinity-base/kttsd/kttsd-14.1.1.ebuild index c80e972c..a3ef0e65 100644 --- a/trinity-base/kttsd/kttsd-14.1.1.ebuild +++ b/trinity-base/kttsd/kttsd-14.1.1.ebuild @@ -6,6 +6,7 @@ EAPI="8" TRINITY_MODULE_NAME="tdeaccessibility" TRINITY_MODULE_TYPE="core" TRINITY_HANDBOOK="optional" +TRINITY_NEED_ARTS="optional" TSM_EXTRACT_ALSO="kspeechsink translations" inherit trinity-meta-2 @@ -14,31 +15,59 @@ if [[ ${PV} != *9999* ]] ; then KEYWORDS="~amd64 ~arm64 ~x86" fi -IUSE="akode alsa arts epos festival flite +freetts kate" -REQUIRED_USE="!arts? ( akode )" +IUSE="akode +alsa epos festival flite freetts hadifix kate" +REQUIRED_USE="|| ( akode alsa arts )" DEPEND=" akode? ( ~media-libs/akode-${PV} ) alsa? ( media-libs/alsa-lib ) ~trinity-base/kcontrol-${PV}" RDEPEND=" ${DEPEND} - arts? ( trinity-base/arts ) - festival? ( app-accessibility/festival ) epos? ( app-accessibility/epos ) flite? ( app-accessibility/flite ) freetts? ( app-accessibility/freetts ) + hadifix? ( app-accessibility/mbrola ) kate? ( trinity-base/kate )" +# Missing dependencies: +# festival? ( app-accessibility/festival ) +# hadifix? ( app-accessibility/txt2pho ) +# Note: tha flags should me masked + +pkg_setup() { + if use festival; then + ewarn + ewarn "app-accessibility/festival was removed from portage. In order to use it" + ewarn "as your TTS engine you will have to provide the festival binary yourself." + fi + + if use hadifix; then + ewarn + ewarn "Hadifix TTS engine requires txt2pho utility which is not currently in portage." + ewarn "In order to use Hadifix as your TTS engine you will have to provide the binary yourself." + fi + + elog "Besides built-in support for several engines kttsd includes generic 'Command'" + elog "module which may utilize other 3rd-party TTS engines like:" + elog " - app-accessibility/espeak-ng" + elog " - app-accessibility/rhvoice" + elog " - app-accessibility/speech-dispatcher" + elog "and others. You are welcome to install one of them." + + trinity-meta-2_pkg_setup +} + src_configure() { local mycmakeargs=( - -DWITH_ARTS="$(usex arts)" + -DWITH_ALSA="$(usex alsa)" -DWITH_AKODE="$(usex akode)" -DBUILD_KTTSD_FESTIVAL="$(usex festival)" -DBUILD_KTTSD_EPOS="$(usex epos)" -DBUILD_KTTSD_FLITE="$(usex flite)" -DBUILD_KTTSD_FREETTS="$(usex freetts)" + -DBUILD_KTTSD_HADIFIX=$(usex hadifix) -DBUILD_KTTSD_KATE="$(usex kate)" -DBUILD_KTTSD_COMMAND=ON - -DBUILD_KTTSD_HADIFIX=ON + -DWITH_GSTREAMER=OFF # gstreamer support is not really finished ) trinity-meta-2_src_configure diff --git a/trinity-base/kttsd/kttsd-9999.ebuild b/trinity-base/kttsd/kttsd-9999.ebuild index f5c8b26d..8c59fd0b 100644 --- a/trinity-base/kttsd/kttsd-9999.ebuild +++ b/trinity-base/kttsd/kttsd-9999.ebuild @@ -1,4 +1,4 @@ -# Copyright 2022 The Trinity Desktop Project +# Copyright 2022-2023 The Trinity Desktop Project # Distributed under the terms of the GNU General Public License v2 EAPI="8" @@ -6,6 +6,7 @@ EAPI="8" TRINITY_MODULE_NAME="tdeaccessibility" TRINITY_MODULE_TYPE="core" TRINITY_HANDBOOK="optional" +TRINITY_NEED_ARTS="optional" TSM_EXTRACT_ALSO="kspeechsink translations" inherit trinity-meta-2 @@ -14,31 +15,59 @@ if [[ ${PV} != *9999* ]] ; then KEYWORDS="~amd64 ~x86" fi -IUSE="akode alsa arts epos festival flite +freetts kate" -REQUIRED_USE="!arts? ( akode )" +IUSE="akode +alsa epos festival flite freetts hadifix kate" +REQUIRED_USE="|| ( akode alsa arts )" DEPEND=" akode? ( ~media-libs/akode-${PV} ) alsa? ( media-libs/alsa-lib ) ~trinity-base/kcontrol-${PV}" RDEPEND=" ${DEPEND} - arts? ( trinity-base/arts ) - festival? ( app-accessibility/festival ) epos? ( app-accessibility/epos ) flite? ( app-accessibility/flite ) freetts? ( app-accessibility/freetts ) + hadifix? ( app-accessibility/mbrola ) kate? ( trinity-base/kate )" +# Missing dependencies: +# festival? ( app-accessibility/festival ) +# hadifix? ( app-accessibility/txt2pho ) +# Note: tha flags should me masked + +pkg_setup() { + if use festival; then + ewarn + ewarn "app-accessibility/festival was removed from portage. In order to use it" + ewarn "as your TTS engine you will have to provide the festival binary yourself." + fi + + if use hadifix; then + ewarn + ewarn "Hadifix TTS engine requires txt2pho utility which is not currently in portage." + ewarn "In order to use Hadifix as your TTS engine you will have to provide the binary yourself." + fi + + elog "Besides built-in support for several engines kttsd includes generic 'Command'" + elog "module which may utilize other 3rd-party TTS engines like:" + elog " - app-accessibility/espeak-ng" + elog " - app-accessibility/rhvoice" + elog " - app-accessibility/speech-dispatcher" + elog "and others. You are welcome to install one of them." + + trinity-meta-2_pkg_setup +} + src_configure() { local mycmakeargs=( - -DWITH_ARTS="$(usex arts)" + -DWITH_ALSA="$(usex alsa)" -DWITH_AKODE="$(usex akode)" -DBUILD_KTTSD_FESTIVAL="$(usex festival)" -DBUILD_KTTSD_EPOS="$(usex epos)" -DBUILD_KTTSD_FLITE="$(usex flite)" -DBUILD_KTTSD_FREETTS="$(usex freetts)" + -DBUILD_KTTSD_HADIFIX=$(usex hadifix) -DBUILD_KTTSD_KATE="$(usex kate)" -DBUILD_KTTSD_COMMAND=ON - -DBUILD_KTTSD_HADIFIX=ON + -DWITH_GSTREAMER=OFF # gstreamer support is not really finished ) trinity-meta-2_src_configure diff --git a/trinity-base/kttsd/metadata.xml b/trinity-base/kttsd/metadata.xml index 57231434..d80114f9 100644 --- a/trinity-base/kttsd/metadata.xml +++ b/trinity-base/kttsd/metadata.xml @@ -11,6 +11,7 @@ Add support festival speech synthesis Add support epos speech synthesis Add support flite speech synthesis + Add support for speech synthesis based on mbrola+txt2pho Build kate tts plugin