From c9c609463fab9bcfb35694627bca1429a21fdbb2 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Mon, 31 Oct 2022 21:06:00 +0000 Subject: gentoo auto-resync : 31:10:2022 - 21:05:59 --- app-accessibility/Manifest.gz | Bin 4724 -> 4727 bytes app-accessibility/speech-dispatcher/Manifest | 7 +- .../speech-dispatcher-0.11.4-GNU_SOURCE.patch | 103 ++++++++++++++++ app-accessibility/speech-dispatcher/metadata.xml | 3 + .../speech-dispatcher-0.11.3-r1.ebuild | 2 +- .../speech-dispatcher-0.11.4.ebuild | 129 +++++++++++++++++++++ 6 files changed, 241 insertions(+), 3 deletions(-) create mode 100644 app-accessibility/speech-dispatcher/files/speech-dispatcher-0.11.4-GNU_SOURCE.patch create mode 100644 app-accessibility/speech-dispatcher/speech-dispatcher-0.11.4.ebuild (limited to 'app-accessibility') diff --git a/app-accessibility/Manifest.gz b/app-accessibility/Manifest.gz index 5df15ec2a4e1..3ec957d69f14 100644 Binary files a/app-accessibility/Manifest.gz and b/app-accessibility/Manifest.gz differ diff --git a/app-accessibility/speech-dispatcher/Manifest b/app-accessibility/speech-dispatcher/Manifest index 729f45699e07..86ca8d671704 100644 --- a/app-accessibility/speech-dispatcher/Manifest +++ b/app-accessibility/speech-dispatcher/Manifest @@ -1,8 +1,11 @@ AUX speech-dispatcher-0.11.1-include-pthread_h.patch 367 BLAKE2B 54e4cb3556f066c7291c6c601a0a9cf13c75dc14bfc2ef493d5fd6e38226d10b119612ed57ea4a44d65819653e76a2e74e54e286214f3fd353b8149c00de1ed2 SHA512 d7afc36cd26052576e0fb3af44ba438b5184d32b1d80c98409e227cc86858dfcfcb9287cf44f986042e2733004f30d30a9431e00653779e312543cf43e108537 AUX speech-dispatcher-0.11.3-fix-dlopen.patch 2518 BLAKE2B 99490232eb3ea43451caf942ff605ca4f94a3917c525a4a67fd21183a0e7c8a99a2bc883c5a22c47ad3c3712a5560278105a5f35439c8d18215b8d5cf8d4e6af SHA512 2b6970624c3f7f88e80266760bc801c0b895c0e5730767ac66adf0cbc147fdd2ad2eaae7662e4939938555e30e0de57a6caa0e783dafaeeee1d04d10126fe2cc +AUX speech-dispatcher-0.11.4-GNU_SOURCE.patch 3680 BLAKE2B 671b55d0418b92d299427fd2d457e3279f1ae9d97548dd1ff89b52a2487cd700c134e7bb042ae6b621883933d1b3c96765f6fc2ed040c0de4c7d97f017ad965f SHA512 d07edc73370fdb8d9c71f8cc9c9db15da8fe3b7d83ca42bd05a09fc4795899786e54436d7dbc8407ab08eb0384997126322352ed9d4c4250d41a11d0d68dd4b4 DIST speech-dispatcher-0.11.2.tar.gz 7147526 BLAKE2B 6b11949736275d900e5e1d3909fab51fc04fbb45baf470a4c98aed19f61b7adb8cedf6b11f1a1aa69d9625383627beab4122c74ec78d9c07a5d0ddf4646669d6 SHA512 038ecaa5b9d56e3f915ec49fe7768cb4eebe1c8be79b95635f09fb3f6067e4c0ade13d2dd355e0b326579dcdf509dd180889b27282410b6bb252a2f642f028d4 DIST speech-dispatcher-0.11.3.tar.gz 7150632 BLAKE2B 92bad589e453a243362a9e0142d2897b9651fa648012f2bd7ef00bc1ded389fd2c01b6f38f19002289357f7aa6361a6e7fa3ee35ec2ad7c044f34d87e7f2c409 SHA512 e9f5b862066c0292230fda32f16782f9a2d66e8d0c0e3aa0ccdb4628c1182661d2f40894f480ae5206af7fbbc49338189312afe02092f5d472095b053afd75c7 +DIST speech-dispatcher-0.11.4.tar.gz 7127323 BLAKE2B 651a20ec403c6158756ab6ff7fbedb38ce1cec413be49367128274c8d20ccc7080a2dccd68cb7ebbec6bab05599f06a4aafc561e4e5e53cf52d19fa1b94fa286 SHA512 d0ebe832e2586abdb1284be36f8427cfbbd94f1a2dead1b74526b151e9529f9e61679339274b73afab5f829d184337372ba0aad93d880c42d2a6a1bcb2b7afef EBUILD speech-dispatcher-0.11.2.ebuild 2868 BLAKE2B 343ddf0cbd7f970e93175e60385aa3869ab173ac51db10ee3f12b38dce0c68724e36b3da03682fe6b850b07a996e2f10d3921eba73c10d8b50bf3954869f7c23 SHA512 42539976ba09a7dfc6853201a23ca60bc6abb0e957bf1e69bd10b14f674c8724aa092ec487fbe5eb5551fa4336adf113a5b62b8445f55f3ad138ffb23867a162 -EBUILD speech-dispatcher-0.11.3-r1.ebuild 2912 BLAKE2B 0ac187c72682eb88a03e9382be2d2c3758ea53a96f0f4d188870fa955a5bc5a1e307dc6ac7eb7d8f0b106550e2cc40e6415a7c36739a4d8becda131384f05d70 SHA512 6ba9d5976a808bd3fa0fbae4d9e5c5375d83aa6cbb232740b22f9be7dd21c4884400b0a67aad040f2ec847c6312a610350c6a49c73ba471402d815aa975c6651 +EBUILD speech-dispatcher-0.11.3-r1.ebuild 2907 BLAKE2B 8e8ea589d179dd8611704f67c62aa1ca56e4692a6b96722a9776902978710a867b53c4ce5c4080d287dc66ed34255336b4faf249d45fe0c2a0b635533ccc46d0 SHA512 1062bccb49a5890e29529a1aa938eaca77bd71d0ed9778ac9ff775c26218c74a294dea1b46421eee9d3e5fad89e382857aa9c81fd72b92ebf156792bdec8907b EBUILD speech-dispatcher-0.11.3.ebuild 2875 BLAKE2B 7e43633fa593175d1bf889e1f11004c5d95973a0eaa25b9005dc7abc116e9cf393d2a708b92849a2d1581c3d5adf5da4cad711d2cefc7e53e91129a3095dab06 SHA512 e0180013b2599505b0bbcae9dc4dfaf1621af0b699bae5c88f81f7b550791371139113cef98ffcbc3de4a7bd689bf068c5e1e300ddc96cbd00b4dd28ca99a91c -MISC metadata.xml 708 BLAKE2B fdccc4d8de7f22eb64469021786480527bd87f3718dd5746426874266b8a46dcb6cc2b7bb25a4561a523362b919e0ed77e3f829f3fe269d90060d17a69f1b2ed SHA512 770e54e5ddeacc46165b90d41dd3ea0d1060adfdfb95055a9dab778f757189b892250e66b515773ce7b4d8b1bbdd692386b4d8cb49d670af7af8dadfed5c8788 +EBUILD speech-dispatcher-0.11.4.ebuild 2970 BLAKE2B 053b7a75196d8142e79d2271628d68b3b06cad231cc563cbd90c74fa7ff18dc73eb6dbc9de95640ebbffbd0bee55c631ab9c9c17d5ab4ef5b353d5405f6d9c3f SHA512 0ef225e30c1b231e84eee07b64fe7ca02fc7735dfd7687c46dd8ff6d2f467a1654242172b5cd03b23c25701ed92b60241bf7f6553a25056dc7103899e029bbb6 +MISC metadata.xml 793 BLAKE2B bbb768aefee6e8685fc109b1c03a1b33436cbda492ac2d0657983cd5dbcefdeb7f70ea1022047a44548d9db380e499ea572f9a005d5ff7312bff3cdb377d5e77 SHA512 2f122e8cad49728e27539d6e39114cba61a178ec1944d386d63a34e9c203f0d4360257226251ce21b5acad626d802af597cef5db726017f8b4600c484a13c401 diff --git a/app-accessibility/speech-dispatcher/files/speech-dispatcher-0.11.4-GNU_SOURCE.patch b/app-accessibility/speech-dispatcher/files/speech-dispatcher-0.11.4-GNU_SOURCE.patch new file mode 100644 index 000000000000..9f08e5a863a4 --- /dev/null +++ b/app-accessibility/speech-dispatcher/files/speech-dispatcher-0.11.4-GNU_SOURCE.patch @@ -0,0 +1,103 @@ +https://github.com/brailcom/speechd/pull/789 + +From da19d096901466e5ff395846405547d422c90b4c Mon Sep 17 00:00:00 2001 +From: Sam James +Date: Mon, 31 Oct 2022 18:33:17 +0000 +Subject: [PATCH] Use AC_USE_SYSTEM_EXTENSIONS +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +We already set _GNU_SOURCE in various places but not consistently. Let's +just use autoconf's AC_USE_SYSTEM_EXTENSIONS to ensure it's always set. + +Fixes failure when building tests: +``` +x86_64-pc-linux-gnu-gcc -DHAVE_CONFIG_H -I. -I../.. -I../../include -I../../src/api/c -I/usr/include/glib-2.0 -I/usr/lib64/glib-2.0/include -O2 -pipe -march=native -fdiagnostics-color=always -frecord-gcc-switches -Wreturn-type -ggdb3 -Werror=format-security -Werror=implicit-function-declaration -Wimplicit-int -Wformat -c -o run_test.o run_test.c +run_test.c: In function ‘wait_for’: +run_test.c:93:21: error: implicit declaration of function ‘strcasestr’; did you mean ‘strcasecmp’? [-Werror=implicit-function-declaration] + 93 | while (0 == strcasestr(reply, event)) { + | ^~~~~~~~~~ + | strcasecmp +cc1: some warnings being treated as errors +``` + +Signed-off-by: Sam James +--- a/configure.ac ++++ b/configure.ac +@@ -68,6 +68,8 @@ AC_PROG_LN_S + AC_CHECK_PROGS([HELP2MAN], [help2man]) + AM_CONDITIONAL([HAVE_HELP2MAN], [test "x$HELP2MAN" != "x"]) + ++AC_USE_SYSTEM_EXTENSIONS ++ + # Checks for libraries. + AC_SEARCH_LIBS([sqrt], [m], [], + [AC_MSG_FAILURE([Math library missing])]) +--- a/src/api/c/Makefile.am ++++ b/src/api/c/Makefile.am +@@ -24,7 +24,7 @@ BUILT_SOURCES = libspeechd_version.h + lib_LTLIBRARIES = libspeechd.la + libspeechd_la_SOURCES = libspeechd.c + libspeechd_la_CFLAGS = $(ERROR_CFLAGS) +-libspeechd_la_CPPFLAGS = $(inc_local) -D_GNU_SOURCE $(GLIB_CFLAGS) -DSPD_SPAWN_CMD=\""$(prefix)/bin/speech-dispatcher"\" ++libspeechd_la_CPPFLAGS = $(inc_local) $(GLIB_CFLAGS) -DSPD_SPAWN_CMD=\""$(prefix)/bin/speech-dispatcher"\" + libspeechd_la_LDFLAGS = -version-info $(LIB_SPD_CURRENT):$(LIB_SPD_REVISION):$(LIB_SPD_AGE) + libspeechd_la_LIBADD = $(GLIB_LIBS) + +--- a/src/api/guile/gssip.c ++++ b/src/api/guile/gssip.c +@@ -24,8 +24,6 @@ + #include + #endif + +-#define _GNU_SOURCE +- + #include + #include + +--- a/src/audio/pulse.c ++++ b/src/audio/pulse.c +@@ -34,8 +34,6 @@ + * + */ + +-#define _GNU_SOURCE +- + #ifdef HAVE_CONFIG_H + #include + #endif +--- a/src/clients/spdsend/spdsend.h ++++ b/src/clients/spdsend/spdsend.h +@@ -24,8 +24,6 @@ + + #define __SPDSEND_H + +-#define _GNU_SOURCE +- + #include + + /* Configuration */ +--- a/src/modules/Makefile.am ++++ b/src/modules/Makefile.am +@@ -32,7 +32,7 @@ common_LDADD = $(DOTCONF_LIBS) $(GLIB_LIBS) $(audio_dlopen) -lpthread + + AM_CFLAGS = $(ERROR_CFLAGS) + AM_CXXFLAGS = $(ERROR_CFLAGS) +-AM_CPPFLAGS = $(inc_local) -DDATADIR=\"$(snddatadir)\" -D_GNU_SOURCE $(GLIB_CFLAGS) ++AM_CPPFLAGS = $(inc_local) -DDATADIR=\"$(snddatadir)\" $(GLIB_CFLAGS) + + module_utils_CPPFLAGS = $(AM_CPPFLAGS) \ + $(DOTCONF_CFLAGS) +--- a/src/server/Makefile.am ++++ b/src/server/Makefile.am +@@ -35,7 +35,7 @@ speech_dispatcher_CPPFLAGS = $(inc_local) $(DOTCONF_CFLAGS) $(GLIB_CFLAGS) \ + -DMODULEBINDIR=\"$(modulebindir)\" \ + -DOLDMODULEBINDIR=\"$(oldmodulebindir)\" \ + -DLOCALE_DATA=\"$(localedatadir)\" \ +- -D_GNU_SOURCE -DDEFAULT_AUDIO_METHOD=\"$(default_audio_method)\" ++ -DDEFAULT_AUDIO_METHOD=\"$(default_audio_method)\" + speech_dispatcher_LDFLAGS = $(RDYNAMIC) + speech_dispatcher_LDADD = $(lib_common) $(DOTCONF_LIBS) $(GLIB_LIBS) \ + $(SNDFILE_LIBS) $(GMODULE_LIBS) $(GTHREAD_LIBS) $(EXTRA_SOCKET_LIBS) \ + diff --git a/app-accessibility/speech-dispatcher/metadata.xml b/app-accessibility/speech-dispatcher/metadata.xml index 0f3199f11253..4df386ee0a85 100644 --- a/app-accessibility/speech-dispatcher/metadata.xml +++ b/app-accessibility/speech-dispatcher/metadata.xml @@ -17,4 +17,7 @@ Adds support for espeak-ng speech engine Adds support for flite speech engine + + brailcom/speechd + diff --git a/app-accessibility/speech-dispatcher/speech-dispatcher-0.11.3-r1.ebuild b/app-accessibility/speech-dispatcher/speech-dispatcher-0.11.3-r1.ebuild index 93309e5e9e06..c197df08623b 100644 --- a/app-accessibility/speech-dispatcher/speech-dispatcher-0.11.3-r1.ebuild +++ b/app-accessibility/speech-dispatcher/speech-dispatcher-0.11.3-r1.ebuild @@ -12,7 +12,7 @@ SRC_URI="https://github.com/brailcom/speechd/releases/download/${PV}/${P}.tar.gz LICENSE="GPL-2" SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86" +KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ppc ppc64 ~riscv ~sparc ~x86" IUSE="alsa ao espeak +espeak-ng flite nas pulseaudio python" REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )" diff --git a/app-accessibility/speech-dispatcher/speech-dispatcher-0.11.4.ebuild b/app-accessibility/speech-dispatcher/speech-dispatcher-0.11.4.ebuild new file mode 100644 index 000000000000..aa87c946a7c6 --- /dev/null +++ b/app-accessibility/speech-dispatcher/speech-dispatcher-0.11.4.ebuild @@ -0,0 +1,129 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +PYTHON_COMPAT=( python3_{8..11} ) +# TODO: drop autotools + eautoreconf after 0.11.4 +inherit autotools python-r1 systemd + +DESCRIPTION="Speech synthesis interface" +HOMEPAGE="https://freebsoft.org/speechd" +SRC_URI="https://github.com/brailcom/speechd/releases/download/${PV}/${P}.tar.gz" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86" +IUSE="alsa ao espeak +espeak-ng flite nas pulseaudio python" + +REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )" + +DEPEND="python? ( ${PYTHON_DEPS} ) + >=dev-libs/dotconf-1.3 + >=dev-libs/glib-2.36:2 + >=media-libs/libsndfile-1.0.2 + alsa? ( media-libs/alsa-lib ) + ao? ( media-libs/libao ) + espeak? ( app-accessibility/espeak ) + espeak-ng? ( app-accessibility/espeak-ng ) + flite? ( app-accessibility/flite ) + nas? ( media-libs/nas ) + pulseaudio? ( media-sound/pulseaudio )" +RDEPEND="${DEPEND} + python? ( dev-python/pyxdg[${PYTHON_USEDEP}] )" +BDEPEND=" + sys-apps/help2man + >=sys-devel/gettext-0.19.8 + virtual/pkgconfig" + +PATCHES=( + "${FILESDIR}"/${PN}-0.11.4-GNU_SOURCE.patch +) + +src_prepare() { + default + + eautoreconf +} + +src_configure() { + # bug 573732 + export GIT_CEILING_DIRECTORIES="${WORKDIR}" + + local myeconfargs=( + --disable-ltdl + --disable-python + --disable-static + --with-baratinoo=no + --with-ibmtts=no + --with-kali=no + --with-pico=no + --with-voxin=no + $(use_with alsa) + $(use_with ao libao) + $(use_with espeak) + $(use_with espeak-ng) + $(use_with flite) + $(use_with nas) + $(use_with pulseaudio pulse) + --with-systemdsystemunitdir="$(systemd_get_systemunitdir)" + ) + econf "${myeconfargs[@]}" +} + +src_compile() { + use python && python_copy_sources + + emake + + if use python; then + building() { + cd src/api/python || die + emake \ + pyexecdir="$(python_get_sitedir)" \ + pythondir="$(python_get_sitedir)" + } + python_foreach_impl run_in_build_dir building + fi +} + +src_install() { + default + + if use python; then + installation() { + cd src/api/python || die + emake \ + DESTDIR="${D}" \ + pyexecdir="$(python_get_sitedir)" \ + pythondir="$(python_get_sitedir)" \ + install + } + python_foreach_impl run_in_build_dir installation + python_replicate_script "${ED}"/usr/bin/spd-conf + python_foreach_impl python_optimize + fi + + find "${D}" -name '*.la' -type f -delete || die +} + +pkg_postinst() { + local editconfig="n" + if ! use espeak-ng; then + ewarn "You have disabled espeak-ng, which is speech-dispatcher's" + ewarn "default speech synthesizer." + ewarn + editconfig="y" + fi + if ! use pulseaudio; then + ewarn "You have disabled pulseaudio support." + ewarn "pulseaudio is speech-dispatcher's default audio subsystem." + ewarn + editconfig="y" + fi + if [[ "${editconfig}" == "y" ]]; then + ewarn "You must edit ${EROOT}/etc/speech-dispatcher/speechd.conf" + ewarn "and make sure the settings there match your system." + ewarn + fi +} -- cgit v1.2.3