From b2c59335bfbeb25c5644f32172e1e9b23c447710 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Thu, 22 Dec 2022 01:55:45 +0000 Subject: gentoo auto-resync : 22:12:2022 - 01:55:45 --- app-accessibility/Manifest.gz | Bin 4716 -> 4720 bytes app-accessibility/speech-dispatcher/Manifest | 4 - ...peech-dispatcher-0.11.1-include-pthread_h.patch | 14 --- .../speech-dispatcher-0.11.3-fix-dlopen.patch | 93 ---------------- .../speech-dispatcher-0.11.3-r1.ebuild | 123 --------------------- 5 files changed, 234 deletions(-) delete mode 100644 app-accessibility/speech-dispatcher/files/speech-dispatcher-0.11.1-include-pthread_h.patch delete mode 100644 app-accessibility/speech-dispatcher/files/speech-dispatcher-0.11.3-fix-dlopen.patch delete mode 100644 app-accessibility/speech-dispatcher/speech-dispatcher-0.11.3-r1.ebuild (limited to 'app-accessibility') diff --git a/app-accessibility/Manifest.gz b/app-accessibility/Manifest.gz index 40fcc46d493d..db1ec89f6c1a 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 a9e9d256b47f..8011efb21a64 100644 --- a/app-accessibility/speech-dispatcher/Manifest +++ b/app-accessibility/speech-dispatcher/Manifest @@ -1,8 +1,4 @@ -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.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.3-r1.ebuild 2905 BLAKE2B f122ead63396f070a9cdbbf8d9fb7eaa225c09a0317ea06352261cdffa276551634bfc0310fe2561b71b4c5cb5584160785747ae372ecda4c5556bb28c091e0d SHA512 5e126acdd39699e1630759fd9e191798bd9c5b4e734db8e0cd01fc1f8aac39cc037010b6f639939cf7b0753223ab1c41d937da1c49b7bc86a63ee19677a62509 EBUILD speech-dispatcher-0.11.4.ebuild 2963 BLAKE2B 59a4b099138b93ff3222776cfb05ef1d57d52eede7760dbfe15af46b5dcb52b53fe236bff346e5a4c4b050eba21871034c862a757ff1fdbb50956aa00c8f298f SHA512 66352d4819fce4cf75900115bad0200c49e6bdc60a6415d1f231ebaa9bfb80ad5baa108691b7566f5bf79caa936f2f34dc49359474dc6959b9c5c24522618692 MISC metadata.xml 793 BLAKE2B bbb768aefee6e8685fc109b1c03a1b33436cbda492ac2d0657983cd5dbcefdeb7f70ea1022047a44548d9db380e499ea572f9a005d5ff7312bff3cdb377d5e77 SHA512 2f122e8cad49728e27539d6e39114cba61a178ec1944d386d63a34e9c203f0d4360257226251ce21b5acad626d802af597cef5db726017f8b4600c484a13c401 diff --git a/app-accessibility/speech-dispatcher/files/speech-dispatcher-0.11.1-include-pthread_h.patch b/app-accessibility/speech-dispatcher/files/speech-dispatcher-0.11.1-include-pthread_h.patch deleted file mode 100644 index 3575e2c54c99..000000000000 --- a/app-accessibility/speech-dispatcher/files/speech-dispatcher-0.11.1-include-pthread_h.patch +++ /dev/null @@ -1,14 +0,0 @@ -This fixes pthread_mutex_t being undefined on musl libc. - -https://github.com/brailcom/speechd/commit/17e4038948f01e389cbd7fedbe3f0eb54ad3292d -https://bugs.gentoo.org/833347 ---- a/src/modules/module_main.h -+++ b/src/modules/module_main.h -@@ -31,6 +31,7 @@ - - #include - #include -+#include - - #ifdef __cplusplus - extern "C" { diff --git a/app-accessibility/speech-dispatcher/files/speech-dispatcher-0.11.3-fix-dlopen.patch b/app-accessibility/speech-dispatcher/files/speech-dispatcher-0.11.3-fix-dlopen.patch deleted file mode 100644 index f520fdc6adfb..000000000000 --- a/app-accessibility/speech-dispatcher/files/speech-dispatcher-0.11.3-fix-dlopen.patch +++ /dev/null @@ -1,93 +0,0 @@ -https://github.com/brailcom/speechd/commit/db21e5fe4b3155734f60a67c8ab5da6b53174e1b -https://github.com/brailcom/speechd/pull/783 -https://bugs.gentoo.org/877339 - -From db21e5fe4b3155734f60a67c8ab5da6b53174e1b Mon Sep 17 00:00:00 2001 -From: Bernard Cafarelli -Date: Mon, 17 Oct 2022 15:28:37 +0200 -Subject: [PATCH] Fix audio plugin loading with dlopen - -dlopen needs the full name including .so extension -Set SPD_AUDIO_PLUGIN_ENTRY to correct name (ltdl adds a prefix) ---- a/src/audio/alsa.c -+++ b/src/audio/alsa.c -@@ -37,7 +37,11 @@ - #include - #include - -+#ifdef USE_DLOPEN -+#define SPD_AUDIO_PLUGIN_ENTRY spd_audio_plugin_get -+#else - #define SPD_AUDIO_PLUGIN_ENTRY spd_alsa_LTX_spd_audio_plugin_get -+#endif - #include - - typedef struct { ---- a/src/audio/libao.c -+++ b/src/audio/libao.c -@@ -32,7 +32,11 @@ - #include - #include - -+#ifdef USE_DLOPEN -+#define SPD_AUDIO_PLUGIN_ENTRY spd_audio_plugin_get -+#else - #define SPD_AUDIO_PLUGIN_ENTRY spd_libao_LTX_spd_audio_plugin_get -+#endif - #include - - /* send a packet of XXX bytes to the sound device */ ---- a/src/audio/nas.c -+++ b/src/audio/nas.c -@@ -32,7 +32,11 @@ - - #include - -+#ifdef USE_DLOPEN -+#define SPD_AUDIO_PLUGIN_ENTRY spd_audio_plugin_get -+#else - #define SPD_AUDIO_PLUGIN_ENTRY spd_nas_LTX_spd_audio_plugin_get -+#endif - #include - - typedef struct { ---- a/src/audio/oss.c -+++ b/src/audio/oss.c -@@ -39,7 +39,11 @@ - - #include - -+#ifdef USE_DLOPEN -+#define SPD_AUDIO_PLUGIN_ENTRY spd_audio_plugin_get -+#else - #define SPD_AUDIO_PLUGIN_ENTRY spd_oss_LTX_spd_audio_plugin_get -+#endif - #include - - typedef struct { ---- a/src/audio/pulse.c -+++ b/src/audio/pulse.c -@@ -51,7 +51,11 @@ - #include - #include - -+#ifdef USE_DLOPEN -+#define SPD_AUDIO_PLUGIN_ENTRY spd_audio_plugin_get -+#else - #define SPD_AUDIO_PLUGIN_ENTRY spd_pulse_LTX_spd_audio_plugin_get -+#endif - #include - - typedef struct { ---- a/src/common/spd_audio.c -+++ b/src/common/spd_audio.c -@@ -120,7 +120,7 @@ AudioID *spd_audio_open(const char *name, void **pars, char **error) - plugin_dir = PLUGIN_DIR; - - #ifdef USE_DLOPEN -- libname = g_strdup_printf("%s/" SPD_AUDIO_LIB_PREFIX "%s", plugin_dir, name); -+ libname = g_strdup_printf("%s/" SPD_AUDIO_LIB_PREFIX "%s.so", plugin_dir, name); - dlhandle = dlopen(libname, RTLD_NOW | RTLD_GLOBAL); - - g_free(libname); - 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 deleted file mode 100644 index 889db1da776b..000000000000 --- a/app-accessibility/speech-dispatcher/speech-dispatcher-0.11.3-r1.ebuild +++ /dev/null @@ -1,123 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -PYTHON_COMPAT=( python3_{8..11} ) -inherit 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.1-include-pthread_h.patch - "${FILESDIR}"/${P}-fix-dlopen.patch -) - -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