app-accessibility/speech-dispatcher: add 0.11.4

Bug: https://bugs.gentoo.org/878873
Signed-off-by: Sam James <sam@gentoo.org>
This commit is contained in:
Sam James
2022-10-31 18:37:43 +00:00
parent 91bb676a59
commit 1c407b27db
3 changed files with 233 additions and 0 deletions
@@ -1,2 +1,3 @@
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
@@ -0,0 +1,103 @@
https://github.com/brailcom/speechd/pull/789
From da19d096901466e5ff395846405547d422c90b4c Mon Sep 17 00:00:00 2001
From: Sam James <sam@gentoo.org>
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 <sam@gentoo.org>
--- 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 <config.h>
#endif
-#define _GNU_SOURCE
-
#include <stdio.h>
#include <string.h>
--- a/src/audio/pulse.c
+++ b/src/audio/pulse.c
@@ -34,8 +34,6 @@
*
*/
-#define _GNU_SOURCE
-
#ifdef HAVE_CONFIG_H
#include <config.h>
#endif
--- a/src/clients/spdsend/spdsend.h
+++ b/src/clients/spdsend/spdsend.h
@@ -24,8 +24,6 @@
#define __SPDSEND_H
-#define _GNU_SOURCE
-
#include <stddef.h>
/* 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) \
@@ -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
}